diff --git a/third_party/nixpkgs/.github/stale.yml b/third_party/nixpkgs/.github/stale.yml index 1cf5014cfb..606d5637cc 100644 --- a/third_party/nixpkgs/.github/stale.yml +++ b/third_party/nixpkgs/.github/stale.yml @@ -9,17 +9,33 @@ exemptLabels: # Label to use when marking an issue as stale staleLabel: "2.status: stale" # Comment to post when marking an issue as stale. Set to `false` to disable -markComment: | - Thank you for your contributions. +pulls: + markComment: | + Hello, I'm a bot and I thank you in the name of the community for your contributions. - This has been automatically marked as stale because it has had no activity for 180 days. + Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. - If this is still important to you, we ask that you leave a comment below. Your comment can be as simple as "still important to me". This lets people see that at least one person still cares about this. Someone will have to do this at most twice a year if there is no other activity. + If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do: - Here are suggestions that might help resolve this more quickly: + If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or via [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file). You can see if someone's a member of the [nixpkgs-committers](https://github.com/orgs/NixOS/teams/nixpkgs-committers) team, by hovering with the mouse over their username on the web interface, or by searching them directly on [the list](https://github.com/orgs/NixOS/teams/nixpkgs-committers). + + If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) to find someone who touched the relevant files in the past. + + If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always [officially request them for a review](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review), or just @ mention them and say you've addressed their comments. + + Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/), or more specifically, [at this thread](https://discourse.nixos.org/t/prs-in-distress/3604) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos). + +issues: + markComment: | + Hello, I'm a bot and I thank you in the name of the community for opening this issue. + + To help our human contributors focus on the most-relevant reports, I check up on old issues to see if they're still relevant. This issue has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. + + The community would appreciate your effort in checking if the issue is still valid. If it isn't, please close it. + + If the issue persists, and you'd like to remove the stale label, you simply need to leave a comment. Your comment can be as simple as "still important to me". If you'd like it to get more attention, you can ask for help by searching for maintainers and people that previously touched related code and @ mention them in a comment. You can use [Git blame](https://git-scm.com/docs/git-blame) or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) on the relevant files to find them. + + Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos). - 1. Search for maintainers and people that previously touched the related code and @ mention them in a comment. - 2. Ask on the [NixOS Discourse](https://discourse.nixos.org/). - 3. Ask on the [#nixos channel](irc://irc.freenode.net/#nixos) on [irc.freenode.net](https://freenode.net). # Comment to post when closing a stale issue. Set to `false` to disable closeComment: false diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.xml b/third_party/nixpkgs/doc/builders/images/dockertools.xml index e7f37fdaaf..126698d0a9 100644 --- a/third_party/nixpkgs/doc/builders/images/dockertools.xml +++ b/third_party/nixpkgs/doc/builders/images/dockertools.xml @@ -166,7 +166,7 @@ hello latest de2bf4786de6 About a minute ago 25.2MB buildLayeredImage - Create a Docker image with many of the store paths being on their own layer to improve sharing between images. + Create a Docker image with many of the store paths being on their own layer to improve sharing between images. The image is realized into the Nix store as a gzipped tarball. Depending on the intended usage, many users might prefer to use streamLayeredImage instead, which this function uses internally. @@ -327,6 +327,27 @@ pkgs.dockerTools.buildLayeredImage { +
+ streamLayeredImage + + + Builds a script which, when run, will stream an uncompressed tarball of a Docker image to stdout. The arguments to this function are as for buildLayeredImage. This method of constructing an image does not realize the image into the Nix store, so it saves on IO and disk/cache space, particularly with large images. + + + + The image produced by running the output script can be piped directly into docker load, to load it into the local docker daemon: + + + + Alternatively, the image be piped via gzip into skopeo, e.g. to copy it into a registry: + + +
+
pullImage diff --git a/third_party/nixpkgs/doc/builders/packages/citrix.xml b/third_party/nixpkgs/doc/builders/packages/citrix.xml index c629dc9ee5..16f1bc6f8f 100644 --- a/third_party/nixpkgs/doc/builders/packages/citrix.xml +++ b/third_party/nixpkgs/doc/builders/packages/citrix.xml @@ -4,34 +4,36 @@ Citrix Workspace - - - Please note that the citrix_receiver package has been deprecated since its development was discontinued by upstream and has been replaced by the citrix workspace app. - - - Citrix Receiver and Citrix Workspace App are a remote desktop viewers which provide access to XenDesktop installations. + The Citrix Workspace App is a remote desktop viewer which provides access to XenDesktop installations.
Basic usage - The tarball archive needs to be downloaded manually as the license agreements of the vendor for Citrix Receiver or Citrix Workspace need to be accepted first. Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. With the archive available in the store the package can be built and installed with Nix. + The tarball archive needs to be downloaded manually as the license agreements of the vendor for Citrix Workspace needs to be accepted first. Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. With the archive available in the store the package can be built and installed with Nix. +
- - Caution with <command>nix-shell</command> installs - - It's recommended to install Citrix Receiver and/or Citrix Workspace using nix-env -i or globally to ensure that the .desktop files are installed properly into $XDG_CONFIG_DIRS. Otherwise it won't be possible to open .ica files automatically from the browser to start a Citrix connection. - - +
+ Citrix Selfservice + + The selfservice is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions. + + + In order to set this up, you first have to download the .cr file from the Netscaler Gateway. After that you can configure the selfservice like this: + + $ storebrowse -C ~/Downloads/receiverconfig.cr + $ selfservice + +
Custom certificates - The Citrix Workspace App in nixpkgs trust several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in $ICAROOT, however this directory is a store path in nixpkgs. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using symlinkJoin: + The Citrix Workspace App in nixpkgs trusts several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in $ICAROOT, however this directory is a store path in nixpkgs. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using symlinkJoin: { config.allowUnfree = true; }; let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in diff --git a/third_party/nixpkgs/doc/languages-frameworks/perl.xml b/third_party/nixpkgs/doc/languages-frameworks/perl.xml index d9b6b2721c..ff0f350e99 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/perl.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/perl.xml @@ -3,159 +3,193 @@ xml:id="sec-language-perl"> Perl - - Nixpkgs provides a function buildPerlPackage, a generic package builder function for any Perl package that has a standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic. - - - - Perl packages from CPAN are defined in pkgs/top-level/perl-packages.nix, rather than pkgs/all-packages.nix. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package called from perl-packages.nix. However, more complicated packages should be put in a separate file, typically in pkgs/development/perl-modules. Here is an example of the former: - -ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.21"; - src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; - }; -}; - - Note the use of mirror://cpan/, and the ${name} in the URL definition to ensure that the name attribute is consistent with the source that we’re actually downloading. Perl packages are made available in all-packages.nix through the variable perlPackages. For instance, if you have a package that needs ClassC3, you would typically write - -foo = import ../path/to/foo.nix { - inherit stdenv fetchurl ...; - inherit (perlPackages) ClassC3; -}; - - in all-packages.nix. You can test building a Perl package as follows: - -$ nix-build -A perlPackages.ClassC3 - - buildPerlPackage adds perl- to the start of the name attribute, so the package above is actually called perl-Class-C3-0.21. So to install it, you can say: - -$ nix-env -i perl-Class-C3 - - (Of course you can also install using the attribute name: nix-env -i -A perlPackages.ClassC3.) - - - - So what does buildPerlPackage do? It does the following: - - - - In the configure phase, it calls perl Makefile.PL to generate a Makefile. You can set the variable makeMakerFlags to pass flags to Makefile.PL - - - - - It adds the contents of the PERL5LIB environment variable to #! .../bin/perl line of Perl scripts as -Idir flags. This ensures that a script can find its dependencies. (This can cause this shebang line to become too long for Darwin to handle; see the note below.) - - - - - In the fixup phase, it writes the propagated build inputs (propagatedBuildInputs) to the file $out/nix-support/propagated-user-env-packages. nix-env recursively installs all packages listed in this file when you install a package that has it. This ensures that a Perl package can find its dependencies. - - - - - - - buildPerlPackage is built on top of stdenv, so everything can be customised in the usual way. For instance, the BerkeleyDB module has a preConfigure hook to generate a configuration file used by Makefile.PL: - -{ buildPerlPackage, fetchurl, db }: - -buildPerlPackage rec { - name = "BerkeleyDB-0.36"; - - src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; - }; - - preConfigure = '' - echo "LIB = ${db.out}/lib" > config.in - echo "INCLUDE = ${db.dev}/include" >> config.in - ''; -} - - - - - Dependencies on other Perl packages can be specified in the buildInputs and propagatedBuildInputs attributes. If something is exclusively a build-time dependency, use buildInputs; if it’s (also) a runtime dependency, use propagatedBuildInputs. For instance, this builds a Perl module that has runtime dependencies on a bunch of other modules: - -ClassC3Componentised = buildPerlPackage rec { - name = "Class-C3-Componentised-1.0004"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; - sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; - }; - propagatedBuildInputs = [ - ClassC3 ClassInspector TestException MROCompat - ]; -}; - - - - - On Darwin, if a script has too many -Idir flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the shortenPerlShebang function from the postInstall phase: - -{ stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: - -ImageExifTool = buildPerlPackage { - pname = "Image-ExifTool"; - version = "11.50"; - - src = fetchurl { - url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; - sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; - }; - - buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optional stdenv.isDarwin '' - shortenPerlShebang $out/bin/exiftool - ''; -}; - - This will remove the -I flags from the shebang line, rewrite them in the use lib form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place. - - -
- Generation from CPAN +
+ Running perl programs on the shell - Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program nix-generate-from-cpan, which can be installed as follows: + When executing a Perl script, it is possible you get an error such as ./myscript.pl: bad interpreter: /usr/bin/perl: no such file or directory. This happens when the script expects Perl to be installed at /usr/bin/perl, which is not the case when using Perl from nixpkgs. You can fix the script by changing the first line to: + + #!/usr/bin/env perl + + to take the Perl installation from the PATH environment variable, or invoke Perl directly with: + + $ perl ./myscript.pl + - -$ nix-env -i nix-generate-from-cpan - + + When the script is using a Perl library that is not installed globally, you might get an error such as Can't locate DB_File.pm in @INC (you may need to install the DB_File module). In that case, you can use nix-shell to start an ad-hoc shell with that library installed, for instance: + + $ nix-shell -p perl perlPackages.DBFile --run ./myscript.pl + + - This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example: - -$ nix-generate-from-cpan XML::Simple - XMLSimple = buildPerlPackage rec { - name = "XML-Simple-2.22"; - src = fetchurl { - url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; - sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; - }; - propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; - meta = { - description = "An API for simple XML files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - - The output can be pasted into pkgs/top-level/perl-packages.nix or wherever else you need it. + If you are always using the script in places where nix-shell is available, you can embed the nix-shell invocation in the shebang like this: + + #!/usr/bin/env nix-shell + #! nix-shell -i perl -p perl perlPackages.DBFile +
-
- Cross-compiling modules +
+ Packaging Perl programs - Nixpkgs has experimental support for cross-compiling Perl modules. In many cases, it will just work out of the box, even for modules with native extensions. Sometimes, however, the Makefile.PL for a module may (indirectly) import a native module. In that case, you will need to make a stub for that module that will satisfy the Makefile.PL and install it into lib/perl5/site_perl/cross_perl/${perl.version}. See the postInstall for DBI for an example. + Nixpkgs provides a function buildPerlPackage, a generic package builder function for any Perl package that has a standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic. + + + Perl packages from CPAN are defined in pkgs/top-level/perl-packages.nix, rather than pkgs/all-packages.nix. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package called from perl-packages.nix. However, more complicated packages should be put in a separate file, typically in pkgs/development/perl-modules. Here is an example of the former: + + ClassC3 = buildPerlPackage rec { + name = "Class-C3-0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; + }; + }; + + Note the use of mirror://cpan/, and the ${name} in the URL definition to ensure that the name attribute is consistent with the source that we’re actually downloading. Perl packages are made available in all-packages.nix through the variable perlPackages. For instance, if you have a package that needs ClassC3, you would typically write + + foo = import ../path/to/foo.nix { + inherit stdenv fetchurl ...; + inherit (perlPackages) ClassC3; + }; + + in all-packages.nix. You can test building a Perl package as follows: + + $ nix-build -A perlPackages.ClassC3 + + buildPerlPackage adds perl- to the start of the name attribute, so the package above is actually called perl-Class-C3-0.21. So to install it, you can say: + + $ nix-env -i perl-Class-C3 + + (Of course you can also install using the attribute name: nix-env -i -A perlPackages.ClassC3.) + + + + So what does buildPerlPackage do? It does the following: + + + + In the configure phase, it calls perl Makefile.PL to generate a Makefile. You can set the variable makeMakerFlags to pass flags to Makefile.PL + + + + + It adds the contents of the PERL5LIB environment variable to #! .../bin/perl line of Perl scripts as -Idir flags. This ensures that a script can find its dependencies. (This can cause this shebang line to become too long for Darwin to handle; see the note below.) + + + + + In the fixup phase, it writes the propagated build inputs (propagatedBuildInputs) to the file $out/nix-support/propagated-user-env-packages. nix-env recursively installs all packages listed in this file when you install a package that has it. This ensures that a Perl package can find its dependencies. + + + + + + + buildPerlPackage is built on top of stdenv, so everything can be customised in the usual way. For instance, the BerkeleyDB module has a preConfigure hook to generate a configuration file used by Makefile.PL: + + { buildPerlPackage, fetchurl, db }: + + buildPerlPackage rec { + name = "BerkeleyDB-0.36"; + + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; + }; + + preConfigure = '' + echo "LIB = ${db.out}/lib" > config.in + echo "INCLUDE = ${db.dev}/include" >> config.in + ''; + } + + + + + Dependencies on other Perl packages can be specified in the buildInputs and propagatedBuildInputs attributes. If something is exclusively a build-time dependency, use buildInputs; if it’s (also) a runtime dependency, use propagatedBuildInputs. For instance, this builds a Perl module that has runtime dependencies on a bunch of other modules: + + ClassC3Componentised = buildPerlPackage rec { + name = "Class-C3-Componentised-1.0004"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; + sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; + }; + propagatedBuildInputs = [ + ClassC3 ClassInspector TestException MROCompat + ]; + }; + + + + + On Darwin, if a script has too many -Idir flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the shortenPerlShebang function from the postInstall phase: + + { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: + + ImageExifTool = buildPerlPackage { + pname = "Image-ExifTool"; + version = "11.50"; + + src = fetchurl { + url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; + sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optional stdenv.isDarwin '' + shortenPerlShebang $out/bin/exiftool + ''; + }; + + This will remove the -I flags from the shebang line, rewrite them in the use lib form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place. + + +
+ Generation from CPAN + + + Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program nix-generate-from-cpan, which can be installed as follows: + + + + $ nix-env -i nix-generate-from-cpan + + + + This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example: + + $ nix-generate-from-cpan XML::Simple + XMLSimple = buildPerlPackage rec { + name = "XML-Simple-2.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; + sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; + }; + propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; + meta = { + description = "An API for simple XML files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + The output can be pasted into pkgs/top-level/perl-packages.nix or wherever else you need it. + +
+ +
+ Cross-compiling modules + + + Nixpkgs has experimental support for cross-compiling Perl modules. In many cases, it will just work out of the box, even for modules with native extensions. Sometimes, however, the Makefile.PL for a module may (indirectly) import a native module. In that case, you will need to make a stub for that module that will satisfy the Makefile.PL and install it into lib/perl5/site_perl/cross_perl/${perl.version}. See the postInstall for DBI for an example. + +
diff --git a/third_party/nixpkgs/doc/stdenv/meta.xml b/third_party/nixpkgs/doc/stdenv/meta.xml index 45f7834eb2..9cef936000 100644 --- a/third_party/nixpkgs/doc/stdenv/meta.xml +++ b/third_party/nixpkgs/doc/stdenv/meta.xml @@ -155,17 +155,17 @@ hello-2.3 A program that produces a familiar, friendly greeting - Single license referenced by attribute (preferred) stdenv.lib.licenses.gpl3. + Single license referenced by attribute (preferred) stdenv.lib.licenses.gpl3Only. - Single license referenced by its attribute shortName (frowned upon) "gpl3". + Single license referenced by its attribute shortName (frowned upon) "gpl3Only". - Single license referenced by its attribute spdxId (frowned upon) "GPL-3.0". + Single license referenced by its attribute spdxId (frowned upon) "GPL-3.0-only". diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.xml b/third_party/nixpkgs/doc/stdenv/stdenv.xml index ee93f39318..818e6c5da0 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.xml +++ b/third_party/nixpkgs/doc/stdenv/stdenv.xml @@ -2018,6 +2018,9 @@ addEnvHooks "$hostOffset" myBashFunction In certain situations you may want to run the main command (autoPatchelf) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the dontAutoPatchelf environment variable to a non-empty value. + + By default autoPatchelf will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the autoPatchelfIgnoreMissingDeps environment variable to a non-empty value. + The autoPatchelf command also recognizes a --no-recurse command line flag, which prevents it from recursing into subdirectories. diff --git a/third_party/nixpkgs/doc/using/configuration.xml b/third_party/nixpkgs/doc/using/configuration.xml index f19eddb586..b670f78f28 100644 --- a/third_party/nixpkgs/doc/using/configuration.xml +++ b/third_party/nixpkgs/doc/using/configuration.xml @@ -85,19 +85,19 @@ Installing packages on unsupported systems - There are also two ways to try compiling a package which has been marked as unsuported for the given system. + There are also two ways to try compiling a package which has been marked as unsupported for the given system. - For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: + For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 - For permanently allowing broken packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: + For permanently allowing unsupported packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: { allowUnsupportedSystem = true; @@ -162,10 +162,10 @@ - The following example configuration blacklists the gpl3 and agpl3 licenses: + The following example configuration blacklists the gpl3Only and agpl3Only licenses: { - blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; + blacklistedLicenses = with stdenv.lib.licenses; [ agpl3Only gpl3Only ]; } diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix index 82bea7af31..d91d7a0cd4 100644 --- a/third_party/nixpkgs/lib/attrsets.nix +++ b/third_party/nixpkgs/lib/attrsets.nix @@ -469,6 +469,7 @@ rec { getBin = getOutput "bin"; getLib = getOutput "lib"; getDev = getOutput "dev"; + getMan = getOutput "man"; /* Pick the outputs of packages to place in buildInputs */ chooseDevOutputs = drvs: builtins.map getDev drvs; diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index e7f59a67ab..7387e9d9f1 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -77,7 +77,7 @@ let genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting getOutput getBin - getLib getDev chooseDevOutputs zipWithNames zip + getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs; inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index b799a6ae8a..2c6da3a865 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -28,7 +28,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "Academic Free License v3.0"; }; - agpl3 = spdx { + agpl3Only = spdx { spdxId = "AGPL-3.0-only"; fullName = "GNU Affero General Public License v3.0 only"; }; @@ -95,6 +95,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = ''BSD 2-clause "Simplified" License''; }; + bsd2Patent = spdx { + spdxId = "BSD-2-Clause-Patent"; + fullName = ''BSD-2-Clause Plus Patent License''; + }; + bsd3 = spdx { spdxId = "BSD-3-Clause"; fullName = ''BSD 3-clause "New" or "Revised" License''; @@ -276,12 +281,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "European Union Public License 1.2"; }; - fdl11 = spdx { + fdl11Only = spdx { spdxId = "GFDL-1.1-only"; fullName = "GNU Free Documentation License v1.1 only"; }; - fdl12 = spdx { + fdl12Only = spdx { spdxId = "GFDL-1.2-only"; fullName = "GNU Free Documentation License v1.2 only"; }; @@ -291,7 +296,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Free Documentation License v1.2 or later"; }; - fdl13 = spdx { + fdl13Only = spdx { spdxId = "GFDL-1.3-only"; fullName = "GNU Free Documentation License v1.3 only"; }; @@ -322,7 +327,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { free = false; }; - gpl1 = spdx { + gpl1Only = spdx { spdxId = "GPL-1.0-only"; fullName = "GNU General Public License v1.0 only"; }; @@ -332,7 +337,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU General Public License v1.0 or later"; }; - gpl2 = spdx { + gpl2Only = spdx { spdxId = "GPL-2.0-only"; fullName = "GNU General Public License v2.0 only"; }; @@ -357,7 +362,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU General Public License v2.0 or later"; }; - gpl3 = spdx { + gpl3Only = spdx { spdxId = "GPL-3.0-only"; fullName = "GNU General Public License v3.0 only"; }; @@ -432,7 +437,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "JasPer License"; }; - lgpl2 = spdx { + lgpl2Only = spdx { spdxId = "LGPL-2.0-only"; fullName = "GNU Library General Public License v2 only"; }; @@ -442,7 +447,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Library General Public License v2 or later"; }; - lgpl21 = spdx { + lgpl21Only = spdx { spdxId = "LGPL-2.1-only"; fullName = "GNU Lesser General Public License v2.1 only"; }; @@ -452,7 +457,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Lesser General Public License v2.1 or later"; }; - lgpl3 = spdx { + lgpl3Only = spdx { spdxId = "LGPL-3.0-only"; fullName = "GNU Lesser General Public License v3.0 only"; }; @@ -462,6 +467,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Lesser General Public License v3.0 or later"; }; + lgpllr = spdx { + spdxId = "LGPLLR"; + fullName = "Lesser General Public License For Linguistic Resources"; + }; + libpng = spdx { spdxId = "Libpng"; fullName = "libpng License"; @@ -482,6 +492,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { url = "https://opensource.franz.com/preamble.html"; }; + llvm-exception = spdx { + spdxId = "LLVM-exception"; + fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License + }; + lppl12 = spdx { spdxId = "LPPL-1.2"; fullName = "LaTeX Project Public License v1.2"; @@ -545,6 +560,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "Non-Profit Open Software License 3.0"; }; + obsidian = { + fullName = "Obsidian End User Agreement"; + url = "https://obsidian.md/eula"; + free = false; + }; + ocamlpro_nc = { fullName = "OCamlPro Non Commercial license version 1"; url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf"; @@ -761,4 +782,16 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; +} // { + # TODO: remove legacy aliases + agpl3 = lib.licenses.agpl3Only; + fdl11 = lib.licenses.fdl11Only; + fdl12 = lib.licenses.fdl12Only; + fdl13 = lib.licenses.fdl13Only; + gpl1 = lib.licenses.gpl1Only; + gpl2 = lib.licenses.gpl2Only; + gpl3 = lib.licenses.gpl3Only; + lgpl2 = lib.licenses.lgpl2Only; + lgpl21 = lib.licenses.lgpl21Only; + lgpl3 = lib.licenses.lgpl3Only; } diff --git a/third_party/nixpkgs/lib/sources.nix b/third_party/nixpkgs/lib/sources.nix index ed9bce4853..776fcc3205 100644 --- a/third_party/nixpkgs/lib/sources.nix +++ b/third_party/nixpkgs/lib/sources.nix @@ -145,10 +145,14 @@ rec { # packed-refs file, so we have to grep through it: then let fileContent = readFile packedRefsName; - matchRef = match (".*\n([^\n ]*) " + file + "\n.*") fileContent; - in if matchRef == null + matchRef = builtins.match "([a-z0-9]+) ${file}"; + isRef = s: builtins.isString s && (matchRef s) != null; + # there is a bug in libstdc++ leading to stackoverflow for long strings: + # https://github.com/NixOS/nix/issues/2147#issuecomment-659868795 + refs = builtins.filter isRef (builtins.split "\n" fileContent); + in if refs == [] then throw ("Could not find " + file + " in " + packedRefsName) - else lib.head matchRef + else lib.head (matchRef (lib.head refs)) else throw ("Not a .git directory: " + path); in readCommitFromFile "HEAD"; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 46ed766e0c..8e77ec4ff3 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -283,6 +283,12 @@ githubId = 273837; name = "Mateusz Czapliński"; }; + akamaus = { + email = "dmitryvyal@gmail.com"; + github = "akamaus"; + githubId = 58955; + name = "Dmitry Vyal"; + }; akaWolf = { email = "akawolf0@gmail.com"; github = "akaWolf"; @@ -633,6 +639,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arnarg = { + email = "arnarg@fastmail.com"; + github = "arnarg"; + githubId = 1291396; + name = "Arnar Ingason"; + }; arnoldfarkas = { email = "arnold.farkas@gmail.com"; github = "arnoldfarkas"; @@ -1025,6 +1037,12 @@ githubId = 5718007; name = "Bastian Köcher"; }; + blaggacao = { + name = "David Arnold"; + email = "dar@xoe.solutions"; + github = "blaggacao"; + githubId = 7548295; + }; blanky0230 = { email = "blanky0230@gmail.com"; github = "blanky0230"; @@ -1043,6 +1061,12 @@ githubId = 16330; name = "Mathijs Kwik"; }; + bmilanov = { + name = "Biser Milanov"; + email = "bmilanov11+nixpkgs@gmail.com"; + github = "bmilanov"; + githubId = 30090366; + }; bobakker = { email = "bobakk3r@gmail.com"; github = "bobakker"; @@ -1133,6 +1157,12 @@ githubId = 7716744; name = "Berno Strik"; }; + breakds = { + email = "breakds@gmail.com"; + github = "breakds"; + githubId = 1111035; + name = "Break Yang"; + }; brettlyons = { email = "blyons@fastmail.com"; github = "brettlyons"; @@ -1598,6 +1628,12 @@ githubId = 32609395; name = "B YI"; }; + conradmearns = { + email = "conradmearns+github@pm.me"; + github = "ConradMearns"; + githubId = 5510514; + name = "Conrad Mearns"; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; @@ -1610,6 +1646,16 @@ githubId = 411324; name = "Carles Pagès"; }; + cpu = { + email = "daniel@binaryparadox.net"; + github = "cpu"; + githubId = 292650; + name = "Daniel McCarney"; + keys = [{ + longkeyid = "rsa2048/0x08FB2BFC470E75B4"; + fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; + }]; + }; craigem = { email = "craige@mcwhirter.io"; github = "craigem"; @@ -1634,6 +1680,16 @@ githubId = 1222362; name = "Matías Lang"; }; + CRTified = { + email = "carl.schneider+nixos@rub.de"; + github = "CRTified"; + githubId = 2440581; + name = "Carl Richard Theodor Schneider"; + keys = [{ + longkeyid = "rsa4096/0x45BCC1E2709B1788"; + fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; + }]; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; @@ -1772,10 +1828,22 @@ githubId = 4971975; name = "Janne Heß"; }; + "dasj19" = { + email = "daniel@serbanescu.dk"; + github = "dasj19"; + githubId = 7589338; + name = "Daniel Șerbănescu"; + }; dasuxullebt = { email = "christoph.senjak@googlemail.com"; name = "Christoph-Simon Senjak"; }; + david-sawatzke = { + email = "d-nix@sawatzke.dev"; + github = "david-sawatzke"; + githubId = 11035569; + name = "David Sawatzke"; + }; david50407 = { email = "me@davy.tw"; github = "david50407"; @@ -2632,6 +2700,12 @@ fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; }]; }; + fionera = { + email = "nix@fionera.de"; + github = "fionera"; + githubId = 5741401; + name = "Tim Windelschmidt"; + }; FireyFly = { email = "nix@firefly.nu"; github = "FireyFly"; @@ -2950,6 +3024,16 @@ githubId = 615606; name = "Glenn Searby"; }; + glittershark = { + name = "Griffin Smith"; + email = "root@gws.fyi"; + github = "glittershark"; + githubId = 1481027; + keys = [{ + longkeyid = "rsa2048/0x44EF5B5E861C09A7"; + fingerprint = "0F11 A989 879E 8BBB FDC1 E236 44EF 5B5E 861C 09A7"; + }]; + }; gloaming = { email = "ch9871@gmail.com"; github = "gloaming"; @@ -3698,6 +3782,12 @@ githubId = 41977; name = "Joachim Fasting"; }; + joachimschmidt557 = { + email = "joachim.schmidt557@outlook.com"; + github = "joachimschmidt557"; + githubId = 28556218; + name = "Joachim Schmidt"; + }; joamaki = { email = "joamaki@gmail.com"; github = "joamaki"; @@ -3879,6 +3969,12 @@ githubId = 4611077; name = "Raymond Gauthier"; }; + jschievink = { + email = "jonasschievink@gmail.com"; + github = "jonas-schievink"; + githubId = 1786438; + name = "Jonas Schievink"; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; @@ -4707,6 +4803,12 @@ githubId = 34683288; name = "Luke Bentley-Fox"; }; + lukegb = { + email = "nix@lukegb.com"; + github = "lukegb"; + githubId = 246745; + name = "Luke Granger-Brown"; + }; lukego = { email = "luke@snabb.co"; github = "lukego"; @@ -5003,6 +5105,12 @@ githubId = 2971615; name = "Marius Bergmann"; }; + mcbeth = { + email = "mcbeth@broggs.org"; + github = "mcbeth"; + githubId = 683809; + name = "Jeffrey Brent McBeth"; + }; mcmtroffaes = { email = "matthias.troffaes@gmail.com"; github = "mcmtroffaes"; @@ -5560,6 +5668,12 @@ githubId = 5047140; name = "Victor Collod"; }; + mupdt = { + email = "nix@pdtpartners.com"; + github = "mupdt"; + githubId = 25388474; + name = "Matej Urbas"; + }; mvnetbiz = { email = "mvnetbiz@gmail.com"; github = "mvnetbiz"; @@ -6296,6 +6410,12 @@ fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; }]; }; + priegger = { + email = "philipp@riegger.name"; + github = "priegger"; + githubId = 228931; + name = "Philipp Riegger"; + }; prikhi = { email = "pavan.rikhi@gmail.com"; github = "prikhi"; @@ -6450,6 +6570,12 @@ githubId = 131856; name = "Arnout Engelen"; }; + RaghavSood = { + email = "r@raghavsood.com"; + github = "RaghavSood"; + githubId = 903072; + name = "Raghav Sood"; + }; rafaelgg = { email = "rafael.garcia.gallego@gmail.com"; github = "rafaelgg"; @@ -7154,6 +7280,12 @@ githubId = 24496705; name = "Scott Hamilton"; }; + ShamrockLee = { + name = "Shamrock Lee"; + email = "44064051+ShamrockLee@users.noreply.github.com"; + github = "ShamrockLee"; + githubId = 44064051; + }; shanemikel = { email = "shanepearlman@pm.me"; github = "shanemikel"; @@ -7266,6 +7398,16 @@ githubId = 2770647; name = "Simon Vandel Sillesen"; }; + siriobalmelli = { + email = "sirio@b-ad.ch"; + github = "siriobalmelli"; + githubId = 23038812; + name = "Sirio Balmelli"; + keys = [{ + longkeyid = "ed25519/0xF72C4A887F9A24CA"; + fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; + }]; + }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; @@ -7840,6 +7982,12 @@ githubId = 1141680; name = "Thane Gill"; }; + TheBrainScrambler = { + email = "esthromeris@riseup.net"; + github = "TheBrainScrambler"; + githubId = 34945377; + name = "John Smith"; + }; thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; @@ -8058,6 +8206,12 @@ githubId = 1486805; name = "Toon Nolten"; }; + toschmidt = { + email = "tobias.schmidt@in.tum.de"; + github = "toschmidt"; + githubId = 27586264; + name = "Tobias Schmidt"; + }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; @@ -8961,4 +9115,28 @@ github = "cpcloud"; githubId = 417981; }; + davegallant = { + name = "Dave Gallant"; + email = "davegallant@gmail.com"; + github = "davegallant"; + githubId = 4519234; + }; + saulecabrera = { + name = "Saúl Cabrera"; + email = "saulecabrera@gmail.com"; + github = "saulecabrera"; + githubId = 1423601; + }; + tfmoraes = { + name = "Thiago Franco de Moraes"; + email = "351108+tfmoraes@users.noreply.github.com"; + github = "tfmoraes"; + githubId = 351108; + }; + deifactor = { + name = "Ash Zahlen"; + email = "ext0l@riseup.net"; + github = "deifactor"; + githubId = 30192992; + }; } diff --git a/third_party/nixpkgs/maintainers/scripts/debian-patches.sh b/third_party/nixpkgs/maintainers/scripts/debian-patches.sh index b4923fb537..de6be136ca 100755 --- a/third_party/nixpkgs/maintainers/scripts/debian-patches.sh +++ b/third_party/nixpkgs/maintainers/scripts/debian-patches.sh @@ -2,7 +2,7 @@ # Download patches from debian project # Usage $0 debian-patches.txt debian-patches.nix -# An example input and output files can be found in applications/graphics/xara/ +# An example input and output files can be found in tools/graphics/plotutils DEB_URL=https://sources.debian.org/data/main declare -a deb_patches diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index 8cc6396337..c1eeed4afd 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -74,6 +74,7 @@ moonscript,,,,,arobyn nvim-client,,,,, penlight,,,,, rapidjson,,,,, +readline,,,,, say,,,,, std__debug,std._debug,,,, std_normalize,std.normalize,,,, diff --git a/third_party/nixpkgs/maintainers/scripts/update.nix b/third_party/nixpkgs/maintainers/scripts/update.nix index 66ea18ddf6..9568c6cbbc 100755 --- a/third_party/nixpkgs/maintainers/scripts/update.nix +++ b/third_party/nixpkgs/maintainers/scripts/update.nix @@ -9,7 +9,13 @@ # TODO: add assert statements let - pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; }); + pkgs = import ./../../default.nix ( + if include-overlays == false then + { overlays = []; } + else if include-overlays == true then + { } # Let Nixpkgs include overlays impurely. + else { overlays = include-overlays; } + ); inherit (pkgs) lib; diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 703a6a031d..750e76a184 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -40,6 +40,7 @@ with lib.maintainers; { cstrahan Frostman kalbasit + mdlayher mic92 orivej rvolosatovs @@ -53,6 +54,7 @@ with lib.maintainers; { hedning jtojnar worldofpeace + dasj19 ]; scope = "Maintain GNOME desktop environment and platform."; }; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/configuration.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/configuration.xml index 507d28814e..6eb8f50bac 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/configuration.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/configuration.xml @@ -18,6 +18,7 @@ + diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml new file mode 100644 index 0000000000..61229390d0 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml @@ -0,0 +1,104 @@ + + GPU acceleration + + + NixOS provides various APIs that benefit from GPU hardware + acceleration, such as VA-API and VDPAU for video playback; OpenGL and + Vulkan for 3D graphics; and OpenCL for general-purpose computing. + This chapter describes how to set up GPU hardware acceleration (as far + as this is not done automatically) and how to verify that hardware + acceleration is indeed used. + + + + Most of the aforementioned APIs are agnostic with regards to which + display server is used. Consequently, these instructions should apply + both to the X Window System and Wayland compositors. + + +
+ OpenCL + + + OpenCL is a + general compute API. It is used by various applications such as + Blender and Darktable to accelerate certain operations. + + + + OpenCL applications load drivers through the Installable Client + Driver (ICD) mechanism. In this mechanism, an ICD file + specifies the path to the OpenCL driver for a particular GPU family. + In NixOS, there are two ways to make ICD files visible to the ICD + loader. The first is through the OCL_ICD_VENDORS + environment variable. This variable can contain a directory which + is scanned by the ICL loader for ICD files. For example: + + $ export \ + OCL_ICD_VENDORS=`nix-build '<nixpkgs>' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ + + + + The second mechanism is to add the OpenCL driver package to + . This links the + ICD file under /run/opengl-driver, where it will + be visible to the ICD loader. + + + + The proper installation of OpenCL drivers can be verified through + the clinfo command of the clinfo + package. This command will report the number of hardware devides + that is found and give detailed information for each device: + + + $ clinfo | head -n3 +Number of platforms 1 +Platform Name AMD Accelerated Parallel Processing +Platform Vendor Advanced Micro Devices, Inc. + +
+ AMD + + + Modern AMD Graphics + Core Next (GCN) GPUs are supported through the + rocm-opencl-icd package. Adding this package to + enables OpenCL + support. However, OpenCL Image support is provided through the + non-free rocm-runtime-ext package. This package can + be added to the same configuration option, but requires that + allowUnfree option is is enabled for nixpkgs. Full + OpenCL support on supported AMD GPUs is thus enabled as follows: + + = [ + rocm-opencl-icd + rocm-runtime-ext +]; + + + + It is also possible to use the OpenCL Image extension without a + system-wide installation of the rocm-runtime-ext + package by setting the ROCR_EXT_DIR environment + variable to the directory that contains the extension: + + $ export \ +ROCR_EXT_DIR=`nix-build '<nixpkgs>' --no-out-link -A rocm-runtime-ext`/lib/rocm-runtime-ext + + + + With either approach, you can verify that OpenCL Image support + is indeed working with the clinfo command: + + $ clinfo | grep Image + Image support Yes + +
+
+ diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml index 395a5ec357..bc801bb3dc 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml @@ -9,7 +9,6 @@ This profile just enables a demo user, with password demo, uid 1000, wheel group and - autologin - in the SDDM display manager. + autologin in the SDDM display manager.
diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml index 110712baf5..18f0be5e7f 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml @@ -90,10 +90,50 @@ using lightdm for a user alice: = true; - = true; - = "alice"; + = true; + = "alice"; - The options are named identically for all other display managers. + + + + Intel Graphics drivers + + There are two choices for Intel Graphics drivers in X.org: + modesetting (included in the xorg-server itself) + and intel (provided by the package xf86-video-intel). + + + The default and recommended is modesetting. + It is a generic driver which uses the kernel + mode setting + (KMS) mechanism. It supports Glamor (2D graphics acceleration via OpenGL) + and is actively maintained but may perform worse in some cases (like in old chipsets). + + + The second driver, intel, is specific to Intel GPUs, + but not recommended by most distributions: it lacks several modern features + (for example, it doesn't support Glamor) and the package hasn't been officially + updated since 2015. + + + The results vary depending on the hardware, so you may have to try both drivers. + Use the option to set one. + The recommended configuration for modern systems is: + + = [ "modesetting" ]; + = true; + + If you experience screen tearing no matter what, this configuration was + reported to resolve the issue: + + = [ "intel" ]; + = '' + Option "DRI" "2" + Option "TearFree" "true" + ''; + + Note that this will likely downgrade the performance compared to + modesetting or intel with DRI 3 (default). diff --git a/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.xml index 31216874c7..a11a938276 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -38,7 +38,12 @@ starting VDE switch for network 1 - The machine state is kept across VM restarts in - /tmp/vm-state-machinename. + You can re-use the VM states coming from a previous run + by setting the --keep-vm-state flag. + +$ ./result/bin/nixos-run-vms --keep-vm-state + + The machine state is stored in the + $TMPDIR/vm-state-machinename directory.
diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml index 150bea8c2d..d9dc3cd5e2 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml @@ -360,6 +360,18 @@ start_all() + + + wait_for_console_text + + + + Wait until the supplied regular expressions match a line of the serial + console output. This method is useful when OCR is not possibile or + accurate enough. + + + wait_for_window @@ -378,7 +390,7 @@ start_all() Copies a file from host to machine, e.g., - copy_file_from_host("myfile", "/etc/my/important/file"). + copy_from_host("myfile", "/etc/my/important/file"). The first argument is the file on the host. The file needs to be diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 0ba909fa95..1cffeed480 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -49,7 +49,7 @@ - Click on Settings / Display / Screen and select VBoxVGA as Graphics Controller + Click on Settings / Display / Screen and select VMSVGA as Graphics Controller diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml index 673df8f2e4..48307ca246 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml @@ -146,7 +146,7 @@ partition. It uses the initially reserved 512MiB at the start of the disk. # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -# parted /dev/sda -- set 3 boot on +# parted /dev/sda -- set 3 esp on @@ -513,7 +513,7 @@ Retype new UNIX password: *** # parted /dev/sda -- mkpart primary 512MiB -8GiB # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -# parted /dev/sda -- set 3 boot on +# parted /dev/sda -- set 3 esp on diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml index f4f663b84f..f70f08a0f8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml @@ -315,7 +315,7 @@ switch), because the hardware and boot loader configuration in the VM are different. The boot loader is installed on an automatically generated virtual disk containing a /boot - partition, which is mounted read-only in the VM. + partition. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml index 393a9286ca..0e9ba027a3 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml @@ -792,7 +792,7 @@ users.users.me = The module has been removed. It was only intended for use in internal NixOS tests, and gave the false impression of it being a special display manager when it's actually LightDM. - Please use the options instead, + Please use the options instead, or any other display manager in NixOS as they all support auto-login. If you used this module specifically because it permitted root auto-login you can override the lightdm-autologin pam module like: 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 a0a0b2cb40..97b94c5756 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 @@ -110,6 +110,26 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; + + + Two new option documentation.man.generateCaches + has been added to automatically generate the man-db caches, which are needed by utilities + like whatis and apropos. The caches are generated during the build of + the NixOS configuration: since this can be expensive when a large number of packages are installed, the + feature is disabled by default. + + + + + services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certifcate authorities. + + + + + Subordinate GID and UID mappings are now set up automatically for all normal users. + This will make container tools like Podman work as non-root users out of the box. + +
@@ -495,6 +515,22 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; In the resilio module, has been changed to listen to [::1] instead of 0.0.0.0. + + + Radicale's default package has changed from 2.x to 3.x. An upgrade + checklist can be found + here. + You can use the newer version in the NixOS service by setting the + package to radicale3, which is done + automatically if stateVersion is 20.09 or higher. + + + + + We now have a unified option interface + to be used for every display-manager in NixOS. + + @@ -656,6 +692,18 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; nextcloud18 before upgrading to nextcloud19 since Nextcloud doesn't support upgrades across multiple major versions. + + The nixos-run-vms script now deletes the + previous run machines states on test startup. You can use the + --keep-vm-state flag to match the previous + behaviour and keep the same VM state between different test runs. + + + + + The nix.buildMachines option is now type-checked. + There are no functional changes, however this may require updating some configurations to use correct types for all attributes. + diff --git a/third_party/nixpkgs/nixos/lib/make-disk-image.nix b/third_party/nixpkgs/nixos/lib/make-disk-image.nix index 9364aab327..a72bdedb16 100644 --- a/third_party/nixpkgs/nixos/lib/make-disk-image.nix +++ b/third_party/nixpkgs/nixos/lib/make-disk-image.nix @@ -181,6 +181,7 @@ let format' = format; in let export NIX_STATE_DIR=$TMPDIR/state nix-store --load-db < ${closureInfo}/registration + chmod 755 "$TMPDIR" echo "running nixos-install..." nixos-install --root $root --no-bootloader --no-root-passwd \ --system ${config.system.build.toplevel} --channel ${channelSources} --substituters "" diff --git a/third_party/nixpkgs/nixos/lib/make-ext4-fs.nix b/third_party/nixpkgs/nixos/lib/make-ext4-fs.nix index 516fe3fc67..74a6c134e6 100644 --- a/third_party/nixpkgs/nixos/lib/make-ext4-fs.nix +++ b/third_party/nixpkgs/nixos/lib/make-ext4-fs.nix @@ -17,7 +17,7 @@ , e2fsprogs , libfaketime , perl -, lkl +, fakeroot }: let @@ -26,7 +26,7 @@ in pkgs.stdenv.mkDerivation { name = "ext4-fs.img${lib.optionalString compressImage ".zst"}"; - nativeBuildInputs = [ e2fsprogs.bin libfaketime perl lkl ] + nativeBuildInputs = [ e2fsprogs.bin libfaketime perl fakeroot ] ++ lib.optional compressImage zstd; buildCommand = @@ -37,32 +37,31 @@ pkgs.stdenv.mkDerivation { ${populateImageCommands} ) - # Add the closures of the top-level store objects. - storePaths=$(cat ${sdClosureInfo}/store-paths) + echo "Preparing store paths for image..." + + # Create nix/store before copying path + mkdir -p ./rootImage/nix/store + + xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths + ( + GLOBIGNORE=".:.." + shopt -u dotglob + cp -a --reflink=auto ./files/* -t ./rootImage/ + ) + + # Also include a manifest of the closures in a format suitable for nix-store --load-db + cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. - numInodes=$(find $storePaths ./files | wc -l) - numDataBlocks=$(du -s -c -B 4096 --apparent-size $storePaths ./files | tail -1 | awk '{ print int($1 * 1.10) }') + numInodes=$(find ./rootImage | wc -l) + numDataBlocks=$(du -s -c -B 4096 --apparent-size ./rootImage | tail -1 | awk '{ print int($1 * 1.10) }') bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks)) echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)" truncate -s $bytes $img - faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $img - # Also include a manifest of the closures in a format suitable for nix-store --load-db. - cp ${sdClosureInfo}/registration nix-path-registration - cptofs -t ext4 -i $img nix-path-registration / - - # Create nix/store before copying paths - faketime -f "1970-01-01 00:00:01" mkdir -p nix/store - cptofs -t ext4 -i $img nix / - - echo "copying store paths to image..." - cptofs -t ext4 -i $img $storePaths /nix/store/ - - echo "copying files to image..." - cptofs -t ext4 -i $img ./files/* / + faketime -f "1970-01-01 00:00:01" fakeroot mkfs.ext4 -L ${volumeLabel} -U ${uuid} -d ./rootImage $img export EXT2FS_NO_MTAB_OK=yes # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py index e7b05968b0..7b8d5803aa 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -3,7 +3,10 @@ from contextlib import contextmanager, _GeneratorContextManager from queue import Queue, Empty from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List from xml.sax.saxutils import XMLGenerator +import queue +import io import _thread +import argparse import atexit import base64 import codecs @@ -19,6 +22,7 @@ import subprocess import sys import tempfile import time +import traceback import unicodedata CHAR_TO_KEY = { @@ -671,6 +675,22 @@ class Machine: with self.nested("waiting for {} to appear on screen".format(regex)): retry(screen_matches) + def wait_for_console_text(self, regex: str) -> None: + self.log("waiting for {} to appear on console".format(regex)) + # Buffer the console output, this is needed + # to match multiline regexes. + console = io.StringIO() + while True: + try: + console.write(self.last_lines.get()) + except queue.Empty: + self.sleep(1) + continue + console.seek(0) + matches = re.search(regex, console.read()) + if matches is not None: + return + def send_key(self, key: str) -> None: key = CHAR_TO_KEY.get(key, key) self.send_monitor_command("sendkey {}".format(key)) @@ -734,11 +754,16 @@ class Machine: self.monitor, _ = self.monitor_socket.accept() self.shell, _ = self.shell_socket.accept() + # Store last serial console lines for use + # of wait_for_console_text + self.last_lines: Queue = Queue() + def process_serial_output() -> None: assert self.process.stdout is not None for _line in self.process.stdout: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() + self.last_lines.put(line) eprint("{} # {}".format(self.name, line)) self.logger.enqueue({"msg": line, "machine": self.name}) @@ -751,6 +776,11 @@ class Machine: self.log("QEMU running (pid {})".format(self.pid)) + def cleanup_statedir(self) -> None: + self.log("delete the VM state directory") + if os.path.isfile(self.state_dir): + shutil.rmtree(self.state_dir) + def shutdown(self) -> None: if not self.booted: return @@ -863,7 +893,8 @@ def run_tests() -> None: try: exec(tests, globals()) except Exception as e: - eprint("error: {}".format(str(e))) + eprint("error: ") + traceback.print_exc() sys.exit(1) else: ptpython.repl.embed(locals(), globals()) @@ -889,6 +920,15 @@ def subtest(name: str) -> Iterator[None]: if __name__ == "__main__": + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument( + "-K", + "--keep-vm-state", + help="re-use a VM state coming from a previous run", + action="store_true", + ) + (cli_args, vm_scripts) = arg_parser.parse_known_args() + log = Logger() vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split())) @@ -896,8 +936,10 @@ if __name__ == "__main__": for nr, vde_socket, _, _ in vde_sockets: os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket - vm_scripts = sys.argv[1:] machines = [create_machine({"startCommand": s}) for s in vm_scripts] + for machine in machines: + if not cli_args.keep_vm_state: + machine.cleanup_statedir() machine_eval = [ "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines) ] @@ -911,7 +953,6 @@ if __name__ == "__main__": continue log.log("killing {} (pid {})".format(machine.name, machine.pid)) machine.process.kill() - for _, _, process, _ in vde_sockets: process.terminate() log.close() diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index 123323711a..c6939c7d69 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -114,7 +114,7 @@ rec { imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; - # Generate onvenience wrappers for running the test driver + # Generate convenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. driver = let warn = if skipLint then lib.warn "Linting is disabled!" else lib.id; in warn (runCommand testDriverName diff --git a/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl b/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl index 15e448b787..e1c7a46e43 100644 --- a/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl +++ b/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl @@ -281,3 +281,58 @@ foreach my $u (values %usersOut) { } updateFile("/etc/shadow", \@shadowNew, 0600); + +# Rewrite /etc/subuid & /etc/subgid to include default container mappings + +my $subUidMapFile = "/var/lib/nixos/auto-subuid-map"; +my $subUidMap = -e $subUidMapFile ? decode_json(read_file($subUidMapFile)) : {}; + +my (%subUidsUsed, %subUidsPrevUsed); + +$subUidsPrevUsed{$_} = 1 foreach values %{$subUidMap}; + +sub allocSubUid { + my ($name, @rest) = @_; + + # TODO: No upper bounds? + my ($min, $max, $up) = (100000, 100000 * 100, 1); + my $prevId = $subUidMap->{$name}; + if (defined $prevId && !defined $subUidsUsed{$prevId}) { + $subUidsUsed{$prevId} = 1; + return $prevId; + } + + my $id = allocId(\%subUidsUsed, \%subUidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); + my $offset = $id - 100000; + my $count = $offset * 65536; + my $subordinate = 100000 + $count; + return $subordinate; +} + +my @subGids; +my @subUids; +foreach my $u (values %usersOut) { + my $name = $u->{name}; + + foreach my $range (@{$u->{subUidRanges}}) { + my $value = join(":", ($name, $range->{startUid}, $range->{count})); + push @subUids, $value; + } + + foreach my $range (@{$u->{subGidRanges}}) { + my $value = join(":", ($name, $range->{startGid}, $range->{count})); + push @subGids, $value; + } + + if($u->{isNormalUser}) { + my $subordinate = allocSubUid($name); + $subUidMap->{$name} = $subordinate; + my $value = join(":", ($name, $subordinate, 65536)); + push @subUids, $value; + push @subGids, $value; + } +} + +updateFile("/etc/subuid", join("\n", @subUids) . "\n"); +updateFile("/etc/subgid", join("\n", @subGids) . "\n"); +updateFile($subUidMapFile, encode_json($subUidMap) . "\n"); diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 7fbbfcec75..ee64f785f5 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -6,6 +6,16 @@ let ids = config.ids; cfg = config.users; + # Check whether a password hash will allow login. + allowsLogin = hash: + hash == "" # login without password + || !(lib.elem hash + [ null # password login disabled + "!" # password login disabled + "!!" # a variant of "!" + "*" # password unset + ]); + passwordDescription = '' The options , and @@ -25,8 +35,19 @@ let ''; hashedPasswordDescription = '' - To generate hashed password install mkpasswd + To generate a hashed password install the mkpasswd package and run mkpasswd -m sha-512. + + If set to an empty string (""), this user will + be able to log in without being asked for a password (but not via remote + services such as SSH, or indirectly via su or + sudo). This should only be used for e.g. bootable + live systems. Note: this is different from setting an empty password, + which ca be achieved using . + + If set to null (default) this user will not + be able to log in using a password (i.e. via login + command). ''; userOpts = { name, config, ... }: { @@ -354,18 +375,6 @@ let }; }; - mkSubuidEntry = user: concatStrings ( - map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n") - user.subUidRanges); - - subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.users)); - - mkSubgidEntry = user: concatStrings ( - map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n") - user.subGidRanges); - - subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.users)); - idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }: let id = builtins.toString (builtins.getAttr idAttr (builtins.getAttr name set)); @@ -385,6 +394,7 @@ let { inherit (u) name uid group description home createHome isSystemUser password passwordFile hashedPassword + isNormalUser subUidRanges subGidRanges initialPassword initialHashedPassword; shell = utils.toShellPath u.shell; }) cfg.users; @@ -406,6 +416,12 @@ in { imports = [ (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ]) + (mkChangedOptionModule + [ "security" "initialRootPassword" ] + [ "users" "users" "root" "initialHashedPassword" ] + (cfg: if cfg.security.initialRootPassword == "!" + then null + else cfg.security.initialRootPassword)) ]; ###### interface @@ -477,14 +493,6 @@ in { ''; }; - # FIXME: obsolete - will remove. - security.initialRootPassword = mkOption { - type = types.str; - default = "!"; - example = ""; - visible = false; - }; - }; @@ -499,7 +507,6 @@ in { home = "/root"; shell = mkDefault cfg.defaultUserShell; group = "root"; - initialHashedPassword = mkDefault config.security.initialRootPassword; }; nobody = { uid = ids.uids.nobody; @@ -549,16 +556,7 @@ in { # Install all the user shells environment.systemPackages = systemShells; - environment.etc = { - subuid = { - text = subuidFile; - mode = "0644"; - }; - subgid = { - text = subgidFile; - mode = "0644"; - }; - } // (mapAttrs' (name: { packages, ... }: { + environment.etc = (mapAttrs' (name: { packages, ... }: { name = "profiles/per-user/${name}"; value.source = pkgs.buildEnv { name = "user-environment"; @@ -588,7 +586,7 @@ in { || cfg.group == "wheel" || elem "wheel" cfg.extraGroups) && - ((cfg.hashedPassword != null && cfg.hashedPassword != "!") + (allowsLogin cfg.hashedPassword || cfg.password != null || cfg.passwordFile != null || cfg.openssh.authorizedKeys.keys != [] @@ -598,7 +596,17 @@ in { Neither the root account nor any wheel user has a password or SSH authorized key. You must set one to prevent being locked out of your system.''; } - ]; + ] ++ flip mapAttrsToList cfg.users (name: user: + { + assertion = (user.hashedPassword != null) + -> (builtins.match ".*:.*" user.hashedPassword == null); + message = '' + The password hash of user "${name}" contains a ":" character. + This is invalid and would break the login system because the fields + of /etc/shadow (file where hashes are stored) are colon-separated. + Please check the value of option `users.users."${name}".hashedPassword`.''; + } + ); warnings = builtins.filter (x: x != null) ( @@ -621,14 +629,13 @@ in { content = "${base64}${sep}${base64}"; mcf = "^${sep}${scheme}${sep}${content}$"; in - if (user.hashedPassword != null + if (allowsLogin user.hashedPassword + && user.hashedPassword != "" # login without password && builtins.match mcf user.hashedPassword == null) - then - '' + then '' The password hash of user "${name}" may be invalid. You must set a - valid hash or the user will be locked out of his account. Please - check the value of option `users.users."${name}".hashedPassword`. - '' + valid hash or the user will be locked out of their account. Please + check the value of option `users.users."${name}".hashedPassword`.'' else null )); diff --git a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix index cf553497c8..b3f1dda98c 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix @@ -22,11 +22,22 @@ in { example = literalExample "pkgs.device-tree_rpi"; type = types.path; description = '' - The package containing the base device-tree (.dtb) to boot. Contains + The path containing the base device-tree (.dtb) to boot. Contains device trees bundled with the Linux kernel by default. ''; }; + name = mkOption { + default = null; + example = "some-dtb.dtb"; + type = types.nullOr types.str; + description = '' + The name of an explicit dtb to be loaded, relative to the dtb base. + Useful in extlinux scenarios if the bootloader doesn't pick the + right .dtb file from FDTDIR. + ''; + }; + overlays = mkOption { default = []; example = literalExample diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix index b4746b21b6..cf24ecf586 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix @@ -64,7 +64,7 @@ in # Without dconf enabled it is impossible to use IBus programs.dconf.enable = true; - programs.dconf.profiles.ibus = "${ibusPackage}/etc/dconf/profile/ibus"; + programs.dconf.packages = [ ibusPackage ]; services.dbus.packages = [ ibusAutostart diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 3707c4b7ec..8c98691116 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -11,15 +11,17 @@ with lib; services.xserver.desktopManager.gnome3.enable = true; - services.xserver.displayManager.gdm = { - enable = true; - # autoSuspend makes the machine automatically suspend after inactivity. - # It's possible someone could/try to ssh'd into the machine and obviously - # have issues because it's inactive. - # See: - # * https://github.com/NixOS/nixpkgs/pull/63790 - # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22 - autoSuspend = false; + services.xserver.displayManager = { + gdm = { + enable = true; + # autoSuspend makes the machine automatically suspend after inactivity. + # It's possible someone could/try to ssh'd into the machine and obviously + # have issues because it's inactive. + # See: + # * https://github.com/NixOS/nixpkgs/pull/63790 + # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22 + autoSuspend = false; + }; autoLogin = { enable = true; user = "nixos"; diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix index e76e06654a..098c2b2870 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix @@ -16,8 +16,8 @@ with lib; }; # Automatically login as nixos. - displayManager.sddm = { - enable = true; + displayManager = { + sddm.enable = true; autoLogin = { enable = true; user = "nixos"; diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 2d34406a03..bef6cd2fb5 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -2,12 +2,6 @@ # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: -let - extlinux-conf-builder = - import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; - }; -in { imports = [ ../../profiles/base.nix @@ -56,7 +50,7 @@ in ''; populateRootCommands = '' mkdir -p ./files/boot - ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot + ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot ''; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 651d1a36dc..d2ba611532 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -2,12 +2,6 @@ # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: -let - extlinux-conf-builder = - import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; - }; -in { imports = [ ../../profiles/base.nix @@ -53,7 +47,7 @@ in ''; populateRootCommands = '' mkdir -p ./files/boot - ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot + ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot ''; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index ba4127eaa0..40a01f9617 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -2,12 +2,6 @@ # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: -let - extlinux-conf-builder = - import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; - }; -in { imports = [ ../../profiles/base.nix @@ -42,7 +36,7 @@ in ''; populateRootCommands = '' mkdir -p ./files/boot - ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot + ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot ''; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix index c15befa59e..ddad1116c9 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix @@ -99,7 +99,7 @@ in }; populateRootCommands = mkOption { - example = literalExample "''\${extlinux-conf-builder} -t 3 -c \${config.system.build.toplevel} -d ./files/boot''"; + example = literalExample "''\${config.boot.loader.generic-extlinux-compatible.populateCmd} -c \${config.system.build.toplevel} -d ./files/boot''"; description = '' Shell commands to populate the ./files directory. All files in that directory are copied to the diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index 35a7b382b7..a15a2dbadb 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/j8dbv5w6jl34caywh2ygdy88knx1mdf7-nix-2.3.6"; - i686-linux = "/nix/store/9fqvbdisahqp0238vrs7wn5anpri0a65-nix-2.3.6"; - aarch64-linux = "/nix/store/72pwn0nm9bjqx9vpi8sgh4bl6g5wh814-nix-2.3.6"; - x86_64-darwin = "/nix/store/g37vk77m90p5zcl5nixjlzp3vqpisfn5-nix-2.3.6"; + x86_64-linux = "/nix/store/4vz8sh9ngx34ivi0bw5hlycxdhvy5hvz-nix-2.3.7"; + i686-linux = "/nix/store/dzxkg9lpp60bjmzvagns42vqlz3yq5kx-nix-2.3.7"; + aarch64-linux = "/nix/store/cfvf8nl8mwyw817by5y8zd3s8pnf5m9f-nix-2.3.7"; + x86_64-darwin = "/nix/store/5ira7xgs92inqz1x8l0n1wci4r79hnd0-nix-2.3.7"; } diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index 422c405054..157dc28e0a 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -628,6 +628,7 @@ EOF write_file($fn, <mandb(8). This allows searching for a page or + keyword using utilities like apropos(1). + ''; + }; + info.enable = mkOption { type = types.bool; default = true; @@ -187,7 +197,33 @@ in environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; - environment.etc."man.conf".source = "${pkgs.man-db}/etc/man_db.conf"; + environment.etc."man_db.conf".text = + let + manualPages = pkgs.buildEnv { + name = "man-paths"; + paths = config.environment.systemPackages; + pathsToLink = [ "/share/man" ]; + extraOutputsToInstall = ["man"]; + ignoreCollisions = true; + }; + manualCache = pkgs.runCommandLocal "man-cache" { } + '' + echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf + ${pkgs.man-db}/bin/mandb -C man.conf -psc + ''; + in + '' + # Manual pages paths for NixOS + MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man + MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man + + ${optionalString cfg.man.generateCaches '' + # Generated manual pages cache for NixOS (immutable) + MANDB_MAP /run/current-system/sw/share/man ${manualCache} + ''} + # Manual pages caches for NixOS + MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos + ''; }) (mkIf cfg.info.enable { diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 0dba92f60c..f361163ca6 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -589,6 +589,7 @@ ./services/networking/autossh.nix ./services/networking/bird.nix ./services/networking/bitlbee.nix + ./services/networking/blockbook-frontend.nix ./services/networking/charybdis.nix ./services/networking/cjdns.nix ./services/networking/cntlm.nix @@ -606,6 +607,7 @@ ./services/networking/dnscrypt-wrapper.nix ./services/networking/dnsdist.nix ./services/networking/dnsmasq.nix + ./services/networking/ncdns.nix ./services/networking/ejabberd.nix ./services/networking/epmd.nix ./services/networking/ergo.nix @@ -685,6 +687,7 @@ ./services/networking/ocserv.nix ./services/networking/ofono.nix ./services/networking/oidentd.nix + ./services/networking/onedrive.nix ./services/networking/openfire.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix @@ -831,6 +834,7 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/codimd.nix + ./services/web-apps/convos.nix ./services/web-apps/cryptpad.nix ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix @@ -935,6 +939,7 @@ ./system/boot/grow-partition.nix ./system/boot/initrd-network.nix ./system/boot/initrd-ssh.nix + ./system/boot/initrd-openvpn.nix ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/demo.nix b/third_party/nixpkgs/nixos/modules/profiles/demo.nix index 18f190071b..4e8c74deed 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/demo.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/demo.nix @@ -11,9 +11,11 @@ uid = 1000; }; - services.xserver.displayManager.sddm.autoLogin = { - enable = true; - relogin = true; - user = "demo"; + services.xserver.displayManager = { + autoLogin = { + enable = true; + user = "demo"; + }; + sddm.autoLogin.relogin = true; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/dconf.nix b/third_party/nixpkgs/nixos/modules/programs/dconf.nix index 6702e8efd1..ec85cb9d18 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dconf.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dconf.nix @@ -4,13 +4,24 @@ with lib; let cfg = config.programs.dconf; - - mkDconfProfile = name: path: - { - name = "dconf/profile/${name}"; - value.source = path; - }; - + cfgDir = pkgs.symlinkJoin { + name = "dconf-system-config"; + paths = map (x: "${x}/etc/dconf") cfg.packages; + postBuild = '' + mkdir -p $out/profile + mkdir -p $out/db + '' + ( + concatStringsSep "\n" ( + mapAttrsToList ( + name: path: '' + ln -s ${path} $out/profile/${name} + '' + ) cfg.profiles + ) + ) + '' + ${pkgs.dconf}/bin/dconf update $out/db + ''; + }; in { ###### interface @@ -22,18 +33,24 @@ in profiles = mkOption { type = types.attrsOf types.path; default = {}; - description = "Set of dconf profile files."; + description = "Set of dconf profile files, installed at /etc/dconf/profiles/name."; internal = true; }; + packages = mkOption { + type = types.listOf types.package; + default = []; + description = "A list of packages which provide dconf profiles and databases in /etc/dconf."; + }; }; }; ###### implementation config = mkIf (cfg.profiles != {} || cfg.enable) { - environment.etc = optionalAttrs (cfg.profiles != {}) - (mapAttrs' mkDconfProfile cfg.profiles); + environment.etc.dconf = mkIf (cfg.profiles != {} || cfg.packages != []) { + source = cfgDir; + }; services.dbus.packages = [ pkgs.dconf ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/fish.nix b/third_party/nixpkgs/nixos/modules/programs/fish.nix index 48b324a0fe..39b92edf2a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fish.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fish.nix @@ -102,6 +102,9 @@ in programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + # Required for man completions + documentation.man.generateCaches = true; + environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit; environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit; diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 1dc7f85331..cfe216d512 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -39,7 +39,7 @@ with lib; The services.xserver.displayManager.auto module has been removed because it was only intended for use in internal NixOS tests, and gave the false impression of it being a special display manager when it's actually - LightDM. Please use the services.xserver.displayManager.lightdm.autoLogin options + LightDM. Please use the services.xserver.displayManager.autoLogin options instead, or any other display manager in NixOS as they all support auto-login. '') (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") diff --git a/third_party/nixpkgs/nixos/modules/security/acme.nix b/third_party/nixpkgs/nixos/modules/security/acme.nix index 776ef07d71..92fb85b99a 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme.nix @@ -302,6 +302,11 @@ in lpath = "acme/${cert}"; apath = "/var/lib/${lpath}"; spath = "/var/lib/acme/.lego/${cert}"; + keyName = builtins.replaceStrings ["*"] ["_"] data.domain; + requestedDomains = pipe ([ data.domain ] ++ (attrNames data.extraDomains)) [ + (domains: sort builtins.lessThan domains) + (domains: concatStringsSep "," domains) + ]; fileMode = if data.allowKeysForGroup then "640" else "600"; globalOpts = [ "-d" data.domain "--email" data.email "--path" "." "--key-type" data.keyType ] ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] @@ -316,6 +321,7 @@ in certOpts ++ data.extraLegoRenewFlags); acmeService = { description = "Renew ACME Certificate for ${cert}"; + path = with pkgs; [ openssl ]; after = [ "network.target" "network-online.target" ]; wants = [ "network-online.target" ]; wantedBy = mkIf (!config.boot.isContainer) [ "multi-user.target" ]; @@ -332,11 +338,18 @@ in ExecStart = pkgs.writeScript "acme-start" '' #!${pkgs.runtimeShell} -e test -L ${spath}/accounts -o -d ${spath}/accounts || ln -s ../accounts ${spath}/accounts - ${pkgs.lego}/bin/lego ${renewOpts} || ${pkgs.lego}/bin/lego ${runOpts} + LEGO_ARGS=(${runOpts}) + if [ -e ${spath}/certificates/${keyName}.crt ]; then + REQUESTED_DOMAINS="${requestedDomains}" + EXISTING_DOMAINS="$(openssl x509 -in ${spath}/certificates/${keyName}.crt -noout -ext subjectAltName | tail -n1 | sed -e 's/ *DNS://g')" + if [ "''${REQUESTED_DOMAINS}" == "''${EXISTING_DOMAINS}" ]; then + LEGO_ARGS=(${renewOpts}) + fi + fi + ${pkgs.lego}/bin/lego ''${LEGO_ARGS[@]} ''; ExecStartPost = let - keyName = builtins.replaceStrings ["*"] ["_"] data.domain; script = pkgs.writeScript "acme-post-start" '' #!${pkgs.runtimeShell} -e cd ${apath} diff --git a/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix b/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix index 4b74e75327..a589153248 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix @@ -16,7 +16,7 @@ in type = types.lines; description = '' Configuration for Spotifyd. For syntax and directives, see - https://github.com/Spotifyd/spotifyd#Configuration. + . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix index 2388f1d6ca..c38fd361d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix @@ -31,6 +31,59 @@ in ''; }; + rcloneOptions = mkOption { + type = with types; nullOr (attrsOf (oneOf [ str bool ])); + default = null; + description = '' + Options to pass to rclone to control its behavior. + See for + available options. When specifying option names, strip the + leading --. To set a flag such as + --drive-use-trash, which does not take a value, + set the value to the Boolean true. + ''; + example = { + bwlimit = "10M"; + drive-use-trash = "true"; + }; + }; + + rcloneConfig = mkOption { + type = with types; nullOr (attrsOf (oneOf [ str bool ])); + default = null; + description = '' + Configuration for the rclone remote being used for backup. + See the remote's specific options under rclone's docs at + . When specifying + option names, use the "config" name specified in the docs. + For example, to set --b2-hard-delete for a B2 + remote, use hard_delete = true in the + attribute set. + Warning: Secrets set in here will be world-readable in the Nix + store! Consider using the rcloneConfigFile + option instead to specify secret values separately. Note that + options set here will override those set in the config file. + ''; + example = { + type = "b2"; + account = "xxx"; + key = "xxx"; + hard_delete = true; + }; + }; + + rcloneConfigFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to the file containing rclone configuration. This file + must contain configuration for the remote specified in this backup + set and also must be readable by root. Options set in + rcloneConfig will override those set in this + file. + ''; + }; + repository = mkOption { type = types.str; description = '' @@ -170,11 +223,22 @@ in ( resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts) ) ( resticCmd + " check" ) ]; + # Helper functions for rclone remotes + rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1; + rcloneAttrToOpt = v: "RCLONE_" + toUpper (builtins.replaceStrings [ "-" ] [ "_" ] v); + rcloneAttrToConf = v: "RCLONE_CONFIG_" + toUpper (rcloneRemoteName + "_" + v); + toRcloneVal = v: if lib.isBool v then lib.boolToString v else v; in nameValuePair "restic-backups-${name}" ({ environment = { RESTIC_PASSWORD_FILE = backup.passwordFile; RESTIC_REPOSITORY = backup.repository; - }; + } // optionalAttrs (backup.rcloneOptions != null) (mapAttrs' (name: value: + nameValuePair (rcloneAttrToOpt name) (toRcloneVal value) + ) backup.rcloneOptions) // optionalAttrs (backup.rcloneConfigFile != null) { + RCLONE_CONFIG = backup.rcloneConfigFile; + } // optionalAttrs (backup.rcloneConfig != null) (mapAttrs' (name: value: + nameValuePair (rcloneAttrToConf name) (toRcloneVal value) + ) backup.rcloneConfig); path = [ pkgs.openssh ]; restartIfChanged = false; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix index 050872e933..705390a21d 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix @@ -67,7 +67,7 @@ in type = types.bool; default = false; description = '' - Wether to enable the slurm control daemon. + Whether to enable the slurm control daemon. Note that the standard authentication method is "munge". The "munge" service needs to be provided with a password file in order for slurm to work properly (see services.munge.password). @@ -135,7 +135,7 @@ in type = types.bool; default = false; description = '' - Wether to provide a slurm.conf file. + Whether to provide a slurm.conf file. Enable this option if you do not run a slurm daemon on this host (i.e. server.enable and client.enable are false) but you still want to run slurm commands from this host. diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix index 52f24b8cee..7b8a35f54b 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -29,7 +29,7 @@ let with open('${cfg.workerPassFile}', 'r', encoding='utf-8') as passwd_file: passwd = passwd_file.read().strip('\r\n') - keepalive = 600 + keepalive = ${toString cfg.keepalive} umask = None maxdelay = 300 numcpus = None @@ -116,6 +116,15 @@ in { description = "Specifies the Buildbot Worker connection string."; }; + keepalive = mkOption { + default = 600; + type = types.int; + description = " + This is a number that indicates how frequently keepalive messages should be sent + from the worker to the buildmaster, expressed in seconds. + "; + }; + package = mkOption { type = types.package; default = pkgs.python3Packages.buildbot-worker; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix index eacfed85dd..4cff19839a 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -1,14 +1,16 @@ { config, lib, pkgs, ... }: +with builtins; with lib; let cfg = config.services.gitlab-runner; hasDocker = config.virtualisation.docker.enable; - hashedServices = with builtins; (mapAttrs' (name: service: nameValuePair - "${name}_${config.networking.hostName}_${ + hashedServices = mapAttrs' + (name: service: nameValuePair + "${name}_${config.networking.hostName}_${ substring 0 12 (hashString "md5" (unsafeDiscardStringContext (toJSON service)))}" service) - cfg.services); + cfg.services; configPath = "$HOME/.gitlab-runner/config.toml"; configureScript = pkgs.writeShellScriptBin "gitlab-runner-configure" ( if (cfg.configFile != null) then '' @@ -76,7 +78,7 @@ let ++ map (v: "--docker-allowed-images ${escapeShellArg v}") service.dockerAllowedImages ++ map (v: "--docker-allowed-services ${escapeShellArg v}") service.dockerAllowedServices ) - ))} && sleep 1 + ))} && sleep 1 || exit 1 fi '') hashedServices)} @@ -89,8 +91,17 @@ let # update global options remarshal --if toml --of json ${configPath} \ - | jq -cM '.check_interval = ${toString cfg.checkInterval} | - .concurrent = ${toString cfg.concurrent}' \ + | jq -cM ${escapeShellArg (concatStringsSep " | " [ + ".check_interval = ${toJSON cfg.checkInterval}" + ".concurrent = ${toJSON cfg.concurrent}" + ".sentry_dsn = ${toJSON cfg.sentryDSN}" + ".listen_address = ${toJSON cfg.prometheusListenAddress}" + ".session_server.listen_address = ${toJSON cfg.sessionServer.listenAddress}" + ".session_server.advertise_address = ${toJSON cfg.sessionServer.advertiseAddress}" + ".session_server.session_timeout = ${toJSON cfg.sessionServer.sessionTimeout}" + "del(.[] | nulls)" + "del(.session_server[] | nulls)" + ])} \ | remarshal --if json --of toml \ | sponge ${configPath} @@ -141,6 +152,66 @@ in 0 does not mean unlimited. ''; }; + sentryDSN = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://public:private@host:port/1"; + description = '' + Data Source Name for tracking of all system level errors to Sentry. + ''; + }; + prometheusListenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "localhost:8080"; + description = '' + Address (<host>:<port>) on which the Prometheus metrics HTTP server + should be listening. + ''; + }; + sessionServer = mkOption { + type = types.submodule { + options = { + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "0.0.0.0:8093"; + description = '' + An internal URL to be used for the session server. + ''; + }; + advertiseAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "runner-host-name.tld:8093"; + description = '' + The URL that the Runner will expose to GitLab to be used + to access the session server. + Fallbacks to if not defined. + ''; + }; + sessionTimeout = mkOption { + type = types.int; + default = 1800; + description = '' + How long in seconds the session can stay active after + the job completes (which will block the job from finishing). + ''; + }; + }; + }; + default = { }; + example = literalExample '' + { + listenAddress = "0.0.0.0:8093"; + } + ''; + description = '' + The session server allows the user to interact with jobs + that the Runner is responsible for. A good example of this is the + interactive web terminal. + ''; + }; gracefulTermination = mkOption { type = types.bool; default = false; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix b/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix index 9b4d9a98b7..7472538b88 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix @@ -5,14 +5,14 @@ with lib; let cfg = config.services.openldap; - openldap = pkgs.openldap; + openldap = cfg.package; dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; configFile = pkgs.writeText "slapd.conf" ((optionalString cfg.defaultSchemas '' - include ${pkgs.openldap.out}/etc/schema/core.schema - include ${pkgs.openldap.out}/etc/schema/cosine.schema - include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema - include ${pkgs.openldap.out}/etc/schema/nis.schema + include ${openldap.out}/etc/schema/core.schema + include ${openldap.out}/etc/schema/cosine.schema + include ${openldap.out}/etc/schema/inetorgperson.schema + include ${openldap.out}/etc/schema/nis.schema '') + '' ${cfg.extraConfig} database ${cfg.database} @@ -46,6 +46,18 @@ in "; }; + package = mkOption { + type = types.package; + default = pkgs.openldap; + description = '' + OpenLDAP package to use. + + This can be used to, for example, set an OpenLDAP package + with custom overrides to enable modules or other + functionality. + ''; + }; + user = mkOption { type = types.str; default = "openldap"; @@ -152,10 +164,10 @@ in "; example = literalExample '' ''' - include ${pkgs.openldap.out}/etc/schema/core.schema - include ${pkgs.openldap.out}/etc/schema/cosine.schema - include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema - include ${pkgs.openldap.out}/etc/schema/nis.schema + include ${openldap.out}/etc/schema/core.schema + include ${openldap.out}/etc/schema/cosine.schema + include ${openldap.out}/etc/schema/inetorgperson.schema + include ${openldap.out}/etc/schema/nis.schema database bdb suffix dc=example,dc=org diff --git a/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix b/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix index e598b01864..6a5fd6b294 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix @@ -6,10 +6,7 @@ let cfg = config.services.jupyter; - # NOTE: We don't use top-level jupyter because we don't - # want to pass in JUPYTER_PATH but use .environment instead, - # saving a rebuild. - package = pkgs.python3.pkgs.notebook; + package = cfg.package; kernels = (pkgs.jupyter-kernel.create { definitions = if cfg.kernels != null @@ -37,6 +34,27 @@ in { ''; }; + package = mkOption { + type = types.package; + # NOTE: We don't use top-level jupyter because we don't + # want to pass in JUPYTER_PATH but use .environment instead, + # saving a rebuild. + default = pkgs.python3.pkgs.notebook; + description = '' + Jupyter package to use. + ''; + }; + + command = mkOption { + type = types.str; + default = "jupyter-notebook"; + example = "jupyter-lab"; + description = '' + Which command the service runs. Note that not all jupyter packages + have all commands, e.g. jupyter-lab isn't present in the default package. + ''; + }; + port = mkOption { type = types.int; default = 8888; @@ -157,7 +175,7 @@ in { serviceConfig = { Restart = "always"; - ExecStart = ''${package}/bin/jupyter-notebook \ + ExecStart = ''${package}/bin/${cfg.command} \ --no-browser \ --ip=${cfg.ip} \ --port=${toString cfg.port} --port-retries 0 \ diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix b/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix index da627af73b..828032dc57 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix @@ -25,8 +25,11 @@ let in { options.services.undervolt = { - enable = mkEnableOption - "Intel CPU undervolting service (WARNING: may permanently damage your hardware!)"; + enable = mkEnableOption '' + Undervolting service for Intel CPUs. + + Warning: This service is not endorsed by Intel and may permanently damage your hardware. Use at your own risk! + ''; verbose = mkOption { type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix index 608f64a68f..ad10ba1d90 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix @@ -280,6 +280,17 @@ in description = "Whether to enable smtp submission."; }; + enableSubmissions = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable smtp submission via smtps. + + According to RFC 8314 this should be preferred + over STARTTLS for submission of messages by end user clients. + ''; + }; + submissionOptions = mkOption { type = types.attrs; default = { @@ -298,6 +309,29 @@ in description = "Options for the submission config in master.cf"; }; + submissionsOptions = mkOption { + type = types.attrs; + default = { + smtpd_sasl_auth_enable = "yes"; + smtpd_client_restrictions = "permit_sasl_authenticated,reject"; + milter_macro_daemon_name = "ORIGINATING"; + }; + example = { + smtpd_sasl_auth_enable = "yes"; + smtpd_sasl_type = "dovecot"; + smtpd_client_restrictions = "permit_sasl_authenticated,reject"; + milter_macro_daemon_name = "ORIGINATING"; + }; + description = '' + Options for the submission config via smtps in master.cf. + + smtpd_tls_security_level will be set to encrypt, if it is missing + or has one of the values "may" or "none". + + smtpd_tls_wrappermode with value "yes" will be added automatically. + ''; + }; + setSendmail = mkOption { type = types.bool; default = true; @@ -454,7 +488,7 @@ in ''; example = { mail_owner = "postfix"; - smtp_use_tls = true; + smtp_tls_security_level = "may"; }; }; @@ -466,18 +500,20 @@ in "; }; + tlsTrustedAuthorities = mkOption { + type = types.str; + default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + description = '' + File containing trusted certification authorities (CA) to verify certificates of mailservers contacted for mail delivery. This basically sets smtp_tls_CAfile and enables opportunistic tls. Defaults to NixOS trusted certification authorities. + ''; + }; + sslCert = mkOption { type = types.str; default = ""; description = "SSL certificate to use."; }; - sslCACert = mkOption { - type = types.str; - default = ""; - description = "SSL certificate of CA."; - }; - sslKey = mkOption { type = types.str; default = ""; @@ -771,18 +807,20 @@ in recipient_canonical_classes = [ "envelope_recipient" ]; } // optionalAttrs cfg.enableHeaderChecks { header_checks = [ "regexp:/etc/postfix/header_checks" ]; } + // optionalAttrs (cfg.tlsTrustedAuthorities != "") { + smtp_tls_CAfile = cfg.tlsTrustedAuthorities; + smtp_tls_security_level = "may"; + } // optionalAttrs (cfg.sslCert != "") { - smtp_tls_CAfile = cfg.sslCACert; smtp_tls_cert_file = cfg.sslCert; smtp_tls_key_file = cfg.sslKey; - smtp_use_tls = true; + smtp_tls_security_level = "may"; - smtpd_tls_CAfile = cfg.sslCACert; smtpd_tls_cert_file = cfg.sslCert; smtpd_tls_key_file = cfg.sslKey; - smtpd_use_tls = true; + smtpd_tls_security_level = "may"; }; services.postfix.masterConfig = { @@ -878,6 +916,23 @@ in command = "smtp"; args = [ "-o" "smtp_fallback_relay=" ]; }; + } // optionalAttrs cfg.enableSubmissions { + submissions = { + type = "inet"; + private = false; + command = "smtpd"; + args = let + mkKeyVal = opt: val: [ "-o" (opt + "=" + val) ]; + adjustSmtpTlsSecurityLevel = !(cfg.submissionsOptions ? smtpd_tls_security_level) || + cfg.submissionsOptions.smtpd_tls_security_level == "none" || + cfg.submissionsOptions.smtpd_tls_security_level == "may"; + submissionsOptions = cfg.submissionsOptions // { + smtpd_tls_wrappermode = "yes"; + } // optionalAttrs adjustSmtpTlsSecurityLevel { + smtpd_tls_security_level = "encrypt"; + }; + in concatLists (mapAttrsToList mkKeyVal submissionsOptions); + }; }; } @@ -900,4 +955,9 @@ in services.postfix.mapFiles.client_access = checkClientAccessFile; }) ]); + + imports = [ + (mkRemovedOptionModule [ "services" "postfix" "sslCACert" ] + "services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities. In case you intend that your server should validate requested client certificates use services.postfix.extraConfig.") + ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix index ed1439745a..a0bbab6498 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -95,6 +95,18 @@ in ''; }; + maxAttachmentSize = mkOption { + type = types.int; + default = 18; + description = '' + The maximum attachment size in MB. + + Note: Since roundcube only uses 70% of max upload values configured in php + 30% is added automatically to . + ''; + apply = configuredMaxAttachmentSize: "${toString (configuredMaxAttachmentSize * 1.3)}M"; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -115,7 +127,7 @@ in $config = array(); $config['db_dsnw'] = 'pgsql://${cfg.database.username}${lib.optionalString (!localDB) ":' . $password . '"}@${if localDB then "unix(/run/postgresql)" else cfg.database.host}/${cfg.database.dbname}'; $config['log_driver'] = 'syslog'; - $config['max_message_size'] = '25M'; + $config['max_message_size'] = '${cfg.maxAttachmentSize}'; $config['plugins'] = [${concatMapStringsSep "," (p: "'${p}'") cfg.plugins}]; $config['des_key'] = file_get_contents('/var/lib/roundcube/des_key'); $config['mime_types'] = '${pkgs.nginx}/conf/mime.types'; @@ -172,8 +184,8 @@ in phpOptions = '' error_log = 'stderr' log_errors = on - post_max_size = 25M - upload_max_filesize = 25M + post_max_size = ${cfg.maxAttachmentSize} + upload_max_filesize = ${cfg.maxAttachmentSize} ''; settings = mapAttrs (name: mkDefault) { "listen.owner" = "nginx"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitolite.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitolite.nix index cc69f81bbc..59cbdac319 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitolite.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitolite.nix @@ -27,7 +27,10 @@ in type = types.str; default = "/var/lib/gitolite"; description = '' - Gitolite home directory (used to store all the repositories). + The gitolite home directory used to store all repositories. If left as the default value + this directory will automatically be created before the gitolite server starts, otherwise + the sysadmin is responsible for ensuring the directory exists with appropriate ownership + and permissions. ''; }; @@ -149,14 +152,6 @@ in }; users.groups.${cfg.group}.gid = config.ids.gids.gitolite; - systemd.tmpfiles.rules = [ - "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} - -" - "d '${cfg.dataDir}'/.gitolite - ${cfg.user} ${cfg.group} - -" - "d '${cfg.dataDir}'/.gitolite/logs - ${cfg.user} ${cfg.group} - -" - - "Z ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -" - ]; - systemd.services.gitolite-init = { description = "Gitolite initialization"; wantedBy = [ "multi-user.target" ]; @@ -167,13 +162,19 @@ in GITOLITE_RC_DEFAULT = "${rcDir}/gitolite.rc.default"; }; - serviceConfig = { - Type = "oneshot"; - User = cfg.user; - Group = cfg.group; - WorkingDirectory = "~"; - RemainAfterExit = true; - }; + serviceConfig = mkMerge [ + (mkIf (cfg.dataDir == "/var/lib/gitolite") { + StateDirectory = "gitolite gitolite/.gitolite gitolite/.gitolite/logs"; + StateDirectoryMode = "0750"; + }) + { + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = "~"; + RemainAfterExit = true; + } + ]; path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.diffutils config.programs.ssh.package ]; script = diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.xml b/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.xml index 2f2ac27eeb..fbfa838b16 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.xml +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.xml @@ -14,9 +14,9 @@ This chapter will show you how to set up your own, self-hosted Matrix homeserver using the Synapse reference homeserver, and how to serve your own - copy of the Riot web client. See the + copy of the Element web client. See the Try - Matrix Now! overview page for links to Riot Apps for Android and iOS, + Matrix Now! overview page for links to Element Apps for Android and iOS, desktop clients, as well as bridges to other networks and other projects around Matrix. @@ -84,7 +84,7 @@ in { "m.homeserver" = { "base_url" = "https://${fqdn}"; }; "m.identity_server" = { "base_url" = "https://vector.im"; }; }; - # ACAO required to allow riot-web on any URL to request this json file + # ACAO required to allow element-web on any URL to request this json file in '' add_header Content-Type application/json; add_header Access-Control-Allow-Origin *; @@ -98,7 +98,7 @@ in { forceSSL = true; # Or do a redirect instead of the 404, or whatever is appropriate for you. - # But do not put a Matrix Web client here! See the Riot Web section below. + # But do not put a Matrix Web client here! See the Element web section below. locations."/".extraConfig = '' return 404; ''; @@ -171,17 +171,19 @@ Success! option until a better solution for NixOS is in place. -
- Riot Web Client +
+ Element (formerly known as Riot) Web Client - Riot Web is + Element Web is the reference web client for Matrix and developed by the core team at - matrix.org. The following snippet can be optionally added to the code before + matrix.org. Element was formerly known as Riot.im, see the + Element introductory blog post + for more information. The following snippet can be optionally added to the code before to complete the synapse installation with a web client served at - https://riot.myhostname.example.org and - https://riot.example.org. Alternatively, you can use the hosted - copy at https://riot.im/app, + https://element.myhostname.example.org and + https://element.example.org. Alternatively, you can use the hosted + copy at https://app.element.io/, or use other web clients or native client applications. Due to the /.well-known urls set up done above, many clients should fill in the required connection details automatically when you enter your @@ -191,14 +193,14 @@ Success! featureset. { - services.nginx.virtualHosts."riot.${fqdn}" = { + services.nginx.virtualHosts."element.${fqdn}" = { enableACME = true; forceSSL = true; serverAliases = [ - "riot.${config.networking.domain}" + "element.${config.networking.domain}" ]; - root = pkgs.riot-web.override { + root = pkgs.element-web.override { conf = { default_server_config."m.homeserver" = { "base_url" = "${config.networking.domain}"; @@ -212,13 +214,13 @@ Success! - Note that the Riot developers do not recommend running Riot and your Matrix + Note that the Element developers do not recommend running Element and your Matrix homeserver on the same fully-qualified domain name for security reasons. In the example, this means that you should not reuse the - myhostname.example.org virtualHost to also serve Riot, + myhostname.example.org virtualHost to also serve Element, but instead serve it on a different subdomain, like - riot.example.org in the example. See the - Riot + element.example.org in the example. See the + Element Important Security Notes for more information on this subject.
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index 0b3d7f3f03..0fbc9cecb4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -193,50 +193,111 @@ in }; buildMachines = mkOption { - type = types.listOf types.attrs; + type = types.listOf (types.submodule ({ + options = { + hostName = mkOption { + type = types.str; + example = "nixbuilder.example.org"; + description = '' + The hostname of the build machine. + ''; + }; + system = mkOption { + type = types.nullOr types.str; + default = null; + example = "x86_64-linux"; + description = '' + The system type the build machine can execute derivations on. + Either this attribute or systems must be + present, where system takes precedence if + both are set. + ''; + }; + systems = mkOption { + type = types.listOf types.str; + default = []; + example = [ "x86_64-linux" "aarch64-linux" ]; + description = '' + The system types the build machine can execute derivations on. + Either this attribute or system must be + present, where system takes precedence if + both are set. + ''; + }; + sshUser = mkOption { + type = types.nullOr types.str; + default = null; + example = "builder"; + description = '' + The username to log in as on the remote host. This user must be + able to log in and run nix commands non-interactively. It must + also be privileged to build derivations, so must be included in + . + ''; + }; + sshKey = mkOption { + type = types.nullOr types.str; + default = null; + example = "/root/.ssh/id_buildhost_builduser"; + description = '' + The path to the SSH private key with which to authenticate on + the build machine. The private key must not have a passphrase. + If null, the building user (root on NixOS machines) must have an + appropriate ssh configuration to log in non-interactively. + + Note that for security reasons, this path must point to a file + in the local filesystem, *not* to the nix store. + ''; + }; + maxJobs = mkOption { + type = types.int; + default = 1; + description = '' + The number of concurrent jobs the build machine supports. The + build machine will enforce its own limits, but this allows hydra + to schedule better since there is no work-stealing between build + machines. + ''; + }; + speedFactor = mkOption { + type = types.int; + default = 1; + description = '' + The relative speed of this builder. This is an arbitrary integer + that indicates the speed of this builder, relative to other + builders. Higher is faster. + ''; + }; + mandatoryFeatures = mkOption { + type = types.listOf types.str; + default = []; + example = [ "big-parallel" ]; + description = '' + A list of features mandatory for this builder. The builder will + be ignored for derivations that don't require all features in + this list. All mandatory features are automatically included in + supportedFeatures. + ''; + }; + supportedFeatures = mkOption { + type = types.listOf types.str; + default = []; + example = [ "kvm" "big-parallel" ]; + description = '' + A list of features supported by this builder. The builder will + be ignored for derivations that require features not in this + list. + ''; + }; + }; + })); default = []; - example = literalExample '' - [ { hostName = "voila.labs.cs.uu.nl"; - sshUser = "nix"; - sshKey = "/root/.ssh/id_buildfarm"; - system = "powerpc-darwin"; - maxJobs = 1; - } - { hostName = "linux64.example.org"; - sshUser = "buildfarm"; - sshKey = "/root/.ssh/id_buildfarm"; - system = "x86_64-linux"; - maxJobs = 2; - speedFactor = 2; - supportedFeatures = [ "kvm" ]; - mandatoryFeatures = [ "perf" ]; - } - ] - ''; description = '' - This option lists the machines to be used if distributed - builds are enabled (see - ). Nix will perform - derivations on those machines via SSH by copying the inputs - to the Nix store on the remote machine, starting the build, - then copying the output back to the local Nix store. Each - element of the list should be an attribute set containing - the machine's host name (hostname), the - user name to be used for the SSH connection - (sshUser), the Nix system type - (system, e.g., - "i686-linux"), the maximum number of - jobs to be run in parallel on that machine - (maxJobs), the path to the SSH private - key to be used to connect (sshKey), a - list of supported features of the machine - (supportedFeatures) and a list of - mandatory features of the machine - (mandatoryFeatures). The SSH private key - should not have a passphrase, and the corresponding public - key should be added to - ~sshUser/authorized_keys - on the remote machine. + This option lists the machines to be used if distributed builds are + enabled (see ). + Nix will perform derivations on those machines via SSH by copying the + inputs to the Nix store on the remote machine, starting the build, + then copying the output back to the local Nix store. ''; }; @@ -461,14 +522,14 @@ in { enable = cfg.buildMachines != []; text = concatMapStrings (machine: - "${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} " - + machine.system or (concatStringsSep "," machine.systems) - + " ${machine.sshKey or "-"} ${toString machine.maxJobs or 1} " - + toString (machine.speedFactor or 1) + "${if machine.sshUser != null then "${machine.sshUser}@" else ""}${machine.hostName} " + + (if machine.system != null then machine.system else concatStringsSep "," machine.systems) + + " ${if machine.sshKey != null then machine.sshKey else "-"} ${toString machine.maxJobs} " + + toString (machine.speedFactor) + " " - + concatStringsSep "," (machine.mandatoryFeatures or [] ++ machine.supportedFeatures or []) + + concatStringsSep "," (machine.mandatoryFeatures ++ machine.supportedFeatures) + " " - + concatStringsSep "," machine.mandatoryFeatures or [] + + concatStringsSep "," machine.mandatoryFeatures + "\n" ) cfg.buildMachines; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index c4aedd7e23..59748efe0d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -34,6 +34,7 @@ let "mail" "mikrotik" "minio" + "modemmanager" "nextcloud" "nginx" "node" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix new file mode 100644 index 0000000000..86ea98b94e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.modemmanager; +in +{ + port = 9539; + extraOpts = { + refreshRate = mkOption { + type = types.str; + default = "5s"; + description = '' + How frequently ModemManager will refresh the extended signal quality + information for each modem. The duration should be specified in seconds + ("5s"), minutes ("1m"), or hours ("1h"). + ''; + }; + }; + serviceOpts = { + serviceConfig = { + # Required in order to authenticate with ModemManager via D-Bus. + SupplementaryGroups = "networkmanager"; + ExecStart = '' + ${pkgs.prometheus-modemmanager-exporter}/bin/modemmanager_exporter \ + -addr ${cfg.listenAddress}:${toString cfg.port} \ + -rate ${cfg.refreshRate} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix index ae8a4958ca..37a48657c1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix @@ -124,7 +124,7 @@ in { "iponly": specifies no authentication. ACLs authorization is used. - "strong": authentication by username/password. If user is not registered his access is denied regardless of ACLs. + "strong": authentication by username/password. If user is not registered their access is denied regardless of ACLs. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix b/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix new file mode 100644 index 0000000000..61938e51e0 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix @@ -0,0 +1,272 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + eachBlockbook = config.services.blockbook-frontend; + + blockbookOpts = { config, lib, name, ...}: { + + options = { + + enable = mkEnableOption "blockbook-frontend application."; + + package = mkOption { + type = types.package; + default = pkgs.blockbook; + description = "Which blockbook package to use."; + }; + + user = mkOption { + type = types.str; + default = "blockbook-frontend-${name}"; + description = "The user as which to run blockbook-frontend-${name}."; + }; + + group = mkOption { + type = types.str; + default = "${config.user}"; + description = "The group as which to run blockbook-frontend-${name}."; + }; + + certFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/etc/secrets/blockbook-frontend-${name}/certFile"; + description = '' + To enable SSL, specify path to the name of certificate files without extension. + Expecting certFile.crt and certFile.key. + ''; + }; + + configFile = mkOption { + type = with types; nullOr path; + default = null; + example = "${config.dataDir}/config.json"; + description = "Location of the blockbook configuration file."; + }; + + coinName = mkOption { + type = types.str; + default = "Bitcoin"; + example = "Bitcoin"; + description = '' + See + for current of coins supported in master (Note: may differ from release). + ''; + }; + + cssDir = mkOption { + type = types.path; + default = "${config.package}/share/css/"; + example = "${config.dataDir}/static/css/"; + description = '' + Location of the dir with main.css CSS file. + By default, the one shipped with the package is used. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/blockbook-frontend-${name}"; + description = "Location of blockbook-frontend-${name} data directory."; + }; + + debug = mkOption { + type = types.bool; + default = false; + description = "Debug mode, return more verbose errors, reload templates on each request."; + }; + + internal = mkOption { + type = types.nullOr types.str; + default = ":9030"; + example = ":9030"; + description = "Internal http server binding [address]:port."; + }; + + messageQueueBinding = mkOption { + type = types.str; + default = "tcp://127.0.0.1:38330"; + example = "tcp://127.0.0.1:38330"; + description = "Message Queue Binding address:port."; + }; + + public = mkOption { + type = types.nullOr types.str; + default = ":9130"; + example = ":9130"; + description = "Public http server binding [address]:port."; + }; + + rpc = { + url = mkOption { + type = types.str; + default = "http://127.0.0.1"; + description = "URL for JSON-RPC connections."; + }; + + port = mkOption { + type = types.port; + default = 8030; + description = "Port for JSON-RPC connections."; + }; + + user = mkOption { + type = types.str; + default = "rpc"; + example = "rpc"; + description = "Username for JSON-RPC connections."; + }; + + password = mkOption { + type = types.str; + default = "rpc"; + example = "rpc"; + description = '' + RPC password for JSON-RPC connections. + Warning: this is stored in cleartext in the Nix store!!! + Use configFile or passwordFile if needed. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing password of the RPC user. + Note: This options is ignored when configFile is used. + ''; + }; + }; + + sync = mkOption { + type = types.bool; + default = true; + description = "Synchronizes until tip, if together with zeromq, keeps index synchronized."; + }; + + templateDir = mkOption { + type = types.path; + default = "${config.package}/share/templates/"; + example = "${config.dataDir}/templates/static/"; + description = "Location of the HTML templates. By default, ones shipped with the package are used."; + }; + + extraConfig = mkOption { + type = types.attrs; + default = {}; + example = literalExample '' { + alternative_estimate_fee = "whatthefee-disabled"; + alternative_estimate_fee_params = "{\"url\": \"https://whatthefee.io/data.json\", \"periodSeconds\": 60}"; + fiat_rates = "coingecko"; + fiat_rates_params = "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"bitcoin\", \"periodSeconds\": 60}"; + coin_shortcut = "BTC"; + coin_label = "Bitcoin"; + xpub_magic = 76067358; + xpub_magic_segwit_p2sh = 77429938; + xpub_magic_segwit_native = 78792518; + }''; + description = '' + Additional configurations to be appended to coin.conf. + Overrides any already defined configuration options. + See + for current configuration options supported in master (Note: may differ from release). + ''; + }; + + extraCmdLineOptions = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-workers=1" "-dbcache=0" "-logtosderr" ]; + description = '' + Extra command line options to pass to Blockbook. + Run blockbook --help to list all available options. + ''; + }; + }; + }; +in +{ + # interface + + options = { + services.blockbook-frontend = mkOption { + type = types.attrsOf (types.submodule blockbookOpts); + default = {}; + description = "Specification of one or more blockbook-frontend instances."; + }; + }; + + # implementation + + config = mkIf (eachBlockbook != {}) { + + systemd.services = mapAttrs' (blockbookName: cfg: ( + nameValuePair "blockbook-frontend-${blockbookName}" ( + let + configFile = if cfg.configFile != null then cfg.configFile else + pkgs.writeText "config.conf" (builtins.toJSON ( { + coin_name = "${cfg.coinName}"; + rpc_user = "${cfg.rpc.user}"; + rpc_pass = "${cfg.rpc.password}"; + rpc_url = "${cfg.rpc.url}:${toString cfg.rpc.port}"; + message_queue_binding = "${cfg.messageQueueBinding}"; + } // cfg.extraConfig) + ); + in { + description = "blockbook-frontend-${blockbookName} daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + ln -sf ${cfg.templateDir} ${cfg.dataDir}/static/ + ln -sf ${cfg.cssDir} ${cfg.dataDir}/static/ + ${optionalString (cfg.rpc.passwordFile != null && cfg.configFile == null) '' + CONFIGTMP=$(mktemp) + ${pkgs.jq}/bin/jq ".rpc_pass = \"$(cat ${cfg.rpc.passwordFile})\"" ${configFile} > $CONFIGTMP + mv $CONFIGTMP ${cfg.dataDir}/${blockbookName}-config.json + ''} + ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = '' + ${cfg.package}/bin/blockbook \ + ${if (cfg.rpc.passwordFile != null && cfg.configFile == null) then + "-blockchaincfg=${cfg.dataDir}/${blockbookName}-config.json" + else + "-blockchaincfg=${configFile}" + } \ + -datadir=${cfg.dataDir} \ + ${optionalString (cfg.sync != false) "-sync"} \ + ${optionalString (cfg.certFile != null) "-certfile=${toString cfg.certFile}"} \ + ${optionalString (cfg.debug != false) "-debug"} \ + ${optionalString (cfg.internal != null) "-internal=${toString cfg.internal}"} \ + ${optionalString (cfg.public != null) "-public=${toString cfg.public}"} \ + ${toString cfg.extraCmdLineOptions} + ''; + Restart = "on-failure"; + WorkingDirectory = cfg.dataDir; + LimitNOFILE = 65536; + }; + } + ) )) eachBlockbook; + + systemd.tmpfiles.rules = flatten (mapAttrsToList (blockbookName: cfg: [ + "d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/static 0750 ${cfg.user} ${cfg.group} - -" + ]) eachBlockbook); + + users.users = mapAttrs' (blockbookName: cfg: ( + nameValuePair "blockbook-frontend-${blockbookName}" { + name = cfg.user; + group = cfg.group; + home = cfg.dataDir; + isSystemUser = true; + })) eachBlockbook; + + users.groups = mapAttrs' (instanceName: cfg: ( + nameValuePair "${cfg.group}" { })) eachBlockbook; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix b/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix index 5d73c0a0d7..1c414c53a9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix @@ -77,6 +77,8 @@ in { AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; NoNewPrivileges = true; DynamicUser = true; + Type = "notify"; + NotifyAccess = "main"; ExecStart = "${getBin cfg.package}/bin/corerad -c=${cfg.configFile}"; Restart = "on-failure"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix new file mode 100644 index 0000000000..c1832ad175 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix @@ -0,0 +1,278 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfgs = config.services; + cfg = cfgs.ncdns; + + dataDir = "/var/lib/ncdns"; + username = "ncdns"; + + valueType = with types; oneOf [ int str bool path ] + // { description = "setting type (integer, string, bool or path)"; }; + + configType = with types; attrsOf (nullOr (either valueType configType)) + // { description = '' + ncdns.conf configuration type. The format consists of an + attribute set of settings. Each setting can be either `null`, + a value or an attribute set. The allowed values are integers, + strings, booleans or paths. + ''; + }; + + configFile = pkgs.runCommand "ncdns.conf" + { json = builtins.toJSON cfg.settings; + passAsFile = [ "json" ]; + } + "${pkgs.remarshal}/bin/json2toml < $jsonPath > $out"; + + defaultFiles = { + public = "${dataDir}/bit.key"; + private = "${dataDir}/bit.private"; + zonePublic = "${dataDir}/bit-zone.key"; + zonePrivate = "${dataDir}/bit-zone.private"; + }; + + # if all keys are the default value + needsKeygen = all id (flip mapAttrsToList cfg.dnssec.keys + (n: v: v == getAttr n defaultFiles)); + + mkDefaultAttrs = mapAttrs (n: v: mkDefault v); + +in + +{ + + ###### interface + + options = { + + services.ncdns = { + + enable = mkEnableOption '' + ncdns, a Go daemon to bridge Namecoin to DNS. + To resolve .bit domains set services.namecoind.enable = true; + and an RPC username/password + ''; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + The IP address the ncdns resolver will bind to. Leave this unchanged + if you do not wish to directly expose the resolver. + ''; + }; + + port = mkOption { + type = types.port; + default = 5333; + description = '' + The port the ncdns resolver will bind to. + ''; + }; + + identity.hostname = mkOption { + type = types.str; + default = config.networking.hostName; + example = "example.com"; + description = '' + The hostname of this ncdns instance, which defaults to the machine + hostname. If specified, ncdns lists the hostname as an NS record at + the zone apex: + + bit. IN NS ns1.example.com. + + If unset ncdns will generate an internal psuedo-hostname under the + zone, which will resolve to the value of + . + If you are only using ncdns locally you can ignore this. + ''; + }; + + identity.hostmaster = mkOption { + type = types.str; + default = ""; + example = "root@example.com"; + description = '' + An email address for the SOA record at the bit zone. + If you are only using ncdns locally you can ignore this. + ''; + }; + + identity.address = mkOption { + type = types.str; + default = "127.127.127.127"; + description = '' + The IP address the hostname specified in + should resolve to. + If you are only using ncdns locally you can ignore this. + ''; + }; + + dnssec.enable = mkEnableOption '' + DNSSEC support in ncdns. This will generate KSK and ZSK keypairs + (unless provided via the options + , + etc.) and add a trust + anchor to recursive resolvers + ''; + + dnssec.keys.public = mkOption { + type = types.path; + default = defaultFiles.public; + description = '' + Path to the file containing the KSK public key. + The key can be generated using the dnssec-keygen + command, provided by the package bind as follows: + + $ dnssec-keygen -a RSASHA256 -3 -b 2048 -f KSK bit + + ''; + }; + + dnssec.keys.private = mkOption { + type = types.path; + default = defaultFiles.private; + description = '' + Path to the file containing the KSK private key. + ''; + }; + + dnssec.keys.zonePublic = mkOption { + type = types.path; + default = defaultFiles.zonePublic; + description = '' + Path to the file containing the ZSK public key. + The key can be generated using the dnssec-keygen + command, provided by the package bind as follows: + + $ dnssec-keygen -a RSASHA256 -3 -b 2048 bit + + ''; + }; + + dnssec.keys.zonePrivate = mkOption { + type = types.path; + default = defaultFiles.zonePrivate; + description = '' + Path to the file containing the ZSK private key. + ''; + }; + + settings = mkOption { + type = configType; + default = { }; + example = literalExample '' + { # enable webserver + ncdns.httplistenaddr = ":8202"; + + # synchronize TLS certs + certstore.nss = true; + # note: all paths are relative to the config file + certstore.nsscertdir = "../../var/lib/ncdns"; + certstore.nssdbdir = "../../home/alice/.pki/nssdb"; + } + ''; + description = '' + ncdns settings. Use this option to configure ncds + settings not exposed in a NixOS option or to bypass one. + See the example ncdns.conf file at for the available options. + ''; + }; + + }; + + services.pdns-recursor.resolveNamecoin = mkOption { + type = types.bool; + default = false; + description = '' + Resolve .bit top-level domains using ncdns and namecoin. + ''; + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveNamecoin { + forwardZonesRecurse.bit = "127.0.0.1:${toString cfg.port}"; + luaConfig = + if cfg.dnssec.enable + then ''readTrustAnchorsFromFile("${cfg.dnssec.keys.public}")'' + else ''addNTA("bit", "namecoin DNSSEC disabled")''; + }; + + # Avoid pdns-recursor not finding the DNSSEC keys + systemd.services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveNamecoin { + after = [ "ncdns.service" ]; + wants = [ "ncdns.service" ]; + }; + + services.ncdns.settings = mkDefaultAttrs { + ncdns = + { # Namecoin RPC + namecoinrpcaddress = + "${cfgs.namecoind.rpc.address}:${toString cfgs.namecoind.rpc.port}"; + namecoinrpcusername = cfgs.namecoind.rpc.user; + namecoinrpcpassword = cfgs.namecoind.rpc.password; + + # Identity + selfname = cfg.identity.hostname; + hostmaster = cfg.identity.hostmaster; + selfip = cfg.identity.address; + + # Other + bind = "${cfg.address}:${toString cfg.port}"; + } + // optionalAttrs cfg.dnssec.enable + { # DNSSEC + publickey = "../.." + cfg.dnssec.keys.public; + privatekey = "../.." + cfg.dnssec.keys.private; + zonepublickey = "../.." + cfg.dnssec.keys.zonePublic; + zoneprivatekey = "../.." + cfg.dnssec.keys.zonePrivate; + }; + + # Daemon + service.daemon = true; + xlog.journal = true; + }; + + users.users.ncdns = + { description = "ncdns daemon user"; }; + + systemd.services.ncdns = { + description = "ncdns daemon"; + after = [ "namecoind.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "ncdns"; + StateDirectory = "ncdns"; + Restart = "on-failure"; + ExecStart = "${pkgs.ncdns}/bin/ncdns -conf=${configFile}"; + }; + + preStart = optionalString (cfg.dnssec.enable && needsKeygen) '' + cd ${dataDir} + if [ ! -e bit.key ]; then + ${pkgs.bind}/bin/dnssec-keygen -a RSASHA256 -3 -b 2048 bit + mv Kbit.*.key bit-zone.key + mv Kbit.*.private bit-zone.private + ${pkgs.bind}/bin/dnssec-keygen -a RSASHA256 -3 -b 2048 -f KSK bit + mv Kbit.*.key bit.key + mv Kbit.*.private bit.private + fi + ''; + }; + + }; + + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix index 6e3eed0c55..3ecbd06ee4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix @@ -11,8 +11,6 @@ let # build nsd with the options needed for the given config nsdPkg = pkgs.nsd.override { - configFile = "${configFile}/nsd.conf"; - bind8Stats = cfg.bind8Stats; ipv6 = cfg.ipv6; ratelimit = cfg.ratelimit.enable; @@ -897,7 +895,10 @@ in + "want, please enable 'services.nsd.rootServer'."; }; - environment.systemPackages = [ nsdPkg ]; + environment = { + systemPackages = [ nsdPkg ]; + etc."nsd/nsd.conf".source = "${configFile}/nsd.conf"; + }; users.groups.${username}.gid = config.ids.gids.nsd; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix new file mode 100644 index 0000000000..a945250fa9 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.onedrive; + + onedriveLauncher = pkgs.writeShellScriptBin + "onedrive-launcher" + '' + # XDG_CONFIG_HOME is not recognized in the environment here. + if [ -f $HOME/.config/onedrive-launcher ] + then + # Hopefully using underscore boundary helps locate variables + for _onedrive_config_dirname_ in $(cat $HOME/.config/onedrive-launcher | grep -v '[ \t]*#' ) + do + systemctl --user start onedrive@$_onedrive_config_dirname_ + done + else + systemctl --user start onedrive@onedrive + fi + '' + ; + +in { + ### Documentation + # meta.doc = ./onedrive.xml; + + ### Interface + + options.services.onedrive = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable OneDrive service"; + }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.onedrive; + defaultText = "pkgs.onedrive"; + example = lib.literalExample "pkgs.onedrive"; + description = '' + OneDrive package to use. + ''; + }; + }; +### Implementation + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.user.services."onedrive@" = { + description = "Onedrive sync service"; + + serviceConfig = { + Type = "simple"; + ExecStart = '' + ${cfg.package}/bin/onedrive --monitor --verbose --confdir=%h/.config/%i + ''; + Restart="on-failure"; + RestartSec=3; + RestartPreventExitStatus=3; + }; + }; + + systemd.user.services.onedrive-launcher = { + wantedBy = [ "default.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${onedriveLauncher}/bin/onedrive-launcher"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/onedrive.xml b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.xml new file mode 100644 index 0000000000..5a9dcf01ae --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.xml @@ -0,0 +1,34 @@ + + Microsoft OneDrive + + Microsoft Onedrive is a popular cloud file-hosting service, used by 85% of Fortune 500 companies. NixOS uses a popular OneDrive client for Linux maintained by github user abraunegg. The Linux client is excellent and allows customization of which files or paths to download, not much unlike the default Windows OneDrive client by Microsoft itself. The client allows syncing with multiple onedrive accounts at the same time, of any type- OneDrive personal, OneDrive business, Office365 and Sharepoint libraries, without any additional charge. + + + For more information, guides and documentation, see . + + + To enable OneDrive support, add the following to your configuration.nix: + + = true; + + This installs the onedrive package and a service onedriveLauncher which will instantiate a onedrive service for all your OneDrive accounts. Follow the steps in documentation of the onedrive client to setup your accounts. To use the service with multiple accounts, create a file named onedrive-launcher in ~/.config and add the filename of the config directory, relative to ~/.config. For example, if you have two OneDrive accounts with configs in ~/.config/onedrive_bob_work and ~/.config/onedrive_bob_personal, add the following lines: + +onedrive_bob_work +# Not in use: +# onedrive_bob_office365 +onedrive_bob_personal + + No such file needs to be created if you are using only a single OneDrive account with config in the default location ~/.config/onedrive, in the absence of ~/.config/onedrive-launcher, only a single service is instantiated, with default config path. + + + + If you wish to use a custom OneDrive package, say from another channel, add the following line: + + = pkgs.unstable.onedrive; + + + diff --git a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix index 30bf22586f..5af035fd59 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix @@ -8,8 +8,10 @@ let confFile = pkgs.writeText "radicale.conf" cfg.config; - # This enables us to default to version 2 while still not breaking configurations of people with version 1 - defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then { + defaultPackage = if versionAtLeast config.system.stateVersion "20.09" then { + pkg = pkgs.radicale3; + text = "pkgs.radicale3"; + } else if versionAtLeast config.system.stateVersion "17.09" then { pkg = pkgs.radicale2; text = "pkgs.radicale2"; } else { @@ -35,8 +37,9 @@ in defaultText = defaultPackage.text; description = '' Radicale package to use. This defaults to version 1.x if - system.stateVersion < 17.09 and version 2.x - otherwise. + system.stateVersion < 17.09, version 2.x if + 17.09 ≤ system.stateVersion < 20.09, and + version 3.x otherwise. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix index c4fa370a5f..0921febba6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix @@ -15,7 +15,11 @@ let listen: ( - { host: "${cfg.listenAddress}"; port: "${toString cfg.port}"; } + ${ + concatMapStringsSep ",\n" + (addr: ''{ host: "${addr}"; port: "${toString cfg.port}"; }'') + cfg.listenAddresses + } ); ${cfg.appendConfig} @@ -33,6 +37,10 @@ let ''; in { + imports = [ + (mkRenamedOptionModule [ "services" "sslh" "listenAddress" ] [ "services" "sslh" "listenAddresses" ]) + ]; + options = { services.sslh = { enable = mkEnableOption "sslh"; @@ -55,10 +63,10 @@ in description = "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them"; }; - listenAddress = mkOption { - type = types.str; - default = "0.0.0.0"; - description = "Listening address or hostname."; + listenAddresses = mkOption { + type = types.coercedTo types.str singleton (types.listOf types.str); + default = [ "0.0.0.0" "[::]" ]; + description = "Listening addresses or hostnames."; }; port = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix index 4bdfa8143d..62bcf7a149 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix @@ -162,6 +162,8 @@ in unitConfig.RequiresMountsFor = stateDir; # This a HACK to fix missing dependencies of dynamic libs extracted from jars environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib"; + # Make sure package upgrades trigger a service restart + restartTriggers = [ cfg.unifiPackage cfg.mongodbPackage ]; serviceConfig = { Type = "simple"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix b/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix index 87c029156b..f188226165 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix @@ -122,7 +122,7 @@ in ExecStart = '' ${cfg.package}/bin/xandikos \ --directory /var/lib/xandikos \ - --listen_address ${cfg.address} \ + --listen-address ${cfg.address} \ --port ${toString cfg.port} \ --route-prefix ${cfg.routePrefix} \ ${lib.concatStringsSep " " cfg.extraOptions} diff --git a/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix b/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix index d792f90abe..50d250fc4d 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix @@ -4,12 +4,21 @@ with lib; let cfg = config.services.nginx.sso; - pkg = getBin pkgs.nginx-sso; + pkg = getBin cfg.package; configYml = pkgs.writeText "nginx-sso.yml" (builtins.toJSON cfg.configuration); in { options.services.nginx.sso = { enable = mkEnableOption "nginx-sso service"; + package = mkOption { + type = types.package; + default = pkgs.nginx-sso; + defaultText = "pkgs.nginx-sso"; + description = '' + The nginx-sso package that should be used. + ''; + }; + configuration = mkOption { type = types.attrsOf types.unspecified; default = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/security/tor.nix b/third_party/nixpkgs/nixos/modules/services/security/tor.nix index 18c105b2f5..b33e905c67 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/tor.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/tor.nix @@ -159,7 +159,7 @@ in type = types.bool; default = false; description = '' - Wheter to enable Tor control socket. Control socket is created + Whether to enable Tor control socket. Control socket is created in ${torRunDirectory}/control ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix index 751f81649d..ab922a38e5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix @@ -93,7 +93,7 @@ in type = types.bool; default = true; description = '' - Wheter to enable HSTS if HTTPS is also enabled. + Whether to enable HSTS if HTTPS is also enabled. ''; }; maxAgeSeconds = mkOption { @@ -385,7 +385,7 @@ in type = types.bool; default = true; description = '' - Wether to enable email registration. + Whether to enable email registration. ''; }; allowGravatar = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/convos.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/convos.nix new file mode 100644 index 0000000000..8be11eec9f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/convos.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.convos; +in +{ + options.services.convos = { + enable = mkEnableOption "Convos"; + listenPort = mkOption { + type = types.port; + default = 3000; + example = 8080; + description = "Port the web interface should listen on"; + }; + listenAddress = mkOption { + type = types.str; + default = "*"; + example = "127.0.0.1"; + description = "Address or host the web interface should listen on"; + }; + reverseProxy = mkOption { + type = types.bool; + default = false; + description = '' + Enables reverse proxy support. This will allow Convos to automatically + pick up the X-Forwarded-For and + X-Request-Base HTTP headers set in your reverse proxy + web server. Note that enabling this option without a reverse proxy in + front will be a security issue. + ''; + }; + }; + config = mkIf cfg.enable { + systemd.services.convos = { + description = "Convos Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + environment = { + CONVOS_HOME = "%S/convos"; + CONVOS_REVERSE_PROXY = if cfg.reverseProxy then "1" else "0"; + MOJO_LISTEN = "http://${toString cfg.listenAddress}:${toString cfg.listenPort}"; + }; + serviceConfig = { + ExecStart = "${pkgs.convos}/bin/convos daemon"; + Restart = "on-failure"; + StateDirectory = "convos"; + WorkingDirectory = "%S/convos"; + DynamicUser = true; + MemoryDenyWriteExecute = true; + ProtectHome = true; + ProtectClock = true; + ProtectHostname = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + LockPersonality = true; + RestrictRealtime = true; + RestrictNamespaces = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6"]; + SystemCallFilter = "@system-service"; + SystemCallArchitectures = "native"; + CapabilityBoundingSet = ""; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix index 1196780cf6..f45eaa24d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix @@ -40,7 +40,7 @@ let $CFG->disableupdateautodeploy = true; $CFG->pathtogs = '${pkgs.ghostscript}/bin/gs'; - $CFG->pathtophp = '${pkgs.php}/bin/php'; + $CFG->pathtophp = '${phpExt}/bin/php'; $CFG->pathtodu = '${pkgs.coreutils}/bin/du'; $CFG->aspellpath = '${pkgs.aspell}/bin/aspell'; $CFG->pathtodot = '${pkgs.graphviz}/bin/dot'; @@ -55,6 +55,9 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; + + phpExt = pkgs.php.withExtensions + ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo ]); in { # interface @@ -222,6 +225,7 @@ in services.phpfpm.pools.moodle = { inherit user group; + phpPackage = phpExt; phpEnv.MOODLE_CONFIG = "${moodleConfig}"; phpOptions = '' zend_extension = opcache.so @@ -263,13 +267,13 @@ in after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; environment.MOODLE_CONFIG = moodleConfig; script = '' - ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$? + ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$? - [ "$rc" == 1 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \ + [ "$rc" == 1 ] && ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \ --non-interactive \ --allow-unstable - [ "$rc" == 2 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \ + [ "$rc" == 2 ] && ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \ --agree-license \ --adminpass=${cfg.initialPassword} @@ -289,7 +293,7 @@ in serviceConfig = { User = user; Group = group; - ExecStart = "${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php"; + ExecStart = "${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix index 8abee7130d..e1d1217943 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -708,6 +708,7 @@ in wantedBy = [ "multi-user.target" ]; wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME); after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME; + before = map (hostOpts: "acme-${hostOpts.hostName}.service") vhostsACME; path = [ pkg pkgs.coreutils pkgs.gnugrep ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 8a015bb355..4c4b7f39e6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -693,6 +693,10 @@ in wantedBy = [ "multi-user.target" ]; wants = concatLists (map (vhostConfig: ["acme-${vhostConfig.serverName}.service" "acme-selfsigned-${vhostConfig.serverName}.service"]) acmeEnabledVhosts); after = [ "network.target" ] ++ map (vhostConfig: "acme-selfsigned-${vhostConfig.serverName}.service") acmeEnabledVhosts; + # Nginx needs to be started in order to be able to request certificates + # (it's hosting the acme challenge after all) + # This fixes https://github.com/NixOS/nixpkgs/issues/81842 + before = map (vhostConfig: "acme-${vhostConfig.serverName}.service") acmeEnabledVhosts; stopIfChanged = false; preStart = '' ${cfg.preStart} diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix index 0631a26569..4ab7307c3b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix @@ -20,10 +20,10 @@ let in valueType; dynamicConfigFile = if cfg.dynamicConfigFile == null then pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.yj ]; + buildInputs = [ pkgs.remarshal ]; preferLocalBuild = true; } '' - yj -jt -i \ + remarshal -if json -of toml \ < ${ pkgs.writeText "dynamic_config.json" (builtins.toJSON cfg.dynamicConfigOptions) diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 6d48b899d2..75bf55a263 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -321,7 +321,7 @@ in fonts.fonts = with pkgs; [ noto-fonts hack-font ]; fonts.fontconfig.defaultFonts = { - monospace = [ "Hack" "Noto Mono" ]; + monospace = [ "Hack" "Noto Sans Mono" ]; sansSerif = [ "Noto Sans" ]; serif = [ "Noto Serif" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index aa6a5ec42b..e990a66d19 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -332,12 +332,45 @@ in }; + # Configuration for automatic login. Common for all DM. + autoLogin = mkOption { + type = types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = cfg.displayManager.autoLogin.user != null; + description = '' + Automatically log in as . + ''; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User to be used for the automatic login. + ''; + }; + }; + }; + + default = {}; + description = '' + Auto login configuration attrset. + ''; + }; + }; }; config = { assertions = [ + { assertion = cfg.displayManager.autoLogin.enable -> cfg.displayManager.autoLogin.user != null; + message = '' + services.xserver.displayManager.autoLogin.enable requires services.xserver.displayManager.autoLogin.user to be set + ''; + } { assertion = cfg.desktopManager.default != null || cfg.windowManager.default != null -> cfg.displayManager.defaultSession == defaultSessionFromLegacyOptions; message = "You cannot use both services.xserver.displayManager.defaultSession option and legacy options (services.xserver.desktopManager.default and services.xserver.windowManager.default)."; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 622ea62f3a..573049ab07 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -37,6 +37,22 @@ let in { + imports = [ + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "enable" ] [ + "services" + "xserver" + "displayManager" + "autoLogin" + "enable" + ]) + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "user" ] [ + "services" + "xserver" + "displayManager" + "autoLogin" + "user" + ]) + ]; meta = { maintainers = teams.gnome.members; @@ -56,40 +72,13 @@ in debugging messages in GDM ''; - autoLogin = mkOption { - default = {}; + # Auto login options specific to GDM + autoLogin.delay = mkOption { + type = types.int; + default = 0; description = '' - Auto login configuration attrset. + Seconds of inactivity after which the autologin will be performed. ''; - - type = types.submodule { - options = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Automatically log in as the sepecified . - ''; - }; - - user = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - User to be used for the autologin. - ''; - }; - - delay = mkOption { - type = types.int; - default = 0; - description = '' - Seconds of inactivity after which the autologin will be performed. - ''; - }; - - }; - }; }; wayland = mkOption { @@ -128,12 +117,6 @@ in config = mkIf cfg.gdm.enable { - assertions = [ - { assertion = cfg.gdm.autoLogin.enable -> cfg.gdm.autoLogin.user != null; - message = "GDM auto-login requires services.xserver.displayManager.gdm.autoLogin.user to be set"; - } - ]; - services.xserver.displayManager.lightdm.enable = false; users.users.gdm = @@ -287,14 +270,14 @@ in environment.etc."gdm/custom.conf".text = '' [daemon] WaylandEnable=${if cfg.gdm.wayland then "true" else "false"} - ${optionalString cfg.gdm.autoLogin.enable ( + ${optionalString cfg.autoLogin.enable ( if cfg.gdm.autoLogin.delay > 0 then '' TimedLoginEnable=true - TimedLogin=${cfg.gdm.autoLogin.user} + TimedLogin=${cfg.autoLogin.user} TimedLoginDelay=${toString cfg.gdm.autoLogin.delay} '' else '' AutomaticLoginEnable=true - AutomaticLogin=${cfg.gdm.autoLogin.user} + AutomaticLogin=${cfg.autoLogin.user} '') } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 087c6b9c38..9bc9e2bf61 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -43,7 +43,7 @@ in services.xserver.displayManager.lightdm.extraSeatDefaults = "greeter-show-manual-login=true"; environment.etc."lightdm/io.elementary.greeter.conf".source = "${pkgs.pantheon.elementary-greeter}/etc/lightdm/io.elementary.greeter.conf"; - environment.etc."wingpanel.d/io.elementary.greeter.whitelist".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.whitelist"; + environment.etc."wingpanel.d/io.elementary.greeter.allowed".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.allowed"; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix index 678cade444..3bee21fa82 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix @@ -53,8 +53,8 @@ let ${optionalString cfg.greeter.enable '' greeter-session = ${cfg.greeter.name} ''} - ${optionalString cfg.autoLogin.enable '' - autologin-user = ${cfg.autoLogin.user} + ${optionalString dmcfg.autoLogin.enable '' + autologin-user = ${dmcfg.autoLogin.user} autologin-user-timeout = ${toString cfg.autoLogin.timeout} autologin-session = ${sessionData.autologinSession} ''} @@ -82,6 +82,20 @@ in ./lightdm-greeters/enso-os.nix ./lightdm-greeters/pantheon.nix ./lightdm-greeters/tiny.nix + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "enable" ] [ + "services" + "xserver" + "displayManager" + "autoLogin" + "enable" + ]) + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "user" ] [ + "services" + "xserver" + "displayManager" + "autoLogin" + "user" + ]) ]; options = { @@ -149,39 +163,13 @@ in description = "Extra lines to append to SeatDefaults section."; }; - autoLogin = mkOption { - default = {}; + # Configuration for automatic login specific to LightDM + autoLogin.timeout = mkOption { + type = types.int; + default = 0; description = '' - Configuration for automatic login. + Show the greeter for this many seconds before automatic login occurs. ''; - - type = types.submodule { - options = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Automatically log in as the specified . - ''; - }; - - user = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - User to be used for the automatic login. - ''; - }; - - timeout = mkOption { - type = types.int; - default = 0; - description = '' - Show the greeter for this many seconds before automatic login occurs. - ''; - }; - }; - }; }; }; @@ -195,17 +183,12 @@ in LightDM requires services.xserver.enable to be true ''; } - { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null; - message = '' - LightDM auto-login requires services.xserver.displayManager.lightdm.autoLogin.user to be set - ''; - } - { assertion = cfg.autoLogin.enable -> sessionData.autologinSession != null; + { assertion = dmcfg.autoLogin.enable -> sessionData.autologinSession != null; message = '' LightDM auto-login requires that services.xserver.displayManager.defaultSession is set. ''; } - { assertion = !cfg.greeter.enable -> (cfg.autoLogin.enable && cfg.autoLogin.timeout == 0); + { assertion = !cfg.greeter.enable -> (dmcfg.autoLogin.enable && cfg.autoLogin.timeout == 0); message = '' LightDM can only run without greeter if automatic login is enabled and the timeout for it is set to zero. @@ -218,7 +201,7 @@ in # Set default session in session chooser to a specified values – basically ignore session history. # Auto-login is already covered by a config value. - services.xserver.displayManager.job.preStart = optionalString (!cfg.autoLogin.enable && dmcfg.defaultSession != null) '' + services.xserver.displayManager.job.preStart = optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null) '' ${setSessionScript}/bin/set-session ${dmcfg.defaultSession} ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index 2f42271da8..e63bb2e445 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -61,9 +61,9 @@ let EnableHidpi=${if cfg.enableHidpi then "true" else "false"} SessionDir=${dmcfg.sessionData.desktops}/share/wayland-sessions - ${optionalString cfg.autoLogin.enable '' + ${optionalString dmcfg.autoLogin.enable '' [Autologin] - User=${cfg.autoLogin.user} + User=${dmcfg.autoLogin.user} Session=${autoLoginSessionName}.desktop Relogin=${boolToString cfg.autoLogin.relogin} ''} @@ -78,6 +78,20 @@ in imports = [ (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] "Set the option `services.xserver.displayManager.sddm.package' instead.") + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoLogin" "enable" ] [ + "services" + "xserver" + "displayManager" + "autoLogin" + "enable" + ]) + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoLogin" "user" ] [ + "services" + "xserver" + "displayManager" + "autoLogin" + "user" + ]) ]; options = { @@ -153,40 +167,14 @@ in ''; }; - autoLogin = mkOption { - default = {}; + # Configuration for automatic login specific to SDDM + autoLogin.relogin = mkOption { + type = types.bool; + default = false; description = '' - Configuration for automatic login. + If true automatic login will kick in again on session exit (logout), otherwise it + will only log in automatically when the display-manager is started. ''; - - type = types.submodule { - options = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Automatically log in as . - ''; - }; - - user = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - User to be used for the automatic login. - ''; - }; - - relogin = mkOption { - type = types.bool; - default = false; - description = '' - If true automatic login will kick in again on session exit (logout), otherwise it - will only log in automatically when the display-manager is started. - ''; - }; - }; - }; }; }; @@ -201,12 +189,7 @@ in SDDM requires services.xserver.enable to be true ''; } - { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null; - message = '' - SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set - ''; - } - { assertion = cfg.autoLogin.enable -> autoLoginSessionName != null; + { assertion = dmcfg.autoLogin.enable -> autoLoginSessionName != null; message = '' SDDM auto-login requires that services.xserver.displayManager.defaultSession is set. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix new file mode 100644 index 0000000000..7553c2aebb --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.boot.initrd.network.openvpn; + +in + +{ + + options = { + + boot.initrd.network.openvpn.enable = mkOption { + type = types.bool; + default = false; + description = '' + Starts an OpenVPN client during initrd boot. It can be used to e.g. + remotely accessing the SSH service controlled by + or other network services + included. Service is killed when stage-1 boot is finished. + ''; + }; + + boot.initrd.network.openvpn.configuration = mkOption { + type = types.path; # Same type as boot.initrd.secrets + description = '' + The configuration file for OpenVPN. + + + + Unless your bootloader supports initrd secrets, this configuration + is stored insecurely in the global Nix store. + + + ''; + example = "./configuration.ovpn"; + }; + + }; + + config = mkIf (config.boot.initrd.network.enable && cfg.enable) { + assertions = [ + { + assertion = cfg.configuration != null; + message = "You should specify a configuration for initrd OpenVPN"; + } + ]; + + # Add kernel modules needed for OpenVPN + boot.initrd.kernelModules = [ "tun" "tap" ]; + + # Add openvpn and ip binaries to the initrd + # The shared libraries are required for DNS resolution + boot.initrd.extraUtilsCommands = '' + copy_bin_and_libs ${pkgs.openvpn}/bin/openvpn + copy_bin_and_libs ${pkgs.iproute}/bin/ip + + cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib + cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib + ''; + + boot.initrd.secrets = { + "/etc/initrd.ovpn" = cfg.configuration; + }; + + # openvpn --version would exit with 1 instead of 0 + boot.initrd.extraUtilsCommandsTest = '' + $out/bin/openvpn --show-gateway + ''; + + # Add `iproute /bin/ip` to the config, to ensure that openvpn + # is able to set the routes + boot.initrd.network.postCommands = '' + (cat /etc/initrd.ovpn; echo -e '\niproute /bin/ip') | \ + openvpn /dev/stdin & + ''; + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix index 85bd420e30..783685c9df 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix @@ -54,7 +54,7 @@ let type = types.bool // { merge = mergeFalseByDefault; }; default = false; description = '' - Wether option should generate a failure when unused. + Whether option should generate a failure when unused. Upon merging values, mandatory wins over optional. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index af39c7bb68..bd508bbe8e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -4,11 +4,15 @@ with lib; let blCfg = config.boot.loader; + dtCfg = config.hardware.deviceTree; cfg = blCfg.generic-extlinux-compatible; timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; + # The builder used to write during system activation builder = import ./extlinux-conf-builder.nix { inherit pkgs; }; + # The builder exposed in populateCmd, which runs on the build architecture + populateBuilder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; }; in { options = { @@ -34,11 +38,28 @@ in Maximum number of configurations in the boot menu. ''; }; + + populateCmd = mkOption { + type = types.str; + readOnly = true; + description = '' + Contains the builder command used to populate an image, + honoring all options except the -c <path-to-default-configuration> + argument. + Useful to have for sdImage.populateRootCommands + ''; + }; + }; }; - config = mkIf cfg.enable { - system.build.installBootLoader = "${builder} -g ${toString cfg.configurationLimit} -t ${timeoutStr} -c"; - system.boot.loader.id = "generic-extlinux-compatible"; - }; + config = let + builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}" + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}"; + in + mkIf cfg.enable { + system.build.installBootLoader = "${builder} ${builderArgs} -c"; + system.boot.loader.id = "generic-extlinux-compatible"; + + boot.loader.generic-extlinux-compatible.populateCmd = "${populateBuilder} ${builderArgs}"; + }; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index 0092ee92b6..854684b87f 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -6,7 +6,7 @@ export PATH=/empty for i in @path@; do PATH=$PATH:$i/bin; done usage() { - echo "usage: $0 -t -c [-d ] [-g ]" >&2 + echo "usage: $0 -t -c [-d ] [-g ] [-n ]" >&2 exit 1 } @@ -15,7 +15,7 @@ default= # Default configuration target=/boot # Target directory numGenerations=0 # Number of other generations to include in the menu -while getopts "t:c:d:g:" opt; do +while getopts "t:c:d:g:n:" opt; do case "$opt" in t) # U-Boot interprets '0' as infinite and negative as instant boot if [ "$OPTARG" -lt 0 ]; then @@ -29,6 +29,7 @@ while getopts "t:c:d:g:" opt; do c) default="$OPTARG" ;; d) target="$OPTARG" ;; g) numGenerations="$OPTARG" ;; + n) dtbName="$OPTARG" ;; \?) usage ;; esac done @@ -96,7 +97,17 @@ addEntry() { echo " LINUX ../nixos/$(basename $kernel)" echo " INITRD ../nixos/$(basename $initrd)" if [ -d "$dtbDir" ]; then - echo " FDTDIR ../nixos/$(basename $dtbs)" + # if a dtbName was specified explicitly, use that, else use FDTDIR + if [ -n "$dtbName" ]; then + echo " FDT ../nixos/$(basename $dtbs)/${dtbName}" + else + echo " FDTDIR ../nixos/$(basename $dtbs)" + fi + else + if [ -n "$dtbName" ]; then + echo "Explicitly requested dtbName $dtbName, but there's no FDTDIR - bailing out." >&2 + exit 1 + fi fi echo " APPEND systemConfig=$path init=$path/init $extraParams" } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index 3975372e15..49e73588ed 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -55,11 +55,13 @@ let storePath = config.boot.loader.grub.storePath; bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId; timeout = if config.boot.loader.timeout == null then -1 else config.boot.loader.timeout; + users = if cfg.users == {} || cfg.version != 1 then cfg.users else throw "GRUB version 1 does not support user accounts."; inherit efiSysMountPoint; inherit (args) devices; inherit (efi) canTouchEfiVariables; inherit (cfg) version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber + extraGrubInstallArgs extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios gfxpayloadEfi gfxpayloadBios; path = with pkgs; makeBinPath ( @@ -137,6 +139,67 @@ in ''; }; + users = mkOption { + default = {}; + example = { + root = { hashedPasswordFile = "/path/to/file"; }; + }; + description = '' + User accounts for GRUB. When specified, the GRUB command line and + all boot options except the default are password-protected. + All passwords and hashes provided will be stored in /boot/grub/grub.cfg, + and will be visible to any local user who can read this file. Additionally, + any passwords and hashes provided directly in a Nix configuration + (as opposed to external files) will be copied into the Nix store, and + will be visible to all local users. + ''; + type = with types; attrsOf (submodule { + options = { + hashedPasswordFile = mkOption { + example = "/path/to/file"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the path to a file containing the password hash + for the account, generated with grub-mkpasswd-pbkdf2. + This hash will be stored in /boot/grub/grub.cfg, and will + be visible to any local user who can read this file. + ''; + }; + hashedPassword = mkOption { + example = "grub.pbkdf2.sha512.10000.674DFFDEF76E13EA...2CC972B102CF4355"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the password hash for the account, + generated with grub-mkpasswd-pbkdf2. + This hash will be copied to the Nix store, and will be visible to all local users. + ''; + }; + passwordFile = mkOption { + example = "/path/to/file"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the path to a file containing the + clear text password for the account. + This password will be stored in /boot/grub/grub.cfg, and will + be visible to any local user who can read this file. + ''; + }; + password = mkOption { + example = "Pa$$w0rd!"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the clear text password for the account. + This password will be copied to the Nix store, and will be visible to all local users. + ''; + }; + }; + }); + }; + mirroredBoots = mkOption { default = [ ]; example = [ @@ -236,6 +299,33 @@ in ''; }; + extraGrubInstallArgs = mkOption { + default = [ ]; + example = [ "--modules=nativedisk ahci pata part_gpt part_msdos diskfilter mdraid1x lvm ext2" ]; + type = types.listOf types.str; + description = '' + Additional arguments passed to grub-install. + + A use case for this is to build specific GRUB2 modules + directly into the GRUB2 kernel image, so that they are available + and activated even in the grub rescue shell. + + They are also necessary when the BIOS/UEFI is bugged and cannot + correctly read large disks (e.g. above 2 TB), so GRUB2's own + nativedisk and related modules can be used + to use its own disk drivers. The example shows one such case. + This is also useful for booting from USB. + See the + + GRUB source code + + for which disk modules are available. + + The list elements are passed directly as argv + arguments to the grub-install program, in order. + ''; + }; + extraPerEntryConfig = mkOption { default = ""; example = "root (hd0)"; @@ -607,7 +697,7 @@ in in pkgs.writeScript "install-grub.sh" ('' #!${pkgs.runtimeShell} set -e - export PERL5LIB=${with pkgs.perlPackages; makePerlPath [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare ]} + export PERL5LIB=${with pkgs.perlPackages; makePerlPath [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare JSON ]} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} '' + flip concatMapStrings cfg.mirroredBoots (args: '' ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl index e469b18abd..5d7f58e7c7 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -8,6 +8,7 @@ use File::stat; use File::Copy; use File::Slurp; use File::Temp; +use JSON; require List::Compare; use POSIX; use Cwd; @@ -20,6 +21,16 @@ my $dom = XML::LibXML->load_xml(location => $ARGV[0]); sub get { my ($name) = @_; return $dom->findvalue("/expr/attrs/attr[\@name = '$name']/*/\@value"); } +sub getList { + my ($name) = @_; + my @list = (); + foreach my $entry ($dom->findnodes("/expr/attrs/attr[\@name = '$name']/list/string/\@value")) { + $entry = $entry->findvalue(".") or die; + push(@list, $entry); + } + return @list; +} + sub readFile { my ($fn) = @_; local $/ = undef; open FILE, "<$fn" or return undef; my $s = ; close FILE; @@ -241,12 +252,51 @@ if ($grubVersion == 1) { timeout $timeout "; if ($splashImage) { - copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n"; + copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= "splashimage " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background.xpm.gz\n"; } } else { + my @users = (); + foreach my $user ($dom->findnodes('/expr/attrs/attr[@name = "users"]/attrs/attr')) { + my $name = $user->findvalue('@name') or die; + my $hashedPassword = $user->findvalue('./attrs/attr[@name = "hashedPassword"]/string/@value'); + my $hashedPasswordFile = $user->findvalue('./attrs/attr[@name = "hashedPasswordFile"]/string/@value'); + my $password = $user->findvalue('./attrs/attr[@name = "password"]/string/@value'); + my $passwordFile = $user->findvalue('./attrs/attr[@name = "passwordFile"]/string/@value'); + + if ($hashedPasswordFile) { + open(my $f, '<', $hashedPasswordFile) or die "Can't read file '$hashedPasswordFile'!"; + $hashedPassword = <$f>; + chomp $hashedPassword; + } + if ($passwordFile) { + open(my $f, '<', $passwordFile) or die "Can't read file '$passwordFile'!"; + $password = <$f>; + chomp $password; + } + + if ($hashedPassword) { + if (index($hashedPassword, "grub.pbkdf2.") == 0) { + $conf .= "\npassword_pbkdf2 $name $hashedPassword"; + } + else { + die "Password hash for GRUB user '$name' is not valid!"; + } + } + elsif ($password) { + $conf .= "\npassword $name $password"; + } + else { + die "GRUB user '$name' has no password!"; + } + push(@users, $name); + } + if (@users) { + $conf .= "\nset superusers=\"" . join(' ',@users) . "\"\n"; + } + if ($copyKernels == 0) { $conf .= " " . $grubStore->search; @@ -280,7 +330,7 @@ else { "; if ($font) { - copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n"; + copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n"; $conf .= " insmod font if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then @@ -308,7 +358,7 @@ else { background_color '$backgroundColor' "; } - copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath\n"; + copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= " insmod " . substr($suffix, 1) . " if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then @@ -342,15 +392,15 @@ sub copyToKernelsDir { # kernels or initrd if this script is ever interrupted. if (! -e $dst) { my $tmp = "$dst.tmp"; - copy $path, $tmp or die "cannot copy $path to $tmp\n"; - rename $tmp, $dst or die "cannot rename $tmp to $dst\n"; + copy $path, $tmp or die "cannot copy $path to $tmp: $!\n"; + rename $tmp, $dst or die "cannot rename $tmp to $dst: $!\n"; } $copied{$dst} = 1; return ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$name"; } sub addEntry { - my ($name, $path) = @_; + my ($name, $path, $options) = @_; return unless -e "$path/kernel" && -e "$path/initrd"; my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); @@ -366,10 +416,10 @@ sub addEntry { # Make sure initrd is not world readable (won't work if /boot is FAT) umask 0137; my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); - system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets\n"; + system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; # Check whether any secrets were actually added if (-e $initrdSecretsPathTemp && ! -z _) { - rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place\n"; + rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; $copied{$initrdSecretsPath} = 1; $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; } else { @@ -396,7 +446,7 @@ sub addEntry { $conf .= " " . ($xen ? "module" : "kernel") . " $kernel $kernelParams\n"; $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; } else { - $conf .= "menuentry \"$name\" {\n"; + $conf .= "menuentry \"$name\" " . ($options||"") . " {\n"; $conf .= $grubBoot->search . "\n"; if ($copyKernels == 0) { $conf .= $grubStore->search . "\n"; @@ -413,7 +463,7 @@ sub addEntry { # Add default entries. $conf .= "$extraEntries\n" if $extraEntriesBeforeNixOS; -addEntry("NixOS - Default", $defaultConfig); +addEntry("NixOS - Default", $defaultConfig, "--unrestricted"); $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS; @@ -536,7 +586,7 @@ if (get("useOSProber") eq "true") { } # Atomically switch to the new config -rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n"; +rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile: $!\n"; # Remove obsolete files from $bootPath/kernels. @@ -557,9 +607,12 @@ struct(GrubState => { efi => '$', devices => '$', efiMountPoint => '$', + extraGrubInstallArgs => '@', }); +# If you add something to the state file, only add it to the end +# because it is read line-by-line. sub readGrubState { - my $defaultGrubState = GrubState->new(name => "", version => "", efi => "", devices => "", efiMountPoint => "" ); + my $defaultGrubState = GrubState->new(name => "", version => "", efi => "", devices => "", efiMountPoint => "", extraGrubInstallArgs => () ); open FILE, "<$bootPath/grub/state" or return $defaultGrubState; local $/ = "\n"; my $name = ; @@ -572,24 +625,37 @@ sub readGrubState { chomp($devices); my $efiMountPoint = ; chomp($efiMountPoint); + # Historically, arguments in the state file were one per each line, but that + # gets really messy when newlines are involved, structured arguments + # like lists are needed (they have to have a separator encoding), or even worse, + # when we need to remove a setting in the future. Thus, the 6th line is a JSON + # object that can store structured data, with named keys, and all new state + # should go in there. + my $jsonStateLine = ; + # For historical reasons we do not check the values above for un-definedness + # (that is, when the state file has too few lines and EOF is reached), + # because the above come from the first version of this logic and are thus + # guaranteed to be present. + $jsonStateLine = defined $jsonStateLine ? $jsonStateLine : '{}'; # empty JSON object + chomp($jsonStateLine); + if ($jsonStateLine eq "") { + $jsonStateLine = '{}'; # empty JSON object + } + my %jsonState = %{decode_json($jsonStateLine)}; + my @extraGrubInstallArgs = exists($jsonState{'extraGrubInstallArgs'}) ? @{$jsonState{'extraGrubInstallArgs'}} : (); close FILE; - my $grubState = GrubState->new(name => $name, version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint ); + my $grubState = GrubState->new(name => $name, version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint, extraGrubInstallArgs => \@extraGrubInstallArgs ); return $grubState } -sub getDeviceTargets { - my @devices = (); - foreach my $dev ($dom->findnodes('/expr/attrs/attr[@name = "devices"]/list/string/@value')) { - $dev = $dev->findvalue(".") or die; - push(@devices, $dev); - } - return @devices; -} -my @deviceTargets = getDeviceTargets(); +my @deviceTargets = getList('devices'); my $prevGrubState = readGrubState(); my @prevDeviceTargets = split/,/, $prevGrubState->devices; +my @extraGrubInstallArgs = getList('extraGrubInstallArgs'); +my @prevExtraGrubInstallArgs = @{$prevGrubState->extraGrubInstallArgs}; my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference()); +my $extraGrubInstallArgsDiffer = scalar (List::Compare->new( '-u', '-a', \@extraGrubInstallArgs, \@prevExtraGrubInstallArgs)->get_symmetric_difference()); my $nameDiffer = get("fullName") ne $prevGrubState->name; my $versionDiffer = get("fullVersion") ne $prevGrubState->version; my $efiDiffer = $efiTarget ne $prevGrubState->efi; @@ -598,25 +664,25 @@ if (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1") { warn "NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER"; $ENV{'NIXOS_INSTALL_BOOTLOADER'} = "1"; } -my $requireNewInstall = $devicesDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_BOOTLOADER'} // "") eq "1"); +my $requireNewInstall = $devicesDiffer || $extraGrubInstallArgsDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_BOOTLOADER'} // "") eq "1"); # install a symlink so that grub can detect the boot drive -my $tmpDir = File::Temp::tempdir(CLEANUP => 1) or die "Failed to create temporary space"; -symlink "$bootPath", "$tmpDir/boot" or die "Failed to symlink $tmpDir/boot"; +my $tmpDir = File::Temp::tempdir(CLEANUP => 1) or die "Failed to create temporary space: $!"; +symlink "$bootPath", "$tmpDir/boot" or die "Failed to symlink $tmpDir/boot: $!"; # install non-EFI GRUB if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { foreach my $dev (@deviceTargets) { next if $dev eq "nodev"; print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n"; - my @command = ("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev)); + my @command = ("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev), @extraGrubInstallArgs); if ($forceInstall eq "true") { push @command, "--force"; } if ($grubTarget ne "") { push @command, "--target=$grubTarget"; } - (system @command) == 0 or die "$0: installation of GRUB on $dev failed\n"; + (system @command) == 0 or die "$0: installation of GRUB on $dev failed: $!\n"; } } @@ -624,7 +690,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { # install EFI GRUB if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; - my @command = ("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint"); + my @command = ("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", @extraGrubInstallArgs); if ($forceInstall eq "true") { push @command, "--force"; } @@ -635,17 +701,29 @@ if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) push @command, "--removable" if $efiInstallAsRemovable eq "true"; } - (system @command) == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; + (system @command) == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed: $!\n"; } # update GRUB state file if ($requireNewInstall != 0) { - open FILE, ">$bootPath/grub/state" or die "cannot create $bootPath/grub/state: $!\n"; + # Temp file for atomic rename. + my $stateFile = "$bootPath/grub/state"; + my $stateFileTmp = $stateFile . ".tmp"; + + open FILE, ">$stateFileTmp" or die "cannot create $stateFileTmp: $!\n"; print FILE get("fullName"), "\n" or die; print FILE get("fullVersion"), "\n" or die; print FILE $efiTarget, "\n" or die; print FILE join( ",", @deviceTargets ), "\n" or die; print FILE $efiSysMountPoint, "\n" or die; + my %jsonState = ( + extraGrubInstallArgs => \@extraGrubInstallArgs + ); + my $jsonStateLine = encode_json(\%jsonState); + print FILE $jsonStateLine, "\n" or die; close FILE or die; + + # Atomically switch to the new state file + rename $stateFileTmp, $stateFile or die "cannot rename $stateFileTmp to $stateFile: $!\n"; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index 31f1e22cda..166f89c706 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -140,7 +140,7 @@ let umount /crypt-ramfs 2>/dev/null ''; - openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, gpgCard, fido2, fallbackToPassword, ... }: assert name' == name; + openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, gpgCard, fido2, fallbackToPassword, preOpenCommands, postOpenCommands,... }: assert name' == name; let csopen = "cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} ${optionalString (header != null) "--header=${header}"}"; cschange = "cryptsetup luksChangeKey ${device} ${optionalString (header != null) "--header=${header}"}"; @@ -412,11 +412,17 @@ let } ''} + # commands to run right before we mount our device + ${preOpenCommands} + ${if (luks.yubikeySupport && (yubikey != null)) || (luks.gpgSupport && (gpgCard != null)) || (luks.fido2Support && (fido2.credential != null)) then '' open_with_hardware '' else '' open_normally ''} + + # commands to run right after we mounted our device + ${postOpenCommands} ''; askPass = pkgs.writeScriptBin "cryptsetup-askpass" '' @@ -467,8 +473,6 @@ in [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" "af_alg" "algif_skcipher" - - (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; description = '' A list of cryptographic kernel modules needed to decrypt the root device(s). @@ -735,6 +739,30 @@ in }; }); }; + + preOpenCommands = mkOption { + type = types.lines; + default = ""; + example = '' + mkdir -p /tmp/persistent + mount -t zfs rpool/safe/persistent /tmp/persistent + ''; + description = '' + Commands that should be run right before we try to mount our LUKS device. + This can be useful, if the keys needed to open the drive is on another partion. + ''; + }; + + postOpenCommands = mkOption { + type = types.lines; + default = ""; + example = '' + umount /tmp/persistent + ''; + description = '' + Commands that should be run right after we have mounted our LUKS device. + ''; + }; }; })); }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix b/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix index dee0ab470c..c75f32c4d9 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix @@ -28,7 +28,7 @@ with lib; Any additional configuration to be appended to the generated modprobe.conf. This is typically used to specify module options. See - modprobe.conf + modprobe.d 5 for details. ''; type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index b0545363b3..721080949e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -302,7 +302,7 @@ let checkDhcpV6 = checkUnitConfig "DHCPv6" [ (assertOnlyFields [ - "UseDns" "UseNTP" "RapidCommit" "ForceDHCPv6PDOtherInformation" + "UseDNS" "UseNTP" "RapidCommit" "ForceDHCPv6PDOtherInformation" "PrefixDelegationHint" ]) (assertValueOneOf "UseDNS" boolValues) @@ -488,7 +488,7 @@ let vlanConfig = mkOption { default = {}; - example = { Id = "4"; }; + example = { Id = 4; }; type = types.addCheck (types.attrsOf unitOption) checkVlan; description = '' Each attribute in this set specifies an option in the diff --git a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix index 23fce22366..55e5b07ed6 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix @@ -102,6 +102,8 @@ in systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ]; systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ]; systemd.services.plymouth-read-write.wantedBy = [ "sysinit.target" ]; + systemd.services.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"]; + systemd.paths.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"]; boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.plymouth}/bin/plymouthd @@ -146,6 +148,7 @@ in # We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen. boot.initrd.preLVMCommands = mkAfter '' mkdir -p /etc/plymouth + mkdir -p /run/plymouth ln -s ${configFile} /etc/plymouth/plymouthd.conf ln -s $extraUtils/share/plymouth/plymouthd.defaults /etc/plymouth/plymouthd.defaults ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh index d1de7920df..936077b9df 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh @@ -169,4 +169,4 @@ exec {logOutFd}>&- {logErrFd}>&- echo "starting systemd..." PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ - exec systemd + exec @systemdExecutable@ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix index 6b0b472273..dd6d83ee00 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix @@ -10,6 +10,7 @@ let src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; shell = "${pkgs.bash}/bin/bash"; + inherit (config.boot) systemdExecutable; isExecutable = true; inherit (config.nix) readOnlyStore; inherit useHostResolvConf; @@ -72,6 +73,15 @@ in ''; }; + systemdExecutable = mkOption { + default = "systemd"; + type = types.str; + description = '' + The program to execute to start systemd. Typically + systemd, which will find systemd in the + PATH. + ''; + }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index a8e51fc090..01ecf1d029 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -818,6 +818,49 @@ in ''; }; + systemd.watchdog.device = mkOption { + type = types.nullOr types.path; + default = null; + example = "/dev/watchdog"; + description = '' + The path to a hardware watchdog device which will be managed by systemd. + If not specified, systemd will default to /dev/watchdog. + ''; + }; + + systemd.watchdog.runtimeTime = mkOption { + type = types.nullOr types.str; + default = null; + example = "30s"; + description = '' + The amount of time which can elapse before a watchdog hardware device + will automatically reboot the system. Valid time units include "ms", + "s", "min", "h", "d", and "w". + ''; + }; + + systemd.watchdog.rebootTime = mkOption { + type = types.nullOr types.str; + default = null; + example = "10m"; + description = '' + The amount of time which can elapse after a reboot has been triggered + before a watchdog hardware device will automatically reboot the system. + Valid time units include "ms", "s", "min", "h", "d", and "w". + ''; + }; + + systemd.watchdog.kexecTime = mkOption { + type = types.nullOr types.str; + default = null; + example = "10m"; + description = '' + The amount of time which can elapse when kexec is being executed before + a watchdog hardware device will automatically reboot the system. This + option should only be enabled if reloadTime is also enabled. Valid + time units include "ms", "s", "min", "h", "d", and "w". + ''; + }; }; @@ -889,6 +932,19 @@ in DefaultIPAccounting=yes ''} DefaultLimitCORE=infinity + ${optionalString (config.systemd.watchdog.device != null) '' + WatchdogDevice=${config.systemd.watchdog.device} + ''} + ${optionalString (config.systemd.watchdog.runtimeTime != null) '' + RuntimeWatchdogSec=${config.systemd.watchdog.runtimeTime} + ''} + ${optionalString (config.systemd.watchdog.rebootTime != null) '' + RebootWatchdogSec=${config.systemd.watchdog.rebootTime} + ''} + ${optionalString (config.systemd.watchdog.kexecTime != null) '' + KExecWatchdogSec=${config.systemd.watchdog.kexecTime} + ''} + ${config.systemd.extraConfig} ''; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 71eed4d6f1..c9d9c6c165 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -197,9 +197,7 @@ in Request encryption keys or passwords for all encrypted datasets on import. For root pools the encryption key can be supplied via both an interactive prompt (keylocation=prompt) and from a file - (keylocation=file://). Note that for data pools the encryption key can - be only loaded from a file and not via interactive prompt since the - import is processed in a background systemd service. + (keylocation=file://). ''; }; @@ -490,7 +488,11 @@ in description = "Import ZFS pool \"${pool}\""; # we need systemd-udev-settle until https://github.com/zfsonlinux/zfs/pull/4943 is merged requires = [ "systemd-udev-settle.service" ]; - after = [ "systemd-udev-settle.service" "systemd-modules-load.service" ]; + after = [ + "systemd-udev-settle.service" + "systemd-modules-load.service" + "systemd-ask-password-console.service" + ]; wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ]; before = (getPoolMounts pool) ++ [ "local-fs.target" ]; unitConfig = { @@ -515,7 +517,20 @@ in done poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. if poolImported "${pool}"; then - ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} + ${optionalString cfgZfs.requestEncryptionCredentials '' + ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do + (case "$kl" in + none ) + ;; + prompt ) + ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${packages.zfsUser}/sbin/zfs load-key "$ds" + ;; + * ) + ${packages.zfsUser}/sbin/zfs load-key "$ds" + ;; + esac) < /dev/null # To protect while read ds kl in case anything reads stdin + done + ''} echo "Successfully imported ${pool}" else exit 1 diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix index 7d18457564..55546ebfda 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix @@ -23,6 +23,15 @@ in maintainers = [] ++ lib.teams.podman.members; }; + + imports = [ + ( + lib.mkRemovedOptionModule + [ "virtualisation" "containers" "users" ] + "All users with `isNormaUser = true` set now get appropriate subuid/subgid mappings." + ) + ]; + options.virtualisation.containers = { enable = @@ -34,6 +43,25 @@ in ''; }; + containersConf = mkOption { + default = {}; + description = "containers.conf configuration"; + type = types.submodule { + options = { + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the containers.conf + configuration file + ''; + + }; + }; + }; + }; + registries = { search = mkOption { type = types.listOf types.str; @@ -80,43 +108,20 @@ in ''; }; - users = mkOption { - default = []; - type = types.listOf types.str; - description = '' - List of users to set up subuid/subgid mappings for. - This is a requirement for running rootless containers. - ''; - }; - }; config = lib.mkIf cfg.enable { + environment.etc."containers/containers.conf".text = '' + [network] + cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + + '' + cfg.containersConf.extraConfig; + environment.etc."containers/registries.conf".source = toTOML "registries.conf" { registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; }; - users.extraUsers = builtins.listToAttrs ( - ( - builtins.foldl' ( - acc: user: { - values = acc.values ++ [ - { - name = user; - value = { - subUidRanges = [ { startUid = acc.offset; count = 65536; } ]; - subGidRanges = [ { startGid = acc.offset; count = 65536; } ]; - }; - } - ]; - offset = acc.offset + 65536; - } - ) - { values = []; offset = 100000; } (lib.unique cfg.users) - ).values - ); - environment.etc."containers/policy.json".source = if cfg.policy != {} then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) else copyFile "${pkgs.skopeo.src}/default-policy.json"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix index 7d196a4627..d87ada35a0 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix @@ -149,6 +149,7 @@ in ###### implementation config = mkIf cfg.enable (mkMerge [{ + boot.kernelModules = [ "bridge" "veth" ]; environment.systemPackages = [ cfg.package ] ++ optional cfg.enableNvidia pkgs.nvidia-docker; users.groups.docker.gid = config.ids.gids.docker; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix index 43b5fcfa8f..1d6a9457dd 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix @@ -265,8 +265,8 @@ in { restartIfChanged = false; }; - systemd.sockets.libvirtd .wantedBy = [ "sockets.target" ]; - systemd.sockets.libvirtd-tcp.wantedBy = [ "sockets.target" ]; + # https://libvirt.org/daemons.html#monolithic-systemd-integration + systemd.sockets.libvirtd.wantedBy = [ "sockets.target" ]; security.polkit.extraConfig = '' polkit.addRule(function(action, subject) { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix index 652850bf50..e0e2f04e24 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix @@ -28,6 +28,10 @@ let in { + imports = [ + (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) + ]; + meta = { maintainers = lib.teams.podman.members; }; @@ -67,25 +71,6 @@ in ''; }; - libpod = mkOption { - default = {}; - description = "Libpod configuration"; - type = types.submodule { - options = { - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration that should be put in the libpod.conf - configuration file - ''; - - }; - }; - }; - }; - package = lib.mkOption { type = types.package; default = podmanPackage; @@ -103,11 +88,6 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."containers/libpod.conf".text = '' - cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] - - '' + cfg.libpod.extraConfig; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; # Enable common /etc/containers configuration diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index be06d6feb1..9154b0c00d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -46,6 +46,13 @@ let description = "Extra options passed to device flag."; }; + name = mkOption { + type = types.nullOr types.str; + default = null; + description = + "A name for the drive. Must be unique in the drives list. Not passed to qemu."; + }; + }; }; @@ -74,6 +81,32 @@ let drivesCmdLine = drives: concatStringsSep " " (imap1 driveCmdline drives); + + # Creates a device name from a 1-based a numerical index, e.g. + # * `driveDeviceName 1` -> `/dev/vda` + # * `driveDeviceName 2` -> `/dev/vdb` + driveDeviceName = idx: + let letter = elemAt lowerChars (idx - 1); + in if cfg.qemu.diskInterface == "scsi" then + "/dev/sd${letter}" + else + "/dev/vd${letter}"; + + lookupDriveDeviceName = driveName: driveList: + (findSingle (drive: drive.name == driveName) + (throw "Drive ${driveName} not found") + (throw "Multiple drives named ${driveName}") driveList).device; + + addDeviceNames = + imap1 (idx: drive: drive // { device = driveDeviceName idx; }); + + efiPrefix = + if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then "${pkgs.OVMF.fd}/FV/OVMF" + else if pkgs.stdenv.isAarch64 then "${pkgs.OVMF.fd}/FV/AAVMF" + else throw "No EFI firmware available for platform"; + efiFirmware = "${efiPrefix}_CODE.fd"; + efiVarsDefault = "${efiPrefix}_VARS.fd"; + # Shell script to start the VM. startVM = '' @@ -99,10 +132,14 @@ let # A writable boot disk can be booted from automatically. ${qemu}/bin/qemu-img create -f qcow2 -b ${bootDisk}/disk.img $TMPDIR/disk.img || exit 1 + NIX_EFI_VARS=$(readlink -f ''${NIX_EFI_VARS:-${cfg.efiVars}}) + ${if cfg.useEFIBoot then '' - # VM needs a writable flash BIOS. - cp ${bootDisk}/bios.bin $TMPDIR || exit 1 - chmod 0644 $TMPDIR/bios.bin || exit 1 + # VM needs writable EFI vars + if ! test -e "$NIX_EFI_VARS"; then + cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS" || exit 1 + chmod 0644 "$NIX_EFI_VARS" || exit 1 + fi '' else '' ''} '' else '' @@ -139,6 +176,8 @@ let # Generate a hard disk image containing a /boot partition and GRUB # in the MBR. Used when the `useBootLoader' option is set. + # Uses `runInLinuxVM` to create the image in a throwaway VM. + # See note [Disk layout with `useBootLoader`]. # FIXME: use nixos/lib/make-disk-image.nix. bootDisk = pkgs.vmTools.runInLinuxVM ( @@ -147,21 +186,22 @@ let '' mkdir $out diskImage=$out/disk.img - bootFlash=$out/bios.bin - ${qemu}/bin/qemu-img create -f qcow2 $diskImage "40M" + ${qemu}/bin/qemu-img create -f qcow2 $diskImage "60M" ${if cfg.useEFIBoot then '' - cp ${pkgs.OVMF-CSM.fd}/FV/OVMF.fd $bootFlash - chmod 0644 $bootFlash + efiVars=$out/efi-vars.fd + cp ${efiVarsDefault} $efiVars + chmod 0644 $efiVars '' else '' ''} ''; buildInputs = [ pkgs.utillinux ]; - QEMU_OPTS = if cfg.useEFIBoot - then "-pflash $out/bios.bin -nographic -serial pty" - else "-nographic -serial pty"; + QEMU_OPTS = "-nographic -serial stdio -monitor none" + + lib.optionalString cfg.useEFIBoot ( + " -drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" + + " -drive if=pflash,format=raw,unit=1,file=$efiVars"); } '' - # Create a /boot EFI partition with 40M and arbitrary but fixed GUIDs for reproducibility + # Create a /boot EFI partition with 60M and arbitrary but fixed GUIDs for reproducibility ${pkgs.gptfdisk}/bin/sgdisk \ --set-alignment=1 --new=1:34:2047 --change-name=1:BIOSBootPartition --typecode=1:ef02 \ --set-alignment=512 --largest-new=2 --change-name=2:EFISystem --typecode=2:ef00 \ @@ -172,6 +212,19 @@ let --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ --hybrid 2 \ --recompute-chs /dev/vda + + ${optionalString (config.boot.loader.grub.device != "/dev/vda") + # In this throwaway VM, we only have the /dev/vda disk, but the + # actual VM described by `config` (used by `switch-to-configuration` + # below) may set `boot.loader.grub.device` to a different device + # that's nonexistent in the throwaway VM. + # Create a symlink for that device, so that the `grub-install` + # by `switch-to-configuration` will hit /dev/vda anyway. + '' + ln -s /dev/vda ${config.boot.loader.grub.device} + '' + } + ${pkgs.dosfstools}/bin/mkfs.fat -F16 /dev/vda2 export MTOOLS_SKIP_CHECK=1 ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot @@ -185,6 +238,10 @@ let mkdir /boot mount /dev/vda2 /boot + ${optionalString config.boot.loader.efi.canTouchEfiVariables '' + mount -t efivarfs efivarfs /sys/firmware/efi/efivars + ''} + # This is needed for GRUB 0.97, which doesn't know about virtio devices. mkdir /boot/grub echo '(hd0) /dev/vda' > /boot/grub/device.map @@ -396,6 +453,7 @@ in mkOption { type = types.listOf (types.submodule driveOpts); description = "Drives passed to qemu."; + apply = addDeviceNames; }; diskInterface = @@ -441,6 +499,16 @@ in ''; }; + virtualisation.efiVars = + mkOption { + default = "./${vmName}-efi-vars.fd"; + description = + '' + Path to nvram image containing UEFI variables. The will be created + on startup if it does not exist. + ''; + }; + virtualisation.bios = mkOption { default = null; @@ -457,7 +525,27 @@ in config = { - boot.loader.grub.device = mkVMOverride cfg.bootDevice; + # Note [Disk layout with `useBootLoader`] + # + # If `useBootLoader = true`, we configure 2 drives: + # `/dev/?da` for the root disk, and `/dev/?db` for the boot disk + # which has the `/boot` partition and the boot loader. + # Concretely: + # + # * The second drive's image `disk.img` is created in `bootDisk = ...` + # using a throwaway VM. Note that there the disk is always `/dev/vda`, + # even though in the final VM it will be at `/dev/*b`. + # * The disks are attached in `virtualisation.qemu.drives`. + # Their order makes them appear as devices `a`, `b`, etc. + # * `fileSystems."/boot"` is adjusted to be on device `b`. + + # If `useBootLoader`, GRUB goes to the second disk, see + # note [Disk layout with `useBootLoader`]. + boot.loader.grub.device = mkVMOverride ( + if cfg.useBootLoader + then driveDeviceName 2 # second disk + else cfg.bootDevice + ); boot.initrd.extraUtilsCommands = '' @@ -512,8 +600,7 @@ in optional cfg.writableStore "overlay" ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"; - virtualisation.bootDevice = - mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda"); + virtualisation.bootDevice = mkDefault (driveDeviceName 1); virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; @@ -531,7 +618,8 @@ in ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"'' ]) (mkIf cfg.useEFIBoot [ - "-pflash $TMPDIR/bios.bin" + "-drive if=pflash,format=raw,unit=0,readonly,file=${efiFirmware}" + "-drive if=pflash,format=raw,unit=1,file=$NIX_EFI_VARS" ]) (mkIf (cfg.bios != null) [ "-bios ${cfg.bios}/bios.bin" @@ -542,25 +630,22 @@ in ]; virtualisation.qemu.drives = mkMerge [ + [{ + name = "root"; + file = "$NIX_DISK_IMAGE"; + driveExtraOpts.cache = "writeback"; + driveExtraOpts.werror = "report"; + }] (mkIf cfg.useBootLoader [ + # The order of this list determines the device names, see + # note [Disk layout with `useBootLoader`]. { - file = "$NIX_DISK_IMAGE"; - driveExtraOpts.cache = "writeback"; - driveExtraOpts.werror = "report"; - } - { + name = "boot"; file = "$TMPDIR/disk.img"; driveExtraOpts.media = "disk"; deviceExtraOpts.bootindex = "1"; } ]) - (mkIf (!cfg.useBootLoader) [ - { - file = "$NIX_DISK_IMAGE"; - driveExtraOpts.cache = "writeback"; - driveExtraOpts.werror = "report"; - } - ]) (imap0 (idx: _: { file = "$(pwd)/empty${toString idx}.qcow2"; driveExtraOpts.werror = "report"; @@ -608,9 +693,9 @@ in }; } // optionalAttrs cfg.useBootLoader { "/boot" = - { device = "/dev/vdb2"; + # see note [Disk layout with `useBootLoader`] + { device = "${lookupDriveDeviceName "boot" cfg.qemu.drives}2"; # 2 for e.g. `vdb2`, as created in `bootDisk` fsType = "vfat"; - options = [ "ro" ]; noCheck = true; # fsck fails on a r/o filesystem }; }); diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix index 834b994e92..486951983d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix @@ -68,7 +68,7 @@ in SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" ''; } (mkIf cfg.x11 { - services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" "modesetting" ]; + services.xserver.videoDrivers = mkOverride 50 [ "vmware" "virtualbox" "modesetting" ]; services.xserver.config = '' diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix index 788b4d9d97..136bbad60a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix @@ -72,6 +72,7 @@ in { audiocontroller = "ac97"; audio = "alsa"; audioout = "on"; + graphicscontroller = "vmsvga"; rtcuseutc = "on"; usb = "on"; usbehci = "on"; diff --git a/third_party/nixpkgs/nixos/tests/acme.nix b/third_party/nixpkgs/nixos/tests/acme.nix index fc41dc1eb5..a818847372 100644 --- a/third_party/nixpkgs/nixos/tests/acme.nix +++ b/third_party/nixpkgs/nixos/tests/acme.nix @@ -48,10 +48,9 @@ in import ./make-test-python.nix ({ lib, ... }: { security.acme.certs."standalone.test" = { webroot = "/var/lib/acme/acme-challenges"; }; - systemd.targets."acme-finished-standalone.test" = {}; - systemd.services."acme-standalone.test" = { - wants = [ "acme-finished-standalone.test.target" ]; - before = [ "acme-finished-standalone.test.target" ]; + systemd.targets."acme-finished-standalone.test" = { + after = [ "acme-standalone.test.service" ]; + wantedBy = [ "acme-standalone.test.service" ]; }; services.nginx.enable = true; services.nginx.virtualHosts."standalone.test" = { @@ -68,11 +67,9 @@ in import ./make-test-python.nix ({ lib, ... }: { # A target remains active. Use this to probe the fact that # a service fired eventhough it is not RemainAfterExit - systemd.targets."acme-finished-a.example.test" = {}; - systemd.services."acme-a.example.test" = { - wants = [ "acme-finished-a.example.test.target" ]; - before = [ "acme-finished-a.example.test.target" ]; - after = [ "nginx.service" ]; + systemd.targets."acme-finished-a.example.test" = { + after = [ "acme-a.example.test.service" ]; + wantedBy = [ "acme-a.example.test.service" ]; }; services.nginx.enable = true; @@ -89,11 +86,9 @@ in import ./make-test-python.nix ({ lib, ... }: { security.acme.server = "https://acme.test/dir"; specialisation.second-cert.configuration = {pkgs, ...}: { - systemd.targets."acme-finished-b.example.test" = {}; - systemd.services."acme-b.example.test" = { - wants = [ "acme-finished-b.example.test.target" ]; - before = [ "acme-finished-b.example.test.target" ]; - after = [ "nginx.service" ]; + systemd.targets."acme-finished-b.example.test" = { + after = [ "acme-b.example.test.service" ]; + wantedBy = [ "acme-b.example.test.service" ]; }; services.nginx.virtualHosts."b.example.test" = { enableACME = true; @@ -104,6 +99,7 @@ in import ./make-test-python.nix ({ lib, ... }: { ''; }; }; + specialisation.dns-01.configuration = {pkgs, config, nodes, lib, ...}: { security.acme.certs."example.test" = { domain = "*.example.test"; @@ -115,10 +111,12 @@ in import ./make-test-python.nix ({ lib, ... }: { user = config.services.nginx.user; group = config.services.nginx.group; }; - systemd.targets."acme-finished-example.test" = {}; + systemd.targets."acme-finished-example.test" = { + after = [ "acme-example.test.service" ]; + wantedBy = [ "acme-example.test.service" ]; + }; systemd.services."acme-example.test" = { - wants = [ "acme-finished-example.test.target" ]; - before = [ "acme-finished-example.test.target" "nginx.service" ]; + before = [ "nginx.service" ]; wantedBy = [ "nginx.service" ]; }; services.nginx.virtualHosts."c.example.test" = { @@ -132,6 +130,26 @@ in import ./make-test-python.nix ({ lib, ... }: { ''; }; }; + + # When nginx depends on a service that is slow to start up, requesting used to fail + # certificates fail. Reproducer for https://github.com/NixOS/nixpkgs/issues/81842 + specialisation.slow-startup.configuration = { pkgs, config, nodes, lib, ...}: { + systemd.services.my-slow-service = { + wantedBy = [ "multi-user.target" "nginx.service" ]; + before = [ "nginx.service" ]; + preStart = "sleep 5"; + script = "${pkgs.python3}/bin/python -m http.server"; + }; + systemd.targets."acme-finished-d.example.com" = { + after = [ "acme-d.example.com.service" ]; + wantedBy = [ "acme-d.example.com.service" ]; + }; + services.nginx.virtualHosts."d.example.com" = { + forceSSL = true; + enableACME = true; + locations."/".proxyPass = "http://localhost:8000"; + }; + }; }; client = {nodes, lib, ...}: { @@ -207,5 +225,15 @@ in import ./make-test-python.nix ({ lib, ... }: { client.succeed( "curl --cacert /tmp/ca.crt https://c.example.test/ | grep -qF 'hello world'" ) + + with subtest("Can request certificate of nginx when startup is delayed"): + webserver.succeed( + "${switchToNewServer}" + ) + webserver.succeed( + "/run/current-system/specialisation/slow-startup/bin/switch-to-configuration test" + ) + webserver.wait_for_unit("acme-finished-d.example.com.target") + client.succeed("curl --cacert /tmp/ca.crt https://d.example.com/") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 7056d414e9..7f3bb9bcc8 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -33,6 +33,7 @@ in bees = handleTest ./bees.nix {}; bind = handleTest ./bind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; + blockbook-frontend = handleTest ./blockbook-frontend.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 boot-stage1 = handleTest ./boot-stage1.nix {}; @@ -65,6 +66,7 @@ in containers-portforward = handleTest ./containers-portforward.nix {}; containers-restart_networking = handleTest ./containers-restart_networking.nix {}; containers-tmpfs = handleTest ./containers-tmpfs.nix {}; + convos = handleTest ./convos.nix {}; corerad = handleTest ./corerad.nix {}; couchdb = handleTest ./couchdb.nix {}; deluge = handleTest ./deluge.nix {}; @@ -124,6 +126,7 @@ in grafana = handleTest ./grafana.nix {}; graphite = handleTest ./graphite.nix {}; graylog = handleTest ./graylog.nix {}; + grub = handleTest ./grub.nix {}; gvisor = handleTest ./gvisor.nix {}; hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {}; @@ -148,6 +151,7 @@ in incron = handleTest ./incron.nix {}; influxdb = handleTest ./influxdb.nix {}; initrd-network-ssh = handleTest ./initrd-network-ssh {}; + initrd-network-openvpn = handleTest ./initrd-network-openvpn {}; initrdNetwork = handleTest ./initrd-network.nix {}; installer = handleTest ./installer.nix {}; iodine = handleTest ./iodine.nix {}; @@ -217,6 +221,7 @@ in nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; + ncdns = handleTest ./ncdns.nix {}; ndppd = handleTest ./ndppd.nix {}; neo4j = handleTest ./neo4j.nix {}; specialisation = handleTest ./specialisation.nix {}; @@ -263,7 +268,9 @@ in php = handleTest ./php {}; plasma5 = handleTest ./plasma5.nix {}; plotinus = handleTest ./plotinus.nix {}; - podman = handleTest ./podman.nix {}; + podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; + postfix = handleTest ./postfix.nix {}; + postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; postgis = handleTest ./postgis.nix {}; postgresql = handleTest ./postgresql.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; @@ -307,6 +314,7 @@ in spacecookie = handleTest ./spacecookie.nix {}; spike = handleTest ./spike.nix {}; sonarr = handleTest ./sonarr.nix {}; + sslh = handleTest ./sslh.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; @@ -316,7 +324,7 @@ in systemd = handleTest ./systemd.nix {}; systemd-analyze = handleTest ./systemd-analyze.nix {}; systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {}; - systemd-boot = handleTestOn ["x86_64-linux"] ./systemd-boot.nix {}; + systemd-boot = handleTest ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/blockbook-frontend.nix b/third_party/nixpkgs/nixos/tests/blockbook-frontend.nix new file mode 100644 index 0000000000..67d0fcab94 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/blockbook-frontend.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "blockbook-frontend"; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ maintainers."1000101" ]; + }; + + machine = { ... }: { + services.blockbook-frontend."test" = { + enable = true; + }; + services.bitcoind = { + enable = true; + rpc = { + port = 8030; + users.rpc.passwordHMAC = "acc2374e5f9ba9e62a5204d3686616cf$53abdba5e67a9005be6a27ca03a93ce09e58854bc2b871523a0d239a72968033"; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("blockbook-frontend-test.service") + + machine.wait_for_open_port(9030) + + machine.succeed("curl -sSfL http://localhost:9030 | grep 'Blockbook'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/ceph-multi-node.nix b/third_party/nixpkgs/nixos/tests/ceph-multi-node.nix index 22fe5cada4..e26c6d5d67 100644 --- a/third_party/nixpkgs/nixos/tests/ceph-multi-node.nix +++ b/third_party/nixpkgs/nixos/tests/ceph-multi-node.nix @@ -183,15 +183,15 @@ let monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") monA.succeed( - "ceph osd pool create multi-node-test 128 128", + "ceph osd pool create multi-node-test 32 32", "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool rename multi-node-test multi-node-other-test", "ceph osd pool ls | grep 'multi-node-other-test'", ) - monA.wait_until_succeeds("ceph -s | grep '1 pools, 128 pgs'") + monA.wait_until_succeeds("ceph -s | grep '2 pools, 33 pgs'") monA.succeed("ceph osd pool set multi-node-other-test size 2") monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") - monA.wait_until_succeeds("ceph -s | grep '128 active+clean'") + monA.wait_until_succeeds("ceph -s | grep '33 active+clean'") monA.fail( "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it", diff --git a/third_party/nixpkgs/nixos/tests/ceph-single-node.nix b/third_party/nixpkgs/nixos/tests/ceph-single-node.nix index 01c4b41384..98528f6317 100644 --- a/third_party/nixpkgs/nixos/tests/ceph-single-node.nix +++ b/third_party/nixpkgs/nixos/tests/ceph-single-node.nix @@ -143,12 +143,12 @@ let monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") monA.succeed( - "ceph osd pool create single-node-test 128 128", + "ceph osd pool create single-node-test 32 32", "ceph osd pool ls | grep 'single-node-test'", "ceph osd pool rename single-node-test single-node-other-test", "ceph osd pool ls | grep 'single-node-other-test'", ) - monA.wait_until_succeeds("ceph -s | grep '1 pools, 128 pgs'") + monA.wait_until_succeeds("ceph -s | grep '2 pools, 33 pgs'") monA.succeed( "ceph osd getcrushmap -o crush", "crushtool -d crush -o decrushed", @@ -158,7 +158,7 @@ let "ceph osd pool set single-node-other-test size 2", ) monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") - monA.wait_until_succeeds("ceph -s | grep '128 active+clean'") + monA.wait_until_succeeds("ceph -s | grep '33 active+clean'") monA.fail( "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it", diff --git a/third_party/nixpkgs/nixos/tests/common/auto.nix b/third_party/nixpkgs/nixos/tests/common/auto.nix index 2c21a8d516..da6b14e9f1 100644 --- a/third_party/nixpkgs/nixos/tests/common/auto.nix +++ b/third_party/nixpkgs/nixos/tests/common/auto.nix @@ -41,8 +41,8 @@ in config = mkIf cfg.enable { - services.xserver.displayManager.lightdm = { - enable = true; + services.xserver.displayManager = { + lightdm.enable = true; autoLogin = { enable = true; user = cfg.user; diff --git a/third_party/nixpkgs/nixos/tests/consul.nix b/third_party/nixpkgs/nixos/tests/consul.nix index 6600dae477..ee85f1d0b9 100644 --- a/third_party/nixpkgs/nixos/tests/consul.nix +++ b/third_party/nixpkgs/nixos/tests/consul.nix @@ -55,30 +55,33 @@ let server = index: { pkgs, ... }: let - ip = builtins.elemAt allConsensusServerHosts index; + numConsensusServers = builtins.length allConsensusServerHosts; + thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; + ip = thisConsensusServerHost; # since we already use IPs to identify servers in { networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ - { address = builtins.elemAt allConsensusServerHosts index; prefixLength = 16; } + { address = ip; prefixLength = 16; } ]; networking.firewall = firewallSettings; services.consul = - let - thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; - in assert builtins.elem thisConsensusServerHost allConsensusServerHosts; { enable = true; inherit webUi; extraConfig = defaultExtraConfig // { server = true; - bootstrap_expect = builtins.length allConsensusServerHosts; + bootstrap_expect = numConsensusServers; + # Tell Consul that we never intend to drop below this many servers. + # Ensures to not permanently lose consensus after temporary loss. + # See https://github.com/hashicorp/consul/issues/8118#issuecomment-645330040 + autopilot.min_quorum = numConsensusServers; retry_join = # If there's only 1 node in the network, we allow self-join; # otherwise, the node must not try to join itself, and join only the other servers. # See https://github.com/hashicorp/consul/issues/2868 - if builtins.length allConsensusServerHosts == 1 + if numConsensusServers == 1 then allConsensusServerHosts else builtins.filter (h: h != thisConsensusServerHost) allConsensusServerHosts; bind_addr = ip; @@ -104,40 +107,123 @@ in { for m in machines: m.wait_for_unit("consul.service") - for m in machines: - m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") + + def wait_for_healthy_servers(): + # See https://github.com/hashicorp/consul/issues/8118#issuecomment-645330040 + # for why the `Voter` column of `list-peers` has that info. + # TODO: The `grep true` relies on the fact that currently in + # the output like + # # consul operator raft list-peers + # Node ID Address State Voter RaftProtocol + # server3 ... 192.168.1.3:8300 leader true 3 + # server2 ... 192.168.1.2:8300 follower true 3 + # server1 ... 192.168.1.1:8300 follower false 3 + # `Voter`is the only boolean column. + # Change this to the more reliable way to be defined by + # https://github.com/hashicorp/consul/issues/8118 + # once that ticket is closed. + for m in machines: + m.wait_until_succeeds( + "[ $(consul operator raft list-peers | grep true | wc -l) == 3 ]" + ) + + + def wait_for_all_machines_alive(): + """ + Note that Serf-"alive" does not mean "Raft"-healthy; + see `wait_for_healthy_servers()` for that instead. + """ + for m in machines: + m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") + + + wait_for_healthy_servers() + # Also wait for clients to be alive. + wait_for_all_machines_alive() client1.succeed("consul kv put testkey 42") client2.succeed("[ $(consul kv get testkey) == 42 ]") - # Test that the cluster can tolearate failures of any single server: - for server in servers: - server.crash() - # For each client, wait until they have connection again - # using `kv get -recurse` before issuing commands. - client1.wait_until_succeeds("consul kv get -recurse") - client2.wait_until_succeeds("consul kv get -recurse") + def rolling_reboot_test(proper_rolling_procedure=True): + """ + Tests that the cluster can tolearate failures of any single server, + following the recommended rolling upgrade procedure from + https://www.consul.io/docs/upgrading#standard-upgrades. - # Do some consul actions while one server is down. - client1.succeed("consul kv put testkey 43") - client2.succeed("[ $(consul kv get testkey) == 43 ]") - client2.succeed("consul kv delete testkey") + Optionally, `proper_rolling_procedure=False` can be given + to wait only for each server to be back `Healthy`, not `Stable` + in the Raft consensus, see Consul setting `ServerStabilizationTime` and + https://github.com/hashicorp/consul/issues/8118#issuecomment-645330040. + """ - # Restart crashed machine. - server.start() + for server in servers: + server.crash() + + # For each client, wait until they have connection again + # using `kv get -recurse` before issuing commands. + client1.wait_until_succeeds("consul kv get -recurse") + client2.wait_until_succeeds("consul kv get -recurse") + + # Do some consul actions while one server is down. + client1.succeed("consul kv put testkey 43") + client2.succeed("[ $(consul kv get testkey) == 43 ]") + client2.succeed("consul kv delete testkey") + + # Restart crashed machine. + server.start() + + if proper_rolling_procedure: + # Wait for recovery. + wait_for_healthy_servers() + else: + # NOT proper rolling upgrade procedure, see above. + wait_for_all_machines_alive() + + # Wait for client connections. + client1.wait_until_succeeds("consul kv get -recurse") + client2.wait_until_succeeds("consul kv get -recurse") + + # Do some consul actions with server back up. + client1.succeed("consul kv put testkey 44") + client2.succeed("[ $(consul kv get testkey) == 44 ]") + client2.succeed("consul kv delete testkey") + + + def all_servers_crash_simultaneously_test(): + """ + Tests that the cluster will eventually come back after all + servers crash simultaneously. + """ + + for server in servers: + server.crash() + + for server in servers: + server.start() # Wait for recovery. - for m in machines: - m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") + wait_for_healthy_servers() # Wait for client connections. client1.wait_until_succeeds("consul kv get -recurse") client2.wait_until_succeeds("consul kv get -recurse") - # Do some consul actions with server back up. + # Do some consul actions with servers back up. client1.succeed("consul kv put testkey 44") client2.succeed("[ $(consul kv get testkey) == 44 ]") client2.succeed("consul kv delete testkey") + + + # Run the tests. + + print("rolling_reboot_test()") + rolling_reboot_test() + + print("all_servers_crash_simultaneously_test()") + all_servers_crash_simultaneously_test() + + print("rolling_reboot_test(proper_rolling_procedure=False)") + rolling_reboot_test(proper_rolling_procedure=False) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/convos.nix b/third_party/nixpkgs/nixos/tests/convos.nix new file mode 100644 index 0000000000..b4ff1188fd --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/convos.nix @@ -0,0 +1,30 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: + +with lib; +let + port = 3333; +in +{ + name = "convos"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ sgo ]; + }; + + nodes = { + machine = + { pkgs, ... }: + { + services.convos = { + enable = true; + listenPort = port; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("convos") + machine.wait_for_open_port("${toString port}") + machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'") + machine.succeed("curl http://localhost:${toString port}/") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index c48e5b0797..5ce67695de 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -30,8 +30,45 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) docker.succeed("docker run --rm ${examples.bash.imageName} bash --version") + # Check imageTag attribute matches image + docker.succeed("docker images --format '{{.Tag}}' | grep -F '${examples.bash.imageTag}'") docker.succeed("docker rmi ${examples.bash.imageName}") + # The remaining combinations + with subtest("Ensure imageTag attribute matches image"): + docker.succeed( + "docker load --input='${examples.bashNoTag}'" + ) + docker.succeed( + "docker images --format '{{.Tag}}' | grep -F '${examples.bashNoTag.imageTag}'" + ) + docker.succeed("docker rmi ${examples.bashNoTag.imageName}:${examples.bashNoTag.imageTag}") + + docker.succeed( + "docker load --input='${examples.bashNoTagLayered}'" + ) + docker.succeed( + "docker images --format '{{.Tag}}' | grep -F '${examples.bashNoTagLayered.imageTag}'" + ) + docker.succeed("docker rmi ${examples.bashNoTagLayered.imageName}:${examples.bashNoTagLayered.imageTag}") + + docker.succeed( + "${examples.bashNoTagStreamLayered} | docker load" + ) + docker.succeed( + "docker images --format '{{.Tag}}' | grep -F '${examples.bashNoTagStreamLayered.imageTag}'" + ) + docker.succeed( + "docker rmi ${examples.bashNoTagStreamLayered.imageName}:${examples.bashNoTagStreamLayered.imageTag}" + ) + + docker.succeed( + "docker load --input='${examples.nixLayered}'" + ) + docker.succeed("docker images --format '{{.Tag}}' | grep -F '${examples.nixLayered.imageTag}'") + docker.succeed("docker rmi ${examples.nixLayered.imageName}") + + with subtest( "Check if the nix store is correctly initialized by listing " "dependencies of the installed Nix binary" @@ -90,13 +127,22 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Ensure Docker images can use an unstable date"): docker.succeed( - "docker load --input='${examples.bash}'" + "docker load --input='${examples.unstableDate}'" ) assert unix_time_second1 not in docker.succeed( "docker inspect ${examples.unstableDate.imageName} " + "| ${pkgs.jq}/bin/jq -r .[].Created" ) + with subtest("Ensure Layered Docker images can use an unstable date"): + docker.succeed( + "docker load --input='${examples.unstableDateLayered}'" + ) + assert unix_time_second1 not in docker.succeed( + "docker inspect ${examples.unstableDateLayered.imageName} " + + "| ${pkgs.jq}/bin/jq -r .[].Created" + ) + with subtest("Ensure Layered Docker images work"): docker.succeed( "docker load --input='${examples.layered-image}'", @@ -178,5 +224,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { # This check may be loosened to allow an *empty* store rather than *no* store. docker.succeed("docker run --rm no-store-paths ls /") docker.fail("docker run --rm no-store-paths ls /nix/store") + + with subtest("Ensure buildLayeredImage does not change store path contents."): + docker.succeed( + "docker load --input='${pkgs.dockerTools.examples.filesInStore}'", + "docker run --rm file-in-store nix-store --verify --check-contents", + "docker run --rm file-in-store |& grep 'some data'", + ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/docker.nix b/third_party/nixpkgs/nixos/tests/docker.nix index 8fda7c1395..a4a61468f3 100644 --- a/third_party/nixpkgs/nixos/tests/docker.nix +++ b/third_party/nixpkgs/nixos/tests/docker.nix @@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { docker.fail("sudo -u noprivs docker ps") docker.succeed("docker stop sleeping") - # Must match version twice to ensure client and server versions are correct - docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]') + # Must match version 4 times to ensure client and server git commits and versions are correct + docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "4" ]') ''; }) diff --git a/third_party/nixpkgs/nixos/tests/dokuwiki.nix b/third_party/nixpkgs/nixos/tests/dokuwiki.nix index 05271919ef..4f00521c20 100644 --- a/third_party/nixpkgs/nixos/tests/dokuwiki.nix +++ b/third_party/nixpkgs/nixos/tests/dokuwiki.nix @@ -32,8 +32,9 @@ let in { name = "dokuwiki"; - meta.maintainers = with pkgs.lib.maintainers; [ "1000101" ]; - + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ maintainers."1000101" ]; + }; machine = { ... }: { services.dokuwiki."site1.local" = { aclUse = false; diff --git a/third_party/nixpkgs/nixos/tests/gnome3-xorg.nix b/third_party/nixpkgs/nixos/tests/gnome3-xorg.nix index b59badcd5d..0d05c12384 100644 --- a/third_party/nixpkgs/nixos/tests/gnome3-xorg.nix +++ b/third_party/nixpkgs/nixos/tests/gnome3-xorg.nix @@ -12,8 +12,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.enable = true; - services.xserver.displayManager.gdm = { - enable = true; + services.xserver.displayManager = { + gdm.enable = true; + gdm.debug = true; autoLogin = { enable = true; user = user.name; @@ -21,6 +22,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome3.debug = true; services.xserver.displayManager.defaultSession = "gnome-xorg"; virtualisation.memorySize = 1024; diff --git a/third_party/nixpkgs/nixos/tests/gnome3.nix b/third_party/nixpkgs/nixos/tests/gnome3.nix index 17e72c5f65..b3d7aff8bd 100644 --- a/third_party/nixpkgs/nixos/tests/gnome3.nix +++ b/third_party/nixpkgs/nixos/tests/gnome3.nix @@ -11,8 +11,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.enable = true; - services.xserver.displayManager.gdm = { - enable = true; + services.xserver.displayManager = { + gdm.enable = true; + gdm.debug = true; autoLogin = { enable = true; user = "alice"; @@ -20,6 +21,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome3.debug = true; virtualisation.memorySize = 1024; }; diff --git a/third_party/nixpkgs/nixos/tests/graphite.nix b/third_party/nixpkgs/nixos/tests/graphite.nix index 71776a94cb..137be2d89c 100644 --- a/third_party/nixpkgs/nixos/tests/graphite.nix +++ b/third_party/nixpkgs/nixos/tests/graphite.nix @@ -1,11 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "graphite"; - meta = { - # Fails on dependency `python-2.7-Twisted`'s test suite - # complaining `ImportError: No module named zope.interface`. - broken = true; - }; nodes = { one = { ... }: { @@ -21,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... } : api = { enable = true; port = 8082; - finders = [ pkgs.python3Packages.influxgraph ]; + finders = [ ]; }; carbon.enableCache = true; seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure @@ -41,10 +36,14 @@ import ./make-test-python.nix ({ pkgs, ... } : # even if they're still in preStart (which takes quite long for graphiteWeb). # Wait for ports to open so we're sure the services are up and listening. one.wait_for_open_port(8080) + one.wait_for_open_port(8082) one.wait_for_open_port(2003) one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003') one.wait_until_succeeds( "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" ) + one.wait_until_succeeds( + "curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" + ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/grub.nix b/third_party/nixpkgs/nixos/tests/grub.nix new file mode 100644 index 0000000000..84bfc90955 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/grub.nix @@ -0,0 +1,60 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "grub"; + + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + machine = { ... }: { + virtualisation.useBootLoader = true; + + boot.loader.timeout = null; + boot.loader.grub = { + enable = true; + users.alice.password = "supersecret"; + + # OCR is not accurate enough + extraConfig = "serial; terminal_output serial"; + }; + }; + + testScript = '' + def grub_login_as(user, password): + """ + Enters user and password to log into GRUB + """ + machine.wait_for_console_text("Enter username:") + machine.send_chars(user + "\n") + machine.wait_for_console_text("Enter password:") + machine.send_chars(password + "\n") + + + def grub_select_all_configurations(): + """ + Selects "All configurations" from the GRUB menu + to trigger a login request. + """ + machine.send_monitor_command("sendkey down") + machine.send_monitor_command("sendkey ret") + + + machine.start() + + # wait for grub screen + machine.wait_for_console_text("GNU GRUB") + + grub_select_all_configurations() + with subtest("Invalid credentials are rejected"): + grub_login_as("wronguser", "wrongsecret") + machine.wait_for_console_text("error: access denied.") + + grub_select_all_configurations() + with subtest("Valid credentials are accepted"): + grub_login_as("alice", "supersecret") + machine.send_chars("\n") # press enter to boot + machine.wait_for_console_text("Linux version") + + with subtest("Machine boots correctly"): + machine.wait_for_unit("multi-user.target") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/home-assistant.nix b/third_party/nixpkgs/nixos/tests/home-assistant.nix index 0d1fcedcd8..a93a28d877 100644 --- a/third_party/nixpkgs/nixos/tests/home-assistant.nix +++ b/third_party/nixpkgs/nixos/tests/home-assistant.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let configDir = "/var/lib/foobar"; + mqttUsername = "homeassistant"; mqttPassword = "secret"; in { name = "home-assistant"; @@ -11,6 +12,15 @@ in { nodes.hass = { pkgs, ... }: { environment.systemPackages = with pkgs; [ mosquitto ]; + services.mosquitto = { + enable = true; + users = { + "${mqttUsername}" = { + acl = [ "pattern readwrite #" ]; + password = mqttPassword; + }; + }; + }; services.home-assistant = { inherit configDir; enable = true; @@ -23,8 +33,11 @@ in { elevation = 0; }; frontend = {}; - # uses embedded mqtt broker - mqtt.password = mqttPassword; + mqtt = { + broker = "127.0.0.1"; + username = mqttUsername; + password = mqttPassword; + }; binary_sensor = [{ platform = "mqtt"; state_topic = "home-assistant/test"; @@ -64,10 +77,10 @@ in { with subtest("Toggle a binary sensor using MQTT"): # wait for broker to become available hass.wait_until_succeeds( - "mosquitto_sub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -W 1 -t '*'" + "mosquitto_sub -V mqttv311 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -W 1 -t '*'" ) hass.succeed( - "mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light" + "mosquitto_pub -V mqttv311 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -m let_there_be_light" ) with subtest("Print log to ease debugging"): output_log = hass.succeed("cat ${configDir}/home-assistant.log") diff --git a/third_party/nixpkgs/nixos/tests/ihatemoney.nix b/third_party/nixpkgs/nixos/tests/ihatemoney.nix index 7df0ea0b69..0451a45058 100644 --- a/third_party/nixpkgs/nixos/tests/ihatemoney.nix +++ b/third_party/nixpkgs/nixos/tests/ihatemoney.nix @@ -1,5 +1,11 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + let - f = backend: import ./make-test-python.nix ({ pkgs, ... }: { + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + f = backend: makeTest { name = "ihatemoney-${backend}"; machine = { lib, ... }: { services.ihatemoney = { @@ -24,9 +30,10 @@ let testScript = '' machine.wait_for_open_port(8000) machine.wait_for_unit("uwsgi.service") + machine.wait_until_succeeds("curl http://localhost:8000") assert '"yay"' in machine.succeed( - "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay\@example.com'" + "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay@example.com'" ) owner, timestamp = machine.succeed( "stat --printf %U:%G___%Y /var/lib/ihatemoney/secret_key" @@ -48,7 +55,7 @@ let assert "ihatemoney" in machine.succeed("curl http://localhost:8000") ''; - }); + }; in { ihatemoney-sqlite = f "sqlite"; ihatemoney-postgresql = f "postgresql"; diff --git a/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/default.nix b/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/default.nix new file mode 100644 index 0000000000..bb4c41e6d7 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/default.nix @@ -0,0 +1,145 @@ +import ../make-test-python.nix ({ lib, ...}: + +{ + name = "initrd-network-openvpn"; + + nodes = + let + + # Inlining of the shared secret for the + # OpenVPN server and client + secretblock = '' + secret [inline] + + ${lib.readFile ./shared.key} + + ''; + + in + { + + # Minimal test case to check a successful boot, even with invalid config + minimalboot = + { ... }: + { + boot.initrd.network = { + enable = true; + openvpn = { + enable = true; + configuration = "/dev/null"; + }; + }; + }; + + # initrd VPN client + ovpnclient = + { ... }: + { + virtualisation.useBootLoader = true; + virtualisation.vlans = [ 1 ]; + + boot.initrd = { + # This command does not fork to keep the VM in the state where + # only the initramfs is loaded + preLVMCommands = + '' + /bin/nc -p 1234 -lke /bin/echo TESTVALUE + ''; + + network = { + enable = true; + + # Work around udhcpc only getting a lease on eth0 + postCommands = '' + /bin/ip addr add 192.168.1.2/24 dev eth1 + ''; + + # Example configuration for OpenVPN + # This is the main reason for this test + openvpn = { + enable = true; + configuration = "${./initrd.ovpn}"; + }; + }; + }; + }; + + # VPN server and gateway for ovpnclient between vlan 1 and 2 + ovpnserver = + { ... }: + { + virtualisation.vlans = [ 1 2 ]; + + # Enable NAT and forward port 12345 to port 1234 + networking.nat = { + enable = true; + internalInterfaces = [ "tun0" ]; + externalInterface = "eth2"; + forwardPorts = [ { destination = "10.8.0.2:1234"; + sourcePort = 12345; } ]; + }; + + # Trust tun0 and allow the VPN Server to be reached + networking.firewall = { + trustedInterfaces = [ "tun0" ]; + allowedUDPPorts = [ 1194 ]; + }; + + # Minimal OpenVPN server configuration + services.openvpn.servers.testserver = + { + config = '' + dev tun0 + ifconfig 10.8.0.1 10.8.0.2 + ${secretblock} + ''; + }; + }; + + # Client that resides in the "external" VLAN + testclient = + { ... }: + { + virtualisation.vlans = [ 2 ]; + }; + }; + + + testScript = + '' + # Minimal test case, checks whether enabling (with invalid config) harms + # the boot process + with subtest("Check for successful boot with broken openvpn config"): + minimalboot.start() + # If we get to multi-user.target, we booted successfully + minimalboot.wait_for_unit("multi-user.target") + minimalboot.shutdown() + + # Elaborated test case where the ovpnclient (where this module is used) + # can be reached by testclient only over ovpnserver. + # This is an indirect test for success. + with subtest("Check for connection from initrd VPN client, config as file"): + ovpnserver.start() + testclient.start() + ovpnclient.start() + + # Wait until the OpenVPN Server is available + ovpnserver.wait_for_unit("openvpn-testserver.service") + ovpnserver.succeed("ping -c 1 10.8.0.1") + + # Wait for the client to connect + ovpnserver.wait_until_succeeds("ping -c 1 10.8.0.2") + + # Wait until the testclient has network + testclient.wait_for_unit("network.target") + + # Check that ovpnclient is reachable over vlan 1 + ovpnserver.succeed("nc -w 2 192.168.1.2 1234 | grep -q TESTVALUE") + + # Check that ovpnclient is reachable over tun0 + ovpnserver.succeed("nc -w 2 10.8.0.2 1234 | grep -q TESTVALUE") + + # Check that ovpnclient is reachable from testclient over the gateway + testclient.succeed("nc -w 2 192.168.2.3 12345 | grep -q TESTVALUE") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/initrd.ovpn b/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/initrd.ovpn new file mode 100644 index 0000000000..5926a48af0 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/initrd.ovpn @@ -0,0 +1,29 @@ +remote 192.168.1.3 +dev tun +ifconfig 10.8.0.2 10.8.0.1 +# Only force VLAN 2 through the VPN +route 192.168.2.0 255.255.255.0 10.8.0.1 +secret [inline] + +# +# 2048 bit OpenVPN static key +# +-----BEGIN OpenVPN Static key V1----- +553aabe853acdfe51cd6fcfea93dcbb0 +c8797deadd1187606b1ea8f2315eb5e6 +67c0d7e830f50df45686063b189d6c6b +aab8bb3430cc78f7bb1f78628d5c3742 +0cef4f53a5acab2894905f4499f95d8e +e69b7b6748b17016f89e19e91481a9fd +bf8c10651f41a1d4fdf5f438925a6733 +13cec8f04701eb47b8f7ffc48bc3d7af +65f07bce766015b87c3db4d668c655ff +be5a69522a8e60ccb217f8521681b45d +27c0b70bdfbfbb426c7646d80adf7482 +3ddac58b25cb1c1bb100de974478b4c6 +8b45a94261a2405e99810cb2b3abd49f +21b3198ada87ff3c4e656a008e540a8d +e7811584363597599cce2040a68ac00e +f2125540e0f7f4adc37cb3f0d922eeb7 +-----END OpenVPN Static key V1----- + \ No newline at end of file diff --git a/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/shared.key b/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/shared.key new file mode 100644 index 0000000000..248a91a3e3 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/shared.key @@ -0,0 +1,21 @@ +# +# 2048 bit OpenVPN static key +# +-----BEGIN OpenVPN Static key V1----- +553aabe853acdfe51cd6fcfea93dcbb0 +c8797deadd1187606b1ea8f2315eb5e6 +67c0d7e830f50df45686063b189d6c6b +aab8bb3430cc78f7bb1f78628d5c3742 +0cef4f53a5acab2894905f4499f95d8e +e69b7b6748b17016f89e19e91481a9fd +bf8c10651f41a1d4fdf5f438925a6733 +13cec8f04701eb47b8f7ffc48bc3d7af +65f07bce766015b87c3db4d668c655ff +be5a69522a8e60ccb217f8521681b45d +27c0b70bdfbfbb426c7646d80adf7482 +3ddac58b25cb1c1bb100de974478b4c6 +8b45a94261a2405e99810cb2b3abd49f +21b3198ada87ff3c4e656a008e540a8d +e7811584363597599cce2040a68ac00e +f2125540e0f7f4adc37cb3f0d922eeb7 +-----END OpenVPN Static key V1----- diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/ibus.nix b/third_party/nixpkgs/nixos/tests/installed-tests/ibus.nix index af54b612b5..a4bc2a7d7d 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/ibus.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/ibus.nix @@ -5,16 +5,12 @@ makeInstalledTest { testConfig = { i18n.inputMethod.enabled = "ibus"; + systemd.user.services.ibus-daemon = { + serviceConfig.ExecStart = "${pkgs.ibus}/bin/ibus-daemon --xim --verbose"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + }; }; - preTestScript = '' - # ibus has ibus-desktop-testing-runner but it tries to manage desktop session so we just spawn ibus-daemon ourselves - machine.succeed("ibus-daemon --daemonize --verbose") - ''; - withX11 = true; - - # TODO: ibus-daemon is currently crashing or something - # maybe make ibus systemd service that auto-restarts? - meta.broken = true; } diff --git a/third_party/nixpkgs/nixos/tests/kubernetes/base.nix b/third_party/nixpkgs/nixos/tests/kubernetes/base.nix index 86de9455e7..8cfac10b6d 100644 --- a/third_party/nixpkgs/nixos/tests/kubernetes/base.nix +++ b/third_party/nixpkgs/nixos/tests/kubernetes/base.nix @@ -9,7 +9,6 @@ with pkgs.lib; let mkKubernetesBaseTest = { name, domain ? "my.zyx", test, machines - , pkgs ? import { inherit system; } , extraConfiguration ? null }: let masterName = head (filter (machineName: any (role: role == "master") machines.${machineName}.roles) (attrNames machines)); diff --git a/third_party/nixpkgs/nixos/tests/lorri/default.nix b/third_party/nixpkgs/nixos/tests/lorri/default.nix index 198171082d..c33c750399 100644 --- a/third_party/nixpkgs/nixos/tests/lorri/default.nix +++ b/third_party/nixpkgs/nixos/tests/lorri/default.nix @@ -18,7 +18,7 @@ import ../make-test-python.nix { machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout") # Ping the daemon - machine.succeed("lorri internal__ping shell.nix") + machine.succeed("lorri internal ping shell.nix") # Wait for the daemon to finish the build machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stdout") diff --git a/third_party/nixpkgs/nixos/tests/ncdns.nix b/third_party/nixpkgs/nixos/tests/ncdns.nix new file mode 100644 index 0000000000..507e20fe7c --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ncdns.nix @@ -0,0 +1,77 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + fakeReply = pkgs.writeText "namecoin-reply.json" '' + { "error": null, + "id": 1, + "result": { + "address": "T31q8ucJ4dI1xzhxQ5QispfECld5c7Xw", + "expired": false, + "expires_in": 2248, + "height": 438155, + "name": "d/test", + "txid": "db61c0b2540ba0c1a2c8cc92af703a37002e7566ecea4dbf8727c7191421edfb", + "value": "{\"ip\": \"1.2.3.4\", \"email\": \"root@test.bit\",\"info\": \"Fake record\"}", + "vout": 0 + } + } + ''; +in + +{ + name = "ncdns"; + + nodes.server = { ... }: { + networking.nameservers = [ "127.0.0.1" ]; + + services.namecoind.rpc = { + address = "127.0.0.1"; + user = "namecoin"; + password = "secret"; + port = 8332; + }; + + # Fake namecoin RPC server because we can't + # run a full node in a test. + systemd.services.namecoind = { + wantedBy = [ "multi-user.target" ]; + script = '' + while true; do + echo -e "HTTP/1.1 200 OK\n\n $(<${fakeReply})\n" \ + | ${pkgs.netcat}/bin/nc -N -l 127.0.0.1 8332 + done + ''; + }; + + services.ncdns = { + enable = true; + dnssec.enable = true; + }; + + services.pdns-recursor = { + enable = true; + dns.allowFrom = [ "127.0.0.0/8" ]; + settings.loglevel = 8; + resolveNamecoin = true; + }; + + environment.systemPackages = [ pkgs.dnsutils ]; + + }; + + testScript = '' + with subtest("DNSSEC keys have been generated"): + server.wait_for_unit("ncdns") + server.wait_for_file("/var/lib/ncdns/bit.key") + server.wait_for_file("/var/lib/ncdns/bit-zone.key") + + with subtest("DNSKEY bit record is present"): + server.wait_for_unit("pdns-recursor") + server.wait_for_open_port("53") + server.succeed("host -t DNSKEY bit") + + with subtest("can resolve a .bit name"): + server.wait_for_unit("namecoind") + server.wait_for_open_port("8332") + assert "1.2.3.4" in server.succeed("host -t A test.bit") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/plasma5.nix b/third_party/nixpkgs/nixos/tests/plasma5.nix index 2eccfdf47f..5a603f8cbf 100644 --- a/third_party/nixpkgs/nixos/tests/plasma5.nix +++ b/third_party/nixpkgs/nixos/tests/plasma5.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.defaultSession = "plasma5"; services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.sddm.autoLogin = { + services.xserver.displayManager.autoLogin = { enable = true; user = "alice"; }; diff --git a/third_party/nixpkgs/nixos/tests/podman.nix b/third_party/nixpkgs/nixos/tests/podman.nix index 9134a68ff3..cd8c2b4308 100644 --- a/third_party/nixpkgs/nixos/tests/podman.nix +++ b/third_party/nixpkgs/nixos/tests/podman.nix @@ -12,9 +12,6 @@ import ./make-test-python.nix ( { pkgs, ... }: { virtualisation.podman.enable = true; - virtualisation.containers.users = [ - "alice" - ]; users.users.alice = { isNormalUser = true; diff --git a/third_party/nixpkgs/nixos/tests/postfix-raise-smtpd-tls-security-level.nix b/third_party/nixpkgs/nixos/tests/postfix-raise-smtpd-tls-security-level.nix new file mode 100644 index 0000000000..bfe0286555 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postfix-raise-smtpd-tls-security-level.nix @@ -0,0 +1,44 @@ +let + certs = import ./common/acme/server/snakeoil-certs.nix; +in +import ./make-test-python.nix { + name = "postfix"; + + machine = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + services.postfix = { + enable = true; + enableSubmissions = true; + submissionsOptions = { + smtpd_tls_security_level = "none"; + }; + }; + + environment.systemPackages = let + checkConfig = pkgs.writeScriptBin "check-config" '' + #!${pkgs.python3.interpreter} + import sys + + state = 1 + success = False + + with open("/etc/postfix/master.cf") as masterCf: + for line in masterCf: + if state == 1 and line.startswith("submissions"): + state = 2 + elif state == 2 and line.startswith(" ") and "smtpd_tls_security_level=encrypt" in line: + success = True + elif state == 2 and not line.startswith(" "): + state == 3 + if not success: + sys.exit(1) + ''; + + in [ checkConfig ]; + }; + + testScript = '' + machine.wait_for_unit("postfix.service") + machine.succeed("check-config") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/postfix.nix b/third_party/nixpkgs/nixos/tests/postfix.nix new file mode 100644 index 0000000000..0d677427d7 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postfix.nix @@ -0,0 +1,76 @@ +let + certs = import ./common/acme/server/snakeoil-certs.nix; +in +import ./make-test-python.nix { + name = "postfix"; + + machine = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + services.postfix = { + enable = true; + enableSubmission = true; + enableSubmissions = true; + sslCACert = certs.ca.cert; + sslCert = certs."acme.test".cert; + sslKey = certs."acme.test".key; + submissionsOptions = { + smtpd_sasl_auth_enable = "yes"; + smtpd_client_restrictions = "permit"; + milter_macro_daemon_name = "ORIGINATING"; + }; + }; + + security.pki.certificateFiles = [ + certs.ca.cert + ]; + + networking.extraHosts = '' + 127.0.0.1 acme.test + ''; + + environment.systemPackages = let + sendTestMail = pkgs.writeScriptBin "send-testmail" '' + #!${pkgs.python3.interpreter} + import smtplib + + with smtplib.SMTP('acme.test') as smtp: + smtp.sendmail('root@localhost', 'alice@localhost', 'Subject: Test\n\nTest data.') + smtp.quit() + ''; + + sendTestMailStarttls = pkgs.writeScriptBin "send-testmail-starttls" '' + #!${pkgs.python3.interpreter} + import smtplib + import ssl + + ctx = ssl.create_default_context() + + with smtplib.SMTP('acme.test') as smtp: + smtp.ehlo() + smtp.starttls(context=ctx) + smtp.ehlo() + smtp.sendmail('root@localhost', 'alice@localhost', 'Subject: Test STARTTLS\n\nTest data.') + smtp.quit() + ''; + + sendTestMailSmtps = pkgs.writeScriptBin "send-testmail-smtps" '' + #!${pkgs.python3.interpreter} + import smtplib + import ssl + + ctx = ssl.create_default_context() + + with smtplib.SMTP_SSL(host='acme.test', context=ctx) as smtp: + smtp.sendmail('root@localhost', 'alice@localhost', 'Subject: Test SMTPS\n\nTest data.') + smtp.quit() + ''; + in [ sendTestMail sendTestMailStarttls sendTestMailSmtps ]; + }; + + testScript = '' + machine.wait_for_unit("postfix.service") + machine.succeed("send-testmail") + machine.succeed("send-testmail-starttls") + machine.succeed("send-testmail-smtps") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 75c4ca12db..b912e3425e 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -363,6 +363,31 @@ let ''; }; + modemmanager = { + exporterConfig = { + enable = true; + refreshRate = "10s"; + }; + metricProvider = { + # ModemManager is installed when NetworkManager is enabled. Ensure it is + # started and is wanted by NM and the exporter to start everything up + # in the right order. + networking.networkmanager.enable = true; + systemd.services.ModemManager = { + enable = true; + wantedBy = [ "NetworkManager.service" "prometheus-modemmanager-exporter.service" ]; + }; + }; + exporterTest = '' + wait_for_unit("ModemManager.service") + wait_for_unit("prometheus-modemmanager-exporter.service") + wait_for_open_port(9539) + succeed( + "curl -sSf http://localhost:9539/metrics | grep -q 'modemmanager_info'" + ) + ''; + }; + nextcloud = { exporterConfig = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/radicale.nix b/third_party/nixpkgs/nixos/tests/radicale.nix index c81e78a8f9..1d3679c82a 100644 --- a/third_party/nixpkgs/nixos/tests/radicale.nix +++ b/third_party/nixpkgs/nixos/tests/radicale.nix @@ -14,9 +14,6 @@ let [storage] filesystem_folder = /tmp/collections - - [logging] - debug = True ''; }; # WARNING: DON'T DO THIS IN PRODUCTION! @@ -49,13 +46,18 @@ in services.radicale.extraArgs = [ "--export-storage" "/tmp/collections-new" ]; + system.stateVersion = "17.03"; }; radicale2_verify = lib.recursiveUpdate radicale2 { - services.radicale.extraArgs = [ "--verify-storage" ]; + services.radicale.extraArgs = [ "--debug" "--verify-storage" ]; + system.stateVersion = "17.09"; }; radicale2 = lib.recursiveUpdate (common args) { system.stateVersion = "17.09"; }; + radicale3 = lib.recursiveUpdate (common args) { + system.stateVersion = "20.09"; + }; }; # This tests whether the web interface is accessible to an authenticated user @@ -117,6 +119,22 @@ in retcode == 0 and "VCALENDAR" in output ), "Could not read calendar from Radicale 2" - radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") + radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") + + with subtest("Check Radicale 3 functionality"): + radicale.succeed( + "${switchToConfig "radicale3"} >&2" + ) + radicale.wait_for_unit("radicale.service") + radicale.wait_for_open_port(${port}) + + (retcode, output) = radicale.execute( + "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/" + ) + assert ( + retcode == 0 and "VCALENDAR" in output + ), "Could not read calendar from Radicale 3" + + radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/restic.nix b/third_party/nixpkgs/nixos/tests/restic.nix index 67bb7f1933..dad5bdfff2 100644 --- a/third_party/nixpkgs/nixos/tests/restic.nix +++ b/third_party/nixpkgs/nixos/tests/restic.nix @@ -4,33 +4,50 @@ import ./make-test-python.nix ( let password = "some_password"; repository = "/tmp/restic-backup"; - passwordFile = pkgs.writeText "password" "correcthorsebatterystaple"; + rcloneRepository = "rclone:local:/tmp/restic-rclone-backup"; + + passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}"; + initialize = true; + paths = [ "/opt" ]; + pruneOpts = [ + "--keep-daily 2" + "--keep-weekly 1" + "--keep-monthly 1" + "--keep-yearly 99" + ]; in { name = "restic"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ bbigras ]; + maintainers = [ bbigras i077 ]; }; nodes = { server = - { ... }: + { pkgs, ... }: { services.restic.backups = { remotebackup = { - inherit repository; - passwordFile = "${passwordFile}"; - initialize = true; - paths = [ "/opt" ]; - pruneOpts = [ - "--keep-daily 2" - "--keep-weekly 1" - "--keep-monthly 1" - "--keep-yearly 99" - ]; + inherit repository passwordFile initialize paths pruneOpts; + }; + rclonebackup = { + repository = rcloneRepository; + rcloneConfig = { + type = "local"; + one_file_system = true; + }; + + # This gets overridden by rcloneConfig.type + rcloneConfigFile = pkgs.writeText "rclone.conf" '' + [local] + type=ftp + ''; + inherit passwordFile initialize paths pruneOpts; }; }; + + environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local"; }; }; @@ -38,25 +55,35 @@ import ./make-test-python.nix ( server.start() server.wait_for_unit("dbus.socket") server.fail( - "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots" + "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots", + "${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots", ) server.succeed( "mkdir -p /opt", "touch /opt/some_file", + "mkdir -p /tmp/restic-rclone-backup", "timedatectl set-time '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', + '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', "timedatectl set-time '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-14 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-15 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-16 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', + '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', ) ''; } diff --git a/third_party/nixpkgs/nixos/tests/sddm.nix b/third_party/nixpkgs/nixos/tests/sddm.nix index a145705250..f9b961163c 100644 --- a/third_party/nixpkgs/nixos/tests/sddm.nix +++ b/third_party/nixpkgs/nixos/tests/sddm.nix @@ -44,8 +44,8 @@ let machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; - services.xserver.displayManager.sddm = { - enable = true; + services.xserver.displayManager = { + sddm.enable = true; autoLogin = { enable = true; user = "alice"; diff --git a/third_party/nixpkgs/nixos/tests/slurm.nix b/third_party/nixpkgs/nixos/tests/slurm.nix index d0e62d1543..a54c5d9db4 100644 --- a/third_party/nixpkgs/nixos/tests/slurm.nix +++ b/third_party/nixpkgs/nixos/tests/slurm.nix @@ -1,16 +1,52 @@ -import ./make-test-python.nix ({ lib, ... }: +import ./make-test-python.nix ({ lib, pkgs, ... }: let - mungekey = "mungeverryweakkeybuteasytointegratoinatest"; - slurmconfig = { - controlMachine = "control"; - nodeName = [ "node[1-3] CPUs=1 State=UNKNOWN" ]; - partitionName = [ "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP" ]; - extraConfig = '' - AccountingStorageHost=dbd - AccountingStorageType=accounting_storage/slurmdbd - ''; + services.slurm = { + controlMachine = "control"; + nodeName = [ "node[1-3] CPUs=1 State=UNKNOWN" ]; + partitionName = [ "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP" ]; + extraConfig = '' + AccountingStorageHost=dbd + AccountingStorageType=accounting_storage/slurmdbd + ''; + }; + environment.systemPackages = [ mpitest ]; + networking.firewall.enable = false; + systemd.tmpfiles.rules = [ + "f /etc/munge/munge.key 0400 munge munge - mungeverryweakkeybuteasytointegratoinatest" + ]; }; + + mpitest = let + mpitestC = pkgs.writeText "mpitest.c" '' + #include + #include + #include + + int + main (int argc, char *argv[]) + { + int rank, size, length; + char name[512]; + + MPI_Init (&argc, &argv); + MPI_Comm_rank (MPI_COMM_WORLD, &rank); + MPI_Comm_size (MPI_COMM_WORLD, &size); + MPI_Get_processor_name (name, &length); + + if ( rank == 0 ) printf("size=%d\n", size); + + printf ("%s: hello world from process %d of %d\n", name, rank, size); + + MPI_Finalize (); + + return EXIT_SUCCESS; + } + ''; + in pkgs.runCommandNoCC "mpitest" {} '' + mkdir -p $out/bin + ${pkgs.openmpi}/bin/mpicc ${mpitestC} -o $out/bin/mpitest + ''; in { name = "slurm"; @@ -21,37 +57,40 @@ in { computeNode = { ...}: { + imports = [ slurmconfig ]; # TODO slurmd port and slurmctld port should be configurations and # automatically allowed by the firewall. - networking.firewall.enable = false; services.slurm = { client.enable = true; - } // slurmconfig; + }; }; in { control = { ...}: { - networking.firewall.enable = false; + imports = [ slurmconfig ]; services.slurm = { server.enable = true; - } // slurmconfig; + }; }; submit = { ...}: { - networking.firewall.enable = false; + imports = [ slurmconfig ]; services.slurm = { enableStools = true; - } // slurmconfig; + }; }; dbd = { pkgs, ... } : { networking.firewall.enable = false; + systemd.tmpfiles.rules = [ + "f /etc/munge/munge.key 0400 munge munge - mungeverryweakkeybuteasytointegratoinatest" + ]; services.slurm.dbdserver = { enable = true; storagePass = "password123"; @@ -87,24 +126,7 @@ in { '' start_all() - # Set up authentification across the cluster - for node in [submit, control, dbd, node1, node2, node3]: - - node.wait_for_unit("default.target") - - node.succeed("mkdir /etc/munge") - node.succeed( - "echo '${mungekey}' > /etc/munge/munge.key" - ) - node.succeed("chmod 0400 /etc/munge/munge.key") - node.succeed("chown munge:munge /etc/munge/munge.key") - node.succeed("systemctl restart munged") - - node.wait_for_unit("munged") - - - # Restart the services since they have probably failed due to the munge init - # failure + # Make sure DBD is up after DB initialzation with subtest("can_start_slurmdbd"): dbd.succeed("systemctl restart slurmdbd") dbd.wait_for_unit("slurmdbd.service") @@ -137,5 +159,8 @@ in { # find the srun job from above in the database control.succeed("sleep 5") control.succeed("sacct | grep hostname") + + with subtest("run_PMIx_mpitest"): + submit.succeed("srun -N 3 --mpi=pmix mpitest | grep size=3") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/sslh.nix b/third_party/nixpkgs/nixos/tests/sslh.nix new file mode 100644 index 0000000000..2a800aa52d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/sslh.nix @@ -0,0 +1,83 @@ +import ./make-test-python.nix { + name = "sslh"; + + nodes = { + server = { pkgs, lib, ... }: { + networking.firewall.allowedTCPPorts = [ 443 ]; + networking.interfaces.eth1.ipv6.addresses = [ + { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; + } + ]; + # sslh is really slow when reverse dns does not work + networking.hosts = { + "fe00:aa:bb:cc::2" = [ "server" ]; + "fe00:aa:bb:cc::1" = [ "client" ]; + }; + services.sslh = { + enable = true; + transparent = true; + appendConfig = '' + protocols: + ( + { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; }, + { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, + ); + ''; + }; + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keyFiles = [ ./initrd-network-ssh/id_ed25519.pub ]; + services.nginx = { + enable = true; + virtualHosts."localhost" = { + addSSL = false; + default = true; + root = pkgs.runCommand "testdir" {} '' + mkdir "$out" + echo hello world > "$out/index.html" + ''; + }; + }; + }; + client = { ... }: { + networking.interfaces.eth1.ipv6.addresses = [ + { + address = "fe00:aa:bb:cc::1"; + prefixLength = 64; + } + ]; + networking.hosts."fe00:aa:bb:cc::2" = [ "server" ]; + environment.etc.sshKey = { + source = ./initrd-network-ssh/id_ed25519; # dont use this anywhere else + mode = "0600"; + }; + }; + }; + + testScript = '' + start_all() + + server.wait_for_unit("sslh.service") + server.wait_for_unit("nginx.service") + server.wait_for_unit("sshd.service") + server.wait_for_open_port(80) + server.wait_for_open_port(443) + server.wait_for_open_port(22) + + for arg in ["-6", "-4"]: + client.wait_until_succeeds(f"ping {arg} -c1 server") + + # check that ssh through sslh works + client.succeed( + f"ssh {arg} -p 443 -i /etc/sshKey -o StrictHostKeyChecking=accept-new server 'echo $SSH_CONNECTION > /tmp/foo{arg}'" + ) + + # check that 1/ the above ssh command had an effect 2/ transparent proxying really works + ip = "fe00:aa:bb:cc::1" if arg == "-6" else "192.168.1." + server.succeed(f"grep '{ip}' /tmp/foo{arg}") + + # check that http through sslh works + assert client.succeed(f"curl {arg} http://server:443").strip() == "hello world" + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/sudo.nix b/third_party/nixpkgs/nixos/tests/sudo.nix index 5bbec3d572..8c38f1b47e 100644 --- a/third_party/nixpkgs/nixos/tests/sudo.nix +++ b/third_party/nixpkgs/nixos/tests/sudo.nix @@ -74,7 +74,7 @@ in with subtest("test5 user should not be able to run commands under root"): machine.fail("sudo -u test5 sudo -n -u root true") - with subtest("test5 user should be able to keep his environment"): + with subtest("test5 user should be able to keep their environment"): machine.succeed("sudo -u test5 sudo -n -E -u test1 true") with subtest("users in group 'barfoo' should not be able to keep their environment"): diff --git a/third_party/nixpkgs/nixos/tests/systemd-boot.nix b/third_party/nixpkgs/nixos/tests/systemd-boot.nix index eba4729d6d..7a663dd9b4 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-boot.nix @@ -11,6 +11,8 @@ let virtualisation.useBootLoader = true; virtualisation.useEFIBoot = true; boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + environment.systemPackages = [ pkgs.efibootmgr ]; }; in { @@ -31,6 +33,36 @@ in machine.succeed( "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" ) + + # "bootctl install" should have created an EFI entry + machine.succeed('efibootmgr | grep "Linux Boot Manager"') + ''; + }; + + # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI" + fallback = makeTest { + name = "systemd-boot-fallback"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + + machine = { pkgs, lib, ... }: { + imports = [ common ]; + boot.loader.efi.canTouchEfiVariables = mkForce false; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + + # Ensure we actually booted using systemd-boot + # Magic number is the vendor UUID used by systemd-boot. + machine.succeed( + "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" + ) + + # "bootctl install" should _not_ have created an EFI entry + machine.fail('efibootmgr | grep "Linux Boot Manager"') ''; }; diff --git a/third_party/nixpkgs/nixos/tests/systemd.nix b/third_party/nixpkgs/nixos/tests/systemd.nix index ca2e36a443..ce950be484 100644 --- a/third_party/nixpkgs/nixos/tests/systemd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd.nix @@ -50,6 +50,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { fi ''; }; + + systemd.watchdog = { + device = "/dev/watchdog"; + runtimeTime = "30s"; + rebootTime = "10min"; + kexecTime = "5min"; + }; }; testScript = '' @@ -117,5 +124,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { retcode, output = machine.execute("systemctl status testservice1.service") assert retcode in [0, 3] # https://bugs.freedesktop.org/show_bug.cgi?id=77507 assert "CPU:" in output + + # Test systemd is configured to manage a watchdog + with subtest("systemd manages hardware watchdog"): + machine.wait_for_unit("multi-user.target") + + # It seems that the device's path doesn't appear in 'systemctl show' so + # check it separately. + assert "WatchdogDevice=/dev/watchdog" in machine.succeed( + "cat /etc/systemd/system.conf" + ) + + output = machine.succeed("systemctl show | grep Watchdog") + assert "RuntimeWatchdogUSec=30s" in output + assert "RebootWatchdogUSec=10m" in output + assert "KExecWatchdogUSec=5m" in output ''; }) diff --git a/third_party/nixpkgs/nixos/tests/taskserver.nix b/third_party/nixpkgs/nixos/tests/taskserver.nix index ab9b589f85..9c07bcf9f5 100644 --- a/third_party/nixpkgs/nixos/tests/taskserver.nix +++ b/third_party/nixpkgs/nixos/tests/taskserver.nix @@ -176,7 +176,8 @@ in { sub checkClientCert ($) { my $user = $_[0]; - my $cmd = "gnutls-cli". + # debug level 3 is a workaround for gnutls issue https://gitlab.com/gnutls/gnutls/-/issues/1040 + my $cmd = "gnutls-cli -d 3". " --x509cafile=/home/$user/.task/keys/ca.cert". " --x509keyfile=/home/$user/.task/keys/private.key". " --x509certfile=/home/$user/.task/keys/public.cert". diff --git a/third_party/nixpkgs/nixos/tests/trezord.nix b/third_party/nixpkgs/nixos/tests/trezord.nix index 8d908a5224..67646496ff 100644 --- a/third_party/nixpkgs/nixos/tests/trezord.nix +++ b/third_party/nixpkgs/nixos/tests/trezord.nix @@ -1,9 +1,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trezord"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ mmahut "1000101" ]; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ mmahut maintainers."1000101" ]; }; - nodes = { machine = { ... }: { services.trezord.enable = true; diff --git a/third_party/nixpkgs/nixos/tests/trickster.nix b/third_party/nixpkgs/nixos/tests/trickster.nix index e2ca00980d..aff4f7eb91 100644 --- a/third_party/nixpkgs/nixos/tests/trickster.nix +++ b/third_party/nixpkgs/nixos/tests/trickster.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trickster"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ "1000101" ]; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ maintainers."1000101" ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/xandikos.nix b/third_party/nixpkgs/nixos/tests/xandikos.nix index 0fded20ff1..886c3e0082 100644 --- a/third_party/nixpkgs/nixos/tests/xandikos.nix +++ b/third_party/nixpkgs/nixos/tests/xandikos.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ( services.xandikos.enable = true; services.xandikos.address = "localhost"; services.xandikos.port = 8080; - services.xandikos.routePrefix = "/xandikos/"; + services.xandikos.routePrefix = "/xandikos-prefix/"; services.xandikos.extraOptions = [ "--defaults" ]; @@ -28,7 +28,7 @@ import ./make-test-python.nix ( serverName = "xandikos.local"; basicAuth.xandikos = "snakeOilPassword"; locations."/xandikos/" = { - proxyPass = "http://localhost:8080/"; + proxyPass = "http://localhost:8080/xandikos-prefix/"; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/xfce.nix b/third_party/nixpkgs/nixos/tests/xfce.nix index 9906566966..99e30342e5 100644 --- a/third_party/nixpkgs/nixos/tests/xfce.nix +++ b/third_party/nixpkgs/nixos/tests/xfce.nix @@ -11,8 +11,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { services.xserver.enable = true; - services.xserver.displayManager.lightdm = { - enable = true; + services.xserver.displayManager = { + lightdm.enable = true; autoLogin = { enable = true; user = "alice"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/aeolus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aeolus/default.nix index bfd75b4e75..c498202599 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/aeolus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1zfr3567mwbqsfybkhg03n5dvmhllk88c9ayb10qzz2nh6d7g2qn"; + sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix index ba000d1ffb..c441a2f9f3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix @@ -1,39 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 -, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib -, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis -, libcdio, libcddb, flac, ffmpeg_3, mpg123, libcue, libmms, libbs2b -, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack -, neon, faad2, lame, libnotify, libsidplayfp +{ + mkDerivation, lib, fetchurl, fetchpatch, + gettext, pkgconfig, + qtbase, + alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, + libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, + libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, + libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, + wavpack, openmpt123 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "audacious"; - version = "3.9"; + version = "4.0.5"; src = fetchurl { - url = "https://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; - sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm"; + url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; + sha256 = "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji"; }; - pluginsSrc = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; - sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra"; + url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; + sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"; }; - nativeBuildInputs = [ - pkgconfig wrapGAppsHook - ]; + nativeBuildInputs = [ gettext pkgconfig ]; buildInputs = [ - gettext glib gtk3 libmowgli dbus-glib libxml2 - xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2 - libpulseaudio fluidsynth libmad libogg libvorbis libcdio - libcddb flac ffmpeg_3 mpg123 libcue libmms libbs2b libsndfile - libmodplug libsamplerate soxr lirc curl wavpack neon faad2 - lame libnotify libsidplayfp - ]; + # Core dependencies + qtbase - configureFlags = [ "--enable-statusicon" ]; + # Plugin dependencies + alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb + libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli + libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile + libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack + openmpt123 + ]; # Here we build both audacious and audacious-plugins in one # derivations, since they really expect to be in the same prefix. @@ -44,10 +45,8 @@ stdenv.mkDerivation rec { source $stdenv/setup genericBuild ) - # Then build the plugins. ( - dontWrapGApps=true nativeBuildInputs="$out $nativeBuildInputs" # to find audacious source $stdenv/setup rm -rfv audacious-* @@ -56,12 +55,10 @@ stdenv.mkDerivation rec { ) ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Audio player"; homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ eelco ramkromberg ]; + maintainers = with maintainers; [ eelco ramkromberg ttuegel ]; platforms = with platforms; linux; license = with licenses; [ bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacious/qt-5.nix b/third_party/nixpkgs/pkgs/applications/audio/audacious/qt-5.nix deleted file mode 100644 index 5c5cd65b41..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/audacious/qt-5.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - mkDerivation, lib, fetchurl, fetchpatch, - gettext, pkgconfig, - qtbase, - alsaLib, curl, faad2, ffmpeg_3, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, - libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug, - libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, - libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, - wavpack -}: - -let - version = "3.9"; - sources = { - "audacious-${version}" = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d"; - }; - - "audacious-plugins-${version}" = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb"; - }; - }; - - qt510_plugins_patch = fetchpatch { - url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch"; - sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17"; - }; -in - -mkDerivation { - inherit version; - name = "audacious-qt5-${version}"; - - sourceFiles = lib.attrValues sources; - sourceRoots = lib.attrNames sources; - - nativeBuildInputs = [ gettext pkgconfig ]; - - inherit qt510_plugins_patch; - - buildInputs = [ - # Core dependencies - qtbase - - # Plugin dependencies - alsaLib curl faad2 ffmpeg_3 flac fluidsynth gdk-pixbuf lame libbs2b libcddb - libcdio libcue libjack2 libmad libmms libmodplug libmowgli - libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile - libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack - ]; - - configureFlags = [ "--enable-qt" "--disable-gtk" ]; - - # Here we build both audacious and audacious-plugins in one - # derivations, since they really expect to be in the same prefix. - # This is slighly tricky. - builder = builtins.toFile "builder.sh" '' - sourceFiles=( $sourceFiles ) - sourceRoots=( $sourceRoots ) - for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do - - ( - # only patch the plugins - if [ "$i" -eq "1" ]; then - patches=( $qt510_plugins_patch ) - fi - src=''${sourceFiles[$i]} - sourceRoot=''${sourceRoots[$i]} - source $stdenv/setup - genericBuild - ) - - if [ $i == 0 ]; then - nativeBuildInputs="$out $nativeBuildInputs" - fi - - done - ''; - - meta = with lib; { - description = "Audio player"; - homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ ttuegel ]; - platforms = with platforms; linux; - license = with licenses; [ - bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING - gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 59136596b0..0ca556a16e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,11 +2,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.1.3"; + version = "3.2.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "11z5flmp55ywgxyccj3pzhijhaggi42i2pvacg88kcpj0cin57vl"; + sha256 = "10zb78n75nbriyjah0m3syv3rv7qwbmj590z24hss7lifa3rs784"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix index 2bdca386bf..f4028807ff 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.6.1"; + version = "0.7.1"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy"; + sha256 = "0p2g3xxl2n425bghs1qnff30jaj9cba94j2gbhgxmwaxhz26vbk7"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix index c88b884444..6b92d1263e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix @@ -59,13 +59,13 @@ assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; rev = version; - sha256 = "0n0q7zfl56gnadcqqp5rg7sbh1xvfcmp7cvmh2ax07037b346qig"; + sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll"; }; buildInputs = with stdenv.lib; [ jansson ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/drumkv1/default.nix b/third_party/nixpkgs/pkgs/applications/audio/drumkv1/default.nix index 04277badfb..8c956c53fb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/drumkv1/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak"; + sha256 = "108jk8p1sbm99plipf98ssij6dxaip1lmznibg8y2c4x0v2la6ab"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix index df563bc384..aaa0712c42 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0p5z6rwckda0lkljrrvx6i90fazj53cxg9pasfmi8154j1z72dj2"; + sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix b/third_party/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix index 643b648fa8..4ec69c62b1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation { # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved postInstallFixup = "rm -rf $out/lib/lv2"; - meta = { + meta = with stdenv.lib; { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = "https://github.com/sampov2/foo-yc20"; - license = "BSD"; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ bsd3 lgpl21 mpl11 ] ; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index acf373fc41..60040119d6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.25_fix"; + version = "1.26"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0q2mcp3xpgwilmiwzr9nnxlyg9c1kynh6cxzlyd95n520j00s6i7"; + sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/fverb/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fverb/default.nix new file mode 100644 index 0000000000..2895537957 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/fverb/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "fverb"; + # no release yet: https://github.com/jpcima/fverb/issues/2 + version = "unstable-2020-06-09"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = pname; + rev = "462020e33e24c0204a375dc95e2c28654cc917b8"; + sha256 = "12nl7qn7mnykk7v8q0j2n8kfq0xc46n0i45z6qcywspadwnncmd4"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postPatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + meta = with stdenv.lib; { + description = "A stereo variant of the reverberator by Jon Dattorro, for lv2"; + homepage = "https://github.com/jpcima/fverb"; + license = licenses.bsd2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix b/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix index fcf4d0b865..5934b0746d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.2.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p"; + sha256 = "1sysv5d0wq6ib47bqsn3wdzkqzjpzjrgzg15bkllbm67hiz9abhh"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index d5bec0c09e..c7df55118c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -20,7 +20,7 @@ }: rustPlatform.buildRustPackage rec { - version = "0.4.7"; + version = "0.4.8"; pname = "gnome-podcasts"; src = fetchFromGitLab { @@ -28,10 +28,10 @@ rustPlatform.buildRustPackage rec { owner = "World"; repo = "podcasts"; rev = version; - sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0"; + sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1"; }; - cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd"; + cargoSha256 = "1jbii9k4bkrivdk1ffr6556q1sgk9j4jbzwnn8vbxmksyl1x328q"; nativeBuildInputs = [ meson diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix index 933c9ac020..4a21868f09 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.15"; + version = "3.10.16"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0ghbanj142n0hgydzfjmnkdgri2kswsjal3mn10c723kih4ir4yr"; + sha256 = "0pbpaasd7kj6y25nm45y1qyb9sxd4570f7g6zkfcpf6pa3nx7qkq"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix index 9b8475006c..d74f1c8728 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -42,16 +42,13 @@ in stdenv.mkDerivation rec { pname = "guitarix"; - version = "0.40.0"; + version = "0.41.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "0q9050499hcj19hvbxb069vxh5yclawjg04vryh46lxm4sfy9g57"; + sha256 = "0qsfbyrrpb3bbdyq68k28mjql7kglxh8nqcw9jvja28x6x9ik5a0"; }; - # see: https://sourceforge.net/p/guitarix/bugs/105 - patches = [ ./fix-build.patch ]; - nativeBuildInputs = [ gettext hicolor-icon-theme @@ -101,8 +98,6 @@ stdenv.mkDerivation rec { "--no-desktop-update" "--enable-nls" "--install-roboto-font" - "--includeresampler" - "--includeconvolver" ] ++ optional optimizationSupport "--optimization"; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/guitarix/fix-build.patch b/third_party/nixpkgs/pkgs/applications/audio/guitarix/fix-build.patch deleted file mode 100644 index 4a0e426777..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/guitarix/fix-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/LV2/xputty/xfilepicker.cpp -+++ b/src/LV2/xputty/xfilepicker.cpp -@@ -191,6 +191,6 @@ - filepicker->selected_file = NULL; - filepicker->path = NULL; - filepicker->filter = NULL; -- asprintf(&filepicker->path, path); -+ asprintf(&filepicker->path, "%s", path); - assert(filepicker->path != NULL); - } diff --git a/third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix index 077bb40702..fa80611fc2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "0jqdqnkg7pg9plcbxy49p7gcs1aj6h0xf7y9gndmjmkw5yjn2940"; + sha256 = "11iv7bwvvspm74pisqvcpsxpg9xi6b08hq4i8q67mri4mvy9hmal"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix new file mode 100644 index 0000000000..593458506d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, alsaLib +, audiofile +, autoconf +, automake +, gnome2 +, gtk2 +, libjack2 +, libtool +, libxml2 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "industrializer"; + version = "0.2.6"; + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.bz2"; + sha256 = "0vls94hqpkk8h17da6fddgqbl5dgm6250av3raimhhzwvm5r1gfi"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + alsaLib + audiofile + autoconf + automake + gnome2.gtkglext + gtk2 + libjack2 + libtool + libxml2 + ]; + + preConfigure = "./autogen.sh"; + + meta = { + description = "This program generates synthesized percussion sounds using physical modelling"; + longDescription = '' + The range of sounds possible include but is not limited to cymbal sounds, metallic noises, bubbly sounds, and chimes. + After a sound is rendered, it can be played and then saved to a .WAV file. + ''; + homepage = "https://sourceforge.net/projects/industrializer/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix index 498d980676..3984305f4b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.6"; + version = "3.5.8"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "00vd6kffsf3vqfwaxjvln63x3n0q32f385qc51fn5iyj54410x0f"; + sha256 = "0mkrlfaw85pxlacrxfhb45731i4jnn67v411lzx5kb42ncar1586"; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix index e4b8b906fa..fc4d211e39 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.35"; + version = "1.3.2"; format = "other"; doCheck = false; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "19nw9qh17yyi9ih1nwngbbwjx1vr26haqhmzsdqf0yjgsgf9vldx"; + sha256 = "14854j1dhq67s1vzs0lqy345vbl6f5w8nb36n4i33fmpva2flsk3"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix new file mode 100644 index 0000000000..c97c7cf1a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix @@ -0,0 +1,70 @@ +{ cmake +, fetchFromGitLab +, lib +, libnotify +, mkDerivation +, pkgconfig +, qtbase +, qtdeclarative +, qtgraphicaleffects +, qtquickcontrols2 +, qttools +, qtwebengine +}: + +mkDerivation rec { + pname = "MellowPlayer"; + version = "3.6.4"; + + src = fetchFromGitLab { + owner = "ColinDuquesnoy"; + repo = "MellowPlayer"; + rev = version; + sha256 = "1ss7s3kal4vzhz7ld0yy2kvp1rk2w3i6fya0z3xd7nff9p31gqvw"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + libnotify + qtbase + qtdeclarative + qtgraphicaleffects + qtquickcontrols2 + qttools + qtwebengine + ]; + + doCheck = true; + + cmakeFlags = [ "-DBUILD_TESTS=ON" ]; + + preCheck = '' + # Running the tests requires a location at the home directory for logging. + export HOME="$NIX_BUILD_TOP/home" + mkdir -p "$HOME/.local/share/MellowPlayer.Tests/MellowPlayer.Tests/Logs" + + # Without this, the tests fail because they cannot create the QT Window + export QT_QPA_PLATFORM=offscreen + '' + # TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this? + + (builtins.concatStringsSep "\n" (lib.lists.flatten (builtins.map + (pkg: [ + (lib.optionalString (pkg ? qtPluginPrefix) '' + export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH + '') + + (lib.optionalString (pkg ? qtQmlPrefix) '' + export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH + '') + ]) buildInputs))); + + meta = with lib; { + inherit (qtbase.meta) platforms; + + description = "Cloud music integration for your desktop."; + homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer"; + license = licenses.gpl2; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix index f889d9e1e8..e1d1585cac 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -19,13 +19,13 @@ let in mkDerivation rec { pname = "mixxx"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv"; + sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr"; }; nativeBuildInputs = [ scons.py2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 5cc3a957d2..796812a9bd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.49.0"; + version = "3.50.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0zddm7286iwx437gjz47m4g28s8gdcxnm2hmly9w1dzi08aa4fas"; + sha256 = "04miwf0dqb8jir9g7xkfnn3l62bdn74ap03kqzz2v3byg64f1p0g"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix index 063a05a72f..0561a0179a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -1,6 +1,7 @@ { stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools +, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects +, qtquickcontrols2, qtscript, qtsvg, qttools , qtwebengine, qtxmlpatterns }: @@ -26,7 +27,8 @@ mkDerivation rec { buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis portaudio portmidi # tesseract - qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns + qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 + qtscript qtsvg qttools qtwebengine qtxmlpatterns ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index bee1065328..f284dd3dac 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "144a7wn5l64fhvj8vgwl7z4bp8lbq0pb0dl38x9y4wkqmdh6wrli"; + sha256 = "0b2g5bd04zh1hcrhkgd2srx9gl94da4gpy9arjcvrldschjxjza1"; }; - cargoSha256 = "19gn0v7j1ly3ywgflfj27pnrwjiiy17m3g1z0kzagxpjy2xi2qxy"; + cargoSha256 = "1gbhvmg7jfmx0b694rdr3s2zs33d4s645gw1lrxvwffif4mg8fy9"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/osmid/default.nix b/third_party/nixpkgs/pkgs/applications/audio/osmid/default.nix index 7e49b872a6..2e31efd817 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/osmid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/osmid/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "osmid"; - version = "0.6.8"; + version = "0.8.0"; src = fetchFromGitHub { owner = "llloret"; repo = "osmid"; rev = "v${version}"; - sha256 = "1yl25abf343yvd49nfsgxsz7jf956zrsi5n4xyqb5ldlp2hifk15"; + sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/third_party/nixpkgs/pkgs/applications/audio/padthv1/default.nix index 19bd6ecc0c..9d6b7dcf7f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/padthv1/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh"; + sha256 = "18ma429kamifcvjmsv0hysxk7qn2r9br4fia929bvfccapck98y1"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix index 71d8524859..3e2192c041 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Pulseaudio command line mixer"; longDescription = '' Features: - - Get the current volume of the default sink, the default source or a selected one by his id + - Get the current volume of the default sink, the default source or a selected one by its id - Set the volume for the default sink, the default source or any other device - List the sinks - List the sources diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 8121c0caee..12eb4a39d5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0lr8gq4immc5cx1wr5ng6ccxs9afbd2dk6i0n5np25z14dvbvk3k"; + sha256 = "0s4yk8w19qa58n5p558n6m7d5mslr9h9z5q3ayrgqcchdlm8cfky"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index eaedcb426b..12ab8ce2e0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -46,13 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.7.2"; + version = "4.7.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1yga25da5bpg12zkikp6dn4wqhn9f7r10awvjzfcz8s6w9xlz6rx"; + sha256 = "1xsw3v9vapd8q1dxacdgy2wk0xf3adqwbmcqiimdkd34llbdv88f"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/rosegarden/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rosegarden/default.nix index 921c8fff67..8bda179df1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rosegarden/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: stdenv.mkDerivation (rec { - version = "19.12"; + version = "20.06"; pname = "rosegarden"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "1qcaxc6hdzva7kwxxhgl95437fagjbxzv4mihsgpr7y9qk08ppw1"; + sha256 = "1i9x9rkqwwdrk77xl5ra8i48cjirbc7fbisnj0nnclccwaq0wk6r"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix b/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix index d26d314cd3..055694fb40 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix @@ -23,17 +23,17 @@ rustPlatform.buildRustPackage rec { pname = "shortwave"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "13lhlh75vw02vkcknl4nvy0yvpdf0qx811mmyja8bzs4rj1j9kr8"; + sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld"; }; - cargoSha256 = "0aph5z54a6i5p8ga5ghhx1c9hjc8zdw5pkv9inmanca0bq3hkdlh"; + cargoSha256 = "181699rlpr5dszc18wg0kbss3gfskxaz9lpxpgsc4yfb6ip89qnk"; nativeBuildInputs = [ cargo diff --git a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix index 531a633f05..25b8f9456a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, asio, avahi, flac, libogg, libvorbis }: +, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr }: let @@ -33,21 +33,21 @@ in stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.15.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "11rnpy6w3wm240qgmkp74k5w8wh5b7hzfx05qrnh6l7ng7m25ky2"; + sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig boost170.dev ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed buildInputs = [ alsaLib asio avahi flac libogg libvorbis - aixlog popl + aixlog popl soxr ]; # Upstream systemd unit files are pretty awful, so we provide our own in a diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index 4a195b4c34..ba3c9c4de8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "0p09xp7andfg0gvarzc979pwglr0xjj1c0cziqj0c9z7p1v0fkws"; + sha256 = "1v0334aivqyqx611cmhgshknzmrgyynbmxcg70qzrs2lyybw2fc1"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix new file mode 100644 index 0000000000..8a08b64508 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix @@ -0,0 +1,46 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, python3Packages +, youtube-dl +}: + +buildPythonApplication rec { + pname = "tuijam"; + version = "unstable-2020-06-05"; + + src = fetchFromGitHub { + owner = "cfangmeier"; + repo = pname; + rev = "7baec6f6e80ee90da0d0363b430dd7d5695ff03b"; + sha256 = "1l0s88jvj99jkxnczw5nfj78m8vihh29g815n4mg9jblad23mgx5"; + }; + + buildInputs = [ python3Packages.Babel ]; + + # the package has no tests + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + gmusicapi + google_api_python_client + mpv + pydbus + pygobject3 + pyyaml + requests + rsa + urwid + ]; + + meta = with lib; { + description = "A fancy TUI client for Google Play Music"; + longDescription = '' + TUIJam seeks to make a simple, attractive, terminal-based interface to + listening to music for Google Play Music All-Access subscribers. + ''; + homepage = "https://github.com/cfangmeier/tuijam"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix index aee73cecdf..95adfd8001 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,30 +1,36 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent -, withGui }: +, withGui, python3, jemalloc, zeromq4 }: with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.5"; + version = "0.21.10"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1jx33n8dhn16iaxvmc56cxw0i5qk0ga5nf7qf9frwwq6zkglknga"; + sha256 = "1m210g6db8f09m66v75ia1fdd1dlvs1srgk2jhd3wqbvnmjqa77f"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db53 boost zlib + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 miniupnpc utillinux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" ]; + cmakeFlags = optionals (!withGui) [ + "-DBUILD_BITCOIN_QT=OFF" + ]; + + # many of the generated scripts lack execute permissions + postConfigure = '' + find ./. -type f -iname "*.sh" -exec chmod +x {} \; + ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/cgminer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/cgminer/default.nix new file mode 100644 index 0000000000..966303ec5a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/cgminer/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, libtool +, autoconf +, automake +, curl +, ncurses +, ocl-icd +, opencl-headers +, libusb1 +, xorg +, jansson }: + +stdenv.mkDerivation rec { + pname = "cgminer"; + version = "4.11.1"; + + src = fetchFromGitHub { + owner = "ckolivas"; + repo = "cgminer"; + rev = "v${version}"; + sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers + xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ]; + + configureScript = "./autogen.sh"; + configureFlags = [ "--enable-scrypt" + "--enable-opencl" + "--enable-bitforce" + "--enable-icarus" + "--enable-modminer" + "--enable-ztex" + "--enable-avalon" + "--enable-klondike" + "--enable-keccak" + "--enable-bflsc"]; + + meta = with stdenv.lib; { + description = "CPU/GPU miner in c for bitcoin"; + homepage = "https://github.com/ckolivas/cgminer"; + license = licenses.gpl3; + maintainers = with maintainers; [ offline mmahut ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrd.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dcrd.nix index 16d39e85da..0d59eb6701 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dcrd.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dcrd.nix @@ -1,34 +1,24 @@ -{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dcrd"; - version = "1.1.2"; - rev = "refs/tags/v${version}"; - goPackagePath = "github.com/decred/dcrd"; + version = "1.5.1"; - buildInputs = [ go git dep cacert ]; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - src = fetchgit { - inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0xcynipdn9zmmralxj0hjrwyanvhkwfj2b1vvjk5zfc95s2xc1q9"; + src = fetchFromGitHub { + owner = "decred"; + repo = "dcrd"; + rev = "refs/tags/release-v${version}"; + sha256 = "1ggw289y1f4dqvj3w60q9bahq8bblbfjymn5xy04ldylr3qlxm9x"; }; - preBuild = '' - export CWD=$(pwd) - cd go/src/github.com/decred/dcrd - dep ensure - go install . ./cmd/... - cd $CWD - ''; + vendorSha256 = "03aw6mcvp1vr01ppxy673jf5hdryd5032cxndlkaiwg005mxp1dy"; + + subPackages = [ "." "cmd/dcrctl" "cmd/promptsecret" ]; meta = { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; - broken = stdenv.isLinux; # 2018-04-10 + maintainers = with lib.maintainers; [ juaningan ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix index 258aad8e1b..0fbd5f33e7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix @@ -1,43 +1,24 @@ -{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dcrwallet"; - version = "1.1.2"; - rev = "refs/tags/v${version}"; - goPackagePath = "github.com/decred/dcrwallet"; + version = "1.5.1"; - buildInputs = [ go git dep cacert ]; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - src = fetchgit { - inherit rev; - url = "https://${goPackagePath}"; - sha256 = "058im4vmcmxcl5ir14h17wik5lagp2ay0p8qc3r99qmpfwvvz39x"; + src = fetchFromGitHub { + owner = "decred"; + repo = "dcrwallet"; + rev = "refs/tags/v${version}"; + sha256 = "0ij2mwvdxg78p9qbdf9wm7aaphfg4j8lqgrjyjsj3kyi1l458ds9"; }; - preBuild = '' - export CWD=$(pwd) - cd go/src/github.com/decred/dcrwallet - dep ensure - ''; - - buildPhase = '' - runHook preBuild - go build - ''; - - installPhase = '' - mkdir -pv $out/bin - cp -v dcrwallet $out/bin - ''; + vendorSha256 = "0qrrr92cad399xwr64qa9h41wqqaj0dy5mw248g5v53zars541w7"; + subPackages = [ "." ]; meta = { homepage = "https://decred.org"; - description = "Decred daemon in Go (golang)"; + description = "A secure Decred wallet daemon written in Go (golang)"; license = with lib.licenses; [ isc ]; - broken = stdenv.isLinux; # 2018-04-10 + maintainers = with lib.maintainers; [ juaningan ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 29990dae40..e7a83d7496 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1a38j7dy6ax9xvcjbdkiz0z33ln4rlmgrxznvqhdf11j70g1sr6x"; + sha256 = "1ng2q9yp03j8p2xh7rlqad5h4p82ks1l00401pq7m0y02q90szr8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index d29292439c..9daccfaaaf 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.15"; + version = "1.9.16"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1c69rfnx9130b87pw9lnaxyrbzwfhqb2dxyl7qyiscq85hqs16f9"; + sha256 = "0vycnyz6v39cfrck70h3dbn7jkkh67q0fli240ksw2cp4pqwpwcn"; }; usb = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; }; - vendorSha256 = "1pjgcx6sydfipsx8s0kl7n6r3lk61klsfrkd7cg4l934k590q2n7"; + vendorSha256 = "0w2214fllw93xbrlxayhl014aqbjsc8zz7mpik7w5b26m60hn5kr"; overrideModAttrs = (_: { postBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 1c76ef8df2..b84e6bd127 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.3.2"; + version = "2.8.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0xd3w564zij614ajg57n1qlvz0hd9l7219qxx81ai6b02b9a5g9h"; + sha256 = "1nj7fjbf99zpmq82kci6wp9nzml8ij1bz96zc77gwzsi0dacjrv5"; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix index 1f249223df..c1f489ff02 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix @@ -1,24 +1,38 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib +, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" ] +}: buildGoModule rec { pname = "lnd"; - version = "0.10.0-beta"; + version = "0.10.3-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "1amciz924s2h6qhy7w34jpv1jc25p5ayfxzvjph6hhx0bccrm88w"; + sha256 = "129vi8z2sk4hagk7axa675nba6sbj9km88zlq8a1g8di7v2k9z6a"; }; - vendorSha256 = "1iyghg11cxvbzi0gl40fvv8pl3d3k52j179w3x5m1f09r5ji223y"; + vendorSha256 = "0a4bk2qry0isnrvl0adwikqn6imxwzlaq5j3nglb5rmwwq2cdz0r"; subPackages = ["cmd/lncli" "cmd/lnd"]; + preBuild = let + buildVars = { + RawTags = lib.concatStringsSep "," tags; + GoVersion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')"; + }; + buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X github.com/lightningnetwork/lnd/build.${k}=${v}") buildVars); + in + lib.optionalString (tags != []) '' + buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}") + buildFlagsArray+=("-ldflags=${buildVarsFlags}") + ''; + meta = with lib; { description = "Lightning Network Daemon"; homepage = "https://github.com/lightningnetwork/lnd"; license = lib.licenses.mit; maintainers = with maintainers; [ cypherpunk2140 ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix index a135d0b3a0..e42f0ddc96 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.16.0.0"; + version = "0.16.0.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld"; + sha256 = "1b1m8vhs0hdh81ysm8s8vfwqskqsihylb51wz16kc98ba40r9gqg"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { icon = "monero"; desktopName = "Monero"; genericName = "Wallet"; - categories = "Application;Network;Utility;"; + categories = "Network;Utility;"; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix index ed6ff8b728..255cb8aaea 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix @@ -10,13 +10,13 @@ assert stdenv.isDarwin -> IOKit != null; stdenv.mkDerivation rec { pname = "monero"; - version = "0.16.0.0"; + version = "0.16.0.1"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh"; + sha256 = "0n2cviqm8radpynx70fc0819k1xknjc58cvb4whlc49ilyvh8ky6"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/pivx.nix b/third_party/nixpkgs/pkgs/applications/blockchains/pivx.nix index 600e462b39..16ea2dc43e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/pivx.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/pivx.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null -, openssl_1_0_2, db48, boost, zlib, miniupnpc, gmp +, openssl, db48, boost, zlib, miniupnpc, gmp , qrencode, glib, protobuf, yasm, libevent , utillinux, qtbase ? null, qttools ? null , enableUpnp ? false @@ -10,17 +10,17 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pivx-${version}"; - version = "4.0.2"; + version = "4.1.1"; src = fetchFromGitHub { owner = "PIVX-Project"; repo= "PIVX"; rev = "v${version}"; - sha256 = "12lnp318k8dx1sar24zfmv2imnzs30srssnlpb31y7hcxhz0wpc5"; + sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; - buildInputs = [ glib gmp openssl_1_0_2 db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] + buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { ++ optional disableWallet "--disable-wallet" ++ optional disableDaemon "--disable-daemon" ++ optionals withGui [ "--with-gui=yes" - "--with-unsupported-ssl" # TODO remove this ASAP "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -56,9 +55,5 @@ stdenv.mkDerivation rec { homepage = "https://www.dash.org"; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; - # TODO - # upstream doesn't support newer openssl versions - # https://github.com/PIVX-Project/PIVX/issues/748 - # openssl_1_0_2 should be replaced with openssl ASAP }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index db3eb37f0a..a098f14668 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { desktopName = "Wasabi"; genericName = "Bitcoin wallet"; comment = meta.description; - categories = "Application;Network;Utility;"; + categories = "Network;Utility;"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/whirlpool-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/whirlpool-gui/default.nix new file mode 100644 index 0000000000..17b817bc61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, callPackage, makeWrapper, makeDesktopItem +, nodejs, yarn, electron_7, jre8, tor }: + +let + system = stdenv.hostPlatform.system; + +in stdenv.mkDerivation rec { + pname = "whirlpool-gui"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "Samourai-Wallet"; + repo = pname; + rev = version; + sha256 = "ru6WJQRulhnQCPY2E0x9M6xXtFdj/pg2fu4HpQxhImU="; + }; + + yarnCache = stdenv.mkDerivation { + name = "${pname}-${version}-${system}-yarn-cache"; + inherit src; + phases = [ "unpackPhase" "buildPhase" ]; + nativeBuildInputs = [ yarn ]; + buildPhase = '' + export HOME=$NIX_BUILD_ROOT + + yarn config set yarn-offline-mirror $out + yarn --frozen-lockfile --ignore-scripts --ignore-platform \ + --ignore-engines --no-progress --non-interactive + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = { + x86_64-linux = "6fl4cSwHXWgQcYlqxCae0p1Ppcb9fI5fFrxm7y6wxTo="; + }.${system} or (throw "Unsupported platform ${system}"); + }; + + nativeBuildInputs = [ makeWrapper nodejs yarn ]; + + configurePhase = '' + # Yarn and bundler wants a real home directory to write cache, config, etc to + export HOME=$NIX_BUILD_ROOT + + # Make yarn install packages from our offline cache, not the registry + yarn config --offline set yarn-offline-mirror ${yarnCache} + ''; + + buildPhase = '' + yarn install --offline --ignore-scripts --frozen-lockfile --no-progress --non-interactive + + patchShebangs node_modules/ + + yarn build + ''; + + installPhase = '' + mkdir -p $out/{bin,share,libexec/whirlpool-gui/app} + + # install production dependencies + yarn install \ + --offline --frozen-lockfile --ignore-scripts \ + --no-progress --non-interactive \ + --production --no-bin-links \ + --modules-folder $out/libexec/whirlpool-gui/node_modules + + # copy application + cp -r app/{dist,app.html,main.prod.js,main.prod.js.map,img} $out/libexec/whirlpool-gui/app + cp -r package.json resources $out/libexec/whirlpool-gui + + # make desktop item + ln -s "${desktopItem}/share/applications" "$out/share/applications" + + # wrap electron + makeWrapper '${electron_7}/bin/electron' "$out/bin/whirlpool-gui" \ + --add-flags "$out/libexec/whirlpool-gui" \ + --prefix PATH : "${jre8}/bin:${tor}/bin" + ''; + + desktopItem = makeDesktopItem { + name = "whirlpool-gui"; + exec = "whirlpool-gui"; + icon = "whirlpool-gui"; + desktopName = "Whirlpool"; + genericName = "Whirlpool"; + comment = meta.description; + categories = "Network;"; + extraEntries = '' + StartupWMClass=whrilpool-gui + ''; + }; + + passthru.prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: { + outputHash = stdenv.lib.fakeSha256; + }); + + meta = with stdenv.lib; { + description = "Desktop GUI for Whirlpool by Samourai-Wallet"; + homepage = https://www.samouraiwallet.com/whirlpool; + license = licenses.unlicense; + maintainers = [ maintainers.offline ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wownero.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wownero.nix index e0d1249181..8d45e1a96b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wownero.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wownero.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc_2, openssl, unbound +{ stdenv, fetchgit, cmake, boost, miniupnpc_2, openssl, unbound , readline, libsodium, rapidjson, fetchurl }: with stdenv.lib; let - randomwowVersion = "1.1.6"; + randomwowVersion = "1.1.7"; randomwow = fetchurl { url = "https://github.com/wownero/RandomWOW/archive/${randomwowVersion}.tar.gz"; - sha256 = "1c55y2dwrayh6k1avpchs89gq1mvy5c305h92jm2k48kzhw6a792"; + sha256 = "1xp76zf01hnhnk6rjvqjav9n9pnvxzxlzqa5rc574d1c2qczfy3q"; }; in stdenv.mkDerivation rec { pname = "wownero"; - version = "0.8.0.0"; + version = "0.8.0.1"; - src = fetchFromGitHub { - owner = "wownero"; - repo = "wownero"; - rev = "v${version}"; - sha256 = "14nggivilgzaqhjd4ng3g2p884yp2hc322hpcpwjdnz2zfc3qq6c"; + src = fetchgit { + url = "https://git.wownero.com/wownero/wownero.git"; + rev = "v${version}"; + sha256 = "15443xv6q1nw4627ajk6k4ghhahvh82lb4gyb8nvq753p2v838g3"; + fetchSubmodules = false; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 1a6904b217..7e519af58e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -198,7 +198,8 @@ in runCommand # binaries are also distributed as proprietary software (unlike the # source-code itself). platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; ([ ] + ++ optional (channel == "stable") primeos); }; } '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index a64b361f8a..0d3157e30c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "4.0.0.16"; # "Android Studio 4.0" - build = "193.6514223"; - sha256Hash = "1sqj64vddwfrr9821habfz7dms9csvbp7b8gf1d027188b2lvh3h"; + version = "4.0.1.0"; # "Android Studio 4.0.1" + build = "193.6626763"; + sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; }; betaVersion = { version = "4.0.0.16"; # "Android Studio 4.0" diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix index 8b6a0c164e..218fbe8fc1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { comment = "Integrated Development Environment"; desktopName = "Eclipse IDE"; genericName = "Integrated Development Environment"; - categories = "Application;Development;"; + categories = "Development;"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix index 49fb00706b..87ac29b58e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -99,6 +99,18 @@ in rec { }; }; + ### Eclipse Committers + + eclipse-committers = buildEclipse { + name = "eclipse-committers-${platform_major}.${platform_minor}"; + description = "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "1l0gc7srpvn3r0yrbrp1pjv1a3n1y7q5fqww5fmzyw1d6j3hjkqj74c9bff16579cpf7z6d4wmj6kr7z89p0ignrx319gc8p0hivi1y"; + }; + }; + ### Environments # Function that assembles a complete Eclipse environment from an diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index d41746a16e..a94ab58a78 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02ni81jyncycgfwslvaav0a62wzx3r9bi86xf0x7jvvk6plfaj8v"; + sha256 = "17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index a2bf2cbf1d..bfdf320aeb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0136hmknkxrsgbygxqzrq1836kg02p14hmv5mzbpp79yglhv2xml"; /* updated by script */ + sha256 = "0q5bnb0rmsgks7brrdpgah83s2ixa4pyhw8jvg9p2g48b582rmf7"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.1.5"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0ivnicpn67mfyhmiwbx80pq5l2xa4g1cpp79mh7rgm2c5klmf201"; /* updated by script */ + sha256 = "0605d772156lzlz5904px2spdijc92yz6rjvmpyg6vk5zv5k2wm9"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.4"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0v6vi6m94fwzsg5s357ymh8604zkv6q0zhyqfh9sj4ynzi7l4fyv"; /* updated by script */ + sha256 = "1wgcc1faqn0y9brxikh53s6ly7zvpdmpg7m5gvp5437isbllisbl"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0q848swfg9mjiini5bbjdj1f0qpd1n4glxdpncjj7mbpvp7s2h5k"; /* updated by script */ + sha256 = "1aycsy2pg8nw5il8p2r6bhim9y47g5rfga63f0p435mpjmzpll0s"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "13khjc7fp28mpcdn74msdw57nzhicg32xrrvj7s7na2qd9gqz0hf"; /* updated by script */ + sha256 = "188wkqcv67kizq4w6v4vg9jpr3qfgbg9x5jc77s4ki4nafkbfxas"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2019.2"; + version = "2020.1.2"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/mps/2019.2/MPS-${version}.tar.gz"; - sha256 = "0rph3bibj74ddbyrn0az1npn4san4g1alci8nlq4gaqdlcz6zx22"; + url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz"; + sha256 = "0ygk31l44bxcv64h6lnqxssmx5prcb5b5xdm3qxmrv7xz1qv59c1"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "16gclbczd9czqhply0xb2ykv0bw4bgv85fihy1n2szc4rp643qdw"; /* updated by script */ + sha256 = "0cw2rx68rl6mrnizpb69ahz4hrh8blry70cv4rjnkw19d4x877m8"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0p2q01yragab7c15aicpmaby075y7mpf6iavdfipi033q4gnlnki"; /* updated by script */ + sha256 = "1290k17nihiih8ipxfqax1xlx320h1vkwbcc5hc50psvpsfgiall"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1lq97aqnibvg483ww7wi8slh302gydd2kdkw6p2516rjcmm6n324"; /* updated by script */ + sha256 = "1ag8jrfs38f0q11pyil4pvddi8lv46b0jxd3mcbmidn3p1z29f9x"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.4"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0flwq61p7827f8nmldqgfpxbfl422imclksw6w97mgzqqhcbgksd"; /* updated by script */ + sha256 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0xhx3n2xdk0k0qx7hdiyfga16hjf2j95k219wh7mh0cys20hkrg8"; /* updated by script */ + sha256 = "1z6z2c31aq29hzi1cifc77zz9vnw48h2jvw4w61lvgskcnzrw9vn"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0d543g06bxpw4q2p19vmvrxpbhqsvspjbs3sqnw6hxni7wcflhkg"; /* updated by script */ + sha256 = "19zqac77fkw1czf86s39ggnd24r9ljr80gj422ch4fdkz4qy832q"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix index 34800d7f02..d938edaa6e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lite"; - version = "1.05"; + version = "1.06"; src = fetchFromGitHub { owner = "rxi"; repo = pname; rev = "v${version}"; - sha256 = "0xh29ddl5h92n1c4nlh4kx9mchwkzn4r3l16kklix3a1jm1c878a"; + sha256 = "1lw4a6xv8pdlgwnhh870caij4iyzxdyjw4qmm4fswja9mbqkj32f"; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix index 3693ff3223..e6166dd14b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gnvim-unwrapped"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "vhakulinen"; repo = "gnvim"; - rev = version; - sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh"; + rev = "v${version}"; + sha256 = "1cc3yk04v9icdjr5cn58mqc3ba1wqmlzhf9ly7biy9m8yk30w9y0"; }; - cargoSha256 = "0ay7hx5bzchp772ywgxzia12c44kbyarrshl689cmqh59wphsrx5"; + cargoSha256 = "1fyn8nsabzrfl9ykf2gk2p8if0yjp6k0ybrmp0pw67pbwaxpb9ym"; buildInputs = [ gtk webkitgtk ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix index ecc3c058f7..7a5630bb9b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -10,7 +10,7 @@ let comment = "Integrated Development Environment"; desktopName = "Apache NetBeans IDE"; genericName = "Integrated Development Environment"; - categories = "Application;Development;"; + categories = "Development;"; icon = "netbeans"; }; in diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix index 093635b10e..7ad2a3247d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix @@ -24,7 +24,7 @@ let ) deviceIds; quartus = stdenv.mkDerivation rec { - version = "19.1.0.670"; + version = "20.1.0.711"; pname = "quartus-prime-lite-unwrapped"; src = let @@ -34,12 +34,12 @@ let }; hashes = { - "arria_lite" = "1flj9w0vb2p9f9zll136izr6qvmxn0lg72bvaqxs3sxc9vj06wm1"; - "cyclonev" = "0bqxpvjgph0y6slk0jq75mcqzglmqkm0jsx10y9xz5llm6zxzqab"; - "cyclone" = "0pzs8y4s3snxg4g6lrb21qi88abm48g279xzd98qv17qxb2z82rr"; - "cyclone10lp" = "1ccxq8n20y40y47zddkijcv41w3cddvydddr3m4844q31in3nxha"; - "max" = "1cxzbqscxvlcy74dpqmvlnxjyyxfwcx3spygpvpwi6dfj3ipgm2z"; - "max10" = "14k83javivbk65mpb17wdwsyb8xk7x9gzj9x0wnd24mmijrvdy9s"; + "arria_lite" = "09g2knq23h3vj0s5y7hsdnqbbkr3pnv53dzpqcw2lq9mb5zfs9r0"; + "cyclonev" = "05hrpysasyfb7xhxg68spdffxyvxcx0iagibd5jz643b7n6aalpa"; + "cyclone" = "1x3rnwsvzrb5kwdz35sbcabxmcvj8xxpnjlpcjwfc69ybiyr6sgz"; + "cyclone10lp" = "1x6d4hm697mjgzaxixrw5va8anr6ihhx96x2524r6axpwqf6wcja"; + "max" = "060b7v0xh86kkjyiix7akfkzhx2kl1b3q117kp7xibnz6yrzwmy3"; + "max10" = "05840l9pmqa4i1b3ajfaxkqz1hppls556vbq16a42acz2qs2g578"; }; devicePackages = map (id: { @@ -48,10 +48,10 @@ let }) (lib.attrValues supportedDeviceIds); in map require ([{ name = "QuartusLiteSetup-${version}-linux.run"; - sha256 = "15vxvqxqdk29ahlw3lkm1nzxyhzy4626wb9s5f2h6sjgq64r8m7f"; + sha256 = "07ssrv8p8kacal6xd80n4h7l5xz13aw1m1gfqqaxig0ivsj971z5"; } { name = "ModelSimSetup-${version}-linux.run"; - sha256 = "0j1vfr91jclv88nam2plx68arxmz4g50sqb840i60wqd5b0l3y6r"; + sha256 = "0smxasrmr1c8k6hy378knskpjmz4cgpgb35v5jclns0kx68y3c42"; }] ++ devicePackages); nativeBuildInputs = [ unstick ]; @@ -81,9 +81,6 @@ let --disable-components ${lib.concatStringsSep "," disabledComponents} \ --mode unattended --installdir $out --accept_eula 1 - # This patch is from https://wiki.archlinux.org/index.php/Altera_Design_Software - patch --force --strip 0 --directory $out < ${./vsim.patch} - rm -r $out/uninstall $out/logs ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/vsim.patch b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/vsim.patch deleted file mode 100644 index 36dc41b7ef..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/vsim.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modelsim_ase/vco 1970-01-01 01:00:01.000000000 +0100 -+++ modelsim_ase/vco 1970-01-01 01:00:01.000000000 +0100 -@@ -207,7 +207,7 @@ - 2.[5-9]*) vco="linux" ;; - 2.[1-9][0-9]*) vco="linux" ;; - 3.[0-9]*) vco="linux" ;; -- *) vco="linux_rh60" ;; -+ *) vco="linux" ;; - esac - if [ ! -x "$dir/$vco/vsim" ]; then - if [ -x "$dir/linuxle/vsim" ]; then diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix index 07a8e7619b..20e1427dde 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.3.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0d1bs909vga1k494xnggq1mcjfxjrwa4acc0mj5rv73xqkc9mb2s"; + sha256 = "1x8jymmc56di1c1wxalsp6qhcban2hahn70ndd097b8mx52gckjr"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix b/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix index 583229eb86..1418734fba 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , makeWrapper -, electron_5 +, electron_8 , dpkg , gtk3 , glib @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.73"; + version = "0.9.89"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "1fgcb4bx5pw8ah5j30d38gw7qi1cmqarfhvgdns9f2n0d57bvvw3"; + sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6"; }; nativeBuildInputs = [ @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { gtk3 ]; - unpackPhase = "dpkg-deb -x $src ."; + # The deb contains setuid permission on `chrome-sandbox`, which will actually not get installed. + unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; dontWrapGApps = true; @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_5}/bin/electron $out/bin/typora \ + makeWrapper ${electron_8}/bin/electron $out/bin/typora \ --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix index 83c8533f5c..77d7ca983c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix @@ -1,5 +1,3 @@ -# TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. -# but I have gvim with python support now :) - Marc { source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu @@ -156,7 +154,12 @@ in stdenv.mkDerivation rec { '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ - "$out"/bin/{vim,gvim} + "$out"/bin/vim + if [[ -e "$out"/bin/gvim ]]; then + patchelf --set-rpath \ + "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ + "$out"/bin/gvim + fi ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 7ca981b295..968cc69d92 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0hmmqdamsjhjy1q8m85bs081cwmskpsp57rkj7vc2wj918wgissm"; - x86_64-darwin = "00xwvi53h9rnwyba12jmsp6grkymmn6vjibypaxb96q7q7p894gh"; + x86_64-linux = "1c8gi2001p2f0zc165cqwwf9f8ls34fgg040qn9l08za7djb9hyv"; + x86_64-darwin = "06n17s3qa2jkmg5qx3zvshz6rvdx33dhxn65j0x5mi62dv93gjgg"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.46.0"; + version = "1.46.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index fd48a4b108..cc0c73b73e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "088nsflscak315704vqnh8m4q7601fczglbhdz5i70kfyg89ar4w"; - x86_64-darwin = "0fxpx1ydsag4gyn2kq5ddq55lpw15w176p3fypk80fyfix4kziqf"; + x86_64-linux = "0l9sg2d0657k9dacy7k2jn8z07z50v8d1czgy4bkzbrj9vz7c6a7"; + x86_64-darwin = "0mnq0ykahwfrgs28rdy1jl366qyclipsr3apnmhym1xsylk0mpfx"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.46.0"; + version = "1.46.1"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 2e11f22f51..72e8462025 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.4"; + version = "3.10.7"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0d1rsgjgnnq6jgms5bgppz8lkh4518nf90fk0qvxajdfi9j4jn12"; + sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index 9bcf517e1d..2216fe9199 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-17"; - sha256 = "15cj9qkikx13j6gfqaawi4nh09lnzg3asf5mdcswx6z6yhbf90zx"; + version = "7.0.10-19"; + sha256 = "12ilfdbxllkaa3bs9z86d2nkklqz5c0l57kqj91l2ixjlvra64w0"; patches = []; }; in diff --git a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix index adbc1eac37..262c7b11f9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "akira"; - version = "2019-10-12"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "akiraux"; repo = "Akira"; - rev = "cab952dee4591b6bde34d670c1f853f5a3ff6b19"; - sha256 = "1fp3a79hkh6xwwqqdrx4zqq2zhsm236c6fhhl5f2nmi108yxz04q"; + rev = "87c495fa0a686b1e9b84aff7d9c0a9553da2c466"; + sha256 = "0ikz6dyx0z2wqskas628hbrbhx3z5gy7i4acrvspfhhg6rk88aqd"; }; nativeBuildInputs = [ @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dprofile=default" ]; - patches = [ ./fix-build-with-vala-0-44-or-later.patch ]; - postPatch = '' chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py diff --git a/third_party/nixpkgs/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch b/third_party/nixpkgs/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch deleted file mode 100644 index 3c35900c04..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch +++ /dev/null @@ -1,88 +0,0 @@ -From bcda8fd53f6f232db0b6411269ba108af551629f Mon Sep 17 00:00:00 2001 -From: Alberto Fanjul -Date: Tue, 9 Apr 2019 09:45:36 +0200 -Subject: [PATCH] Build on vala >= 0.44.2 - ---- - src/FileFormat/JsonObject.vala | 2 +- - src/FileFormat/JsonObjectArray.vala | 2 +- - src/FileFormat/ZipArchiveHandler.vala | 18 +++++++++++++++++- - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/src/FileFormat/JsonObject.vala b/src/FileFormat/JsonObject.vala -index 7bfe46f..805fbad 100644 ---- a/src/FileFormat/JsonObject.vala -+++ b/src/FileFormat/JsonObject.vala -@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObject : GLib.Object { - - private ObjectClass obj_class; - -- public JsonObject.from_object (Json.Object object) { -+ protected JsonObject.from_object (Json.Object object) { - Object (object: object); - } - -diff --git a/src/FileFormat/JsonObjectArray.vala b/src/FileFormat/JsonObjectArray.vala -index 4f6e573..d0a7dad 100644 ---- a/src/FileFormat/JsonObjectArray.vala -+++ b/src/FileFormat/JsonObjectArray.vala -@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObjectArray : Object { - * - * Your JsonObject implementation should have it's own list of items - */ -- public JsonObjectArray (Json.Object object, string property_name) { -+ protected JsonObjectArray (Json.Object object, string property_name) { - Object (object: object, property_name: property_name); - } - -diff --git a/src/FileFormat/ZipArchiveHandler.vala b/src/FileFormat/ZipArchiveHandler.vala -index ca60dd0..5d65aa2 100644 ---- a/src/FileFormat/ZipArchiveHandler.vala -+++ b/src/FileFormat/ZipArchiveHandler.vala -@@ -262,11 +262,17 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - continue; - } - -+ Posix.off_t offset; -+#if VALA_0_42 -+ uint8[] buffer; -+ while (archive.read_data_block (out buffer, out offset) == Archive.Result.OK) { -+ if (extractor.write_data_block (buffer, offset) != Archive.Result.OK) { -+#else - void* buffer = null; - size_t buffer_length; -- Posix.off_t offset; - while (archive.read_data_block (out buffer, out buffer_length, out offset) == Archive.Result.OK) { - if (extractor.write_data_block (buffer, buffer_length, offset) != Archive.Result.OK) { -+#endif - break; - } - } -@@ -316,9 +322,15 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - // Add an entry to the archive - Archive.Entry entry = new Archive.Entry (); - entry.set_pathname (initial_folder.get_relative_path (current_file)); -+#if VALA_0_42 -+ entry.set_size ((Archive.int64_t) file_info.get_size ()); -+ entry.set_filetype (Archive.FileType.IFREG); -+ entry.set_perm (Archive.FileType.IFREG); -+#else - entry.set_size (file_info.get_size ()); - entry.set_filetype ((uint) Posix.S_IFREG); - entry.set_perm (0644); -+#endif - - if (archive.write_header (entry) != Archive.Result.OK) { - critical ("Error writing '%s': %s (%d)", current_file.get_path (), archive.error_string (), archive.errno ()); -@@ -333,7 +345,11 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - break; - } - -+#if VALA_0_42 -+ archive.write_data (buffer[0:bytes_read]); -+#else - archive.write_data (buffer, bytes_read); -+#endif - } - } - } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix index fa97ceb5eb..53779041fc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { icon = "avocode"; desktopName = "Avocode"; genericName = "Design Inspector"; - categories = "Application;Development;"; + categories = "Development;"; comment = "The bridge between designers and developers"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix new file mode 100644 index 0000000000..209a6a4753 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix @@ -0,0 +1,82 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, dxflib +, eigen +, flann +, gdal +, LASzip +, libLAS +, pdal +, qtbase +, qtsvg +, qttools +, tbb +, xercesc +}: + +mkDerivation rec { + pname = "cloudcompare"; + version = "2.11.0"; + + src = fetchFromGitHub { + owner = "CloudCompare"; + repo = "CloudCompare"; + rev = "v${version}"; + sha256 = "02ahhhivgb9k1aygw1m35wdvhaizag1r98mb0r6zzrs5p4y64wlb"; + # As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules): + # * libE57Format + # * PoissonRecon + # In > 2.11 it will also contain + # * CCCoreLib + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + eigen # header-only + ]; + + buildInputs = [ + dxflib + flann + gdal + LASzip + libLAS + pdal + qtbase + qtsvg + qttools + tbb + xercesc + ]; + + cmakeFlags = [ + # TODO: This will become -DCCCORELIB_USE_TBB=ON in > 2.11.0, see + # https://github.com/CloudCompare/CloudCompare/commit/f5a0c9fd788da26450f3fa488b2cf0e4a08d255f + "-DCOMPILE_CC_CORE_LIB_WITH_TBB=ON" + "-DOPTION_USE_DXF_LIB=ON" + "-DOPTION_USE_GDAL=ON" + "-DOPTION_USE_SHAPE_LIB=ON" + + "-DPLUGIN_GL_QEDL=ON" + "-DPLUGIN_GL_QSSAO=ON" + "-DPLUGIN_IO_QADDITIONAL=ON" + "-DPLUGIN_IO_QCORE=ON" + "-DPLUGIN_IO_QCSV_MATRIX=ON" + "-DPLUGIN_IO_QE57=ON" + "-DPLUGIN_IO_QFBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs + "-DPLUGIN_IO_QPDAL=ON" # required for .las/.laz support + "-DPLUGIN_IO_QPHOTOSCAN=ON" + "-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs + ]; + + meta = with lib; { + description = "3D point cloud and mesh processing software"; + homepage = "https://cloudcompare.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nh2 ]; + platforms = with platforms; linux; # only tested here; might work on others + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix index b021c186b5..e0bcf9ab95 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; - # Reduce the risk of collisions + # Doc has high risk of collisions postInstall = "rm -r $out/share/doc"; # darktable changed its rpath handling in commit @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; libPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; in '' + for f in $out/share/darktable/kernels/*.cl; do + sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f" + done + gappsWrapperArgs+=( --prefix ${libPathEnvVar} ":" "${libPathPrefix}" ) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 7026d13365..69764daede 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.2.2"; + version = "13.4.5"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "0npqw4ih047d9s1yyllcvcih2r61fgji4rvzsw88r02mj5q5rgdn"; + sha256 = "1vp5krgj0xzhkiidj658ij6j10d2p97l1nifx0nrqysblcz2km3g"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix index 9e448fa23a..aa440f2c47 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , substituteAll +, autoreconfHook , pkgconfig , intltool , babl @@ -28,9 +29,10 @@ , ghostscript , aalib , shared-mime-info -, python2Packages +, python2 , libexif , gettext +, makeWrapper , xorg , glib-networking , libmypaint @@ -47,7 +49,7 @@ }: let - inherit (python2Packages) pygtk wrapPython python; + python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; version = "2.10.20"; @@ -59,11 +61,25 @@ in stdenv.mkDerivation rec { sha256 = "4S+fh0saAHxCd7YKqB4LZzML5+YVPldJ6tg5uQL8ezw="; }; + patches = [ + # to remove compiler from the runtime closure, reference was retained via + # gimp --version --verbose output + (substituteAll { + src = ./remove-cc-reference.patch; + cc_version = stdenv.cc.cc.name; + }) + + # Use absolute paths instead of relying on PATH + # to make sure plug-ins are loaded by the correct interpreter. + ./hardcode-plugin-interpreters.patch + ]; + nativeBuildInputs = [ + autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am pkgconfig intltool gettext - wrapPython + makeWrapper ]; buildInputs = [ @@ -97,7 +113,6 @@ in stdenv.mkDerivation rec { libwebp libheif python - pygtk libexif xorg.libXpm glib-networking @@ -116,8 +131,6 @@ in stdenv.mkDerivation rec { gegl ]; - pythonPath = [ pygtk ]; - # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; @@ -126,19 +139,8 @@ in stdenv.mkDerivation rec { export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" ''; - patches = [ - # to remove compiler from the runtime closure, reference was retained via - # gimp --version --verbose output - (substituteAll { - src = ./remove-cc-reference.patch; - cc_version = stdenv.cc.cc.name; - }) - ]; - postFixup = '' - wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/ wrapProgram $out/bin/gimp-${lib.versions.majorMinor version} \ - --prefix PYTHONPATH : "$PYTHONPATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch b/third_party/nixpkgs/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch new file mode 100644 index 0000000000..1528404c31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch @@ -0,0 +1,11 @@ +--- a/plug-ins/pygimp/Makefile.am ++++ b/plug-ins/pygimp/Makefile.am +@@ -157,7 +157,7 @@ install-interp-file: + echo 'python=$(PYBIN_PATH)' > '$(DESTDIR)$(pyinterpfile)' + echo 'python2=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' + echo '/usr/bin/python=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' +- echo ":Python:E::py::`basename $(PYTHON)`:" >> '$(DESTDIR)$(pyinterpfile)' ++ echo ":Python:E::py::$(PYTHON):" >> '$(DESTDIR)$(pyinterpfile)' + + install-data-local: install-env-file install-interp-file + diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index 352b6b900c..2906026c48 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.6.5"; + version = "2.8.1"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0x8931i5zs4zl3iqjhlp7h8y6ssklxiqsddz5kh84nl3p0izbg0y"; + sha256 = "00g2vw7lz3yb4nq358x8d3r4mf3hkrq2vw1g9lli27zdp5p6jja1"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -64,6 +64,7 @@ perlPackages.buildPerlPackage rec { # Add runtime dependencies wrapProgram "$out/bin/gscan2pdf" \ + --prefix PATH : "${sane-backends}/bin" \ --prefix PATH : "${imagemagick}/bin" \ --prefix PATH : "${libtiff}/bin" \ --prefix PATH : "${djvulibre}/bin" \ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix index f98edd1e8a..95a3e1e092 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.2.9"; + version = "4.3.0"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0rvm9mpaq66lxyq4f09x9w6xxhgys0phza223hm5zv6kgn413xsf"; + sha256 = "19qlpp9ds60bab73pwi64dq1zn4zn2hcdkrxhjr1j438mc4pflsd"; }; # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix index 53d1c5c3f7..a3ab52ba87 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.21"; + version = "2.22"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "1bmk71vbxc1n8cnizlmzfqlvgxjb95cydbzxlvq1s5givxr2jwli"; + sha256 = "011y2nl0jakf29cxprjmj1ifqc9iva61q5f4kk47b03gq7jw8sl4"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix index 67e95aec75..8104b41374 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "nomacs"; - version = "3.14.2"; + version = "3.15.1616"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "1vms13kyg7cpqi2hxvrrhlnl7cq92ijr7dm1kl5ryglpcagqv811"; + sha256 = "0g1saqf31zncqdiwk7aaf951j3g33bg0vcjcr5mvg600jxiinw8j"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index e667f7c0f1..c03f5f8ed8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "09z4z2csp7ld47q36x2id5zadaihisbnk7bkdvci826hwm8km7sl"; + sha256 = "00c4psgfh4hia144zsdhrq83bw3fqda1ancv2gkn5ymxkbpnpyrn"; }; vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix index cad6a35ce3..de5ae4fcbf 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "processing"; - version = "3.5.3"; + version = "3.5.4"; src = fetchFromGitHub { owner = "processing"; repo = "processing"; - rev = "processing-0269-${version}"; - sha256 = "0ajniy3a0i0rx7is46r85yh3ah4zm4ra1gbllmihw9pmnfjgfajn"; + rev = "processing-0270-${version}"; + sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58"; }; nativeBuildInputs = [ ant rsync makeWrapper ]; @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { # do not download a file during build ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { - url = "http://download.processing.org/reference.zip"; - sha256 = "198bpk8mzns6w5h0zdf50wr6iv7sgdi6v7jznj5rbsnpgyilxz35"; + # Use archive.org link for reproducibility until the following issue is fixed: + # https://github.com/processing/processing/issues/5711 + url = "https://web.archive.org/web/20200406132357/https://download.processing.org/reference.zip"; + sha256 = "093hc7kc9wfxqgf5dzfmfp68pbsy8x647cj0a25vgjm1swi61zbi"; } } ./java/reference.zip diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix index 0615b00f13..bd4a5ac9ad 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -2,7 +2,7 @@ , sane-backends, meson, ninja }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.3"; + version = "0.99.8"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ avahi libsoup libjpeg libpng sane-backends ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "1sxp207vzjzi0ad5202n46acbha4dfmzcijl2v0b9j9lj4k42a8k"; + sha256 = "0sdlnbzhnfn4i5mkqhc8zmjywbbjqkbnsiz2gpqhy6fypshryahz"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix index fc9132ec0b..ffc19653da 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { desktopName = "SwingSane"; genericName = "Scan from local or remote SANE servers"; comment = meta.description; - categories = "Office;Application;"; + categories = "Office;"; }; in '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xara/debian-patches.nix b/third_party/nixpkgs/pkgs/applications/graphics/xara/debian-patches.nix deleted file mode 100644 index dd30614618..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/xara/debian-patches.nix +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by debian-patches.sh from debian-patches.txt -let - prefix = "http://patch-tracker.debian.org/patch/series/dl/xaralx/0.7r1785-5"; -in -[ - { - url = "${prefix}/30_gtk_wxwidgets_symbol_clash"; - sha256 = "1rc9dh9mnp93mad96dkp7idyhhcw7h6w0g5s92mqgzj79hqgaziz"; - } - { - url = "${prefix}/40_algorithm_include"; - sha256 = "03jhl1qnxj7nl8malf6v1y24aldfz87x1p2jxp04mrr35nzvyyc0"; - } - { - url = "${prefix}/50_update_imagemagick_version_parser"; - sha256 = "1nilsqghlr649sc14n1aqkhdx7f66rq91gqccdpi17jwijs27497"; - } - { - url = "${prefix}/remove-icon-suffix"; - sha256 = "160zmkgwlsanqivnip89558yvd9zvqp8ks2wbyr2aigl2rafin22"; - } - { - url = "${prefix}/45_fix_gcc4"; - sha256 = "06zsj0z9v5n557gj8337v6xd26clbvm4dc0qhvpvzbisq81l9jyi"; - } - { - url = "${prefix}/55_fix_contstuctor_call"; - sha256 = "0b14glrcwhv0ja960h56n5jm4f9563ladap2pgaywihq485ql1c1"; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xara/debian-patches.txt b/third_party/nixpkgs/pkgs/applications/graphics/xara/debian-patches.txt deleted file mode 100644 index 5c95d401a3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/xara/debian-patches.txt +++ /dev/null @@ -1,7 +0,0 @@ -xaralx/0.7r1785-5 -30_gtk_wxwidgets_symbol_clash -40_algorithm_include -50_update_imagemagick_version_parser -remove-icon-suffix -45_fix_gcc4 -55_fix_contstuctor_call diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xara/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xara/default.nix deleted file mode 100644 index 5e3c252435..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/xara/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig -, wxGTK, gtk2, perl, zip}: - -stdenv.mkDerivation { - name = "xaralx-0.7r1785"; - - src = fetchurl { - url = "http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2"; - sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; - }; - - nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; - buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; - - configureFlags = [ "--disable-svnversion" ]; - - patches = map fetchurl (import ./debian-patches.nix); - - prePatch = "patchShebangs Scripts"; - - meta.broken = true; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix index 8d36e4630d..5c7b4c22a3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXft}: stdenv.mkDerivation rec { pname = "xfractint"; - version = "20.04p14"; + version = "20.04p15"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz"; - sha256 = "0jdqr639z862qrswwk5srmv4fj5d7rl8kcscpn6mlkx4jvjmca0f"; + sha256 = "1wv2hgyjvrjxzqxb55vz65ra80p24j8sd34llykk2qlx73x8f3nk"; }; buildInputs = [libX11 libXft]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch similarity index 69% rename from third_party/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch rename to third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch index ba6bbedeea..58390cba22 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch @@ -1,27 +1,42 @@ -Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp -=================================================================== ---- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp -+++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp -@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, - mStorageController = new Akonadi::ProcessControl; - mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld - connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); -- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - - if (mAgentServerEnabled) { - mAgentServer = new Akonadi::ProcessControl; - connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); -- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); +From 90969b9b36400d47b1afe761fb8468c1acb8a04a Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 13 Jul 2020 11:41:19 -0500 +Subject: [PATCH 1/3] akonadi paths + +--- + src/akonadicontrol/agentmanager.cpp | 4 ++-- + src/akonadicontrol/agentprocessinstance.cpp | 2 +- + src/server/storage/dbconfigmysql.cpp | 26 ++++----------------- + src/server/storage/dbconfigpostgresql.cpp | 19 +++------------ + 4 files changed, 11 insertions(+), 40 deletions(-) + +diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp +index 23b4a1f..c13b658 100644 +--- a/src/akonadicontrol/agentmanager.cpp ++++ b/src/akonadicontrol/agentmanager.cpp +@@ -61,7 +61,7 @@ public: + []() { + QCoreApplication::instance()->exit(255); + }); +- start(QStringLiteral("akonadiserver"), args, RestartOnCrash); ++ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash); } - } -Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp -=================================================================== ---- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp -+++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A + ~StorageProcessControl() override +@@ -84,7 +84,7 @@ public: + []() { + qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; + }); +- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash); ++ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash); + } + + ~AgentServerProcessControl() override +diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp +index 4e58f7e..e8bb532 100644 +--- a/src/akonadicontrol/agentprocessinstance.cpp ++++ b/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) } else { Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); const QStringList arguments = QStringList() << executable << identifier(); @@ -30,11 +45,11 @@ Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp mController->start(agentLauncherExec, arguments); } return true; -Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp -=================================================================== ---- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp -@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &sett +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index cac40f5..527649b 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -42,7 +57,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &sett +@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &settings) #endif const bool defaultInternalServer = true; @@ -60,7 +75,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown") -@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &sett +@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &settings) #endif } @@ -73,7 +88,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &sett +@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -82,7 +97,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &settings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -92,7 +107,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &settings) settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -102,7 +117,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer( +@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file @@ -111,11 +126,11 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { -Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp -=================================================================== ---- akonadi-19.08.0.orig/src/server/storage/dbconfigpostgresql.cpp -+++ akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp -@@ -140,9 +140,7 @@ bool DbConfigPostgresql::init(QSettings +diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp +index 09cdbd5..1c8996b 100644 +--- a/src/server/storage/dbconfigpostgresql.cpp ++++ b/src/server/storage/dbconfigpostgresql.cpp +@@ -141,9 +141,7 @@ bool DbConfigPostgresql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -125,7 +140,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp QString defaultPgData; #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows -@@ -153,12 +151,8 @@ bool DbConfigPostgresql::init(QSettings +@@ -154,12 +152,8 @@ bool DbConfigPostgresql::init(QSettings &settings) mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); if (mInternalServer) { @@ -139,7 +154,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } -@@ -177,20 +171,14 @@ bool DbConfigPostgresql::init(QSettings +@@ -178,20 +172,14 @@ bool DbConfigPostgresql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -162,7 +177,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath; mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString(); if (mPgData.isEmpty()) { -@@ -206,7 +194,6 @@ bool DbConfigPostgresql::init(QSettings +@@ -207,7 +195,6 @@ bool DbConfigPostgresql::init(QSettings &settings) settings.setValue(QStringLiteral("Port"), mHostPort); } settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -170,3 +185,6 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch new file mode 100644 index 0000000000..ac9b3146e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch @@ -0,0 +1,26 @@ +From b8c6a2a017321649db8fec553a644b8da2300514 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 13 Jul 2020 11:41:35 -0500 +Subject: [PATCH 2/3] akonadi timestamps + +--- + src/server/storage/dbconfigmysql.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index 527649b..08c3dd4 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer() + bool confUpdate = false; + QFile actualFile(actualConfig); + // update conf only if either global (or local) is newer than actual +- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || +- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { ++ if (true) { + QFile globalFile(globalConfig); + QFile localFile(localConfig); + if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch similarity index 59% rename from third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch rename to third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch index c3964c5c05..1a0bc000c8 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch +++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch @@ -1,19 +1,18 @@ -From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 -From: gnidorah -Date: Fri, 22 Dec 2017 17:36:03 +0300 -Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" +From 7afe018382cf68b477b35f87b666424d62d19ef4 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 13 Jul 2020 11:41:55 -0500 +Subject: [PATCH 3/3] akonadi revert make relocatable -This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. --- CMakeLists.txt | 3 --- KF5AkonadiConfig.cmake.in | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) -Index: akonadi-19.08.0/CMakeLists.txt -=================================================================== ---- akonadi-19.08.0.orig/CMakeLists.txt -+++ akonadi-19.08.0/CMakeLists.txt -@@ -306,9 +306,6 @@ configure_package_config_file( +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d927471..83a74c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -330,9 +330,6 @@ configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} @@ -23,11 +22,11 @@ Index: akonadi-19.08.0/CMakeLists.txt ) install(FILES -Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in -=================================================================== ---- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in -+++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in -@@ -26,8 +26,8 @@ if(BUILD_TESTING) +diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in +index 421e1df..e3abf27 100644 +--- a/KF5AkonadiConfig.cmake.in ++++ b/KF5AkonadiConfig.cmake.in +@@ -24,8 +24,8 @@ if(BUILD_TESTING) find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") endif() @@ -38,7 +37,7 @@ Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in find_dependency(Boost "@Boost_MINIMUM_VERSION@") -@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako +@@ -33,7 +33,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed @@ -47,3 +46,6 @@ Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in #################################################################################### # CMAKE_AUTOMOC +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/third_party/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch deleted file mode 100644 index e299a6991f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp -=================================================================== ---- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp -@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer( - bool confUpdate = false; - QFile actualFile(actualConfig); - // update conf only if either global (or local) is newer than actual -- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || -- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { -+ if (true) { - QFile globalFile(globalConfig); - QFile localFile(localConfig); - if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix index b9a96394a6..2c163445d5 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix @@ -11,7 +11,11 @@ mkDerivation { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./0001-akonadi-paths.patch + ./0002-akonadi-timestamps.patch + ./0003-akonadi-revert-make-relocatable.patch + ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/series b/third_party/nixpkgs/pkgs/applications/kde/akonadi/series deleted file mode 100644 index f828d503cc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/series +++ /dev/null @@ -1,3 +0,0 @@ -akonadi-paths.patch -akonadi-timestamps.patch -0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch diff --git a/third_party/nixpkgs/pkgs/applications/kde/bovo.nix b/third_party/nixpkgs/pkgs/applications/kde/bovo.nix new file mode 100644 index 0000000000..4bd3113a05 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/bovo.nix @@ -0,0 +1,28 @@ +{ mkDerivation, lib +, libkdegames, extra-cmake-modules +, kdeclarative, knewstuff +}: + +mkDerivation { + name = "bovo"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.bovo"; + description = "Five in a row application"; + longDescription = '' + Bovo is a Gomoku (from Japanese 五目並べ - lit. "five points") like game for two players, + where the opponents alternate in placing their respective pictogram on the game board. + (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses) + ''; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdeclarative + knewstuff + libkdegames + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix index 60df1f899d..7eef4049e6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix @@ -74,6 +74,7 @@ let akregator = callPackage ./akregator.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; + bovo = callPackage ./bovo.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; @@ -89,6 +90,7 @@ let kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; + kapptemplate = callPackage ./kapptemplate.nix { }; kate = callPackage ./kate.nix {}; kbreakout = callPackage ./kbreakout.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; @@ -173,6 +175,7 @@ let messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; okular = callPackage ./okular.nix {}; + picmi = callPackage ./picmi.nix {}; pimcommon = callPackage ./pimcommon.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh index 3f6dc9ef18..7f5bc76910 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.3/src ) +WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.1/src) diff --git a/third_party/nixpkgs/pkgs/applications/kde/kapptemplate.nix b/third_party/nixpkgs/pkgs/applications/kde/kapptemplate.nix new file mode 100644 index 0000000000..a5e211318a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kapptemplate.nix @@ -0,0 +1,24 @@ +{ lib +, mkDerivation +, fetchurl +, cmake +, extra-cmake-modules +, qtbase +, kactivities +}: +mkDerivation { + + name = "kapptemplate"; + + nativeBuildInputs = [ extra-cmake-modules cmake ]; + + buildInputs = [ kactivities qtbase ]; + + meta = with lib; { + description = "KDE App Code Template Generator"; + license = licenses.gpl2; + homepage = "https://kde.org/applications/en/development/org.kde.kapptemplate"; + maintainers = [ maintainers.shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix index dc0b63594c..2e7887582f 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -9,14 +9,6 @@ mkDerivation { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # Fix a bug with thumbnail.so processes hanging: - # https://bugs.kde.org/show_bug.cgi?id=404652 - (fetchpatch { - url = "https://github.com/KDE/kdegraphics-thumbnailers/commit/3e2ea6e924d0e2a2cdd9bb435b06965117d6d34c.patch"; - sha256 = "0fq85zhymmrq8vl0y6vgh87qf4c6fhcq704p4kpkaq7y0isxj4h1"; - }) - ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kio libkexiv2 libkdcraw ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive.nix b/third_party/nixpkgs/pkgs/applications/kde/kdenlive.nix index 95496f90e0..795ba87ad5 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdenlive.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdenlive.nix @@ -25,12 +25,13 @@ , frei0r , phonon-backend-gstreamer , qtdeclarative -, qtquickcontrols +, qtquickcontrols2 , qtscript , qtwebkit , rttr , kpurpose , kdeclarative +, wrapGAppsHook }: mkDerivation { @@ -59,7 +60,7 @@ mkDerivation { mlt phonon-backend-gstreamer qtdeclarative - qtquickcontrols + qtquickcontrols2 qtscript qtwebkit shared-mime-info @@ -69,6 +70,7 @@ mkDerivation { rttr kpurpose kdeclarative + wrapGAppsHook ]; # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: diff --git a/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix b/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix index a7aa817576..a803ba7298 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix @@ -1,9 +1,9 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, - kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, - kdelibs4support, kpty, syntax-highlighting, libmtp, libssh, openexr, ilmbase, - openslp, phonon, qtsvg, samba, solid, gperf + kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio, + khtml, kdelibs4support, kpty, syntax-highlighting, libmtp, libssh, openexr, + ilmbase, openslp, phonon, qtsvg, samba, solid, gperf }: mkDerivation { @@ -15,9 +15,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons - kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support - kpty syntax-highlighting libmtp libssh openexr openslp phonon qtsvg samba - solid gperf + kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml + kdelibs4support kpty syntax-highlighting libmtp libssh openexr openslp + phonon qtsvg samba solid gperf ]; CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmail.nix b/third_party/nixpkgs/pkgs/applications/kde/kmail.nix index ab24f15a14..6b8941e578 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kmail.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kmail.nix @@ -7,7 +7,7 @@ kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon, - messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi + messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi, kdepim-addons }: mkDerivation { @@ -24,6 +24,7 @@ mkDerivation { knotifications knotifyconfig kontactinterface kparts kpty kservice ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine + kdepim-addons ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; patches = [ ./kmail.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix b/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix index 23920a081c..1c7852fd19 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix @@ -5,7 +5,7 @@ grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, - pimcommon, qtwebengine, qtwebkit, syntax-highlighting + pimcommon, qca-qt5, qtwebengine, qtwebkit, syntax-highlighting }: mkDerivation { @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap - kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit + kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5 qtwebkit syntax-highlighting ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/picmi.nix b/third_party/nixpkgs/pkgs/applications/kde/picmi.nix new file mode 100644 index 0000000000..dd09e8f9cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/picmi.nix @@ -0,0 +1,25 @@ +{ mkDerivation, lib +, libkdegames, extra-cmake-modules +, kdeclarative, knewstuff +}: + +mkDerivation { + name = "picmi"; + meta = with lib; { + description = "Nonogram game"; + longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or + leaving blank the cells in a grid according to numbers given at the side of the grid. + ''; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdeclarative + knewstuff + libkdegames + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix index 2d46b3cdaa..b980ea21df 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix @@ -17,8 +17,8 @@ mkDerivation { knewstuff kwayland ]; postPatch = '' - substituteInPlace desktop/org.kde.spectacle.desktop \ - --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" + substituteInPlace desktop/org.kde.spectacle.desktop.cmake \ + --replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" ''; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix index dc6eb0f09e..66b44efad4 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix @@ -1,1734 +1,1742 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde/fetch.sh +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde { fetchurl, mirror }: { akonadi = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadi-19.12.3.tar.xz"; - sha256 = "e41714d81ecbb629aaa0b267e0c32a4b1d83c6a45cf3f37d52232003b4c0f325"; - name = "akonadi-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadi-20.04.1.tar.xz"; + sha256 = "0bffbcd00e0d4f4f3a2084ce6a42da8f05fdf14cb361141b4b734e35203d764e"; + name = "akonadi-20.04.1.tar.xz"; }; }; akonadi-calendar = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadi-calendar-19.12.3.tar.xz"; - sha256 = "c58d18153ef711a79962ba907e44338a0ddd62968e0a6c50486bba09a6e2a446"; - name = "akonadi-calendar-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadi-calendar-20.04.1.tar.xz"; + sha256 = "4b2c5b77b8f7e20a62e4dda534d4a7f4d3b9f1b1d72ae7c57a96c9d13c3607d7"; + name = "akonadi-calendar-20.04.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadi-calendar-tools-19.12.3.tar.xz"; - sha256 = "ad2c23cf188228dc697d39e2120b56ce445bbea3eb46721794cd6344aa7e94ba"; - name = "akonadi-calendar-tools-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadi-calendar-tools-20.04.1.tar.xz"; + sha256 = "611e500f2d8b931fa9eef6821e51c7aec1586911e1d5a47cedc91131df83a3c4"; + name = "akonadi-calendar-tools-20.04.1.tar.xz"; }; }; akonadiconsole = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadiconsole-19.12.3.tar.xz"; - sha256 = "0dedcccfcfd7e6ad9a5af0aa61ce05f26cbb625d8bf6b6d210ac6e3c5813487f"; - name = "akonadiconsole-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadiconsole-20.04.1.tar.xz"; + sha256 = "d62039d66c996902f16575918d278996b895a872ea0a5046b0aa4d39746b556a"; + name = "akonadiconsole-20.04.1.tar.xz"; }; }; akonadi-contacts = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadi-contacts-19.12.3.tar.xz"; - sha256 = "b0baed9edb8c05b6d9b8db84239cd83a334d8f1d14d4aa8027dc1139a543eadf"; - name = "akonadi-contacts-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadi-contacts-20.04.1.tar.xz"; + sha256 = "917a7656a745e3cad94ec6470040b6fb384a14bcf9b571e82d3a256ab37aef45"; + name = "akonadi-contacts-20.04.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadi-import-wizard-19.12.3.tar.xz"; - sha256 = "2c1491e4f5994ed0d317a27cc717184a86f7d92c4b44f8bd056e147e80bee8c5"; - name = "akonadi-import-wizard-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadi-import-wizard-20.04.1.tar.xz"; + sha256 = "483c2fd59209284e24d15f03052a96c1d25f89f719e0500b2e774cc7f72bc833"; + name = "akonadi-import-wizard-20.04.1.tar.xz"; }; }; akonadi-mime = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadi-mime-19.12.3.tar.xz"; - sha256 = "13bdf9a233a183d5aeee1be0991617fca6d73ffd35bc14ca0d18714149f04392"; - name = "akonadi-mime-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadi-mime-20.04.1.tar.xz"; + sha256 = "1cbdb6d560959e4cb5660b3d5fddbe1dd9812af104e0b8d25142fca1a239a7f1"; + name = "akonadi-mime-20.04.1.tar.xz"; }; }; akonadi-notes = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadi-notes-19.12.3.tar.xz"; - sha256 = "a34c2420190925b985b0629d7d2d19be04443cfeeaf284229666338e039e56e2"; - name = "akonadi-notes-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadi-notes-20.04.1.tar.xz"; + sha256 = "02c2c68ccd016dff57346cdb2e25237ae64d283c544e77d66252d62ce748c213"; + name = "akonadi-notes-20.04.1.tar.xz"; }; }; akonadi-search = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akonadi-search-19.12.3.tar.xz"; - sha256 = "60072a36f6c817d009a8476bad2e80c4131b14358e03b4889a03aa42340ed041"; - name = "akonadi-search-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akonadi-search-20.04.1.tar.xz"; + sha256 = "a0b49db300507e3aae406fb786eef2e6b0847776eaf0dfec71ff11223c21b7c0"; + name = "akonadi-search-20.04.1.tar.xz"; }; }; akregator = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/akregator-19.12.3.tar.xz"; - sha256 = "63db0f6c75bffe9235122201445d151f4eaa7061d2a8df4eb924bca1a4600f68"; - name = "akregator-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/akregator-20.04.1.tar.xz"; + sha256 = "574c507cbe2e26c4b4d2a840c0f686e3dc807eed448dca07f331e1a639f4219c"; + name = "akregator-20.04.1.tar.xz"; }; }; analitza = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/analitza-19.12.3.tar.xz"; - sha256 = "47ca3acaf2d2f52e91cd2253742ab97d9b07abc3fef0d632bfc36d253dbf161b"; - name = "analitza-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/analitza-20.04.1.tar.xz"; + sha256 = "d8a3f0e31b26ed4d845f037e5957b1a100b95266fce427bee27765593282f6b6"; + name = "analitza-20.04.1.tar.xz"; }; }; ark = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ark-19.12.3.tar.xz"; - sha256 = "78594029729c197fc90321850696f1bd189b40d8d7fbc9faf51ad6b2ab744a07"; - name = "ark-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ark-20.04.1.tar.xz"; + sha256 = "3c0e213917c3b87b12bab32499f13b99df36866b94b46705cbb01e468372ab3c"; + name = "ark-20.04.1.tar.xz"; }; }; artikulate = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/artikulate-19.12.3.tar.xz"; - sha256 = "c27a5cb98a8e2975638fe74683a73f92c160ce133b133878844062dd99ffded6"; - name = "artikulate-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/artikulate-20.04.1.tar.xz"; + sha256 = "a6275e9745b792f93fd9a8f0852c4f298cfb9d1bf9ba43ca3f9992a70eaa51d6"; + name = "artikulate-20.04.1.tar.xz"; }; }; audiocd-kio = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/audiocd-kio-19.12.3.tar.xz"; - sha256 = "b920170ae816f29a61a6f6b25df68c9125a5d4d9fec225feee45e46317d64d42"; - name = "audiocd-kio-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/audiocd-kio-20.04.1.tar.xz"; + sha256 = "d3d7392c76ff285ef6d9195da6ea0d7c7dc1e5113afebd64111f62af56ef9662"; + name = "audiocd-kio-20.04.1.tar.xz"; }; }; baloo-widgets = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/baloo-widgets-19.12.3.tar.xz"; - sha256 = "236c0bb0bcb345f4ce5f07d591bded6221383bc7b190b42b96999893390cd8a5"; - name = "baloo-widgets-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/baloo-widgets-20.04.1.tar.xz"; + sha256 = "00f271d90c92ac4be978270fee323a8e8617cb975e0ea7d7ecb1b00d773a9bf4"; + name = "baloo-widgets-20.04.1.tar.xz"; }; }; blinken = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/blinken-19.12.3.tar.xz"; - sha256 = "06ef385ab73d99fa3f1925a6f2ef522f691d04cd594777f5d9fa52a5f2e45a94"; - name = "blinken-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/blinken-20.04.1.tar.xz"; + sha256 = "51b55f749d10af0ad00bce7f42bfd7877c66a665f31e02a05ad515205e22f620"; + name = "blinken-20.04.1.tar.xz"; }; }; bomber = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/bomber-19.12.3.tar.xz"; - sha256 = "ea4926fe08c62ac5da28c3bb480a6986e51f7a77e3245d1dc1603c38617da4b0"; - name = "bomber-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/bomber-20.04.1.tar.xz"; + sha256 = "bbb8e041365d7866a3c3a1e1804398ddec262f78322455acdd66b9abe89918fc"; + name = "bomber-20.04.1.tar.xz"; }; }; bovo = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/bovo-19.12.3.tar.xz"; - sha256 = "ac67aff75c1e8e0d1a1a8142ae94431e4f39565f411287f57c2778f8820316af"; - name = "bovo-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/bovo-20.04.1.tar.xz"; + sha256 = "04800ade7e832de7b717c9698b1da2940a581a7fa0c0ac7fa8be84def1580c8a"; + name = "bovo-20.04.1.tar.xz"; }; }; calendarsupport = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/calendarsupport-19.12.3.tar.xz"; - sha256 = "ecbd194b5aa39284d33f7f2ddca75175f8699efee1bfbd5000ea10076567bae8"; - name = "calendarsupport-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/calendarsupport-20.04.1.tar.xz"; + sha256 = "7e77c354a1bc634cf31f728315ea7f0b85bd112d7dfd49786701118e8f8663fb"; + name = "calendarsupport-20.04.1.tar.xz"; }; }; cantor = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/cantor-19.12.3.tar.xz"; - sha256 = "8347160f18993f53c857ec0d418dfebbc533878ad9f480047646d121e4e644cb"; - name = "cantor-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/cantor-20.04.1.tar.xz"; + sha256 = "6066b18b6c2feb8a14bab3a5ca844ef636d3a46ec8a6a7fc5c726f19542033be"; + name = "cantor-20.04.1.tar.xz"; }; }; cervisia = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/cervisia-19.12.3.tar.xz"; - sha256 = "733a90f521cd79157f6d02eeb28376bc703239800473e8cf366611dd4f3342a6"; - name = "cervisia-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/cervisia-20.04.1.tar.xz"; + sha256 = "c74a98d1baa447f517894951ac956f5a3e44ac4bea9d745c7d493436ad5507e9"; + name = "cervisia-20.04.1.tar.xz"; }; }; dolphin = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/dolphin-19.12.3.tar.xz"; - sha256 = "ba16f4d5be5ccc3c135a913f2e3c7dd3b7a492cfc9ec9ae518f714fcd7c2ab47"; - name = "dolphin-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/dolphin-20.04.1.tar.xz"; + sha256 = "ba5db89b338d29c5fa492fc7ce08304427d8db51775fe5a4d34b444034d02577"; + name = "dolphin-20.04.1.tar.xz"; }; }; dolphin-plugins = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/dolphin-plugins-19.12.3.tar.xz"; - sha256 = "7dbd5c0fe4281c46df789f86f468c4ea32949285055cae4652bab3de59acdfd3"; - name = "dolphin-plugins-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/dolphin-plugins-20.04.1.tar.xz"; + sha256 = "f97c2b77d1b4fd74a2e4a242b5b9a66f7d8f05a185d012ee5646d5f38c26e489"; + name = "dolphin-plugins-20.04.1.tar.xz"; }; }; dragon = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/dragon-19.12.3.tar.xz"; - sha256 = "c5b09b2bd37f4e86f8412d3b950331d330257ba53278b1a569f36bf3fbf560ee"; - name = "dragon-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/dragon-20.04.1.tar.xz"; + sha256 = "b2073f437884c671d8c6eec1e1d2e25ad108157fb25c6a029afceea080785aeb"; + name = "dragon-20.04.1.tar.xz"; }; }; elisa = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/elisa-19.12.3.tar.xz"; - sha256 = "28ad795c1d993969d49ab71514129589a71ee6fe8a2de785e22f17f5af7c3d32"; - name = "elisa-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/elisa-20.04.1.tar.xz"; + sha256 = "c471e38f5ccc380f73eae10dec2f7fa9eefb81eae3203c99710e0e2ed03d6efa"; + name = "elisa-20.04.1.tar.xz"; }; }; eventviews = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/eventviews-19.12.3.tar.xz"; - sha256 = "e2ac6a77c6bdee008229a2b03262ac5602e0cabfd325a92df58be63aaa7db662"; - name = "eventviews-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/eventviews-20.04.1.tar.xz"; + sha256 = "e3b02c47ec39312abd493e54b86e9cc17f9e3f08def30fff7cf5dc974bba296a"; + name = "eventviews-20.04.1.tar.xz"; }; }; ffmpegthumbs = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ffmpegthumbs-19.12.3.tar.xz"; - sha256 = "cc4a1c3b4768dc674d210294a9957d622448cbe9cdaf713c1cb40bff3a79260e"; - name = "ffmpegthumbs-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ffmpegthumbs-20.04.1.tar.xz"; + sha256 = "acbe27fc497ad7839bad819a21b131ba42117d30624d97f3fc050635c607859e"; + name = "ffmpegthumbs-20.04.1.tar.xz"; }; }; filelight = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/filelight-19.12.3.tar.xz"; - sha256 = "9ea78509f932cd2bd553d934e2af75c25d0b65d85d2b0ab4a007ac5929b2d3b5"; - name = "filelight-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/filelight-20.04.1.tar.xz"; + sha256 = "0398a859374a97d96f0d6f972de70548a80fc080d1942a333a32501ba9082283"; + name = "filelight-20.04.1.tar.xz"; }; }; granatier = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/granatier-19.12.3.tar.xz"; - sha256 = "aa2e410e4eeae74f3902028069955017a31a922dff98b81850f20743f7b54c95"; - name = "granatier-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/granatier-20.04.1.tar.xz"; + sha256 = "06fbd240bc7f035dc8e105deb2ae85c800b2f1a2c4c812f7e3c872dd5a0a9a90"; + name = "granatier-20.04.1.tar.xz"; }; }; grantlee-editor = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/grantlee-editor-19.12.3.tar.xz"; - sha256 = "5df3e5ce7933290f9f6423bdbcb0ff5614a1a4b6fda250a37bd3ed57647f8a3c"; - name = "grantlee-editor-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/grantlee-editor-20.04.1.tar.xz"; + sha256 = "8652c1401aa903cff84524cd74d5eab3c20c1808fbcb245ff349cd862e89f25d"; + name = "grantlee-editor-20.04.1.tar.xz"; }; }; grantleetheme = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/grantleetheme-19.12.3.tar.xz"; - sha256 = "cc0ce448c9d8396dcadea2a43089feca8e1074572df42752f70dd176676f29f9"; - name = "grantleetheme-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/grantleetheme-20.04.1.tar.xz"; + sha256 = "5d6a173f42e79610832fa1616b705e2d6b5c0ab652ec528f06c069b058614b3d"; + name = "grantleetheme-20.04.1.tar.xz"; }; }; gwenview = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/gwenview-19.12.3.tar.xz"; - sha256 = "b453cd55b7409bf8e4446a1b714dc66e73a0376d2da65b184b82f786767164e7"; - name = "gwenview-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/gwenview-20.04.1.tar.xz"; + sha256 = "80c2103f8ec8333b8ab08949dea8c5b670a4e3f73309fbaf5172f7e8371f13e1"; + name = "gwenview-20.04.1.tar.xz"; }; }; incidenceeditor = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/incidenceeditor-19.12.3.tar.xz"; - sha256 = "c608a95f6d09433b378f5df0243eff77be3738fb56f99ab439774f2cad5908a6"; - name = "incidenceeditor-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/incidenceeditor-20.04.1.tar.xz"; + sha256 = "dec62f0aaa304e9e67589ed49d96e5c834e18b722cd6aea596775760382df7f6"; + name = "incidenceeditor-20.04.1.tar.xz"; }; }; juk = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/juk-19.12.3.tar.xz"; - sha256 = "4bc4210d223afc23cb6edc9262eceee038ecc6243a550698e676230168943611"; - name = "juk-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/juk-20.04.1.tar.xz"; + sha256 = "b9feff202cd216ded86a880a4da36fd3fd8b57a3508a61dc628b416fe7817a1b"; + name = "juk-20.04.1.tar.xz"; }; }; k3b = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/k3b-19.12.3.tar.xz"; - sha256 = "832c314d528ed21971d9d9d26c1c4d6c61323c9b3b01787d710541e3651575a5"; - name = "k3b-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/k3b-20.04.1.tar.xz"; + sha256 = "c7d3e3113e7c45e8b938057b0f78ad2af8c95c280f3c59e83d13d79c6db40164"; + name = "k3b-20.04.1.tar.xz"; }; }; kaccounts-integration = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kaccounts-integration-19.12.3.tar.xz"; - sha256 = "452b95113de5fb0d19a13ef75e229ee07b0e92cc1e7a17e9a2dc7879121d9d33"; - name = "kaccounts-integration-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kaccounts-integration-20.04.1.tar.xz"; + sha256 = "a5c05c8cd1f29961992e058283ccc885395715b75666d7363ff449aa8586981f"; + name = "kaccounts-integration-20.04.1.tar.xz"; }; }; kaccounts-providers = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kaccounts-providers-19.12.3.tar.xz"; - sha256 = "8774e9a8113e4aba593afeff655e38f6259c78e7dbaf1d95ea00235be880f3dd"; - name = "kaccounts-providers-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kaccounts-providers-20.04.1.tar.xz"; + sha256 = "54cee10a789568d55882a719ea5c0ed61fec09025bc4643abad81234f20e456b"; + name = "kaccounts-providers-20.04.1.tar.xz"; }; }; kaddressbook = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kaddressbook-19.12.3.tar.xz"; - sha256 = "1dede421e6fef2b1abc7d36dd1855cef43cc82de909a432cd38cff42d4168fba"; - name = "kaddressbook-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kaddressbook-20.04.1.tar.xz"; + sha256 = "5771d59ca8612366cf7ed336fffdb021bbbf0cac634a6165d722aa836483edee"; + name = "kaddressbook-20.04.1.tar.xz"; }; }; kajongg = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kajongg-19.12.3.tar.xz"; - sha256 = "23e2b1be670b48bdd027e4e7a57e86a94b322afe6d37d8492c3d17689decfae5"; - name = "kajongg-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kajongg-20.04.1.tar.xz"; + sha256 = "93ddc88e635377f2c3a82a127b392f8e82e2231c2ad95e928cc15f36e2b3fc57"; + name = "kajongg-20.04.1.tar.xz"; }; }; kalarm = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kalarm-19.12.3.tar.xz"; - sha256 = "526ab8884752c15622233db8b72e88d0c22a7a1bd265763d850b6e18e32de417"; - name = "kalarm-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kalarm-20.04.1.tar.xz"; + sha256 = "d1a910bd1a7b19e15167c83ec51be7946cc84cb473c3ae536684d6f6e2eacb32"; + name = "kalarm-20.04.1.tar.xz"; }; }; kalarmcal = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kalarmcal-19.12.3.tar.xz"; - sha256 = "0ec5188f1164d91de702639ab2f85a713889feef48fc02dfe7385c945d06aa60"; - name = "kalarmcal-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kalarmcal-20.04.1.tar.xz"; + sha256 = "7121dc985241b84fdebb7d45a28c7c993ff51319091887f115f4b2ff3fa90b3c"; + name = "kalarmcal-20.04.1.tar.xz"; }; }; kalgebra = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kalgebra-19.12.3.tar.xz"; - sha256 = "ac865dded31b61c438ddb9db721543b8facba79c9b39365750b4bebfe2645640"; - name = "kalgebra-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kalgebra-20.04.1.tar.xz"; + sha256 = "b49588319105d49132caad8d0a104613467c7369af945fa769d4fc024fb43f09"; + name = "kalgebra-20.04.1.tar.xz"; }; }; kalzium = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kalzium-19.12.3.tar.xz"; - sha256 = "e44f359d1343c30cf1993a3970a3e610d0d5782f92a6b331b035cf4fef104195"; - name = "kalzium-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kalzium-20.04.1.tar.xz"; + sha256 = "fdb066519cc4839ce59a5325729414dd5e6082ce23eff004afee60968744c577"; + name = "kalzium-20.04.1.tar.xz"; }; }; kamera = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kamera-19.12.3.tar.xz"; - sha256 = "22e19527bf9748cdc298be4c3fa2cb0a3b8b337da3a3a804c9d6066d7f3e1110"; - name = "kamera-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kamera-20.04.1.tar.xz"; + sha256 = "d0e0346535d334972b25248d54006e9c3cc3ebd8f1a517c9f11301a5ceff4bf4"; + name = "kamera-20.04.1.tar.xz"; }; }; kamoso = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kamoso-19.12.3.tar.xz"; - sha256 = "9ae14c4c80cdbbf2ce2e92db5e9c814fbd685e81aa5c319aac5477649fc39fe4"; - name = "kamoso-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kamoso-20.04.1.tar.xz"; + sha256 = "5e397cf9a0bd7d5414a8976a2959ac1ebf310d3a2874b3469bd1c959c2908730"; + name = "kamoso-20.04.1.tar.xz"; }; }; kanagram = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kanagram-19.12.3.tar.xz"; - sha256 = "441cae90d3b70dbef40bebbcf1325fa06e0df174a3f961b4b117a5fa1b40d6e3"; - name = "kanagram-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kanagram-20.04.1.tar.xz"; + sha256 = "55f3901c606739078eb1da52639db7ed5646daac909123a8b136d6cea5d569bd"; + name = "kanagram-20.04.1.tar.xz"; }; }; kapman = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kapman-19.12.3.tar.xz"; - sha256 = "3c81e3395ce2b2ea0937b09c0836cb58b8a941c2b7e2a27bd9741b2a9be1c1dd"; - name = "kapman-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kapman-20.04.1.tar.xz"; + sha256 = "051a11bc02f7b555a0c3196485514d06794c6d63f3e55a9c7b0597c7ee992baa"; + name = "kapman-20.04.1.tar.xz"; }; }; kapptemplate = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kapptemplate-19.12.3.tar.xz"; - sha256 = "5bef4e4fb74da3102cba6672584195962514ee3f53fb369b48d492d6ce7255ad"; - name = "kapptemplate-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kapptemplate-20.04.1.tar.xz"; + sha256 = "f1a179a21197eaabac798e79815c43df4df6bd0161aab674e0a9c6725acab18a"; + name = "kapptemplate-20.04.1.tar.xz"; }; }; kate = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kate-19.12.3.tar.xz"; - sha256 = "f60b52e5a6a78920ac703a458f1eaf0ced02ffcd8b5f2d49de9a48674eeb007c"; - name = "kate-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kate-20.04.1.tar.xz"; + sha256 = "f1707e85aa858cc7f1d71ca3400ee12e96c012fb8dd3e472a7387b7dc0f02b5b"; + name = "kate-20.04.1.tar.xz"; }; }; katomic = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/katomic-19.12.3.tar.xz"; - sha256 = "d7ed527e2546e94cb091e433a2e61618301152704c48e1f003e1f8e60b4f0cbd"; - name = "katomic-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/katomic-20.04.1.tar.xz"; + sha256 = "852be12aed5e5dadc84724ac9707b9a4b4edf73b3b5f2b6b12661007ec7d3407"; + name = "katomic-20.04.1.tar.xz"; }; }; kbackup = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kbackup-19.12.3.tar.xz"; - sha256 = "1761009f9cd854d3fb4f98eb24b5ee7f3c42c4541f7cfb2ff1589786c86bdc99"; - name = "kbackup-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kbackup-20.04.1.tar.xz"; + sha256 = "8c8e67c17efda683d67416b82e5dbcdb6706f261cfc10c8d8b6c13547781e477"; + name = "kbackup-20.04.1.tar.xz"; }; }; kblackbox = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kblackbox-19.12.3.tar.xz"; - sha256 = "dffb910a5d429dfc231b7d2185119430856d26af2c027d34c551a6d664ae49c6"; - name = "kblackbox-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kblackbox-20.04.1.tar.xz"; + sha256 = "8d9949c584b213abbdae7ddcb06ca3c03274f7ff6be4c2a09bb5539fda9f3c59"; + name = "kblackbox-20.04.1.tar.xz"; }; }; kblocks = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kblocks-19.12.3.tar.xz"; - sha256 = "5bc5cb14b91c9b230563388b4d935211975bae34ed36cb0479cbf25bc3b652fb"; - name = "kblocks-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kblocks-20.04.1.tar.xz"; + sha256 = "6580387f9364b44a31834528db0046a2bcd6398070db947bfa48690739f01951"; + name = "kblocks-20.04.1.tar.xz"; }; }; kblog = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kblog-19.12.3.tar.xz"; - sha256 = "3fba584c4c217c5b5b3be52752f8f3c371fb877fe3b730a48711028fedc6b3d4"; - name = "kblog-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kblog-20.04.1.tar.xz"; + sha256 = "13ee4a28b5265436b7a72b737a7f1a0713a1c7f93afa6df02e5f73547457235e"; + name = "kblog-20.04.1.tar.xz"; }; }; kbounce = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kbounce-19.12.3.tar.xz"; - sha256 = "d1b7ac99e54070e1e28a3449e8773691e90625c9f881cf94352ef752700197d0"; - name = "kbounce-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kbounce-20.04.1.tar.xz"; + sha256 = "9a752b37694e26268129e2aa2dc550e72c75f0c8cfd9248eca097bb00fe5cfab"; + name = "kbounce-20.04.1.tar.xz"; }; }; kbreakout = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kbreakout-19.12.3.tar.xz"; - sha256 = "ca662c9f2c6765f5f8b07bd4cc2e2aa0a43b69fec6428c3deda2cfad0ab675fa"; - name = "kbreakout-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kbreakout-20.04.1.tar.xz"; + sha256 = "9c4ca0f9123c70f738fc16565106127169336eb438a813ed0683072df1171b71"; + name = "kbreakout-20.04.1.tar.xz"; }; }; kbruch = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kbruch-19.12.3.tar.xz"; - sha256 = "522ddae0b2ec640e70c717a9fe0d6a95aef1ed3fe2acbca4b93a99a309abd559"; - name = "kbruch-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kbruch-20.04.1.tar.xz"; + sha256 = "15bc46fc263694b4a15e963892d9c22d6f76ea993da59ecf5de7ed94207878b2"; + name = "kbruch-20.04.1.tar.xz"; }; }; kcachegrind = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kcachegrind-19.12.3.tar.xz"; - sha256 = "a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41"; - name = "kcachegrind-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kcachegrind-20.04.1.tar.xz"; + sha256 = "4cdbd03e0f27811c16b4c3a31ea25c13468d26641067f76aa0fd06e98c3ea13b"; + name = "kcachegrind-20.04.1.tar.xz"; }; }; kcalc = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kcalc-19.12.3.tar.xz"; - sha256 = "bbda4fc074e1ea748e95840aa79c51fdf0a1943ebb63ce6c7b68c197831258bd"; - name = "kcalc-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kcalc-20.04.1.tar.xz"; + sha256 = "cb90d263b77378a25ba2409618b61dec412a57fb922c7c81a07fe7f1eea32f70"; + name = "kcalc-20.04.1.tar.xz"; }; }; kcalutils = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kcalutils-19.12.3.tar.xz"; - sha256 = "00da1f331110a63c3d3c2c96394ead3d282f582d73fa925065560a50807fb7ff"; - name = "kcalutils-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kcalutils-20.04.1.tar.xz"; + sha256 = "06f5b8a339b2f0c4fe7884e41476960fff03896769a5cd6dc01d3fb81147466c"; + name = "kcalutils-20.04.1.tar.xz"; }; }; kcharselect = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kcharselect-19.12.3.tar.xz"; - sha256 = "9be6ac607148b0815bd985075fbb97d44561fdd6a955b60f0afc728f9cbd978b"; - name = "kcharselect-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kcharselect-20.04.1.tar.xz"; + sha256 = "634dcb6d6b0a723525319f1c056f2808d008d9ee99faf559bcbecfa20df042d0"; + name = "kcharselect-20.04.1.tar.xz"; }; }; kcolorchooser = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kcolorchooser-19.12.3.tar.xz"; - sha256 = "cb0395c1b4f953fd51129cfe5088702ec261f84cc045f889e22c13e81793744a"; - name = "kcolorchooser-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kcolorchooser-20.04.1.tar.xz"; + sha256 = "7810437f7282eb9ad6491a5884a44c8ffd749940e4ffc85e3666e30b93b88cfc"; + name = "kcolorchooser-20.04.1.tar.xz"; }; }; kcron = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kcron-19.12.3.tar.xz"; - sha256 = "22d07834e8431d0fcc756a0e7d92d4e8993008766bf336254f8650c9455c9ab0"; - name = "kcron-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kcron-20.04.1.tar.xz"; + sha256 = "9c956179eea9a6b28d105d921426acb28cc72b1be32be275d89af70763f70fcc"; + name = "kcron-20.04.1.tar.xz"; }; }; kdav = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdav-19.12.3.tar.xz"; - sha256 = "7a0ed47378e064536b26dfdfcf7abcdb8dd2ec253a7bbcef7962b701d368872a"; - name = "kdav-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdav-20.04.1.tar.xz"; + sha256 = "b3d37c335d1df279bb91c2218362a859a117518e9f7a7fc08dde8c4e1b875e83"; + name = "kdav-20.04.1.tar.xz"; }; }; kdebugsettings = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdebugsettings-19.12.3.tar.xz"; - sha256 = "ad18d13dd0943a3651ec4729441899b103bd2dc743a4a373ce7bd14fb38dd3e0"; - name = "kdebugsettings-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdebugsettings-20.04.1.tar.xz"; + sha256 = "5ef5e45c37c9a2922d201f7053b9ed27cf9675c575cb2bb607dda13c86723dd8"; + name = "kdebugsettings-20.04.1.tar.xz"; + }; + }; + kdeconnect-kde = { + version = "20.04.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.04.1/src/kdeconnect-kde-20.04.1.tar.xz"; + sha256 = "788d5d514f329decd956ae79c93260d309a042a275a6e61a2a883bb79abcd0ce"; + name = "kdeconnect-kde-20.04.1.tar.xz"; }; }; kde-dev-scripts = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kde-dev-scripts-19.12.3.tar.xz"; - sha256 = "94c0ba9de369dd6af14dcea505616025bf06599618a6c7557861aa9fb89ea628"; - name = "kde-dev-scripts-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kde-dev-scripts-20.04.1.tar.xz"; + sha256 = "82fe7f3c0713cd9d5613478fb9b9c2208ce9f0add6cedc713001f2022dab18c8"; + name = "kde-dev-scripts-20.04.1.tar.xz"; }; }; kde-dev-utils = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kde-dev-utils-19.12.3.tar.xz"; - sha256 = "772ec425865082b8be3650cf0af10ad943f38096036227cab22405b32c4e1fae"; - name = "kde-dev-utils-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kde-dev-utils-20.04.1.tar.xz"; + sha256 = "01b2d23fd94358b9d771b81680da310830da09e190ded465d20c5ea68cea08a0"; + name = "kde-dev-utils-20.04.1.tar.xz"; }; }; kdeedu-data = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdeedu-data-19.12.3.tar.xz"; - sha256 = "76fd5c0efaf339bcfc5ac9f131bac8889cff1df2dd3452ea7dd507b8d9e2645b"; - name = "kdeedu-data-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdeedu-data-20.04.1.tar.xz"; + sha256 = "c59d4fb421f8a81709c2899e90e2b40191c1c589ae07f989aa9511b08f94c3a8"; + name = "kdeedu-data-20.04.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdegraphics-mobipocket-19.12.3.tar.xz"; - sha256 = "c459f9f04cf98cdc88a6763da8880f418e0c33b3cbd1d06b9a7347ebb470d835"; - name = "kdegraphics-mobipocket-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdegraphics-mobipocket-20.04.1.tar.xz"; + sha256 = "1a617212f196be24a23620a238c7918d00fa2f56280ee5a6f139797d7628e2b2"; + name = "kdegraphics-mobipocket-20.04.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdegraphics-thumbnailers-19.12.3.tar.xz"; - sha256 = "92a045ac0e9ca57ea27760df3cca0203f29ba435574e9d837d0c1069b8e88f72"; - name = "kdegraphics-thumbnailers-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdegraphics-thumbnailers-20.04.1.tar.xz"; + sha256 = "91b2a6f95fe19ddea64999bdb62e1820c43eebfe2f2cf3f261b04a5d392c8915"; + name = "kdegraphics-thumbnailers-20.04.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdenetwork-filesharing-19.12.3.tar.xz"; - sha256 = "8cc75f47ef8038cd7ee75974056cd48022816ab42c76cb6bd2c35a3619445180"; - name = "kdenetwork-filesharing-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdenetwork-filesharing-20.04.1.tar.xz"; + sha256 = "8339c13b4f2509deadf86755fa8ab73615d5cb7808afc357bd46e3bb95a599af"; + name = "kdenetwork-filesharing-20.04.1.tar.xz"; }; }; kdenlive = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdenlive-19.12.3.tar.xz"; - sha256 = "cebcb8f019bc0fc719ef54d00507dc1281758e3c8c69ea2f93f99feda777bc64"; - name = "kdenlive-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdenlive-20.04.1.tar.xz"; + sha256 = "a8957cace200119cfdecc62058f1f2d7e30a314bf5485090b06728ec385bc3d5"; + name = "kdenlive-20.04.1.tar.xz"; }; }; kdepim-addons = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdepim-addons-19.12.3.tar.xz"; - sha256 = "f33bc70ac54ab56eea7bd8ca4c0ac98d9612acc4ddc9ce989d06b99f04f62c19"; - name = "kdepim-addons-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdepim-addons-20.04.1.tar.xz"; + sha256 = "de4b504094754251cb74ca028decae8f8e1e7193e4bffe9c6850857331c46f39"; + name = "kdepim-addons-20.04.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdepim-apps-libs-19.12.3.tar.xz"; - sha256 = "e133cf76364f6b244338eafd39845a9f392eb9b55c43446541acbcb24a6f4796"; - name = "kdepim-apps-libs-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdepim-apps-libs-20.04.1.tar.xz"; + sha256 = "916d17c08de218f786f3515c25fbfca1d2d686e8efad686082569da4a5cb3855"; + name = "kdepim-apps-libs-20.04.1.tar.xz"; }; }; kdepim-runtime = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdepim-runtime-19.12.3.tar.xz"; - sha256 = "dabf7da1ad35dfaa3531639a8964b61dbd7094ec0a9b3d62f50fa24a22f5db13"; - name = "kdepim-runtime-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdepim-runtime-20.04.1.tar.xz"; + sha256 = "efa538972e1d97aee7a8cb7357256818b432ba4c7c3a264eb493b2b739e9c4c6"; + name = "kdepim-runtime-20.04.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdesdk-kioslaves-19.12.3.tar.xz"; - sha256 = "8b075bff545883aba24fee1763d0cdc64bf9444ae865f0623a33fc1ca295d254"; - name = "kdesdk-kioslaves-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdesdk-kioslaves-20.04.1.tar.xz"; + sha256 = "4906481d4c03a5373c95ac20b47ab7f7eece469ea3e1e90c7b77463d73a3d9fd"; + name = "kdesdk-kioslaves-20.04.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdesdk-thumbnailers-19.12.3.tar.xz"; - sha256 = "b304843045f93e91e0aeeeacf968018dc192ea71ed9977be3d9cfc4e149edcde"; - name = "kdesdk-thumbnailers-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdesdk-thumbnailers-20.04.1.tar.xz"; + sha256 = "2efad05749d2bb8148917cfc57880299d4b889bc25781e4c6a23413d74a4d029"; + name = "kdesdk-thumbnailers-20.04.1.tar.xz"; }; }; kdf = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdf-19.12.3.tar.xz"; - sha256 = "257e07e27376f45eaa1bfb1b3055c7f10759ca7ec185aa7572dc60317c8119bd"; - name = "kdf-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdf-20.04.1.tar.xz"; + sha256 = "01579ae0fef0e8d9a871e58bb3d5b582f6c8e8e946505cb7270ba5d45e749770"; + name = "kdf-20.04.1.tar.xz"; }; }; kdialog = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdialog-19.12.3.tar.xz"; - sha256 = "e6f9a7a6b7c2f18795070bf9466dd6256568b02683d955ef3253432216594d00"; - name = "kdialog-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdialog-20.04.1.tar.xz"; + sha256 = "68cd5e24b36d448b0e73af36638a4e1a31942bb510210a8e3b025f0788599a12"; + name = "kdialog-20.04.1.tar.xz"; }; }; kdiamond = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kdiamond-19.12.3.tar.xz"; - sha256 = "95dfd2fd3daa59a58d128c35b95b609117438efdb5d60110414ab7aff5fe3e7c"; - name = "kdiamond-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kdiamond-20.04.1.tar.xz"; + sha256 = "9ed4c3caaefe3be86b7123434595f458f02ef60db212664f162a4e03795763a8"; + name = "kdiamond-20.04.1.tar.xz"; }; }; keditbookmarks = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/keditbookmarks-19.12.3.tar.xz"; - sha256 = "1c5efb63eb0a714942677eb03f91ae0bbd10731eace5471ea12ae9d3296b6b05"; - name = "keditbookmarks-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/keditbookmarks-20.04.1.tar.xz"; + sha256 = "a715a06c76d8f3e9f786b80cb1c23093d0e243631cc2476012c6ba27e55e4de1"; + name = "keditbookmarks-20.04.1.tar.xz"; }; }; kfind = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kfind-19.12.3.tar.xz"; - sha256 = "b3738d6e3f26fffbfcc204d946e165ae0727d9f460cb2065ceb221b4872019b1"; - name = "kfind-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kfind-20.04.1.tar.xz"; + sha256 = "5ee825ec4e9327cd2c4bbbd7a5665de17203e612cf04b19359459e80b2896644"; + name = "kfind-20.04.1.tar.xz"; }; }; kfloppy = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kfloppy-19.12.3.tar.xz"; - sha256 = "7f384f9197d5066a5db978a9551665ae9a90b1f3afd1937f800ab61e376d3723"; - name = "kfloppy-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kfloppy-20.04.1.tar.xz"; + sha256 = "40160fc89ebe9839adc117133d89eed8bb4b6684f812342dcfd982c20005cd57"; + name = "kfloppy-20.04.1.tar.xz"; }; }; kfourinline = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kfourinline-19.12.3.tar.xz"; - sha256 = "1d2f4fdbf427e2ce86a0519ee61a70df0675f039cebd658cd75bd27af4fe69f6"; - name = "kfourinline-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kfourinline-20.04.1.tar.xz"; + sha256 = "a2303eadde7e4c7937d3afa3c2ba274b56e9d12b314c55c569107b3d10b035c7"; + name = "kfourinline-20.04.1.tar.xz"; }; }; kgeography = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kgeography-19.12.3.tar.xz"; - sha256 = "3947ca1f50910d77f85c630b49128a085fed4230c7919e09281bc1765529a533"; - name = "kgeography-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kgeography-20.04.1.tar.xz"; + sha256 = "b6d03fbc053b4e681471e1cc90876cddf805eb760624f8e3a38685ae27ca3d5b"; + name = "kgeography-20.04.1.tar.xz"; }; }; kget = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kget-19.12.3.tar.xz"; - sha256 = "a4b1d8fb94617c80a557c27ae58a14131bda4476340c136262e5bf8f51d918d9"; - name = "kget-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kget-20.04.1.tar.xz"; + sha256 = "b5380270516d266feb4b8a7d84efa91257440f67f033b822c21fbdc8382a9deb"; + name = "kget-20.04.1.tar.xz"; }; }; kgoldrunner = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kgoldrunner-19.12.3.tar.xz"; - sha256 = "5808d797fb9df178526b3ea462bc902ca36b5926ef7c51233816ba3da6bc0bdd"; - name = "kgoldrunner-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kgoldrunner-20.04.1.tar.xz"; + sha256 = "3aac3d6e6e6439c003f22f0b8841eb7b915cb9c8c48f21ab7c781dc0087021db"; + name = "kgoldrunner-20.04.1.tar.xz"; }; }; kgpg = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kgpg-19.12.3.tar.xz"; - sha256 = "53e5726a1ccf34a70090ac0bbf2effb6f1f9f9b3d0164a5beead982a24c97e38"; - name = "kgpg-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kgpg-20.04.1.tar.xz"; + sha256 = "705a0d124b4a344e68df77274800922c611c029f4ec1ec9950efa8ac967ea30d"; + name = "kgpg-20.04.1.tar.xz"; }; }; khangman = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/khangman-19.12.3.tar.xz"; - sha256 = "55286b318ec2c2d8b7e63f4063fc0e39a8ff81c0a9d3f06c9879f141c94762a8"; - name = "khangman-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/khangman-20.04.1.tar.xz"; + sha256 = "b502f916efe4e3a16bf740a92ff32c1a5f55add473d15c62a4a63f9024418e2f"; + name = "khangman-20.04.1.tar.xz"; }; }; khelpcenter = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/khelpcenter-19.12.3.tar.xz"; - sha256 = "526c89e46cace9e8afb4e748f9bbf0d105472a4cc4a6d8bb821e8b9b88ab0f73"; - name = "khelpcenter-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/khelpcenter-20.04.1.tar.xz"; + sha256 = "0b27cbbb66cbff7bebe4c71dc9a2e35e41a8efe748494cd8618ec9fd5496bf73"; + name = "khelpcenter-20.04.1.tar.xz"; }; }; kidentitymanagement = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kidentitymanagement-19.12.3.tar.xz"; - sha256 = "254bfc3a60df7bc1960fa1e6d5b7733f6aa5ed7772c1097d9a8cfcdda2704516"; - name = "kidentitymanagement-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kidentitymanagement-20.04.1.tar.xz"; + sha256 = "f9c14e57349801ee697071f5d931b47b9d5b0ab62116aff7733f640ad34d973a"; + name = "kidentitymanagement-20.04.1.tar.xz"; }; }; kig = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kig-19.12.3.tar.xz"; - sha256 = "1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3"; - name = "kig-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kig-20.04.1.tar.xz"; + sha256 = "2d2a07b69fd2b657b738a73f7d0b5c733d2acc5821846de1efae78bfcb9a5fb1"; + name = "kig-20.04.1.tar.xz"; }; }; kigo = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kigo-19.12.3.tar.xz"; - sha256 = "ee18b8563c49e3e01924ea76cd8c6ec376482c2100e0fac7cdfd14b5899592d5"; - name = "kigo-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kigo-20.04.1.tar.xz"; + sha256 = "dcc732cc39062014dae19f526f0564258b7b75dca648c9700292a7d5ba0014b4"; + name = "kigo-20.04.1.tar.xz"; }; }; killbots = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/killbots-19.12.3.tar.xz"; - sha256 = "3c5dc7e1f27036d2584f6ee58bf3bbffd9e56a467f30a8e2eab9e1bda1e7d4a3"; - name = "killbots-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/killbots-20.04.1.tar.xz"; + sha256 = "f2946d1c9ad5cd7234476f562f698923573edc4089f401770dd49114082f8345"; + name = "killbots-20.04.1.tar.xz"; }; }; kimagemapeditor = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kimagemapeditor-19.12.3.tar.xz"; - sha256 = "1aee6521974bde5151744d92823f6b405ee4a8bd2dfe3c538324a209e18c6b35"; - name = "kimagemapeditor-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kimagemapeditor-20.04.1.tar.xz"; + sha256 = "2e0488664085dd52ec681e92c96ab86aa6087d15aeeb29f99b7867376f76e274"; + name = "kimagemapeditor-20.04.1.tar.xz"; }; }; kimap = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kimap-19.12.3.tar.xz"; - sha256 = "5c3b3cdf928754f9919030d865a2cdad0ad342c82c436afef660d018f85de4d2"; - name = "kimap-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kimap-20.04.1.tar.xz"; + sha256 = "aaea2cb82212e79c2218cd01b5d9db623ae9d34c8876e15db055a48bbfe342f4"; + name = "kimap-20.04.1.tar.xz"; }; }; kio-extras = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kio-extras-19.12.3.tar.xz"; - sha256 = "413cb21479fedf1421a6e2585b4df813c3a3fadaa77c248a9f810021f58cea4b"; - name = "kio-extras-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kio-extras-20.04.1.tar.xz"; + sha256 = "4a81b3f8f81fa7b6d0677d6706bbb9c995db27643ce40fca6501c2c56c2d8f33"; + name = "kio-extras-20.04.1.tar.xz"; }; }; kipi-plugins = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kipi-plugins-19.12.3.tar.xz"; - sha256 = "16997bd6fbb59c194c2997732c870e33bbacd3d7346546af9a255db3330ec5ac"; - name = "kipi-plugins-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kipi-plugins-20.04.1.tar.xz"; + sha256 = "49f969d9078b3395ff307f499e1e17a04e46efb3461822795649b972432bec0a"; + name = "kipi-plugins-20.04.1.tar.xz"; }; }; kirigami-gallery = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kirigami-gallery-19.12.3.tar.xz"; - sha256 = "17febaeb77e0dfc6f591dd285fd7f538466572f2f2e3253461c41f92d6cb05fe"; - name = "kirigami-gallery-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kirigami-gallery-20.04.1.tar.xz"; + sha256 = "3926532f974cf59c2ba89d1692b4d9869ae8b51871c532be44bf5fd92d93f11b"; + name = "kirigami-gallery-20.04.1.tar.xz"; }; }; kiriki = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kiriki-19.12.3.tar.xz"; - sha256 = "abbaa49f9b47286f9afbe7c968eb6fbfeecb4be84ed4b2ce7514a3ed1e92b2d5"; - name = "kiriki-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kiriki-20.04.1.tar.xz"; + sha256 = "7362025232aeb40481ac344da71e1b108fbc74e30083d107d5cdb8e5b2ffb1a1"; + name = "kiriki-20.04.1.tar.xz"; }; }; kiten = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kiten-19.12.3.tar.xz"; - sha256 = "663739a8b252cb95a38294c6f7d675c833daaa81f2654f5cabd8e512fd353560"; - name = "kiten-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kiten-20.04.1.tar.xz"; + sha256 = "62ef7e45692709f296f89de25c4dc649cf0e510233a486549869ba3c884b5f41"; + name = "kiten-20.04.1.tar.xz"; }; }; kitinerary = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kitinerary-19.12.3.tar.xz"; - sha256 = "4188efe8672091cbdaa4f757f5d8b94a30b1373dceafc076b01330602d5086e2"; - name = "kitinerary-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kitinerary-20.04.1.tar.xz"; + sha256 = "ba3a61e482ce5a148b5b403198e7ad67704c8a6cc7ca4fce58ddef8c66f4b4cf"; + name = "kitinerary-20.04.1.tar.xz"; }; }; kjumpingcube = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kjumpingcube-19.12.3.tar.xz"; - sha256 = "b969111cb884efc9ad8ef585066ca33d7168bb045c93a3f18668173a11d29ea2"; - name = "kjumpingcube-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kjumpingcube-20.04.1.tar.xz"; + sha256 = "c1918ec80759a019ce5821eb7445de629bcb68df3cc47db08f9121881bab506b"; + name = "kjumpingcube-20.04.1.tar.xz"; }; }; kldap = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kldap-19.12.3.tar.xz"; - sha256 = "49f1ad32ae10b7f997c77f3a8db0776b972b93f9e18873b77baabf0db05cd5d4"; - name = "kldap-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kldap-20.04.1.tar.xz"; + sha256 = "d92b07339cbd01efd53edf102d0b17065fa6f95601650b1c065d336f50b91472"; + name = "kldap-20.04.1.tar.xz"; }; }; kleopatra = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kleopatra-19.12.3.tar.xz"; - sha256 = "04edf29e42088b2bccdfe36b9b7170c38acd7816657673da5393244b73773098"; - name = "kleopatra-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kleopatra-20.04.1.tar.xz"; + sha256 = "d6dc989f4ee441aecba4c77ed41dc85389f8c96664ccf1d19aee882ad6b7a0d4"; + name = "kleopatra-20.04.1.tar.xz"; }; }; klettres = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/klettres-19.12.3.tar.xz"; - sha256 = "f2a1bbb002954a80045780de24f494154214b8add53a5c01a8783cbeb26d26c7"; - name = "klettres-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/klettres-20.04.1.tar.xz"; + sha256 = "831cb557366b84649ca5d64f414ebc02c20e19cc9eb350893006f10470248db4"; + name = "klettres-20.04.1.tar.xz"; }; }; klickety = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/klickety-19.12.3.tar.xz"; - sha256 = "351e421ecca5fc80955ed614453c81d8b790200185db16f56be1e0ca9325ad39"; - name = "klickety-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/klickety-20.04.1.tar.xz"; + sha256 = "5964fb7926d342f3516c13e4aaecd5166913af853b063e51196a92fff4ebd8dc"; + name = "klickety-20.04.1.tar.xz"; }; }; klines = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/klines-19.12.3.tar.xz"; - sha256 = "8d11894d0a02de20090e52ef697a5a3c00e902213c018a82c94ca0985e92350a"; - name = "klines-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/klines-20.04.1.tar.xz"; + sha256 = "0d0f124ee9a5d5b7ecd3bfd687b6f665b46dc5db6dabbefac9cde4ba0ad68f22"; + name = "klines-20.04.1.tar.xz"; }; }; kmag = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmag-19.12.3.tar.xz"; - sha256 = "d1e8bbc8006cd2cfcb345e30aac73350562bff98b69b0333ad49726cdce81e7e"; - name = "kmag-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmag-20.04.1.tar.xz"; + sha256 = "a51a876df4286d49f899791a30791509c668efebe9045930e2fb8194454493a2"; + name = "kmag-20.04.1.tar.xz"; }; }; kmahjongg = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmahjongg-19.12.3.tar.xz"; - sha256 = "41a07f74cc4e3bf05f6a57a380d4e093b0303528cb703369981b262a0b1787c8"; - name = "kmahjongg-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmahjongg-20.04.1.tar.xz"; + sha256 = "fdfbf777f41b98de4f004594b2f08eb06971a4e2a236a52ded1f66b2757f0a7b"; + name = "kmahjongg-20.04.1.tar.xz"; }; }; kmail = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmail-19.12.3.tar.xz"; - sha256 = "7f70e5270960e474b15631a36110e13fdf7238d6fd9f1b3fdb6d8c145b6529ba"; - name = "kmail-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmail-20.04.1.tar.xz"; + sha256 = "77fcbd6dad9d6dcf302db8591bdaefe8379314939a90c9ca3555ab5be2ef0e1b"; + name = "kmail-20.04.1.tar.xz"; }; }; kmail-account-wizard = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmail-account-wizard-19.12.3.tar.xz"; - sha256 = "4199e8c73456bf31b829596919ca481c3a95e59dee7c9bfb2e680311d0354ff0"; - name = "kmail-account-wizard-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmail-account-wizard-20.04.1.tar.xz"; + sha256 = "4dadc238ba43bb5f0d1ebeef3a8696b508851d4e331b18b691831a0227259241"; + name = "kmail-account-wizard-20.04.1.tar.xz"; }; }; kmailtransport = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmailtransport-19.12.3.tar.xz"; - sha256 = "077b3dba7c02dde9693c003ab7039f3b2a530e3b1aecfcf187313db5226e8953"; - name = "kmailtransport-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmailtransport-20.04.1.tar.xz"; + sha256 = "75abe8cd02c628950906f979fe29aa23659afcd770e91442750ed3dfffa398eb"; + name = "kmailtransport-20.04.1.tar.xz"; }; }; kmbox = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmbox-19.12.3.tar.xz"; - sha256 = "de69683abb42c5c24ccb4f034e067f50c94d5a10c53f359b0e6ad4b75a70b376"; - name = "kmbox-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmbox-20.04.1.tar.xz"; + sha256 = "2ccfc0d2c12acedf72713ee31c8a7b586b95e4826434a333ab3478b2d1f0960d"; + name = "kmbox-20.04.1.tar.xz"; }; }; kmime = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmime-19.12.3.tar.xz"; - sha256 = "5ed20ad77000c60ba5723aaa22149fca3a3956f930d63e70984f0a17b9339300"; - name = "kmime-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmime-20.04.1.tar.xz"; + sha256 = "59d0ec6905c7a7228f7837c2e498052e84484954e1ea42b1c720f81cb2eb6db6"; + name = "kmime-20.04.1.tar.xz"; }; }; kmines = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmines-19.12.3.tar.xz"; - sha256 = "05d8004f2e560bf2c9e32a3ca1988b3848b99bfb9cc96307c1ac2b703c202dad"; - name = "kmines-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmines-20.04.1.tar.xz"; + sha256 = "a167441b999216ad410657fb94e50f71ba27ea8a9e52a5dedcd24985e937d163"; + name = "kmines-20.04.1.tar.xz"; }; }; kmix = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmix-19.12.3.tar.xz"; - sha256 = "a4c637383e988ffa21b9c48c72ef6d8855fe207c852d0679011337a331ccfc5c"; - name = "kmix-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmix-20.04.1.tar.xz"; + sha256 = "cd06a84b3b94ac8f3cebd69e34c36ed19998ba8d70067a0dcb989f72af1745d9"; + name = "kmix-20.04.1.tar.xz"; }; }; kmousetool = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmousetool-19.12.3.tar.xz"; - sha256 = "3741aff20c778bb704c76df7ff005da36ef6c41b07fca35f257ba440741b8413"; - name = "kmousetool-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmousetool-20.04.1.tar.xz"; + sha256 = "28791546f1ca336aaaae0e4a2a140c1daec1c77a40aa8a6e24dac2f8515f4606"; + name = "kmousetool-20.04.1.tar.xz"; }; }; kmouth = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmouth-19.12.3.tar.xz"; - sha256 = "424dd4cf81cd43e47630ada0f2a9e47be8106b31ebf2e5c8c1077e55e3a8113f"; - name = "kmouth-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmouth-20.04.1.tar.xz"; + sha256 = "e7b1a7df6546e5361c060af4d107ead483e5207be78dd1f26075d7a43dedcfa9"; + name = "kmouth-20.04.1.tar.xz"; }; }; kmplot = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kmplot-19.12.3.tar.xz"; - sha256 = "2743e3a472ccf40281f5afd9c6110dde6fb9bc437e8e291beba484d405d8152e"; - name = "kmplot-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kmplot-20.04.1.tar.xz"; + sha256 = "a851b568b01323fbf97b14866f1ed8371f69b23ef508484e5fc91484ff622cd9"; + name = "kmplot-20.04.1.tar.xz"; }; }; knavalbattle = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/knavalbattle-19.12.3.tar.xz"; - sha256 = "59875e10b0f2b06c2d3165f2f2457113f04550215947c8296ce1dcaf385ee37f"; - name = "knavalbattle-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/knavalbattle-20.04.1.tar.xz"; + sha256 = "36a13173f14433109007851a952d9a9ba28f4646ce48b9450854e62ab72f88af"; + name = "knavalbattle-20.04.1.tar.xz"; }; }; knetwalk = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/knetwalk-19.12.3.tar.xz"; - sha256 = "24cb7cfa4143b2ab1bcaf38a6698cd01252201238c6561bc711e0673366642ae"; - name = "knetwalk-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/knetwalk-20.04.1.tar.xz"; + sha256 = "3144bad390f29371361774d2e696c65891942191035cec3fb249d679227f9569"; + name = "knetwalk-20.04.1.tar.xz"; }; }; knights = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/knights-19.12.3.tar.xz"; - sha256 = "4796654dcaff355b4f1097260748cfe04812ff926acc7ca0f037711875dd1512"; - name = "knights-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/knights-20.04.1.tar.xz"; + sha256 = "7038b75a5ea6cdecffb2105c0f27f9e7f44287d41b13a7bb31c468612ce82a87"; + name = "knights-20.04.1.tar.xz"; }; }; knotes = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/knotes-19.12.3.tar.xz"; - sha256 = "b27846609dfac1ffcb3ac5e7165b7557231b096f6a84206da956c37233aed7b0"; - name = "knotes-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/knotes-20.04.1.tar.xz"; + sha256 = "5dc6764ab4d3cfd18a1a1a8caa2f01499ad32e5dd7f03a8b0bcfdcb2dcb1048e"; + name = "knotes-20.04.1.tar.xz"; }; }; kolf = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kolf-19.12.3.tar.xz"; - sha256 = "2ba1f781d7d98ca0b10231e4f963b27d043c726f44da662b6c77105da4f9cffc"; - name = "kolf-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kolf-20.04.1.tar.xz"; + sha256 = "48d615f63928f29f7043bdf750899fda98f7329d1f170ceb6e1b75e77b5cf37f"; + name = "kolf-20.04.1.tar.xz"; }; }; kollision = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kollision-19.12.3.tar.xz"; - sha256 = "ce0bb077e8db8a959f965d463bb25bac02c91585b422af6c9249ad8a8f25eaab"; - name = "kollision-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kollision-20.04.1.tar.xz"; + sha256 = "fc6c01ec19583b910af3a7d4155abc9ec30518c88399b8e540bb1febf477aee5"; + name = "kollision-20.04.1.tar.xz"; }; }; kolourpaint = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kolourpaint-19.12.3.tar.xz"; - sha256 = "7c134da2feb75a87bfda6b4265ef705868a9be03d70a828111a2869ca0b517b1"; - name = "kolourpaint-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kolourpaint-20.04.1.tar.xz"; + sha256 = "897154fc53b7406ded0a78466300fa98ff7be36f85a324aefdc040f676ed5f25"; + name = "kolourpaint-20.04.1.tar.xz"; }; }; kompare = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kompare-19.12.3.tar.xz"; - sha256 = "b89b266b6f648500627d2e70df29b73248c7b7d7d5e7c1bbcaddaedf072f6f1a"; - name = "kompare-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kompare-20.04.1.tar.xz"; + sha256 = "86bcd9890715cd19253cf8f3d67ae816617c8266241ef1a77a9549e2d56dc39c"; + name = "kompare-20.04.1.tar.xz"; }; }; konqueror = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/konqueror-19.12.3.tar.xz"; - sha256 = "0f2b31a1dae1740839232bd646bf22d7cb57e34995584b9a96271ebcb0da7f0e"; - name = "konqueror-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/konqueror-20.04.1.tar.xz"; + sha256 = "15d0b65e32a57d724abf50c0bd3cdc43613a193b1b442d731e6aecddf7a2713b"; + name = "konqueror-20.04.1.tar.xz"; }; }; konquest = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/konquest-19.12.3.tar.xz"; - sha256 = "e23732a7d78382c73fca0d31afb3ed85614ee4b4bfe2f07647a13582fa0811a5"; - name = "konquest-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/konquest-20.04.1.tar.xz"; + sha256 = "f2f18ac95cb1ee72d20d3adbf884ca514edc6bdc960ef9c1361d565cba23cdd8"; + name = "konquest-20.04.1.tar.xz"; }; }; konsole = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/konsole-19.12.3.tar.xz"; - sha256 = "0bde8eb6365c53e96489d0ceb05baa0bb0385ee865492622033164a4c4bfccdc"; - name = "konsole-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/konsole-20.04.1.tar.xz"; + sha256 = "b5ada61759b4731cccb3814c4cc9a495c309ad93c9943e4b7e802b3fe53a7932"; + name = "konsole-20.04.1.tar.xz"; }; }; kontact = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kontact-19.12.3.tar.xz"; - sha256 = "8dbd01f73c181f7b44df5dfffac1cf33c36b36149294fd854403bada9ef33052"; - name = "kontact-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kontact-20.04.1.tar.xz"; + sha256 = "4911776068a8ec41b19769957018782a061cc3d090e7631a00de2ed4723f224b"; + name = "kontact-20.04.1.tar.xz"; }; }; kontactinterface = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kontactinterface-19.12.3.tar.xz"; - sha256 = "1a0392cbeb6833f4834c86f202ff06e5b6069d12100bffe37de6427f0531af89"; - name = "kontactinterface-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kontactinterface-20.04.1.tar.xz"; + sha256 = "72745cf857ab6cecef331582ba8c806fa386d03b99a44aa30b6bed2979a83868"; + name = "kontactinterface-20.04.1.tar.xz"; }; }; kopete = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kopete-19.12.3.tar.xz"; - sha256 = "8d58fb0c9dd8b651bfc996e6928f7ccdad8e21cba39ffd0e54d46f7145fa7b27"; - name = "kopete-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kopete-20.04.1.tar.xz"; + sha256 = "3ea0b53f644a5aa31f720b462d58e3eecf37aa9a381a02dc2c02513f618a2f91"; + name = "kopete-20.04.1.tar.xz"; }; }; korganizer = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/korganizer-19.12.3.tar.xz"; - sha256 = "ea0a970aa510d5cdbbf80e974049fa3e7591e02c9ec2c4206137c49266df1acb"; - name = "korganizer-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/korganizer-20.04.1.tar.xz"; + sha256 = "5964961df1b34949e879c37286af64f4f7976250323d7d7ff297829c1b1d9f12"; + name = "korganizer-20.04.1.tar.xz"; }; }; kpat = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kpat-19.12.3.tar.xz"; - sha256 = "00b823b1b204b68e0c8671e5ddfe5f96abe8c9fcfb1efa9b7f70191cfa5384e1"; - name = "kpat-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kpat-20.04.1.tar.xz"; + sha256 = "647527a727df2d3ee41054025ebe3703f6da6c4d2a56262260d2dac0a78da22c"; + name = "kpat-20.04.1.tar.xz"; }; }; kpimtextedit = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kpimtextedit-19.12.3.tar.xz"; - sha256 = "64be03d7a8d4b9ece40c0065a23113023c2b3320dc57068fe00f6c4bc72537d5"; - name = "kpimtextedit-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kpimtextedit-20.04.1.tar.xz"; + sha256 = "9e97bec1aedfa40da74ac561a5d0d22d5e4512e71a97c339e8831540b626cd48"; + name = "kpimtextedit-20.04.1.tar.xz"; }; }; kpkpass = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kpkpass-19.12.3.tar.xz"; - sha256 = "45723989170e86c6739c8a377c54b3ba7456a8dc3ed6cf52eef884074c2df189"; - name = "kpkpass-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kpkpass-20.04.1.tar.xz"; + sha256 = "c7841a70df52bd5ba8dbf4e8358b9728b287c1513315135c7ca3ba76cec3cd0d"; + name = "kpkpass-20.04.1.tar.xz"; }; }; kqtquickcharts = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kqtquickcharts-19.12.3.tar.xz"; - sha256 = "94669a7add0cef9a1c0969a92ece8e60a67fbb0ff32826cc49ce87bd890c976c"; - name = "kqtquickcharts-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kqtquickcharts-20.04.1.tar.xz"; + sha256 = "2376df3641f2e421ba7fe10c8e6f14b8e5299641b4e94ae27f97fee46a19b7f3"; + name = "kqtquickcharts-20.04.1.tar.xz"; }; }; krdc = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/krdc-19.12.3.tar.xz"; - sha256 = "12602912abbc22e061067b6b5048d37a7cbdaaf99d203829d3f52fdf7319acce"; - name = "krdc-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/krdc-20.04.1.tar.xz"; + sha256 = "39f14c577c5f23c3b223ed3200743374d81f4e7dd2fa88c5be9d656dc71ce2c2"; + name = "krdc-20.04.1.tar.xz"; }; }; kreversi = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kreversi-19.12.3.tar.xz"; - sha256 = "6bfe3a2faa7c0d08fb689b75341bfd5881d66bc865445573b2f4dbb316a751e8"; - name = "kreversi-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kreversi-20.04.1.tar.xz"; + sha256 = "b9cf0a7729744fcd761f2eefb1e1b13693b4917928afd5236bd0fb248164c97c"; + name = "kreversi-20.04.1.tar.xz"; }; }; krfb = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/krfb-19.12.3.tar.xz"; - sha256 = "cb88997dc7b15b992d1de5c5cabaeccb37122e20823501ac29140875259782ee"; - name = "krfb-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/krfb-20.04.1.tar.xz"; + sha256 = "33943e5529a9ad436562790e56c91054475986fbfb8ccfbf98af5e8990955124"; + name = "krfb-20.04.1.tar.xz"; }; }; kross-interpreters = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kross-interpreters-19.12.3.tar.xz"; - sha256 = "2b4060494901a68ca1d07e0c345cc0814e11fb84e9f48014a7231021e4377487"; - name = "kross-interpreters-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kross-interpreters-20.04.1.tar.xz"; + sha256 = "fa5839fca67d89f33b94cf38acef42e5f556d9ea3c995030ff72dc30ae8fc51c"; + name = "kross-interpreters-20.04.1.tar.xz"; }; }; kruler = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kruler-19.12.3.tar.xz"; - sha256 = "803a0d31bbb5bfbfa057b13a7f6bbf7630dcc1816a0d41ea13cc4592bdacaa47"; - name = "kruler-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kruler-20.04.1.tar.xz"; + sha256 = "8726f5580a1e0ea1f3dd16806bd99fbaad41d279a77037fdc6b07af7a910cd6c"; + name = "kruler-20.04.1.tar.xz"; }; }; kshisen = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kshisen-19.12.3.tar.xz"; - sha256 = "f6ce353725d71ce65269b1b7b3d118cb8555cd065db0d3b17fe4696d87c10601"; - name = "kshisen-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kshisen-20.04.1.tar.xz"; + sha256 = "9029c459f60b13feb00de2ac2755a73b319b18cf1a53ee38e4fa0b075e5831f6"; + name = "kshisen-20.04.1.tar.xz"; }; }; ksirk = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ksirk-19.12.3.tar.xz"; - sha256 = "6387d7a6320e644157f10b94474ca715e7ad7fd15cdf7156a8e7d94bff019dcb"; - name = "ksirk-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ksirk-20.04.1.tar.xz"; + sha256 = "a7b20b97ac22c54b0f6e2ebbb8e6105a2087010d62b887e875d8a22df399a5f9"; + name = "ksirk-20.04.1.tar.xz"; }; }; ksmtp = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ksmtp-19.12.3.tar.xz"; - sha256 = "1fd69f494afee91c11667ddbba43bc6cc316b51acf5894fe4c3a2631f53fae27"; - name = "ksmtp-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ksmtp-20.04.1.tar.xz"; + sha256 = "1daebe85fddbab20a6891d6fea6d57fd6b6314f665aac81b1eac81ba2254caf7"; + name = "ksmtp-20.04.1.tar.xz"; }; }; ksnakeduel = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ksnakeduel-19.12.3.tar.xz"; - sha256 = "8db1dece78571f3e6933f8edcd693c3ceb1035acff780547a72c98b9f7decb87"; - name = "ksnakeduel-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ksnakeduel-20.04.1.tar.xz"; + sha256 = "bff33c30e7d264f47b023c66680d09c31bda17f01859a65a2711ce8b59c34083"; + name = "ksnakeduel-20.04.1.tar.xz"; }; }; kspaceduel = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kspaceduel-19.12.3.tar.xz"; - sha256 = "a9b5dc498b3695b59ae8925cc572cfc521ccadc8532756fa95ac876a7423c444"; - name = "kspaceduel-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kspaceduel-20.04.1.tar.xz"; + sha256 = "af22a7944b30cfc8e26f88a19a25eba880691f52baf7b35606e1634d4707bd3b"; + name = "kspaceduel-20.04.1.tar.xz"; }; }; ksquares = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ksquares-19.12.3.tar.xz"; - sha256 = "45a922e4d85835cc655de560b6fd9be87d8cabc74eadbdecda3f17ba53ac92af"; - name = "ksquares-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ksquares-20.04.1.tar.xz"; + sha256 = "561407854ce0ea2a0408be7088cdbcd1355d2281670b520bd52ccb61341f9b55"; + name = "ksquares-20.04.1.tar.xz"; }; }; ksudoku = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ksudoku-19.12.3.tar.xz"; - sha256 = "1cf36e762f31464b0640a88c739dfbb39b10129cace7fb5b74093ec607dea06c"; - name = "ksudoku-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ksudoku-20.04.1.tar.xz"; + sha256 = "f4ff5d465b56b7f2c0c399ae22d8897c3530bf2254a639b26c31ed8c0351d21c"; + name = "ksudoku-20.04.1.tar.xz"; }; }; ksystemlog = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ksystemlog-19.12.3.tar.xz"; - sha256 = "8225b1308ace76ebbf9bb805a2b6fae9bf8a425d0b09518645234c1b2df522dc"; - name = "ksystemlog-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ksystemlog-20.04.1.tar.xz"; + sha256 = "d16ad8b37a5a751ec8c5a72b6738a7cffacdd2698246ec3f6f9d6eeb138246a0"; + name = "ksystemlog-20.04.1.tar.xz"; }; }; kteatime = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kteatime-19.12.3.tar.xz"; - sha256 = "0ab5fb6e33583e6d627b8f9dfaba5ce59e2b363e8045dfc66a4f65236d56542f"; - name = "kteatime-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kteatime-20.04.1.tar.xz"; + sha256 = "7487ee83c88dc4ad023e8ded99418203205eec7fbb2d43816da53d0c2f728ce1"; + name = "kteatime-20.04.1.tar.xz"; }; }; ktimer = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktimer-19.12.3.tar.xz"; - sha256 = "921af876a176a4731a74b5e9e76d751853043ec4f4857301b39a5c680246557c"; - name = "ktimer-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktimer-20.04.1.tar.xz"; + sha256 = "e705dd4fdad6c4289ab911142128a5b1988de3790d701378da9863c61eaececb"; + name = "ktimer-20.04.1.tar.xz"; }; }; ktnef = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktnef-19.12.3.tar.xz"; - sha256 = "3537515b432e5da00d401046e94e0098fa54c071246cb0e357e3d8f47296ed3c"; - name = "ktnef-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktnef-20.04.1.tar.xz"; + sha256 = "29c8aba942aaf1f099b1e2f7bda9000d124aa710ac04e6bd295a4dc1c5b8c532"; + name = "ktnef-20.04.1.tar.xz"; }; }; ktouch = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktouch-19.12.3.tar.xz"; - sha256 = "522fb081da5877717d577493fdaeeecbfe3d8d773e5d7fc83ecced008744ef0e"; - name = "ktouch-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktouch-20.04.1.tar.xz"; + sha256 = "cc33d04d4d8c3f35d351a5d168b69275722e0482a07c1aa85b8ccaea7ea721df"; + name = "ktouch-20.04.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-accounts-kcm-19.12.3.tar.xz"; - sha256 = "ae5ae5004ecbf34596711a56e069d480c952de5ea784f5e90c391750439aff51"; - name = "ktp-accounts-kcm-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-accounts-kcm-20.04.1.tar.xz"; + sha256 = "0783a0478709b42a6183dda95d5a8abcdc079b54d497bcfe3f7f862b80c66559"; + name = "ktp-accounts-kcm-20.04.1.tar.xz"; }; }; ktp-approver = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-approver-19.12.3.tar.xz"; - sha256 = "af4f6d247b6332745f6b6dfacef74eb2ea0f7bbea9398080fc7b57e5953fdfbd"; - name = "ktp-approver-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-approver-20.04.1.tar.xz"; + sha256 = "6c7db7142ea1d93eb5f85102caef846838af01804af9ebcf00f92536a068bb8d"; + name = "ktp-approver-20.04.1.tar.xz"; }; }; ktp-auth-handler = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-auth-handler-19.12.3.tar.xz"; - sha256 = "40822e78879d97c3cc1d16f44f7d3b581980c4e249a273d7471b291adf3b9225"; - name = "ktp-auth-handler-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-auth-handler-20.04.1.tar.xz"; + sha256 = "1aeef044bfa5d05b62323a2f04a75000376540a23cd24401a9d192f047b3c8f0"; + name = "ktp-auth-handler-20.04.1.tar.xz"; }; }; ktp-call-ui = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-call-ui-19.12.3.tar.xz"; - sha256 = "96b1dd64b0f87228d76f12b6cad3677afeb4c44d6f18645c3001555506573fb1"; - name = "ktp-call-ui-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-call-ui-20.04.1.tar.xz"; + sha256 = "ecf694205bde02e9abc06ada604d4b02eb6bcc4274746b001481ed06f14f6b12"; + name = "ktp-call-ui-20.04.1.tar.xz"; }; }; ktp-common-internals = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-common-internals-19.12.3.tar.xz"; - sha256 = "48cde7fc4f2f0d39999f70699867044e0f85e06769a0824aac49c572fb1af5a4"; - name = "ktp-common-internals-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-common-internals-20.04.1.tar.xz"; + sha256 = "0a5707920c9d2162767407e5e04e0f1fd426a84a7bbec11dfed4ebbb32817dae"; + name = "ktp-common-internals-20.04.1.tar.xz"; }; }; ktp-contact-list = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-contact-list-19.12.3.tar.xz"; - sha256 = "093544e84ca12169966837be5f01d339ddc59e5f031d78e68ddf7be4dd890efd"; - name = "ktp-contact-list-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-contact-list-20.04.1.tar.xz"; + sha256 = "0d3756ab9a8958d971c2419f4e79cdea35b2f393c79938980c1e5b57456d6de1"; + name = "ktp-contact-list-20.04.1.tar.xz"; }; }; ktp-contact-runner = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-contact-runner-19.12.3.tar.xz"; - sha256 = "50646e8670449d6f6a9b107e36f18174b5ec37052a7b4f471617f4f53fecc96b"; - name = "ktp-contact-runner-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-contact-runner-20.04.1.tar.xz"; + sha256 = "bf0a6475d30e03a8f4181bb5ca8497147c7b2279eb0f8544deebb79039cd8556"; + name = "ktp-contact-runner-20.04.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-desktop-applets-19.12.3.tar.xz"; - sha256 = "4ab8f04537345db8e41ed9f8ff7a6a2f3135e3539382cef97d1a7e9f0eddb54e"; - name = "ktp-desktop-applets-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-desktop-applets-20.04.1.tar.xz"; + sha256 = "30fb419ebf7acd89f354e4b9043dfd3dc2ec971e8f445b0de64e1a1f2929b46e"; + name = "ktp-desktop-applets-20.04.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-filetransfer-handler-19.12.3.tar.xz"; - sha256 = "b2e81fec33b51628d9d88707b6bd844c69eb2c9bfb00cb0b45759a4fd9769b03"; - name = "ktp-filetransfer-handler-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-filetransfer-handler-20.04.1.tar.xz"; + sha256 = "a692c5f2eadf423bfb5c685e9ad4e7e4243b5f45b12d3700d2db352808b6508c"; + name = "ktp-filetransfer-handler-20.04.1.tar.xz"; }; }; ktp-kded-module = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-kded-module-19.12.3.tar.xz"; - sha256 = "6bb0c05683812738e254c88d39936565966096a7156111565d8a64a59c55ef0d"; - name = "ktp-kded-module-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-kded-module-20.04.1.tar.xz"; + sha256 = "2bce15e4a689cf35b9e0c353a9c4a4b13de9b703f680f71d7ef9be49205ef9c8"; + name = "ktp-kded-module-20.04.1.tar.xz"; }; }; ktp-send-file = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-send-file-19.12.3.tar.xz"; - sha256 = "566d9dccc0c2fa7c23c95051c25543d3aabe76065ddff7dff9d8a37683d2022b"; - name = "ktp-send-file-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-send-file-20.04.1.tar.xz"; + sha256 = "ba0ffac5f78bb047a29b5f6356c202332d7c9871d383a2086195697f7cb8db25"; + name = "ktp-send-file-20.04.1.tar.xz"; }; }; ktp-text-ui = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktp-text-ui-19.12.3.tar.xz"; - sha256 = "b8ad9a224ae300c0412874d0877fdc8e050869d3a8f60a4051a0919a8749c50f"; - name = "ktp-text-ui-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktp-text-ui-20.04.1.tar.xz"; + sha256 = "5f9731344e902d3f476c4fbdb016e2c9881922efc388963a509e5c2db237c9cc"; + name = "ktp-text-ui-20.04.1.tar.xz"; }; }; ktuberling = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/ktuberling-19.12.3.tar.xz"; - sha256 = "c4d74d18173d5761f7e6f8adf6178713a726c671aaa2eda4e6c77115484e9e55"; - name = "ktuberling-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/ktuberling-20.04.1.tar.xz"; + sha256 = "15026bf0aa8c4cf4d7e12da931466d195aea65d1daff2fd74971ac1524f0c55f"; + name = "ktuberling-20.04.1.tar.xz"; }; }; kturtle = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kturtle-19.12.3.tar.xz"; - sha256 = "6958a88c484261919cd89cb1f0d163b0c5d5f1e28b10b3b4e3b6b9e82e379ef1"; - name = "kturtle-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kturtle-20.04.1.tar.xz"; + sha256 = "eee20401ea3644b4abbe0f6aadbd4068109b2239aabb35e7899633696e802948"; + name = "kturtle-20.04.1.tar.xz"; }; }; kubrick = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kubrick-19.12.3.tar.xz"; - sha256 = "8fc0a0e68d255481c6efb3f4ff894c5e376367b29958c4738bd72d3f4b1ff557"; - name = "kubrick-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kubrick-20.04.1.tar.xz"; + sha256 = "197fb16a531dcf5be141962bef2a01e877f1f26c65b4de72d6e193b7287744e1"; + name = "kubrick-20.04.1.tar.xz"; }; }; kwalletmanager = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kwalletmanager-19.12.3.tar.xz"; - sha256 = "247c7f80a54babd21a13e6b9386370b72ec12bdf928c08a7e8a647ccca53e393"; - name = "kwalletmanager-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kwalletmanager-20.04.1.tar.xz"; + sha256 = "5f7d2602881474afc56708a1ff1f7afae5dae7f77409cf497d89b9345a9251c6"; + name = "kwalletmanager-20.04.1.tar.xz"; }; }; kwave = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kwave-19.12.3.tar.xz"; - sha256 = "3c90115d4702dbe46767e2404c952d84533137fa558b787b87ff95ed61f6930d"; - name = "kwave-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kwave-20.04.1.tar.xz"; + sha256 = "dc4754b651380e9c6c8ac740f37ea118a7e6e2d91ee5ce4abaf10976c7414a7b"; + name = "kwave-20.04.1.tar.xz"; }; }; kwordquiz = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/kwordquiz-19.12.3.tar.xz"; - sha256 = "6965a3b3c171c3f62aeecf4ccdddde14d23062ab914b1860822546a5770b80fc"; - name = "kwordquiz-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/kwordquiz-20.04.1.tar.xz"; + sha256 = "e1829615763689958936971b9b89f52288c280843682def74082379d4d7d6a0f"; + name = "kwordquiz-20.04.1.tar.xz"; }; }; libgravatar = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libgravatar-19.12.3.tar.xz"; - sha256 = "70ea306f48aede9f8f327eaa74ea5ce5761e5dfe67f2da50d3242c0f312edc86"; - name = "libgravatar-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libgravatar-20.04.1.tar.xz"; + sha256 = "22275231f63c625fa60ff8ddaf1cd52f2fa03ccea7c010a6231b883c45640125"; + name = "libgravatar-20.04.1.tar.xz"; }; }; libkcddb = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkcddb-19.12.3.tar.xz"; - sha256 = "69cbaf03adba24c0cabf957ee4149c4fa86d403eb6b8a07f7f80eb17be49e892"; - name = "libkcddb-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkcddb-20.04.1.tar.xz"; + sha256 = "1068e8263cc9f0c93ecee9a27cd2a2fdc4e417524d765c28c4ba368aa4f299bb"; + name = "libkcddb-20.04.1.tar.xz"; }; }; libkcompactdisc = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkcompactdisc-19.12.3.tar.xz"; - sha256 = "74aac7dcac84c60a7962f23e7bcc6eb693048fd96ca21015441a87487baa9d1c"; - name = "libkcompactdisc-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkcompactdisc-20.04.1.tar.xz"; + sha256 = "7d693691e5ce39890b6f5ddd12f73c3ee31cf6e17ce2485ab3366bdc2188c447"; + name = "libkcompactdisc-20.04.1.tar.xz"; }; }; libkdcraw = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkdcraw-19.12.3.tar.xz"; - sha256 = "9454aed707ee311dbfb921f8d45fba11710ffc01f48d65f64585d12c2580116f"; - name = "libkdcraw-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkdcraw-20.04.1.tar.xz"; + sha256 = "21cf13ec2184702c8196e2e21dda831809d636932968f503f60bde48ee248c29"; + name = "libkdcraw-20.04.1.tar.xz"; }; }; libkdegames = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkdegames-19.12.3.tar.xz"; - sha256 = "39cf5039b7fe11688028df026252c9cd4424546817b5bb635af2558f71ba6b20"; - name = "libkdegames-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkdegames-20.04.1.tar.xz"; + sha256 = "233ce6110a4cda82f2469e220db5e99ec464d8afcd77c5a4522572c9e1ce59f7"; + name = "libkdegames-20.04.1.tar.xz"; }; }; libkdepim = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkdepim-19.12.3.tar.xz"; - sha256 = "911e7d174240d4c056472549dbd1f3da4467a57c765f3cb34fbac32943f38dbb"; - name = "libkdepim-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkdepim-20.04.1.tar.xz"; + sha256 = "0a36c8b799f102cc3ca4a880297ba2a14ba371f7d7f53cea9baf2b1a4c995a2d"; + name = "libkdepim-20.04.1.tar.xz"; }; }; libkeduvocdocument = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkeduvocdocument-19.12.3.tar.xz"; - sha256 = "31594d30e03890507b25d676981164fd64258e69c6b264b85939118377eda964"; - name = "libkeduvocdocument-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkeduvocdocument-20.04.1.tar.xz"; + sha256 = "a252e3c7f253ec5dd62d75e0ee7f58f87285d0bc12d47301b048996d6a923ff6"; + name = "libkeduvocdocument-20.04.1.tar.xz"; }; }; libkexiv2 = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkexiv2-19.12.3.tar.xz"; - sha256 = "f5d0947f6b1ca0583d569990dc6f68bb01d8f7756a38bcc40b1e54f7814e4d4d"; - name = "libkexiv2-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkexiv2-20.04.1.tar.xz"; + sha256 = "91c23aacc2fc51970a5bd141de689c51c454d72b489ff842b5b8534c21c7b9a4"; + name = "libkexiv2-20.04.1.tar.xz"; }; }; libkgapi = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkgapi-19.12.3.tar.xz"; - sha256 = "f52923c382272b47782348fbadb32902fbcd4652f4100875a745ba57033cf48a"; - name = "libkgapi-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkgapi-20.04.1.tar.xz"; + sha256 = "c4cf6ea348fc71ae4e7f399a062dd609a3b1d7ea34b87cde6067f99db12b6d5b"; + name = "libkgapi-20.04.1.tar.xz"; }; }; libkgeomap = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkgeomap-19.12.3.tar.xz"; - sha256 = "eb604deffe78cdcd4a8c7d888416246d0a17f2e3b7d80d6959e1412f03ab2755"; - name = "libkgeomap-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkgeomap-20.04.1.tar.xz"; + sha256 = "a71f6e0900c7eb3b68528d5ef3850c9a5ed61e7e470f811d51278f7bc0f264c9"; + name = "libkgeomap-20.04.1.tar.xz"; }; }; libkipi = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkipi-19.12.3.tar.xz"; - sha256 = "3a57d07cd4fe8e118558d807242bf483fa2aac1bcf3dcdc29139636c2b280786"; - name = "libkipi-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkipi-20.04.1.tar.xz"; + sha256 = "b818634c52b657db875ea1c84ee43b5b5a4a699cd384b84bd7d70909aee33b6d"; + name = "libkipi-20.04.1.tar.xz"; }; }; libkleo = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkleo-19.12.3.tar.xz"; - sha256 = "1e715442a0c52ca561316abdce9662082f52ad9f3101ea01435a90984989a057"; - name = "libkleo-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkleo-20.04.1.tar.xz"; + sha256 = "dba1ae92e248c181ab43a47c6f26f76e1e95999b7bcca8d9c9b992ee71bd3266"; + name = "libkleo-20.04.1.tar.xz"; }; }; libkmahjongg = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkmahjongg-19.12.3.tar.xz"; - sha256 = "f8ea23952a576e6081052d10e9c967bebe5db017ad62775183f91236158cc19f"; - name = "libkmahjongg-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkmahjongg-20.04.1.tar.xz"; + sha256 = "7c2d3ae0c4154ad9215392cb1478c5dbd010acfa3db969fd74c038d1d04cbf56"; + name = "libkmahjongg-20.04.1.tar.xz"; }; }; libkomparediff2 = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libkomparediff2-19.12.3.tar.xz"; - sha256 = "aadc6e420e24bdebe203d4dfc76f5c23c8529be70ac057d89b516ab57b165094"; - name = "libkomparediff2-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libkomparediff2-20.04.1.tar.xz"; + sha256 = "acfd3fff2cd9dbbce26235a5e6e9f2ec824961dcbe7aa56eb7c409779f3e1555"; + name = "libkomparediff2-20.04.1.tar.xz"; }; }; libksane = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libksane-19.12.3.tar.xz"; - sha256 = "0aab855b8414041c37ddfbb9f0732272206af1c0844376f1370b9d2a907af71d"; - name = "libksane-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libksane-20.04.1.tar.xz"; + sha256 = "e88d173d5f46049fad345caa308e1041ef619317df9783c84d30c2b35379eb0a"; + name = "libksane-20.04.1.tar.xz"; }; }; libksieve = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/libksieve-19.12.3.tar.xz"; - sha256 = "990e6a15e7e88120bf6c744fe6f1ac78184d6470318005f24634a70219f45002"; - name = "libksieve-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/libksieve-20.04.1.tar.xz"; + sha256 = "6c80cb0d584fb4d18bb6c31f3589d7929212b90058efcb4b5e8feef2f8b46212"; + name = "libksieve-20.04.1.tar.xz"; }; }; lokalize = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/lokalize-19.12.3.tar.xz"; - sha256 = "8015c994e974fd51c1c7f5903a005bbbc25f094656bdd44cd5e8675cd69cea92"; - name = "lokalize-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/lokalize-20.04.1.tar.xz"; + sha256 = "e3006440f9499aacc230e1938e3470b6af01814b2ab29912412205b98851f586"; + name = "lokalize-20.04.1.tar.xz"; }; }; lskat = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/lskat-19.12.3.tar.xz"; - sha256 = "5f13417ba9f6831a5f48c220a5c67a8d73787715b8b4aa433e6e356b7ac58776"; - name = "lskat-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/lskat-20.04.1.tar.xz"; + sha256 = "214faf9c5a842a5693e1e8184e326d70ab061935d2b2c1ccd405e6bf5d2270a6"; + name = "lskat-20.04.1.tar.xz"; }; }; mailcommon = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/mailcommon-19.12.3.tar.xz"; - sha256 = "d3999d290505b20aecbb4b14bec5af4d6a7db72d1f26f7a40b4aff231588c7e5"; - name = "mailcommon-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/mailcommon-20.04.1.tar.xz"; + sha256 = "547421c0c3a8e91495dafad531d0ff9e646365974dc130f3b7ebd0d0ff293360"; + name = "mailcommon-20.04.1.tar.xz"; }; }; mailimporter = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/mailimporter-19.12.3.tar.xz"; - sha256 = "b81e8a5794aee24aa611c1a1912f93a308ce56c429ad4a72afe308e6b554c4a7"; - name = "mailimporter-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/mailimporter-20.04.1.tar.xz"; + sha256 = "4654e9e0c211f6eeb71e1e43e4d05b514a0890990a622bb707f137a801bf49a4"; + name = "mailimporter-20.04.1.tar.xz"; }; }; marble = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/marble-19.12.3.tar.xz"; - sha256 = "73a2c5234f8a1728e2a97499166e7bbf8dfb2f48d10fe8cff96380631d064627"; - name = "marble-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/marble-20.04.1.tar.xz"; + sha256 = "28cdf7161e8f3a2f00fd35cc4a384e29e7875c7177c27ff6d5dd8f8f53bcaa67"; + name = "marble-20.04.1.tar.xz"; }; }; mbox-importer = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/mbox-importer-19.12.3.tar.xz"; - sha256 = "62fb1490517e0a49bf823946c8b747062cb970dbe00281d459adda73596f0046"; - name = "mbox-importer-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/mbox-importer-20.04.1.tar.xz"; + sha256 = "a6d5af5eafee5ec32bad4a0677e6eae1c03006e93801d71a6011cc3b0225b6cc"; + name = "mbox-importer-20.04.1.tar.xz"; }; }; messagelib = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/messagelib-19.12.3.tar.xz"; - sha256 = "5e776d5ea7b0cbb246b03cf2bfc84a65a959e7433a7f80b77a5f67cfa7c23ccb"; - name = "messagelib-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/messagelib-20.04.1.tar.xz"; + sha256 = "6142a47750b2aa8ef68b27855c9f78bbce45a5aaa2c4c49214fac2254c22780f"; + name = "messagelib-20.04.1.tar.xz"; }; }; minuet = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/minuet-19.12.3.tar.xz"; - sha256 = "740a3704004336f08c0fde148257c1562254b4e706704ec7eb2149fb3d7b6b9b"; - name = "minuet-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/minuet-20.04.1.tar.xz"; + sha256 = "09ebe068f852c5fe7adbd7d934db90ccfa30c8eeb04b652bd9153d46012e0950"; + name = "minuet-20.04.1.tar.xz"; }; }; okular = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/okular-19.12.3.tar.xz"; - sha256 = "c5de22cc4292e3b7adae3f6ef6566dcba33a1dd5995fb0b968ea3e705a4c04e0"; - name = "okular-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/okular-20.04.1.tar.xz"; + sha256 = "10e29f50f7616b4784ce673ef7fd6c04d622b02c175f96cd127a99cc5cffa9bc"; + name = "okular-20.04.1.tar.xz"; }; }; palapeli = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/palapeli-19.12.3.tar.xz"; - sha256 = "6989bbc94ed955f6990d40bccbc0c38768898bf2ccb8163c45119517340b723d"; - name = "palapeli-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/palapeli-20.04.1.tar.xz"; + sha256 = "0983ad830b6aecd21b5569282a31c0353d89822047af2e8262740f266931d8e2"; + name = "palapeli-20.04.1.tar.xz"; }; }; parley = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/parley-19.12.3.tar.xz"; - sha256 = "ebf9fdec981abca988d83d8a77e921e7ce871eb010b6cf4ea9065ee6d45f5089"; - name = "parley-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/parley-20.04.1.tar.xz"; + sha256 = "60dfe90d58adc9b64354073a0abb54ce0f65fc51fc6d18201636ac4b58fe67b8"; + name = "parley-20.04.1.tar.xz"; }; }; picmi = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/picmi-19.12.3.tar.xz"; - sha256 = "04a69125fc76b1fcd58d873452e4a4e642ee9ee672cdb7656214d8cd854fc178"; - name = "picmi-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/picmi-20.04.1.tar.xz"; + sha256 = "db4dba3934ce9d304dcdcaa1df404674e830efcf2a82386c7d7ad3433c95c407"; + name = "picmi-20.04.1.tar.xz"; }; }; pimcommon = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/pimcommon-19.12.3.tar.xz"; - sha256 = "443e2915eb42a4f56f1ddf47785ceeceb4ca1e0384ff48bc93fc4a7756392766"; - name = "pimcommon-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/pimcommon-20.04.1.tar.xz"; + sha256 = "f2640bf49d72ad894be28de4545804f4de27e79dbe45e236959e47c2cbc68e96"; + name = "pimcommon-20.04.1.tar.xz"; }; }; pim-data-exporter = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/pim-data-exporter-19.12.3.tar.xz"; - sha256 = "8e9961fcc4f1ed0305d589e3a417f8924657d89d798a77c53956d73f6bf19938"; - name = "pim-data-exporter-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/pim-data-exporter-20.04.1.tar.xz"; + sha256 = "e05ffffb1f790f9e74559f40fa6b48bd75c3973f519e8825db0e330d425392d0"; + name = "pim-data-exporter-20.04.1.tar.xz"; }; }; pim-sieve-editor = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/pim-sieve-editor-19.12.3.tar.xz"; - sha256 = "641ea56304df079a80e098fb253c173b63266990856f8795af093c144c3883ae"; - name = "pim-sieve-editor-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/pim-sieve-editor-20.04.1.tar.xz"; + sha256 = "c9a382a7a2f33939da5a47149499d859eecaa67936ac1321ad4c0ca1ae28a13e"; + name = "pim-sieve-editor-20.04.1.tar.xz"; }; }; poxml = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/poxml-19.12.3.tar.xz"; - sha256 = "190178290ce18fe3a684c22d650843f3008a6e31ebbab8fff25491c58b21e276"; - name = "poxml-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/poxml-20.04.1.tar.xz"; + sha256 = "69a49d0f150e592a1457a36faeeec8c7ad21c70ef3420d7b91ec743d8a2ec441"; + name = "poxml-20.04.1.tar.xz"; }; }; print-manager = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/print-manager-19.12.3.tar.xz"; - sha256 = "74c13802a65136539b4542fec10fb248149a3324e8060e947a8f305ce665269a"; - name = "print-manager-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/print-manager-20.04.1.tar.xz"; + sha256 = "368f10cde07ecee03b55c40c91e5c85a2281ba38607f30dbaea5a0a951cbbefc"; + name = "print-manager-20.04.1.tar.xz"; }; }; rocs = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/rocs-19.12.3.tar.xz"; - sha256 = "f834e69e676913e364162906b79da5a75a6043f4a5c8506954d1630abda45e3c"; - name = "rocs-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/rocs-20.04.1.tar.xz"; + sha256 = "f19e5a07b033c6fc11aff352e979e24f2d0274d901cbc3bd37f8b0b5bb01234c"; + name = "rocs-20.04.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/signon-kwallet-extension-19.12.3.tar.xz"; - sha256 = "46199be023bad630b769b14c2c0a63feff2949da944c76780b1ebd9a50ee3daa"; - name = "signon-kwallet-extension-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/signon-kwallet-extension-20.04.1.tar.xz"; + sha256 = "1ce6c80522ccf281035c3ec5a45e6a9cd4577ecaf9355d9f04b533b1df946e5d"; + name = "signon-kwallet-extension-20.04.1.tar.xz"; }; }; spectacle = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/spectacle-19.12.3.tar.xz"; - sha256 = "443f114dab1fb50e7e12a046fdf06c0456bf99a3abdf09dce05605fdf7d3de81"; - name = "spectacle-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/spectacle-20.04.1.tar.xz"; + sha256 = "24890d9283c7d7df126bc9449ba09612e11d35860feca8e899be29e86bcc95fe"; + name = "spectacle-20.04.1.tar.xz"; }; }; step = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/step-19.12.3.tar.xz"; - sha256 = "0eb62c87553769e009daa02406b1d95742c946bdffe0d22327776ec558e7584b"; - name = "step-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/step-20.04.1.tar.xz"; + sha256 = "bf66f979de6633b033f18268f1c85f3b8e35903ebd6ad62c0a7c17dd7b676163"; + name = "step-20.04.1.tar.xz"; }; }; svgpart = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/svgpart-19.12.3.tar.xz"; - sha256 = "942d877a516d8407ef2782d7c6869ab688274fee6cde9b23ab1061bcbddf2cc9"; - name = "svgpart-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/svgpart-20.04.1.tar.xz"; + sha256 = "963637581d0377a5326223f4cc3ef3b1daa10bc335271a0f3f8f4b3a82a53af9"; + name = "svgpart-20.04.1.tar.xz"; }; }; sweeper = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/sweeper-19.12.3.tar.xz"; - sha256 = "cf89cfba61c9eeda9b4e7921c21a23e7d9a110b134ab6fbd127c37d036bd0517"; - name = "sweeper-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/sweeper-20.04.1.tar.xz"; + sha256 = "a9c0c7cfac243dea33dba3e5428973408d66c425b2aa8beb5aa1400ba760e3ab"; + name = "sweeper-20.04.1.tar.xz"; }; }; umbrello = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/umbrello-19.12.3.tar.xz"; - sha256 = "b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193"; - name = "umbrello-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/umbrello-20.04.1.tar.xz"; + sha256 = "2289b8314414b132269133b38ddcc6b861d85f725623defec8114c2ea148d2c4"; + name = "umbrello-20.04.1.tar.xz"; }; }; yakuake = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/yakuake-19.12.3.tar.xz"; - sha256 = "0e4f16eaf155750b0c35f1f8f1a625909f386f3359b9f23bf4e7c2f9045384e3"; - name = "yakuake-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/yakuake-20.04.1.tar.xz"; + sha256 = "57cb4c1ce0b255f45f05ac347c84ffb219a0dc0ea870c1520f21390c0ad582cf"; + name = "yakuake-20.04.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.12.3"; + version = "20.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.3/src/zeroconf-ioslave-19.12.3.tar.xz"; - sha256 = "c9b2146030a9845b8164f5784d1c6fcc198b6cfe0e23f6a91edf78d093e4368f"; - name = "zeroconf-ioslave-19.12.3.tar.xz"; + url = "${mirror}/stable/release-service/20.04.1/src/zeroconf-ioslave-20.04.1.tar.xz"; + sha256 = "0cf51d8efdad5210acff3ba4f351b71a02a9d0d7284eb8e2a55a5fc2bc2c93e1"; + name = "zeroconf-ioslave-20.04.1.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index 5e027fcdf0..eeaf8d5618 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -2,26 +2,22 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.0.0"; + version = "1.1.1"; src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1d1lxmrmirh3837zib91dmxblb4imdz8gbq56pb7kgbff3zf96ql"; - stripRoot = false; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "0pscm61dc69vmkrzrnxi531d37ig9y48w8q1lvzsg13zvvwaw8hs"; - stripRoot = false; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchurl { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "1sb5qdssasqm7z7j4xzgkmkgf132zhgm93d7rkx3y5j0rac98y0g"; - } - else throw "Architecture not supported"; + if stdenv.isLinux then fetchzip { + url = { + "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + }.${stdenv.hostPlatform.system}; + sha256 = { + "i686-linux" = "1andl3ripkcg4jhwdkd4b39c9aaxqpx9wzq21pysn6rlyy4hfcb0"; + "x86_64-linux" = "0qj5v8psqyp0sra0pvzkwjpm28kx3bgg36y37wklb6zl2ngpxm5g"; + }.${stdenv.hostPlatform.system}; + stripRoot = false; + } else fetchurl { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; + sha256 = "16inwxkrky4xwlr7vara1l8kapdgjg3kfq1l94i5855782hn4ppm"; + }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 6201d881a8..71404e7354 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.2.1"; + version = "4.2.3.3"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "0pr9rrhi44yl99c2i12rimmc4mhbh0ma9jn17cgsh8p0kbj8sq94"; + sha256 = "0v69rrs5fr1n5llfx42xkiish52al7kb36fjy3ng0j9qfp3g8pj7"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/airtame/default.nix b/third_party/nixpkgs/pkgs/applications/misc/airtame/default.nix index 4e1f2e8c08..a5c08ad364 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/airtame/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/airtame/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { desktopName = "Airtame"; icon = name; genericName = comment; - categories = "Application;Network;"; + categories = "Network;"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix index 0ca01c8d2a..45746a963b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { --prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}" ''; - meta = { + meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; homepage = "http://www.speech.kth.se/wavesurfer/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd0; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index 953e12a033..1dbcdf31ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = "${version}"; - sha256 = "0qkwdaxhig4qjim7h20j6ln6w76ycppfc786nd8l69bd1qv46m40"; + sha256 = "17ify6v4z8i8ps3s8qabnrqfkj0my4yzyqwk3q3nhrqilbnhr40x"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix new file mode 100644 index 0000000000..6243498296 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libnotify, pkg-config, glib }: + +stdenv.mkDerivation rec { + pname = "batsignal"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "electrickite"; + repo = "batsignal"; + rev = "${version}"; + sha256 = "wy7YhgKfz07u0bp7rWpze+KmSdooOkmU7giaBX3wWkY="; + }; + + buildInputs = [ libnotify glib ]; + nativeBuildInputs = [ pkg-config ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/electrickite/batsignal"; + description = "Lightweight battery daemon written in C"; + license = licenses.isc; + maintainers = with maintainers; [ SlothOfAnarchy ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix index 5385cf6788..8eb6a16872 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix @@ -7,6 +7,7 @@ , qtbase , qttools , qtx11extras + , qttranslations }: mkDerivation rec { @@ -20,11 +21,21 @@ mkDerivation rec { sha256 = "15l8drdmamq1dpqpj0h9ajj2r5vcs23cx421drvhfgs6bqlzd1hl"; }; + patches = [ + # See https://github.com/NixOS/nixpkgs/issues/86054 + ./fix-qttranslations-path.diff + ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ qtbase qttools qtx11extras ]; + postPatch = '' + substituteInPlace src/birdtrayapp.cpp \ + --subst-var-by qttranslations ${qttranslations} + ''; + meta = with lib; { description = "Mail system tray notification icon for Thunderbird"; homepage = "https://github.com/gyunaev/birdtray"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff b/third_party/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff new file mode 100644 index 0000000000..2a379b5e27 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff @@ -0,0 +1,13 @@ +diff --git a/src/birdtrayapp.cpp b/src/birdtrayapp.cpp +index 847b4d3..3a3709a 100644 +--- a/src/birdtrayapp.cpp ++++ b/src/birdtrayapp.cpp +@@ -130,7 +130,7 @@ bool BirdtrayApp::loadTranslations() { + [](QString path) { return path.append("/translations"); }); + QLocale locale = QLocale::system(); + bool success = loadTranslation( +- qtTranslator, locale, "qt", {QLibraryInfo::location(QLibraryInfo::TranslationsPath)}); ++ qtTranslator, locale, "qt", {QLatin1String("@qttranslations@/translations")}); + success &= loadTranslation(dynamicTranslator, locale, "dynamic", locations); + success &= loadTranslation(mainTranslator, locale, "main", locations); + return success; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix index 0111f8519e..3c11c7bfaf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix @@ -1,5 +1,5 @@ { stdenv -, pythonPackages +, python3Packages , fetchurl , gettext , gobject-introspection @@ -9,15 +9,15 @@ , libnotify }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bleachbit"; - version = "3.2.0"; + version = "4.0.0"; format = "other"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1sszpn7ifiry0wwmkzdppzh61zvgrfypm9g7wk6q1ya20qhb5b51"; + sha256 = "1dn3h6lr9ldbfpvgq9sdlk972sxhwalgj2f377qbqibm3yfxzpil"; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { libnotify ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ chardet pygobject3 requests @@ -51,6 +51,12 @@ pythonPackages.buildPythonApplication rec { "prefix=${placeholder "out"}" ]; + # prevent double wrapping from wrapGApps and wrapPythonProgram + dontWrapGApps = true; + makeWrapperArgs = [ + ''''${gappsWrapperArgs[@]}'' + ]; + strictDeps = false; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index bf2a89ade5..232ab1b2df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.0"; + version = "2.83.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl"; + sha256 = "1kd74nzqvpcpsb4lghnjj9z3ps93lzqbhkv3lp5p79rqs8y64i23"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/python' \ '${python}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace 'set(PYTHON_VERSION 3.7)' \ + 'set(PYTHON_VERSION ${python.pythonVersion})' \ + --replace '${"$"}{PYTHON_VERSION}m' \ + '${"$"}{PYTHON_VERSION}' \ --replace '${"$"}{LIBDIR}/python' \ '${python}' \ --replace '${"$"}{LIBDIR}/opencollada' \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix index f4018cff5f..9b8f531e80 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "4.3"; + version = "4.4"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1cq508ymak3g5fhi1n4bdiiqkc86s2l3k4dvzw842vv2x0441cac"; + sha256 = "10r5f1n0vcxxmqqqsgmlvibwg1xffijrr2id6r140rgiyhprz556"; }; checkInputs = [ @@ -38,6 +38,7 @@ with python3.pkgs; buildPythonApplication rec { click html5lib vcrpy + toml ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index ff39eccf4f..acd4c9fcac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.17.0"; + version = "4.19.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qgzx2q8a5g102z311ibz4aw1ipn2j1lbndgadig7xvy6zdhknma"; + sha256 = "1kpj65spwr9m88vshsljpdrw5jy7bbpqgqcrvqb17abh7fnnrb4x"; }; patches = [ @@ -47,7 +47,7 @@ mkDerivation rec { ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${pypkgs.pyqt5_with_qtwebkit}/share/sip/PyQt5':" \ + sed -i "/pyqt_sip_dir/ s:=.*:= '${pypkgs.pyqt5}/share/sip/PyQt5':" \ setup/build_environment.py # Remove unneeded files and libs diff --git a/third_party/nixpkgs/pkgs/applications/misc/cgminer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cgminer/default.nix deleted file mode 100644 index 09236565d5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/cgminer/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake -, curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }: - -stdenv.mkDerivation { - version = "3.7.2"; - pname = "cgminer"; - - src = fetchgit { - url = "https://github.com/ckolivas/cgminer.git"; - rev = "refs/tags/v3.7.2"; - sha256 = "1xfzx91dpwjj1vmhas3v9ybs0p2i74lrhinijmpav15acfggm9fq"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - autoconf automake libtool curl ncurses ocl-icd opencl-headers - xorg.libX11 xorg.libXext xorg.libXinerama jansson - ]; - configureScript = "./autogen.sh"; - configureFlags = [ "--enable-scrypt" "--enable-opencl" ]; - NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; - - postBuild = '' - gcc api-example.c -o cgminer-api - ''; - - postInstall = '' - cp cgminer-api $out/bin/ - chmod 444 $out/bin/*.cl - ''; - - meta = with stdenv.lib; { - description = "CPU/GPU miner in c for bitcoin"; - longDescription= '' - This is a multi-threaded multi-pool GPU, FPGA and ASIC miner with ATI GPU - monitoring, (over)clocking and fanspeed support for bitcoin and derivative - coins. Do not use on multiple block chains at the same time! - ''; - homepage = "https://github.com/ckolivas/cgminer"; - license = licenses.gpl3; - maintainers = [ maintainers.offline ]; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix index ec4d71a0dc..42b0377474 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "3.10.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0indvycj972wng979mvia8mrb7bwdfay7wxq3lnj05qyxqafj5h2"; + sha256 = "0j9w2rm8imb15njj7334xl6w0fgjvfqnrfvdq4zfsrwzl67ds86l"; }; subPackages = [ "cmd/cheat" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index d2ade055d6..c74ac5ffb3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "cherrytree"; - version = "0.39.3"; + version = "0.39.4"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "1k9i7acpphx0if6ij2p9fkmj638ry6hcyr1rdr039a8zi8hq98gz"; + sha256 = "1wycgn1f3b858qb6kn2bsaabak8n52qkpd24w54xz6fjizlnw7x0"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix new file mode 100644 index 0000000000..b70f9a2e7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix @@ -0,0 +1,30 @@ +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, libchewing, qtbase +, qttools }: + +mkDerivation rec { + pname = "chewing-editor"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "chewing"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w"; + }; + + doCheck = true; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libchewing qtbase qttools ]; + + meta = with stdenv.lib; { + description = "Cross platform chewing user phrase editor"; + longDescription = '' + chewing-editor is a cross platform chewing user phrase editor. It provides a easy way to manage user phrase. With it, user can customize their user phrase to increase input performance. + ''; + homepage = "https://github.com/chewing/chewing-editor"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.ShamrockLee ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix index c5083f2379..c06d00ebb5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "0pqnn52nn22k49f5cw4jcr8vcbff28n56i8fizg1mmfshy8pn891"; + sha256 = "07z1m1x7nnczd51sg7m2lb6rb2c37c8glsnbrlq44hx176sj9cmj"; }; # dbus-1.pc has datadir=/etc diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 3b55a15063..c26e47bdba 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.1.0"; + version = "7.1.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { desktopName = "dbeaver"; comment = "SQL Integrated Development Environment"; genericName = "SQL Integrated Development Environment"; - categories = "Application;Development;"; + categories = "Development;"; }; buildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1q3f5bghm3jw5c7c62ivf32fldjqhmj1a0qlwgqjxyhmfcig0rnb"; + sha256 = "131v8y5la2pv3cqf2qknd816z24dvhf2c4f7js8vfzrfw5vwsqbq"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/ddcui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ddcui/default.nix new file mode 100644 index 0000000000..1ec288c678 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ddcui/default.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, qtbase +, qttools +, ddcutil +}: + +mkDerivation rec { + pname = "ddcui"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "rockowitz"; + repo = "ddcui"; + rev = "v${version}"; + sha256 = "0myma1zw6dlygv3xbin662d91zcnwss10syf12q2fppkrd8qdgqf"; + }; + + nativeBuildInputs = [ + # Using cmake instead of the also-supported qmake because ddcui's qmake + # file is not currently written to support PREFIX installations. + cmake + pkg-config + ]; + + buildInputs = [ + qtbase + qttools + ddcutil + ]; + + meta = with lib; { + description = "Graphical user interface for ddcutil - control monitor settings"; + homepage = "https://www.ddcutil.com/ddcui_main/"; + license = licenses.gpl2; + maintainers = with maintainers; [ nh2 ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix index ca2e6f56e8..250a7567d7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dmenu-wayland-unstable"; - version = "2020-04-03"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "nyyManni"; repo = "dmenu-wayland"; - rev = "550a7c39f3f925b803d51c616609c8cb6c0ea543"; - sha256 = "0az3w1csn4x6mjyacg6lf70kykdfqamic3hbr57mj83i5jjv0jlv"; + rev = "304c8e917651ee02b16ebf0b7097a5c53fa2236b"; + sha256 = "0rkpmpk7xkcfbnv9vpg8n65423z5xpgp0hm2vg0rxf9354bjin7k"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix index fcf8191d3b..bc40f2dad8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix @@ -11,13 +11,13 @@ perlPackages.buildPerlPackage rec { pname = "fbmenugen"; - version = "2020-05-20"; + version = "0.85"; src = fetchFromGitHub { owner = "trizen"; repo = pname; - rev = "ed9a680546edbb5b05086971b6a9f42a37cb485f"; - sha256 = "1fikdl08a0s8d6k1ls1pzmw2rcwkfbbczsjfx6lr12ngd2bz222h"; + rev = version; + sha256 = "1pmms3wzkm8h41a8zrkpn6gq9m9yy5wr5rrzmb84lbacprqq6q7q"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index 00b858a327..bed673ef8d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.6"; + version = "6.4.8"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn"; + sha256 = "1g893dr3982vrqzxybmflnqfmd1q6yipd9krvxn0avhlrrp97k96"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix index 05c535e62c..a03c87eb41 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "tud-zih-energy"; repo = "FIRESTARTER"; rev = "v${version}"; - sha256 = "161mg0h1hvp6bxfjdhyfqrljvphys896mfd36254rbgzxm38ibi7"; + sha256 = "0zqfqb7hf48z39g1qhbl1iraf8rz4d629h1q6ikizckpzfq23kd0"; }; nativeBuildInputs = [ python3 ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; - maintainers = with maintainers; [ astro ]; + maintainers = with maintainers; [ astro marenz ]; license = licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix index 008e59eebe..b2001c21bf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "1bzqvspplp1zj0n0869jqbc60wgbjhf0vdrn5bj8dfawxynh8s5f"; + sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix new file mode 100644 index 0000000000..7370939be7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}: + +stdenv.mkDerivation rec { + pname = "fuzzel"; + version = "1.3.0"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/fuzzel"; + rev = "${version}"; + sha256 = "12jv5iwmksygw8nfkxbd9rbi03wnpgb30hczq009aqgy7lyi5zmp"; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; + buildInputs = [ wayland pixman cairo librsvg wayland-protocols wlroots libxkbcommon tllist fcft ]; + + meta = with lib; { + description = "Wayland-native application launcher, similar to rofi’s drun mode"; + homepage = "https://codeberg.org/dnkl/fuzzel"; + license = licenses.mit; + maintainers = with maintainers; [ fionera ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 6b8f6aa38c..8049f79af2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.1"; + version = "1.14.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0w4zmfbsr7xdymrrmdvcc0kqz11ql8j067ghlr84faqlsnx09z74"; + sha256 = "14a8skaxc4xn2hm8ahp8lzrmwh1f3lbcibvhpprqr3szd6i2p0pf"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix index 2e8478f41d..b36bd83e70 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { desktopName = "GanttProject"; genericName = "Shedule and manage projects"; comment = meta.description; - categories = "Office;Application;"; + categories = "Office;"; }; javaOptions = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix index eaee8fb5fb..8ca4c60616 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./gmrun-0.9.2-xdg.patch ]; - meta = { + meta = with stdenv.lib; { description = "Gnome Completion-Run Utility"; longDescription = '' A simple program which provides a "run program" window, featuring a bash-like TAB completion. @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { Running commands in a terminal with CTRL-Enter. URL handlers. ''; homepage = "https://sourceforge.net/projects/gmrun/"; - license = "GPL"; + license = licenses.gpl2; maintainers = []; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index 761d05e5f9..3eaefd6639 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -12,7 +12,7 @@ let desktopName = "GoldenCheetah"; genericName = "GoldenCheetah"; comment = "Performance software for cyclists, runners and triathletes"; - categories = "Application;Utility;"; + categories = "Utility;"; }; in mkDerivation rec { pname = "golden-cheetah"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix index ef4c732ef5..1915b2dae1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "gpsbabel"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qtbase which ] + buildInputs = [ zlib qtbase which libusb-compat-0_1 ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index b3dbecb56b..9ee3b96a5b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.30"; + version = "7.31"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs"; + sha256 = "0y60h66p8ydkinxk9x4sp4cm6gq66nc9jcavy135vmycsiq9gphn"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix index 7709a42bae..1626fc440e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "1sxdi1an9x62q9vwv7r2761my4dva6nc63n9861swxjjk18hmmar"; + sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix index b1e740fb76..81f931b11f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix @@ -15,15 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ readline ncurses gettext ]; - configurePhase = '' - autoreconf -fvi - ./configure - ''; - - installPhase = '' - mkdir -p $out/bin/ - mv src/hstr $out/bin/ - ''; + configureFlags = [ "--prefix=$(out)" ]; meta = { homepage = "https://github.com/dvorka/hstr"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index ba01f88cc5..d80526d66f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.72.0"; + version = "0.73.0"; buildInputs = [ libsass ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "05parzx0wm51z4qkvh4k096ykgiyr9i5xy55c0g99j4y96drcybb"; + sha256 = "0qhv8kdv5k1xfk6106lxvsz7f92k7w6wk05ngz7qxbkb6zkcnshw"; }; golibsass = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 8731ed2683..86f1bf23a6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.1) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -15,16 +15,16 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.12.2) + ffi (1.13.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.12.3) + html-pipeline (2.13.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) - jekyll (4.1.0) + jekyll (4.1.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -76,9 +76,9 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.19.0) + rouge (3.20.0) safe_yaml (1.0.5) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix index 8c1773f19d..e4c8a94fce 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; + sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; forwardable-extended = { groups = ["default"]; @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4"; + sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6"; type = "gem"; }; - version = "2.12.3"; + version = "2.13.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v01g9cwn4v7rnpsl9yvscjzvah3p4xwh03zp37zxkvw5kv004n8"; + sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r"; type = "gem"; }; - version = "4.1.0"; + version = "4.1.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -353,10 +353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; + sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic"; type = "gem"; }; - version = "3.19.0"; + version = "3.20.0"; }; safe_yaml = { groups = ["default"]; @@ -374,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock index 8b771bc1c0..9acfaaa97c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.1) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -11,7 +11,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) classifier-reborn (2.2.0) fast-stemmer (~> 1.0) - coderay (1.1.2) + coderay (1.1.3) coffee-script (2.4.1) coffee-script-source execjs @@ -26,16 +26,16 @@ GEM faraday (1.0.1) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - ffi (1.12.2) + ffi (1.13.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.12.3) + html-pipeline (2.13.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) - jekyll (4.1.0) + jekyll (4.1.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -55,7 +55,7 @@ GEM jekyll-coffeescript (2.0.0) coffee-script (~> 2.2) coffee-script-source (~> 1.12) - jekyll-feed (0.13.0) + jekyll-feed (0.14.0) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) @@ -110,9 +110,9 @@ GEM ffi (~> 1.0) rdoc (6.2.1) rexml (3.2.4) - rouge (3.19.0) + rouge (3.20.0) safe_yaml (1.0.5) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix index 5f54a4f738..073f69f5b3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; + sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; coffee-script = { dependencies = ["coffee-script-source" "execjs"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; forwardable-extended = { groups = ["default"]; @@ -195,10 +195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4"; + sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6"; type = "gem"; }; - version = "2.12.3"; + version = "2.13.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -216,10 +216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v01g9cwn4v7rnpsl9yvscjzvah3p4xwh03zp37zxkvw5kv004n8"; + sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r"; type = "gem"; }; - version = "4.1.0"; + version = "4.1.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lx8nvkhd8l1wm3b6s506rycwbmpbzbsbjl65p21asjz6vbwf1ir"; + sha256 = "0fhbz5wc8cf60dwsbqcr49wygyk5qarpc7g77p6dlwq2r21nil5c"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; jekyll-gist = { dependencies = ["octokit"]; @@ -602,10 +602,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; + sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic"; type = "gem"; }; - version = "3.19.0"; + version = "3.20.0"; }; safe_yaml = { groups = ["default"]; @@ -623,10 +623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; sawyer = { dependencies = ["addressable" "faraday"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix index 89d09703dd..7f607de5ff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "16538"; + version = "16731"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "07hzwcjnfbl3s8l0m6japln0clm6wjm1zd3r1pd47b1dvclnyv28"; + sha256 = "0r94jcqciggjwjxfz5q3m81sx6cvh94hq5r9mpw44dvpnyfjj6p6"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "1y0ssrwfqnmcvxwjfa3gdc3m9a952n8l3pdx0zmmaqwws4kak2a2"; + sha256 = "1ilcqy6ssi1jfnbw9nzpd4qlf2dmskfywy2lfm07y4w4gyjsp6w9"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix new file mode 100644 index 0000000000..2b4ae320e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation +, extra-cmake-modules +, fetchFromGitHub +, kdoctools +, kiconthemes +, kio +, kjobwidgets +, kxmlgui +, stdenv +}: + +mkDerivation rec { + pname = "k4dirstat"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "jeromerobert"; + repo = pname; + rev = version; + sha256 = "15xjb80jq6vhzvzx4l341f40d8a23w1334qh6cczqm9adfnzycp7"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kiconthemes kio kjobwidgets kxmlgui ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jeromerobert/k4dirstat"; + description = "A small utility program that sums up disk usage for directory trees"; + license = licenses.gpl2; + maintainers = [ maintainers.raboof ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix index e6193d4356..4f84420330 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.14"; + version = "1.2.15"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "11bwajzidnyagdyip7i8rwni1f66acv0k4lybdm0mc4195anivjh"; + sha256 = "0lib2qlc8a59i9dak0g1j5hymwbq9vhflp5srhcjislxypfvrizs"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix index 3a1393913e..ea579ce411 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -68,7 +68,7 @@ with builtins; buildDotnetPackage rec { icon = "keepass"; desktopName = "Keepass"; genericName = "Password manager"; - categories = "Application;Utility;"; + categories = "Utility;"; mimeType = stdenv.lib.concatStringsSep ";" [ "application/x-keepass2" "" diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix index 469b4cf5ea..86ea1d6d50 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -6,6 +6,7 @@ , qttools , darwin +, asciidoctor , curl , glibcLocales , libXi @@ -39,13 +40,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.5.4"; + version = "2.6.0"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "1xih9q1pxszalc0l29fmjxwn1vrrrrbnhc8gmi8brw5sclhbs6bh"; + sha256 = "0yi6kxnsrqirjn6hxhwym2krzf86qxf3kc6bfpkmiaggnd2kqpkp"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ @@ -63,11 +64,6 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch - # use wl-copy on Wayland - can be dropped with the next version update - (fetchpatch { - url = "https://github.com/keepassxreboot/keepassxc/commit/6128e5d58294f26411160f44da91087ebe7f4b07.patch"; - sha256 = "16q0h7kijqjdbskmk4ar6p3g8vcxr0bq1zrlq2bk16pk10nv4bh1"; - }) ]; cmakeFlags = [ @@ -97,6 +93,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; buildInputs = [ + asciidoctor curl glibcLocales libXi diff --git a/third_party/nixpkgs/pkgs/applications/misc/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kitty/default.nix index 12db0cd87e..85e9795a03 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.18.0"; + version = "0.18.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "15i4ld65a5rfbaxxdh6kgg9h0ih73iqjskk82h8j72qgzkc6g3hf"; + sha256 = "1g4mfgygyl143k0k6d3cb8b2l05ahiamlcqs1iqi66pc73cax4z6"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix index 798c32aa72..6fad8b23d3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix @@ -97,7 +97,7 @@ in buildFHSUserEnv { libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls libbsd + vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix index 2ff2a82dd4..99e24eea15 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -1,9 +1,43 @@ { buildPythonApplication, lib, fetchFromGitHub, fetchpatch -, wrapGAppsHook, gobject-introspection, glib-networking, gnome-desktop, libnotify, libgnome-keyring, pango -, gdk-pixbuf, atk, webkitgtk, gst_all_1 -, dbus-python, evdev, pyyaml, pygobject3, requests, pillow -, xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma -, libstrangle, wine, fluidsynth, xorgserver + +# build inputs +, atk +, gdk-pixbuf +, glib-networking +, gnome-desktop +, gobject-introspection +, gst_all_1 +, gtk3 +, libgnome-keyring +, libnotify +, pango +, webkitgtk +, wrapGAppsHook + +# python dependencies +, dbus-python +, distro +, evdev +, pillow +, pygobject3 +, pyyaml +, requests + +# commands that lutris needs +, xrandr +, pciutils +, psmisc +, glxinfo +, vulkan-tools +, xboxdrv +, pulseaudio +, p7zip +, xgamma +, libstrangle +, wine +, fluidsynth +, xorgserver +, xorg }: let @@ -22,37 +56,57 @@ let wine fluidsynth xorgserver + xorg.setxkbmap + xorg.xkbcomp ]; gstDeps = with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer ]; in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "1g093g0difnkjmnm91p20issdsxn9ri4c56zzddj5wfrbmhwdfag"; + sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa"; }; nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = [ - gobject-introspection glib-networking gnome-desktop libnotify libgnome-keyring pango - gdk-pixbuf atk webkitgtk + atk + gdk-pixbuf + glib-networking + gnome-desktop + gobject-introspection + gtk3 + libgnome-keyring + libnotify + pango + webkitgtk ] ++ gstDeps; - makeWrapperArgs = [ - "--prefix PATH : ${binPath}" + propagatedBuildInputs = [ + evdev distro pyyaml pygobject3 requests pillow dbus-python ]; - propagatedBuildInputs = [ - evdev pyyaml pygobject3 requests pillow dbus-python + # avoid double wrapping + dontWrapGApps = true; + makeWrapperArgs = [ + "--prefix PATH : ${binPath}" + ''''${gappsWrapperArgs[@]}'' ]; + # needed for glib-schemas to work correctly (will crash on dialogues otherwise) + # see https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; preCheck = "export HOME=$PWD"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix index 4f6b73d592..34e7e145e7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.5.1"; + version = "2.3.5.2"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "0mv32s26igm0pd8vs7d2mk1240dpr83y0a2wyh3xz6b67ph0w157"; + sha256 = "1pwdh0ljd7lm5a83vsqmp4695irhig07wxa90jc23ng5gap589na"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix index 5813fc15c0..e7600752ce 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix @@ -1,19 +1,25 @@ -{ appimageTools, fetchurl, lib }: +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: let pname = "marktext"; - version = "v0.16.0-rc.2"; + version = "v0.16.2"; in appimageTools.wrapType2 rec { name = "${pname}-${version}-binary"; src = fetchurl { url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage"; - sha256 = "1w1mxa1j94zr36xhvlhzq8d77pi359vdxqb2j8mnz2bib9khxk9k"; + sha256 = "0ivf9lvv2jk7dvxmqprzcsxgya3617xmx5bppjvik44z14b5x8r7"; }; profile = '' export LC_ALL=C.UTF-8 + '' + # Fixes file open dialog error + # GLib-GIO-ERROR **: 20:36:48.243: No GSettings schemas are installed on the system + # See https://github.com/NixOS/nixpkgs/pull/83701#issuecomment-608034097 + + '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; multiPkgs = null; # no 32bit needed diff --git a/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix index 5df4a1b8d9..d541c5e128 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.4.38"; + version = "5.6.09"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.amd64.tar.gz"; - sha256 = "0fidy8gd4mqvyfgmrwdiz8z53dyzihqqhgfrffj0z0idm2zi4mcq"; + sha256 = "0v9j6fwr0xl03kr77vf4wdb06zlplmn4mr3jyzxhvs8a77scmfzb"; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix index e04833cd4b..d5da4c7d77 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "megasync"; - version = "4.3.0.8"; + version = "4.3.1.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "1rhxkc6j3039rcsi8cxy3n00g6w7acir82ymnksbpsnp4yxqv5r3"; + sha256 = "0b68wpif8a0wf1vfn1nr19dmz8f31dprb27jpldxrxhyfslc43yj"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix index 28157d6153..f391c3621a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "13klasvrndwsmpcxkgy7kvsl2jqmp2cl52vb4i0hk18lr004scgy"; + sha256 = "1j3jk76rd0sc9sd9zrd24q3636559wd809yfnb9bv5jmvn9s1bkz"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix index 6a15217641..efd9cc4c02 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.43.16"; + version = "0.43.19"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1gx1hbxiilggwfw0jspyk2cw92r6qs9a8yqa8x1d2ndf493mjx9y"; + sha256 = "1rpkiyhy7z5zq0rmn0kj2kva57bnhkhvaplrlhfczv99h1kwsixg"; }; outputs = [ "out" "udev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mrxvt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mrxvt/default.nix index 6717fc3c97..4dc70133ec 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mrxvt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mrxvt/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation { sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; - meta = { + meta = with stdenv.lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " - Multitabbed lightweight terminal emulator based on rxvt. + Multitabbed lightweight terminal emulator based on rxvt. Supports transparency, backgroundimages, freetype fonts, ... "; homepage = "https://sourceforge.net/projects/materm"; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix index a553eb3e71..8a7e8b6074 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libnsbmp"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35"; + sha256 = "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nimmm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nimmm/default.nix new file mode 100644 index 0000000000..16400d76f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/nimmm/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, nim, termbox, pcre }: + +let + noise = fetchFromGitHub { + owner = "jangko"; + repo = "nim-noise"; + rev = "db1e86e312413e4348fa82c02340784316a89cc1"; + sha256 = "0n9l2dww5smrsl1xfqxjnxz3f1srb72lc1wl3pdvs6xfyf44qzlh"; + }; + + nimbox = fetchFromGitHub { + owner = "dom96"; + repo = "nimbox"; + rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b"; + sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1"; + }; + + lscolors = fetchFromGitHub { + owner = "joachimschmidt557"; + repo = "nim-lscolors"; + rev = "v0.3.3"; + sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4"; + }; + +in stdenv.mkDerivation rec { + pname = "nimmm"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "joachimschmidt557"; + repo = "nimmm"; + rev = "v${version}"; + sha256 = "1zpq181iz6g7yfi298gjwv33b89l4fpnkjprimykah7py5cpw67w"; + }; + + nativeBuildInputs = [ nim ]; + buildInputs = [ termbox pcre ]; + + NIX_LDFLAGS = "-lpcre"; + + buildPhase = '' + export HOME=$TMPDIR; + nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim + ''; + + installPhase = '' + install -Dt $out/bin src/nimmm + ''; + + meta = with stdenv.lib; { + description = "Terminal file manager written in nim"; + homepage = "https://github.com/joachimschmidt557/nimmm"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.joachimschmidt557 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix index 95920362a5..293f1d16b1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "nnn"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "13p3379c26l57121ymx0kw7afh51zv614p57di311d2a41jaz5cw"; + sha256 = "1dxa5blpdf0s03znhnr23zzpsz8yzqpnwknycz42h1w9g9s9jz1v"; }; configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix new file mode 100644 index 0000000000..396a784511 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3}: + +let + pname = "obsidian"; + version = "0.7.3"; +in + +appimageTools.wrapType2 rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.AppImage"; + sha256 = "1qiag5szagalik72j8s2dmp7075g48jxgcdy0wgd02kfv90ai0y6"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + # Strip version from binary name. + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + description = "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files."; + homepage = "https://obsidian.md"; + license = licenses.obsidian; + maintainers = with maintainers; [ conradmearns ]; + platforms = [ "x86_64-linux" ]; + }; +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 7d613f3767..793ea927a0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -16,11 +16,17 @@ let py = python3.override { self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") - (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") - (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") - (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") - (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") + (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") + (mkOverride "flask_assets" "0.12" "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0") + (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") + (mkOverride "flask_login" "0.4.1" "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8") + (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") + (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") + (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") + (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") + (mkOverride "werkzeug" "0.16.1" "010zmhyfbp4d56c1rgalwi188imjlkv9g7rm25jrvify6xnqalxk") + (mkOverride "websocket_client" "0.56.0" "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z") + (mkOverride "wrapt" "1.11.2" "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn") # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4, diff --git a/third_party/nixpkgs/pkgs/applications/misc/olifant/default.nix b/third_party/nixpkgs/pkgs/applications/misc/olifant/default.nix new file mode 100644 index 0000000000..b3b2857df5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/olifant/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, vala +, meson +, ninja +, pkgconfig +, python3 +, libgee +, gsettings-desktop-schemas +, gnome3 +, pantheon +, wrapGAppsHook +, gtk3 +, json-glib +, glib +, glib-networking +}: + +stdenv.mkDerivation rec { + pname = "olifant"; + version = "0.2.1-beta5"; + + src = fetchFromGitHub { + owner = "cleac"; + repo = pname; + rev = version; + sha256 = "1fpyg3nii75vmsdhp8x4yvhi3npvp3xnbqmd0qcidn05mbsam68r"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + glib + glib-networking + gnome3.libsoup + gsettings-desktop-schemas + gtk3 + json-glib + libgee + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey"; + homepage = "https://github.com/cleac/olifant"; + license = licenses.gpl3; + maintainers = with maintainers; [ worldofpeace ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix index c0d20c14f7..892038c252 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix @@ -1,18 +1,47 @@ -{ stdenv, fetchFromGitHub, cmake, libosmium, protozero, boost, bzip2, zlib, expat }: +{ stdenv +, fetchFromGitHub +, cmake +, installShellFiles +, pandoc +, boost +, bzip2 +, expat +, libosmium +, protozero +, zlib +}: stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "18afn5qzdjpip176kk5pr04mj0p7dv70dbz1n36qmqnq3gyms10q"; + sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libosmium protozero boost bzip2 zlib expat ]; + nativeBuildInputs = [ + cmake + installShellFiles + pandoc + ]; + + buildInputs = [ + boost + bzip2 + expat + libosmium + protozero + zlib + ]; + + doCheck = true; + + postInstall = '' + installShellCompletion --zsh ../zsh_completion/_osmium + ''; meta = with stdenv.lib; { description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix index c43ae1de9a..b8f7c4641d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "0a9ap7p8iw57sn5nmhim7gp5as8gj6ir6l3p0bpmg4iqjsr4169h"; + sha256 = "03siz4ar6flyvrrgh7hr7sslc6n9x5d9i13lc5rm2qnssd0qdich"; }; nativeBuildInputs = [ @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 pikepdf + img2pdf setuptools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index d189235278..dcf4a0a621 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { desktopName = "PDFsam Basic"; genericName = "PDF Split and Merge"; mimeType = "application/pdf;"; - categories = "Office;Application;"; + categories = "Office;"; }; meta = with stdenv.lib; { @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ maintainers."1000101" ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgadmin/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgadmin/default.nix index 5fc0703e01..b0aabead24 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pgadmin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { exec = "pgadmin3"; icon = "pgAdmin3"; type = "Application"; - categories = "Application;Development;"; + categories = "Development;"; mimeType = "text/html"; }; in '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 3ecace18f9..15dd7222b2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plasma-applet-volumewin7mixer"; - version = "24"; + version = "25"; src = fetchFromGitHub { owner = "Zren"; repo = "plasma-applet-volumewin7mixer"; rev = "v${version}"; - sha256 = "1pms71229y7fv3zs38a0l9mdcg5qkcdv9yrcvdm6xqpdyk21jbz2"; + sha256 = "1nvz0a06qb3pfk8dfh5n5vgf3psd6k0j3vms9pskr511qsxw0dfi"; }; patches = [ ./cmake.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 144addf02c..79ad84e99b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { comment = "G-code generator for 3D printers"; desktopName = "PrusaSlicer"; genericName = "3D printer tool"; - categories = "Application;Development;"; + categories = "Development;"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index db84f5fbb9..1294ca6dcf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "06jxj89ya91grrwxfs7l1ahy46y993kxsc8gpkxajc0j5ihax2al"; + sha256 = "0x8slqxpnk4pis834g11wzp8fqsxwhdf0xnssz1pkkww4dqzali0"; }; - cargoSha256 = "191j3lpd24ycissw0y2hv65i1cjzf24draamq3sxv7hv0sxcjw4d"; + cargoSha256 = "0r110zlzpzg0j5cq9zg0kk46qigp6bzd0kzmpx3ddvhblhxvq5m5"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 3dfda8b9c5..0079cd220b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -11,13 +11,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.24.3.4"; + version = "3.24.3.10"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "0hv9050srrq7fm1fqla8b52mwpilsvr1jriz4ay633s63svss3zz"; + sha256 = "0izyn4y1ffq1mgxs5dymkrqih6n6v9ifrcpyk1z2vyhbm5xx4qsa"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix index 0fe0e03060..90e99b5adf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "0zks1pcj2s2pqkmw0hhm41vgdhfgj2r6dmvpsagbmf64578ww349"; + sha256 = "049m0p4wbsl822iym8xmc938d4k90iw7wjdzcxfyy8d27hv9mp45"; }; vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sbagen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sbagen/default.nix index 821fbe35ca..d7d7dd3ab7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sbagen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sbagen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Binaural sound generator"; homepage = "http://uazu.net/sbagen"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix index 04ceed6354..6f43774a12 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.91"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "071vfx7bdf7hfa4784xz97vrj9x5aipgjbp30r00kg2zhg8wa2ls"; + sha256 = "090plqnby2wxzr1waq5kz89w3269j363mgxwfz9g7qg55lddaahz"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix index 917e1965e2..7cc5bc6eb7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.17.0"; + version = "1.19.0"; sha256 = { - x86_64-linux = "14kjx4y3kvw7h8wk8mmkpx1288jscmd8bgl10bw6kcfigcwahpw3"; + x86_64-linux = "1bvg8xlf2y9nz7dzs5jkr5b48hwmvhvb6m4ia1fyvnqqq46nz9wb"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix index 912deee4cb..c8ecfbcb4a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { comment = "G-code generator for 3D printers"; desktopName = "Slic3r"; genericName = "3D printer tool"; - categories = "Application;Development;"; + categories = "Development;"; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix index 5c13cbf866..01dd6a19d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null }: +{ stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null, patches ? [] }: with stdenv.lib; stdenv.mkDerivation rec { pname = "slstatus"; - version = "unstable-2018-04-16"; + version = "unstable-2019-02-16"; src = fetchgit { url = "https://git.suckless.org/slstatus"; - rev = "97ef7c2a1d67bb2c9c379e657fbc8e35acd6aafb"; - sha256 = "1777hgl10imk0l2sgnqgbkfchv1mpxrd82ninzwp7f1rgwchz36v"; + rev = "b14e039639ed28005fbb8bddeb5b5fa0c93475ac"; + sha256 = "0kayyhpmppybhwndxgabw48wsk9v8x9xdb05xrly9szkw3jbvgw4"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + inherit patches; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/st/default.nix b/third_party/nixpkgs/pkgs/applications/misc/st/default.nix index 018fd9306a..a772629a7a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/st/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/st/default.nix @@ -4,11 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.8.3"; + pname = "st"; + version = "0.8.4"; src = fetchurl { - url = "https://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"; + url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; + sha256 = "19j66fhckihbg30ypngvqc9bcva47mp379ch5vinasjdxgn3qbfl"; }; inherit patches; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index 926db03652..94875de7eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -24,7 +24,7 @@ let icon = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Application;Graphics;2DGraphics;3DGraphics;"; + categories = "Graphics;2DGraphics;3DGraphics;"; }; patchPhase = '' @@ -34,7 +34,7 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; + buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' ant furniture textures help @@ -53,7 +53,7 @@ let makeWrapper ${jre}/bin/java $out/bin/$exec \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" + --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" ''; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix index ec75957244..d6b44a86e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix @@ -20,7 +20,7 @@ let name = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Application;Graphics;2DGraphics;3DGraphics;"; + categories = "Graphics;2DGraphics;3DGraphics;"; }; buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 28506c8fa8..c45ea27c42 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.10"; + version = "0.11.0"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "14nn0igcx4kd7pcna1ggz3yz9xfk1czgy87fxkmn2p91psmy2i18"; + sha256 = "1lpjrij6y8l738hd7bfig0piglqinnqbadidzw9k0nm53bh4pqrr"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix index fd6065010f..2b5c9da4b1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation { installPhase = ":"; - meta = { + meta = with stdenv.lib; { description = "Task management system"; homepage = "http://www.thinkingrock.com.au/"; - license = "CDDL"; # Common Development and Distribution License - platforms = stdenv.lib.platforms.unix; + license = licenses.cddl; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/tilda/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tilda/default.nix index 84d37a4f46..0a672b039f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tilda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tilda/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "tilda"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "lanoxx"; repo = "tilda"; rev = "${pname}-${version}"; - sha256 = "1kk69sg7ph906yr5jagkjx0qfkhr5w2nyx407wl2dsjimbps44rd"; + sha256 = "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix index dc991402ee..326dd3c0d9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix @@ -1,7 +1,25 @@ -{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre -, glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage -, libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp -, libstartup_notification, wrapGAppsHook +{ stdenv +, fetchFromGitLab +, pkg-config +, cmake +, gettext +, cairo +, pango +, pcre +, glib +, imlib2 +, gtk2 +, libXinerama +, libXrender +, libXcomposite +, libXdamage +, libX11 +, libXrandr +, librsvg +, libpthreadstubs +, libXdmcp +, libstartup_notification +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,13 +33,35 @@ stdenv.mkDerivation rec { sha256 = "1937z0kixb6r82izj12jy4x8z4n96dfq1hx05vcsvsg1sx3wxgb0"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ + pkg-config + cmake + gettext + wrapGAppsHook + ]; - nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; + buildInputs = [ + cairo + pango + pcre + glib + imlib2 + gtk2 + libXinerama + libXrender + libXcomposite + libXdamage + libX11 + libXrandr + librsvg + libpthreadstubs + libXdmcp + libstartup_notification + ]; - buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender - libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs - libXdmcp libstartup_notification ]; + cmakeFlags = [ + "-Ddocdir=share/doc/${pname}" + ]; postPatch = '' for f in ./src/launcher/apps-common.c \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix index 8316fd918a..4782b90b4a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tipp10"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitLab { - owner = "a_a"; + owner = "tipp10"; repo = pname; rev = "v${version}"; - sha256 = "1mksga1zyqz1y2s524nkw86irg36zpjwz7ff87n2ygrlysczvnx1"; + sha256 = "0fav5jlw6lw78iqrj7a65b8vd50hhyyaqyzmfrvyxirpsqhjk1v7"; }; nativeBuildInputs = [ cmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index be9027f9d0..e1d578edb0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.22"; + version = "1.23.0"; src = fetchurl { - url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; - sha256 = "09w2040xkvv78190fmhx99c0dwy7vpab5fvxs67s7yyjwh5n4693"; + url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb"; + sha256 = "1yxa0fdc3fnffny6jf1hm7545792pw7828mc27il17l4kn346g98"; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix index 5ce35f3292..f46af56ed4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.26.0"; + version = "0.27.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "146jj83jixahgxwh12bbkfvci2wrz398h5x01kgppdy59m4pa4pl"; + sha256 = "197g9lvwg8qnsf18kifcqdj3cpfdnxz9vay766rn9bi4nfz0s6j2"; }; checkInputs = with python3Packages; [ pytest ]; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; - license = licenses.mit; + license = licenses.gpl3; maintainers = [ maintainers.matthiasbeyer ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix index 7b9efb6bbe..dbe5b971ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tut"; - version = "0.0.9"; + version = "0.0.13"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "19y6brw1d6dlp2gnkdpbp261662h5j46rmiqg73cxhrlws0y0kfk"; + sha256 = "085qiv9q2hzv1v6qmbddra23acsmmkbwmjqc3cp81gfgl893z7sm"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 34ca82b8d0..a9713ffed3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.7.3"; + version = "5.8.0"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "0wq2zsq3496fjfg89q01dsm7sb7kv92sycvqm6ad8z1z2kpisrbh"; + sha256 = "1czxzcxix9iwv1sir1q64j5aavc7lzjjwqpisgdc1kidkwnk05zp"; }; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix index ef4684689b..c5edd9133b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "11wkwjqsq848ks6m2jqsb8h0xnz75fb60bm0c4jkxys9wzy4chg5"; + sha256 = "16g7dzvjcfhaz52wbmcapamy55l7vfhgizqy3m8dv9gkmy8vap89"; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix b/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix index ce4fae1cb2..9b6289d708 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "2.3"; + version = "2.4"; pname = "weather"; src = fetchurl { url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; - sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546"; + sha256 = "084f0am0s1h6y71wgja9acaaxp0mq6k74b6ad4b5wpk2znwv0rzz"; }; nativeBuildInputs = [ pythonPackages.wrapPython ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix index 37b991e6d4..d466384e66 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook }: +{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: stdenv.mkDerivation rec { pname = "wofi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; buildInputs = [ wayland gtk3 ]; # Fixes icon bug on NixOS. @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { }) ]; + postInstall = '' + installManPage man/wofi* + ''; + meta = with lib; { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix index aeece53e77..8bc0a31b91 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "11vy39zygk1gxb1nc1zmxlgs6fn7yq68090fwm2jar0lsxx8a83i"; + sha256 = "07ngk83p753w9qxm8bvw6n5vk0zldn14yv08d900sxny8cg2h0rb"; }; - vendorSha256 = "0qfb352gmsmy5glrsjwc3w57di5k2kjdsyfqn4xf7p4v12yg88va"; + vendorSha256 = "09iy148pnbdrzjj2j50lbd8s9mkv7vggrx77mj88p1gnqclz3lip"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix b/third_party/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix index 3b982b1766..7b7d9051ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz"; sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; }; - + patches = [ (fetchurl { url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch"; @@ -39,14 +39,15 @@ stdenv.mkDerivation { cp -v goo/libGoo.a $out/lib/goo cp -v fofi/libfofi.a $out/lib/fofi cp -v xpdf/libxpdf.a $out/lib/xpdf - + cp -v *.h $out/include cp -v goo/*.h $out/include cp -v fofi/*.h $out/include cp -v xpdf/*.h $out/include ''; - - meta = { - platforms = stdenv.lib.platforms.unix; + + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix new file mode 100644 index 0000000000..bbfef294cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "amfora"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "makeworld-the-better-one"; + repo = "amfora"; + rev = "v${version}"; + sha256 = "0bnjwsyi6l9p27rajwh0nq53zi4km7qpgyb08q17j0vd87gpdhka"; + }; + + vendorSha256 = "1rj2m3rg8ixclj5jr0nmp266vwj1mg5ampxn04i3wgaayy49dbdi"; + + meta = with lib; { + description = "A fancy terminal browser for the Gemini protocol"; + homepage = "https://github.com/makeworld-the-better-one/amfora"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ deifactor ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/cargo-lock.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/cargo-lock.patch new file mode 100644 index 0000000000..1d3990bc62 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/cargo-lock.patch @@ -0,0 +1,1351 @@ +diff --git i/Cargo.lock w/Cargo.lock +index 6807c00..00b2c60 100644 +--- i/Cargo.lock ++++ w/Cargo.lock +@@ -4,29 +4,34 @@ + name = "aho-corasick" + version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" + dependencies = [ +- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", + ] + + [[package]] + name = "arc-swap" + version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7b8a9123b8027467bce0099fe556c628a53c8d83df0507084c31e9ba2e39aff" + + [[package]] + name = "array-macro" + version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d034edd76d4e7adc314c95400941dedc89bd4337d565bf87f6b69d3b20dc4de" + + [[package]] + name = "arrayref" + version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" + + [[package]] + name = "arrayvec" + version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" + + [[package]] + name = "asuka" +@@ -38,8 +43,6 @@ dependencies = [ + "lazy_static", + "native-tls", + "open", +- "openssl", +- "openssl-sys", + "regex", + "tempfile", + "textwrap", +@@ -50,769 +53,861 @@ dependencies = [ + name = "autocfg" + version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + + [[package]] + name = "backtrace" + version = "0.3.40" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" + dependencies = [ +- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys", ++ "cfg-if", ++ "libc", ++ "rustc-demangle", + ] + + [[package]] + name = "backtrace-sys" + version = "0.1.32" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" + dependencies = [ +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", + ] + + [[package]] + name = "base64" + version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" + dependencies = [ +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", + ] + + [[package]] + name = "bitflags" + version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + + [[package]] + name = "blake2b_simd" + version = "0.5.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0" + dependencies = [ +- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", + ] + + [[package]] + name = "byteorder" + version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" + + [[package]] + name = "c2-chacha" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" + dependencies = [ +- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", + ] + + [[package]] + name = "cc" + version = "1.0.47" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" + + [[package]] + name = "cfg-if" + version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + + [[package]] + name = "chrono" + version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" + dependencies = [ +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", + ] + + [[package]] + name = "cloudabi" + version = "0.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", + ] + + [[package]] + name = "constant_time_eq" + version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" + + [[package]] + name = "core-foundation" + version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" + dependencies = [ +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + + [[package]] + name = "core-foundation-sys" + version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + + [[package]] + name = "crossbeam-channel" + version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" + dependencies = [ +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-utils" + version = "0.6.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "lazy_static", + ] + + [[package]] + name = "cursive" + version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6261747aa936aab19fc4ac3a2c1a8eee8fb5862ba96fb1e524ee56cb520d9caf" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "enum-map 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "enumset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "ncurses 5.99.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "xi-unicode 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "chrono", ++ "crossbeam-channel", ++ "enum-map", ++ "enumset", ++ "hashbrown", ++ "lazy_static", ++ "libc", ++ "log", ++ "maplit", ++ "ncurses", ++ "num", ++ "owning_ref", ++ "signal-hook", ++ "term_size", ++ "toml", ++ "unicode-segmentation", ++ "unicode-width", ++ "xi-unicode", + ] + + [[package]] + name = "darling" + version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" + dependencies = [ +- "darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "darling_macro 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "darling_core", ++ "darling_macro", + ] + + [[package]] + name = "darling_core" + version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" + dependencies = [ +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv", ++ "ident_case", ++ "proc-macro2", ++ "quote", ++ "strsim", ++ "syn", + ] + + [[package]] + name = "darling_macro" + version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" + dependencies = [ +- "darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "darling_core", ++ "quote", ++ "syn", + ] + + [[package]] + name = "dirs" + version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "dirs-sys", + ] + + [[package]] + name = "dirs-sys" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "redox_users", ++ "winapi 0.3.8", + ] + + [[package]] + name = "enum-map" + version = "0.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75eb4afb8170adb4120b13700c1af58c3137cd72e4c56e282045af5c29ab5329" + dependencies = [ +- "array-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "enum-map-derive 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "array-macro", ++ "enum-map-derive", + ] + + [[package]] + name = "enum-map-derive" + version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e57001dfb2532f5a103ff869656887fae9a8defa7d236f3e39d2ee86ed629ad7" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] + name = "enumset" + version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57b811aef4ff1cc938f13bbec348f0ecbfc2bb565b7ab90161c9f0b2805edc8a" + dependencies = [ +- "enumset_derive 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "enumset_derive", ++ "num-traits", + ] + + [[package]] + name = "enumset_derive" + version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b184c2d0714bbeeb6440481a19c78530aa210654d99529f13d2f860a1b447598" + dependencies = [ +- "darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "darling", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] + name = "failure" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" + dependencies = [ +- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace", ++ "failure_derive", + ] + + [[package]] + name = "failure_derive" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", + ] + + [[package]] + name = "fnv" + version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" + + [[package]] + name = "foreign-types" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" + dependencies = [ +- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types-shared", + ] + + [[package]] + name = "foreign-types-shared" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + + [[package]] + name = "fuchsia-cprng" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + + [[package]] + name = "getrandom" + version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", + ] + + [[package]] + name = "hashbrown" + version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" + + [[package]] + name = "ident_case" + version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + + [[package]] + name = "idna" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", + ] + + [[package]] + name = "json" + version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3ca41abbeb7615d56322a984e63be5e5d0a117dfaca86c14393e32a762ccac1" + + [[package]] + name = "kernel32-sys" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + dependencies = [ +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8", ++ "winapi-build", + ] + + [[package]] + name = "lazy_static" + version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" + version = "0.2.65" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" + + [[package]] + name = "log" + version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", + ] + + [[package]] + name = "maplit" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + + [[package]] + name = "matches" + version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + + [[package]] + name = "maybe-uninit" + version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + + [[package]] + name = "memchr" + version = "2.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" + + [[package]] + name = "native-tls" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)", +- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", + ] + + [[package]] + name = "ncurses" + version = "5.99.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15699bee2f37e9f8828c7b35b2bc70d13846db453f2d507713b758fabe536b82" + dependencies = [ +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", ++ "pkg-config", + ] + + [[package]] + name = "num" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" + dependencies = [ +- "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-complex", ++ "num-integer", ++ "num-iter", ++ "num-rational", ++ "num-traits", + ] + + [[package]] + name = "num-complex" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-traits", + ] + + [[package]] + name = "num-integer" + version = "0.1.41" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-traits", + ] + + [[package]] + name = "num-iter" + version = "0.1.39" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-integer", ++ "num-traits", + ] + + [[package]] + name = "num-rational" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-integer", ++ "num-traits", + ] + + [[package]] + name = "num-traits" + version = "0.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "443c53b3c3531dfcbfa499d8893944db78474ad7a1d87fa2d94d1a2231693ac6" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", + ] + + [[package]] + name = "open" + version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94b424e1086328b0df10235c6ff47be63708071881bead9e76997d9291c0134b" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "openssl" + version = "0.10.25" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "lazy_static", ++ "libc", ++ "openssl-sys", + ] + + [[package]] + name = "openssl-probe" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + + [[package]] + name = "openssl-sys" + version = "0.9.52" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", + ] + + [[package]] + name = "owning_ref" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" + dependencies = [ +- "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "stable_deref_trait", + ] + + [[package]] + name = "percent-encoding" + version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + + [[package]] + name = "pkg-config" + version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" + + [[package]] + name = "ppv-lite86" + version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + + [[package]] + name = "proc-macro2" + version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" + dependencies = [ +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", + ] + + [[package]] + name = "quote" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", + ] + + [[package]] + name = "rand" + version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" + dependencies = [ +- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core 0.5.1", ++ "rand_hc", + ] + + [[package]] + name = "rand_chacha" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" + dependencies = [ +- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "c2-chacha", ++ "rand_core 0.5.1", + ] + + [[package]] + name = "rand_core" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" + dependencies = [ +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", + ] + + [[package]] + name = "rand_core" + version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + + [[package]] + name = "rand_core" + version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" + dependencies = [ +- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", + ] + + [[package]] + name = "rand_hc" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" + dependencies = [ +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1", + ] + + [[package]] + name = "rand_os" + version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" + dependencies = [ +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.4.2", ++ "rdrand", ++ "winapi 0.3.8", + ] + + [[package]] + name = "rdrand" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "redox_syscall" + version = "0.1.56" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + + [[package]] + name = "redox_users" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" + dependencies = [ +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure", ++ "rand_os", ++ "redox_syscall", ++ "rust-argon2", + ] + + [[package]] + name = "regex" + version = "1.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" + dependencies = [ +- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", + ] + + [[package]] + name = "regex-syntax" + version = "0.6.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" + + [[package]] + name = "remove_dir_all" + version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "rust-argon2" + version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" + dependencies = [ +- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64", ++ "blake2b_simd", ++ "crossbeam-utils", + ] + + [[package]] + name = "rustc-demangle" + version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + + [[package]] + name = "schannel" + version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "winapi 0.3.8", + ] + + [[package]] + name = "security-framework" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "301c862a6d0ee78f124c5e1710205965fc5c553100dcda6d98f13ef87a763f04" + dependencies = [ +- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", + ] + + [[package]] + name = "security-framework-sys" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" + dependencies = [ +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", + ] + + [[package]] + name = "serde" + version = "1.0.102" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" + + [[package]] + name = "signal-hook" + version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb543aecec4ba8b867f41284729ddfdb7e8fcd70ec3d7d37fca3007a4b53675f" + dependencies = [ +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "signal-hook-registry", + ] + + [[package]] + name = "signal-hook-registry" + version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" + dependencies = [ +- "arc-swap 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arc-swap", ++ "libc", + ] + + [[package]] + name = "smallvec" + version = "0.6.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" + dependencies = [ +- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "maybe-uninit", + ] + + [[package]] + name = "stable_deref_trait" + version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" + + [[package]] + name = "strsim" + version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" + + [[package]] + name = "syn" + version = "1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", + ] + + [[package]] + name = "synstructure" + version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", + ] + + [[package]] + name = "tempfile" + version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi 0.3.8", + ] + + [[package]] + name = "term_size" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" + dependencies = [ +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "libc", ++ "winapi 0.2.8", + ] + + [[package]] +@@ -828,225 +923,126 @@ dependencies = [ + name = "thread_local" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", + ] + + [[package]] + name = "time" + version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" + dependencies = [ +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.8", + ] + + [[package]] + name = "toml" + version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" + dependencies = [ +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", + ] + + [[package]] + name = "unicode-bidi" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", + ] + + [[package]] + name = "unicode-normalization" + version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" + dependencies = [ +- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec", + ] + + [[package]] + name = "unicode-segmentation" + version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" + + [[package]] + name = "unicode-width" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" + + [[package]] + name = "unicode-xid" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" + + [[package]] + name = "url" + version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" + dependencies = [ +- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna", ++ "matches", ++ "percent-encoding", + ] + + [[package]] + name = "vcpkg" + version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" + + [[package]] + name = "wasi" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" + + [[package]] + name = "winapi" + version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + + [[package]] + name = "winapi" + version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" + dependencies = [ +- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", + ] + + [[package]] + name = "winapi-build" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + + [[package]] + name = "winapi-i686-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "xi-unicode" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +- +-[metadata] +-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +-"checksum arc-swap 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d7b8a9123b8027467bce0099fe556c628a53c8d83df0507084c31e9ba2e39aff" +-"checksum array-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7d034edd76d4e7adc314c95400941dedc89bd4337d565bf87f6b69d3b20dc4de" +-"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" +-"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +-"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +-"checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0" +-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +-"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +-"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" +-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +-"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" +-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +-"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" +-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +-"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +-"checksum cursive 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261747aa936aab19fc4ac3a2c1a8eee8fb5862ba96fb1e524ee56cb520d9caf" +-"checksum darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +-"checksum darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +-"checksum darling_macro 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +-"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +-"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +-"checksum enum-map 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75eb4afb8170adb4120b13700c1af58c3137cd72e4c56e282045af5c29ab5329" +-"checksum enum-map-derive 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e57001dfb2532f5a103ff869656887fae9a8defa7d236f3e39d2ee86ed629ad7" +-"checksum enumset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "57b811aef4ff1cc938f13bbec348f0ecbfc2bb565b7ab90161c9f0b2805edc8a" +-"checksum enumset_derive 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b184c2d0714bbeeb6440481a19c78530aa210654d99529f13d2f860a1b447598" +-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +-"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" +-"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" +-"checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +-"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +-"checksum json 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3ca41abbeb7615d56322a984e63be5e5d0a117dfaca86c14393e32a762ccac1" +-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +-"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" +-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +-"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +-"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" +-"checksum ncurses 5.99.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15699bee2f37e9f8828c7b35b2bc70d13846db453f2d507713b758fabe536b82" +-"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" +-"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" +-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" +-"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" +-"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" +-"checksum num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "443c53b3c3531dfcbfa499d8893944db78474ad7a1d87fa2d94d1a2231693ac6" +-"checksum open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "94b424e1086328b0df10235c6ff47be63708071881bead9e76997d9291c0134b" +-"checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449" +-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +-"checksum openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc" +-"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" +-"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +-"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +-"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" +-"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" +-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +-"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" +-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +-"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" +-"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" +-"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" +-"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +-"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" +-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +-"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" +-"checksum security-framework 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "301c862a6d0ee78f124c5e1710205965fc5c553100dcda6d98f13ef87a763f04" +-"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" +-"checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" +-"checksum signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cb543aecec4ba8b867f41284729ddfdb7e8fcd70ec3d7d37fca3007a4b53675f" +-"checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" +-"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +-"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +-"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" +-"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" +-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +-"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" +-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +-"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" +-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +-"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" +-"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +-"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" +-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +-"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" +-"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" +-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-"checksum xi-unicode 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7395cdb9d0a6219fa0ea77d08c946adf9c1984c72fcd443ace30365f3daadef7" ++checksum = "7395cdb9d0a6219fa0ea77d08c946adf9c1984c72fcd443ace30365f3daadef7" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix new file mode 100644 index 0000000000..458ab3064a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "asuka"; + version = "0.8.0"; + + src = fetchurl { + url = "https://git.sr.ht/~julienxx/${pname}/archive/${version}.tar.gz"; + sha256 = "10hmsdwf2nrsmpycqa08vd31c6vhx7w5fhvv5a9f92sqp0lcavf0"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0csj63x77nkdh543pzl9cbaip6xp8anw0942hc6j19y7yicd29ns"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ ncurses openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "Gemini Project client written in Rust with NCurses"; + homepage = "https://git.sr.ht/~julienxx/asuka"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index b3261431cc..5a8171a40a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -86,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.8.95"; + version = "1.11.97"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1mlffg2v31b42gj354w5yv0yzlqc2f4f3cmdnddzkplw10jgw6f1"; + sha256 = "1wmjwk98fvzy5slyqpzpnn1mx663q3pvcyr3fzcinf6v971vz3q2"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix index 6209c3263b..7c234c42c2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix @@ -13,15 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "castor"; - version = "0.8.14"; + version = "0.8.16"; src = fetchurl { url = "https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz"; - sha256 = "1ykpmbimhfy3ys2hvv0mn8xiwxzdl43gpny1nc58i0gzv07ar8sc"; + sha256 = "1qwsprwazkzcs70h219fhh5jj5s5hm1k120fn3pk4qivii4lyhah"; }; - cargoSha256 = "04w49wka1vkb295lk6fzd6c5rwhzrqkp26hd5d94rx7bhcjmmb9w"; - verifyCargoDeps = true; + cargoSha256 = "0yn2kfiaz6d8wc8rdqli2pwffp5vb1v3zi7520ysrd5b6fc2csf2"; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 5dbafcee83..e538fb66bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -81,7 +81,7 @@ let # "ffmpeg" # https://crbug.com/731766 # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together # so we can't build with one from system and other from source - ] ++ optional (versionRange "0" "84") "yasm"; + ]; opusWithCustomModes = libopus.override { withCustomModes = true; @@ -94,9 +94,10 @@ let xdg_utils minizip libwebp libusb1 re2 zlib ffmpeg_3 libxslt libxml2 + nasm # harfbuzz # in versions over 63 harfbuzz and freetype are being built together # so we can't build with one from system and other from source - ] ++ (if (versionRange "0" "84") then [ yasm ] else [ nasm ]); + ]; # build paths and release info packageName = extraAttrs.packageName or extraAttrs.name; @@ -123,9 +124,9 @@ let nativeBuildInputs = [ ninja which python2Packages.python perl pkgconfig python2Packages.ply python2Packages.jinja2 nodejs - gnutar - ] ++ optional (versionAtLeast version "83") python2Packages.setuptools - ++ optional (versionAtLeast version "84") (xorg.xcbproto.override { python = python2Packages.python; }); + gnutar python2Packages.setuptools + (xorg.xcbproto.override { python = python2Packages.python; }) + ]; buildInputs = defaultDependencies ++ [ nspr nss systemd @@ -181,6 +182,11 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' + substituteInPlace ui/gfx/x/BUILD.gn \ + --replace \ + '/usr/share/xcb' \ + '${xorg.xcbproto}/share/xcb/' + sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc @@ -226,16 +232,9 @@ let ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar - '' + optionalString (versionAtLeast version "84") '' - substituteInPlace ui/gfx/x/BUILD.gn \ - --replace \ - '/usr/share/xcb' \ - '${xorg.xcbproto}/share/xcb/' ''; - gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") { - linux_use_bundled_binutils = false; - } // { + gnFlags = mkGnFlags ({ use_lld = false; use_gold = true; gold_path = "${stdenv.cc}/bin"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 2fea779a8f..d9a1398d09 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,9 +1,9 @@ { newScope, config, stdenv, llvmPackages_9, llvmPackages_10 -, makeWrapper, ed +, makeWrapper, ed, gnugrep , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 -, gcc, nspr, nss, patchelfUnstable, runCommand +, gcc, nspr, nss, runCommand , lib # package customization @@ -69,8 +69,6 @@ let # The .deb file for Google Chrome src = upstream-info.binary; - nativeBuildInputs = [ patchelfUnstable ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let @@ -189,7 +187,7 @@ in stdenv.mkDerivation { '' + '' # libredirect causes chromium to deadlock on startup - export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch index b5372d1a25..8d879de7bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch @@ -31,15 +31,6 @@ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT // |output_mode_| as well. if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) -@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { - // depends on the bitstream and sometimes it's not enough to cover the amount - // of frames needed by the client pipeline (see b/133733739). - // TODO(crbug.com/911754): Enable for VP9 Profile 2. -- if (IsGeminiLakeOrLater() && -+ if (false && IsGeminiLakeOrLater() && - (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) { - // Add one to the reference frames for the one being currently egressed, and - // an extra allocation for both |client_| and |decoder_|, see --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h @@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix index 707bf2056f..fb5b89ba4e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -4,7 +4,6 @@ , nspr , nss , fetchzip -, patchelfUnstable , enablePepperFlash ? false , upstream-info diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 65dda49314..874e45307e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0wsqxq8xxcafmjxsjkagysrcbr6qryiyqn6m3ysp256aam7z3d88"; - sha256bin64 = "03jff1sdv05hbn37cw0ij0r4rils0q11lnnhxg52igg633jzwyc1"; - version = "84.0.4147.45"; + sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; + sha256bin64 = "017ix9a74f2gzlg6in0x6fqgiw8bpk0rypr6wsqqkslywprypjd0"; + version = "84.0.4147.89"; }; dev = { - sha256 = "16rmzyzjmxmhmr5yqbzqbwf5sq94iqcwlm04fkafiwcycd17nyhs"; - sha256bin64 = "0wjmc1wdmwiq9d1f5gk4c9jkj1p116kaz9nb0hvhjf01iv07xl2m"; - version = "85.0.4168.2"; + sha256 = "1dbbr7s8vbhxd0sk4k2yqp630zp1r4gzkkd2a86pzlzq2mjhsk8a"; + sha256bin64 = "0bphfwi6nkj9nzrjjaffiv27xfblgdikyifsbjl6vv2pawkh335q"; + version = "85.0.4183.15"; }; stable = { - sha256 = "0bvy17ymlih87n4ymnzvyn0m34ghmr1yasvy7gxv02qbw6i57lfg"; - sha256bin64 = "00hjr5y0cczs6h2pxrigpmjiv24456948v32q7mr7x5ysr5kxpn6"; - version = "83.0.4103.106"; + sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; + sha256bin64 = "1hzhgvs2ykqsncpnbnhzh09sw1vlsdfjhs06z5gc80l47brdi3wz"; + version = "84.0.4147.89"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix index 985497a095..79cb5437b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, xlibsWrapper, bzip2, zlib, openssl +{ stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib, openssl , gpm , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -10,11 +10,12 @@ assert enableGuile -> guile != null; assert enablePython -> python != null; -stdenv.mkDerivation { - name = "elinks-0.12pre6"; +stdenv.mkDerivation rec { + pname = "elinks"; + version = "0.12pre6"; src = fetchurl { - url = "http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2"; + url = "http://elinks.or.cz/download/${pname}-${version}.tar.bz2"; sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq"; }; @@ -23,7 +24,15 @@ stdenv.mkDerivation { ./openssl-1.1.patch ]; - buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] + postPatch = (stdenv.lib.optional stdenv.isDarwin) '' + patch -p0 < ${fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/72bed7749e76b9092ddd8d9fe2d8449c5afb1d71/www/elinks/files/patch-perl.diff"; + sha256 = "14q9hk3kg2n2r5b062hvrladp7b4yzysvhq07903w9kpg4zdbyqh"; + }} + ''; + + buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey ] + ++ stdenv.lib.optional stdenv.isLinux gpm ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python ++ stdenv.lib.optional enablePerl perl @@ -44,10 +53,10 @@ stdenv.mkDerivation { ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}" ; - meta = { + meta = with stdenv.lib; { description = "Full-featured text-mode web browser"; homepage = "http://elinks.or.cz"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 601e4a77db..94490ee7e2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "78.0b2"; + version = "79.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ach/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ach/firefox-79.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f70d001f2415f46f0a2fddb7a3de19d0b4be6fb185b1e4e875bb3f374b9e73f65369117b197ddeea7cea72bf8993984ff166d0a58dd9fcea1a555db19df242af"; + sha256 = "423172ecaa10ac58180d725febebb54131c7443b77fb5205102512a467cb9698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/af/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/af/firefox-79.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "9376bfa53068581a4bcbbf2fa7fe946d3ae006770edef1060f82b0c1722c90712c65cd86e89292c03167bebbe3e67c5b3215b88e11681c723f430470f84e685c"; + sha256 = "408a019bd91f9f167606fc068fcf8c815fbf63253040323a496ecb039e048239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/an/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/an/firefox-79.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "51b4294f4ecd8716b875060b219af558df8298113c487f24a23c0e598ef7c5516fdab9a888022c4ad6679efdf0cd86cdb601179c146e6b97ccd332d22f0d08a6"; + sha256 = "9e1ba3ade4031b2a1349cac7ae2df975705dec9a0928721c4fae634f16ad2336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ar/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ar/firefox-79.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "4fc9a968ffaa96019819603ab9788ef0580f43da222c899c1af68db2e8f4e9d056356ea99d27481bb9b7eb451504bbe31fb857bd511d1862cb366ad4177616e2"; + sha256 = "b007dcecaf3c3fbf4e2d1b55311269984932e9193f045ae5659656d288a6d290"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ast/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ast/firefox-79.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c70026f3a7ec4572750c01df1d7ab5859afd91dd12b242534c5afbfeaf99dfe2585655d5d87d861f5211cef6cf67a0ab177190adcfca0697a89c7a6f7de022c4"; + sha256 = "dd4e126494416fd0188d8dfcf7b202a61199cd9ceeae2d59d4c278cb82dee95e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/az/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/az/firefox-79.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "005b79149215e2f85851900e08ffb1214f8b100a0a1bcf73365115769f8744e687f9b0ff8500a40cc48dc53cb203d33b757153266157cda3406532e5a1cb0c5a"; + sha256 = "a375291cf4e6b86b8bb4097115014e16dec3e75237bb5124cc2c71c630103aae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/be/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/be/firefox-79.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "11e1ec1146b0688ccadf1c9ce4c219a722533ecd00a3df828e0519c2b49bdb66280aee053254fecd00fc90e0d577de167ea3c1e146e2f9c351b9bfe4756c21eb"; + sha256 = "678768f65e54aaab7c1088f0b65e1eb9d8590b257c8f72ceeaaf690235cb3ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bg/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/bg/firefox-79.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4a8cc34e0a59d9000b62181461633863583c2f35e50dd7e2de8307b0d537e0f3b439112b2879a95c9a4341a01b361971f0160abd9409be1f4169cad44c3c3825"; + sha256 = "4d3a8bda9f809af7fae056bc17b6ca49acff26f175b750af2e341048ae18e502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/bn/firefox-79.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "8330315eb21da9da68840bfa64e8f4a150fd4df5e12d10ebd504f38dacab17cf43a246c10cd77ccb6fafbd8f4094d1f6ede53b623308fae90e161d4cf86e6fe6"; + sha256 = "3e389228649921f1accf39541d9c76797be1e94e9b65a7cfe69c40f2a1081c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/br/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/br/firefox-79.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "cfd67e67af7d97f0bbae051b3c366fba48a09ec4615fa4ff178bc12610962952dd2584916df5a76e52a5f575fd4060e473ff4a2ccb63322f8cb8ed1a351b5a94"; + sha256 = "f5813909a8ea779ac7a13db38af5630ef4581f9df482169342108825573a4fd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/bs/firefox-79.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e4781c53f1eeae10b6af48c4841a2ecff7f82006ecdea50b3afd40d000af3d4d89806a5372feb13c5d44b04c0c7dca32a0ca6f2d9a138b393569a9f1d96d572c"; + sha256 = "7cd07a4e9bb83df432450fd6babd4058ea445d14d1769e31592954f14838252d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ca-valencia/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ca-valencia/firefox-79.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "9dc0395dd7f7e2c704a77deb4823882e1ea7c9ccc38bc49da4c906e70a009d912afb0cf05359d1f757b4591243091adc6890caaa85ee15cf1b2a26d2245cae58"; + sha256 = "a2ca4b866d764880a0dca1397f655e074bad53cfc9b811cf113c13e8525b0d0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ca/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ca/firefox-79.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "118980cb81ac4d84d456675db91d61ea54a35ad4796acc59434cfe294fd1e0355c1ee92a73de867b18ae04972a28d849d8ed4c8feb5dd6bacd1066175ae3968a"; + sha256 = "cbfbe3266fcad8b4887a3dfe6c90b6808297803a112245a40984e6648242dee3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cak/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/cak/firefox-79.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "47f85a0a6dd1c8540abdb017de664577d9ca79da8057c26b84045fb2ae1fa3b03dafb6c067c9bfe485e0d208d114449ac3cc02274ffef6e80affde8c2ec0c530"; + sha256 = "aa9e74a8ed9fff2e04cb2b4b0eaaa81b8a40e9409d48e70af9dcb68397f7b331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/cs/firefox-79.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "0a51c2fbd9ea337487073b7c6e4fe616762019682b91cb9513f1a8a8436ec73f2c1175ee3fd66ce81084d0122f3f550fb49c5d91ac461bb6f2ac47d29dd69152"; + sha256 = "894dec5e0affc7b3f3bd5bf44e1109593a8aa6435fe71e481e3f8983af98a3fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cy/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/cy/firefox-79.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "aa795f346fe87ac8afbca19add1bcf6aaacdf051323e4dbe8f04fa83c27444d9814cd4b7ae169390fbe3c3987deed14e453f45800393c64d896b8607af05b65b"; + sha256 = "8f3784f77b09c674a23a255492f1634d280e0fc56f0a3694275ef6c024dba530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/da/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/da/firefox-79.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "80796ffe89d9dd15b354015585dd722da3047db5b8b15fb380f7566fd99792959133a100bebe7d4b77ce5dfa710117fab61f5f5d0569eae88284138718e5fa63"; + sha256 = "57bc320453a7a7d19ea98c61915cafb964044be95d3d25ebfbb67668d2e8ec33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/de/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/de/firefox-79.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "a75dea0908d83630e2df0991250102fc8d3148644005e70e31a15cc626d189735565e49021de9ed766419873adcded2086186a520b6edd8c8f753710381e55e6"; + sha256 = "7e782965454cef0005df730141f593b37e01f15c120185de02ae315a6471b0bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/dsb/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/dsb/firefox-79.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "729e10b88c59a24b4d838b3888ed6ba910e28199211df046c1f09d68b19b5547e5e9953c131118fda4c302b23b09a5a8d6a78a6e220207701590d815af74097e"; + sha256 = "ffab16697e970e33256b518a2f607f660a4b6ea6bcb66c89ddef9d77bc2f0073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/el/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/el/firefox-79.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "862377ff91054392814f851da646f18a2e485753fce3338411fa590eb461100d94f5b9926fc97848e38d4d1715a8cbd82b87033575daf2e3cff00bddb5c7f165"; + sha256 = "72e2f63d29736b517c1cb1a715b3f53adc2a1b7a5275bb9254ed5246fc809d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-CA/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/en-CA/firefox-79.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "5a02d99dad00e69f47117f41a0b5f48b3a52d64b1595f9c8cc13086ed0db67c7f9debee30c071140d633821fd42f588430bd8ef93a16bb80f0def1f965da7135"; + sha256 = "afc0656f0c1cf3b45a17475531294dd88976d2ab5adced074d041f8ab0b82e5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-GB/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/en-GB/firefox-79.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a8fefe63ff03015f945d45294d20954808488bbbb8f28629ac0bd2309500f64b6c766a1c75cc2b340f65bb511d1a50516097ac82d7bc2f3e7f82ae88789aeb91"; + sha256 = "cc9a1b76381a57025a814f50240a3f54ad4c65afc6dbcb964bc64cfa0428a8b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-US/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/en-US/firefox-79.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "73df2d07120716b9e25028f8fc46c0e0e671b6ae1b131f9045049c709a1d678f9227d882ebe2f496cf0dfb71ae7bdab4185015728d1bd8e2b3661acf74ee1573"; + sha256 = "baa573e6205a1892e30d5dd4cb1f569e7d188a196ff44fae9fe3b9d1f3698e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/eo/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/eo/firefox-79.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "835944b50e3005cfa69c8c0aa0644d76ad2f953d1b01be6d019423a276f8ba5abc39cad0393356029f5bfd4d2edf6b94c653a1590017eaa4cd206161e3513350"; + sha256 = "affb91fbc15242b9d7d1dd95f5a5f4d2baaba7f4c299667bb83cd2852d0e0070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-AR/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/es-AR/firefox-79.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "7395feba72406eb9888a59587674e1ad0041fb8339fef29f2bf136a7a7a54aeeb082e9be897b2137ee2f48bb09c844ed153213393d0492b05b93ec13fb9852cc"; + sha256 = "b2990fce69dd8a605367297fbb031e683a91b7992dab83bac67024dc2f4c8967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-CL/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/es-CL/firefox-79.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ec654f43750239ba622b8e0dffe99acc7bd04144f8a116ffe2f40b3995ca37abfd94b6827cf3af916d0657e38041b8ae3e86c6f5c0d215b24fcabbc97accf51d"; + sha256 = "4a3ed88b87309f482c43ef8acc30e67e1e791364a774dae5ef2de9d3948dbf52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-ES/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/es-ES/firefox-79.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "65ad0d7c4d9d0ca6501b7c957175661bf692ee388679c435471af6199d4ed0e070168490c4dcb65d53b66d8b517c5271019f869af7a5048be81259c3d73d01ea"; + sha256 = "3c33e05e6d28db7a164984c746c3919e641dc2a6db8d192cfe9cac000fa16743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-MX/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/es-MX/firefox-79.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "de8fd8cd130f6de8bd26ca054c8eb655de4c958d183cc05bcb41e64102697a4805abe706e760eaa32121e777f20170eaa48eb46db468a51c3c77fc74b4ca2626"; + sha256 = "4b8c25940ec033be273e83694784c5175fd54f146e5d20eed04c5c675c3aa902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/et/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/et/firefox-79.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d39f4f6a65ae24aac5d4c541246ca5911d6af14cb851eef3869e9481f52c9dc593f5518d1c475dfd3a7f2f55d661463e0d6510e0267f46795b3282a6a26684ae"; + sha256 = "512bec2a4e96fc4cc55bdcd2651928e3070556fb3ac266776674d2f157f839a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/eu/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/eu/firefox-79.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4661cf17da33ed88b8bb0ef8967809f0748c3cd1c8afaf22ba679aec95a9d0ee95cd5c1d08f7a449fafb55f49a32e2a4ef366d09056460985ee5b6999ae80181"; + sha256 = "a27a0907895889a42d803da53de25c8d89387ab5dadbbf0907a9b49124de5e6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fa/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/fa/firefox-79.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "83181415420d2c8c5d56f81d40ad587c1ff1ccf21b1469a235efabad0960db78e912f459e7264f10cc9c2707fa3d6756b8c0b0f8321754e44ca5b319a952f9e2"; + sha256 = "3d3fe4787c0f5cc9980cabff9830f107664af7bf30b1f7a5f9195d36a6bbeb11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ff/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ff/firefox-79.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7821df8329fa367002e526bc792432631e098b1ee15e116af2b0ca06d629594d650e8310e701d5e02711bc438c7be9aac997686ee314d226b834ae9ad661fbbc"; + sha256 = "4b768ef1f4c02bbd4e6ce524fb1d23c9d94778da4ef706fab4f8b6c5bbc2e22b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fi/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/fi/firefox-79.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9cb5b49cd326ba3f3effa2c844a9b2cec1f5e55a56f4e86514e6b8607dd8d3fdf88335614c974a8d2362f6967bca800032411e2d18a6ae5f1d44ea815baba134"; + sha256 = "bf65329b5cdd186b68d14471bde971beb85d8d8d8bf1ef539b9b6ddcda352c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/fr/firefox-79.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "fcc80e9643c05ab9c581c9652bb24aa682b76c07702c3cc6bf4fb6abc3b5e198bba5691e0403cafacd1a52e45eeab707897603a24311a78a4b54da706208123b"; + sha256 = "a3f7e5ca5cf021135ee4e3723cc6752815877698f12f9f0192f6ef5df1d6ab66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fy-NL/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/fy-NL/firefox-79.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "6df59da001300587d579b6202b85c089867b2b762ddb4705cd44927f16766e8c85d9c72fa00a5c47904b07e475f7ebf4f26428b9f4af73684a1b8140a8a6e7ba"; + sha256 = "f8ded8da8420d57eeb97f896c1ca300ea37a05a9c4ec0882f6458fe90f9d57f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ga-IE/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ga-IE/firefox-79.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b94d32ed84c6c06a060040fa349f470886ce06a33139b987a04540fd567f74be779a63d7a8e860b22abb8711114cbd2c22b882bfaea4baba1eaa73d9a31670ba"; + sha256 = "e243ae2eb3bbaa2062149b81ae7a0b3707a22cdd22cf12d52b4ad16a092b1f50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gd/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/gd/firefox-79.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4dfd64b333aac4848dcf3ff44b56d2070dcaa5b81150d643e50c68a1c1c32e533f6b00befef3daa1fa6f6bfa8041593acfbef4fbf91694c9cbea931b0082f890"; + sha256 = "21c754935d320abf785d9da13458cd7cad87b94a9bd58f04b7d2caccc74d4a23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/gl/firefox-79.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b4f10e6c26cf215b810512786988af3e961383d5c00e4d0c6ff2e0cf45d4616a3f999837df0b15c642109f0a930a543192d69b38fd5ac6d2adc4b8e147c85297"; + sha256 = "3ed764d4ffb47f8b044122677333c56a43097f9a9f6ac41f14cd3e2c2c1b1f0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/gn/firefox-79.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f51911301d88ca070defb75ff49bdc6d1ca5dc60534518febfad20f2aa256dc226f15945993300e96ff4fe1aadb427aa51340dc1f3ec7420c15432f57fa31d8f"; + sha256 = "4f74dce5938a97ef1b813f5e7423f8f7915a22c5248da3462ac3692534dcda09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gu-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/gu-IN/firefox-79.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c122187243467d12422da400affa93fc62070801d30976fda1fde6664c5dbff3cab37c3b1e0a20a1b62605eb1127f13bdf806c07063cd84ee5f8fb9d19397573"; + sha256 = "1d75b6b71937b131b09ea15d5f2e1abaa53077f7e2c7d4d9716f64dc73c0c27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/he/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/he/firefox-79.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5f0208c47710d0bdde59742392c4086add04cce787cf257d9295243426cd3085b5693a382985a6a0b5cc46815049012807c6fdf5c4835fce8c0f60c105743020"; + sha256 = "1e383432af4efb2e8ecf50f1ba2491312066f3b6212a82d7ce586ea6075183f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hi-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hi-IN/firefox-79.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "28c296e2e3e6c17ddeb5bdff5b3c75e81eebe631c10bfe63a8b7755cbce78627634cdd300d8ca7e65bebab1ad3a058eed0be6704a1f3eb0c46761b2516e25a34"; + sha256 = "2eebb66deb729e9b3ba6b2672467c3e7e1e30f978eb7a9a25c6cc87b2a524795"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hr/firefox-79.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "638cc3b5f2a1f5fb3e45e81beb209234a1a89356bdc99b933a7c7d84811691a33dca27163e93e9b77b2cd1168decac98d2c21a6837dee4335214f87e5f1cd78c"; + sha256 = "f4e71ac432b6e3991ca68190ba837ef0b6da2ca2ed0e5d4e21e0257f6bc95821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hsb/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hsb/firefox-79.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "40e842a776c591dbe92ad2d191e6fd1c1c26c00aec6110b74e734ace0b5868afe430017ee2e953692fcbdb542115904229adb9294c64ffa63a15ae4da6abd949"; + sha256 = "12b5694518fc5bb41a7d371a2dd0e38b0c8a63f82fc10cb9838c2f6d85f442ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hu/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hu/firefox-79.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b544898a2433c66c6b69fa84e36558f95d722e986d09afeb76f412c128a351977389bf554d524e28c02d8e5554519ebcdc136d57f17b0baaf40f78f0738c9aa9"; + sha256 = "bb12e0d9ffa8adb6f34702e553b87b36f5b346a40819674f54edd6e127e3cfb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hy-AM/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hy-AM/firefox-79.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1a3a40148fb35f3d741f732e3a39e6f1662e6196b1d0ab149b0f42f2f7dfc103fa51df0dfe1874a5d483a5a998555d858be06f8afce9815f7242b7b86d8b3af6"; + sha256 = "96224e693763a6aef998b6166a8026c6c9ac96cab1bbd064e91e823bf299c5bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ia/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ia/firefox-79.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "7e8472462754b358a4ed7f7d9a1d853d0f590a680a64e985ff1db631e84e6200908348d85ae3757b9236c76e9b3e302f18bba3a84b620834345142e3e39f95ec"; + sha256 = "e2b65a3363dcc13ebbdbe85fca49038bd1bc9ec98cbc49f148de407f0c905e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/id/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/id/firefox-79.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "028df055359a2fc5088b65ee1f377b94dd69f7c6c718cc954084ef5a53e3f53ddb95a8e52c46b2e463e5de6ecd7272a4d687e49718ad96ac17579ad121403bc5"; + sha256 = "d8aa4ba3b4f86c1110cf2da3a5b999901dae2510ee4083189cfa62c5db0ce0fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/is/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/is/firefox-79.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "232ed8f86d6c825444a0e2448b5d5f06a8d17be5c4ce35fc0d6cff24cf3e49253ab92c16d82ff52726540104106c242e3bfd0b3b969f8a437f46b60114654f42"; + sha256 = "3a814210821ef5b0d9f6c6c20bff5b8a658febab7d1c2480d4de23c4a57ab52d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/it/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/it/firefox-79.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "43f29ac4beb67d8859cc8cd7abdb3ffe2e3c3aec7c962e4e9481d89005a72598571a0dd53a65b06241ed04e6022b7992b2a2c4cb95bbaac95c4132e1bde4869e"; + sha256 = "2acce241d65617fcb1aa4ea992fbd84a1089848f3f8a2daee58d381368189bb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ja/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ja/firefox-79.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "c469704306f8e28f8508b66bc418a867b3f39eb33405430c0b3fce3f5ff5cf0390d03889ab1c20aa52d5f0b7f4631cb98e0315ab63c3e9412f30f484ac88df5d"; + sha256 = "d25196134b98791547e92d0d1af29d27ef1ca180eec31a9b71700ccafbbff093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ka/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ka/firefox-79.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5c4eb2a1f8167ab3f6e818291595a67b3b9f125f800ca84b930e0ffe64357e37b9a9999efc17593e502abd1912498250423fd672c7c479d227dd7d6df3092c49"; + sha256 = "733c8da99cb3746fe056b4cf76eb827333857d296a9c4d1d4617ee546001f87d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kab/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/kab/firefox-79.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d7b7eb5065a6d949b018d0b1bd7c3613a97311168783a64597731da0b7bd248f11b13069833f3fc794563b1de1f4e0c40be23231b33471dc49bbe112f8e536e2"; + sha256 = "80c0bfabb148359eda25c475563038682237df10662681577c5d652b46661180"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/kk/firefox-79.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7c2a20a0e20bf581aa8ebcea29ce7096fe14c8181780364ca6c828e0df71862b4da85e46ad5e9b73c6fb1dd575732ad1bf36e7dd9f6087f187cd56e29861aa4b"; + sha256 = "b87bc307b178c6c6fb3652fcceda3f442616f97be21e72fcdafdbd93dac18f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/km/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/km/firefox-79.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "47ce70d662ad99540a0186f62c51918e1728976467f612cba3fc36b9d336b1435db1c06a834bec54e1546b9842028c03fc965efc472a08db81a6c13766db48bd"; + sha256 = "4284fc0cc354aa780785a090672ca4391c697a40a4c4ad41f5802aa43057ee6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/kn/firefox-79.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "3a62cacb7f5e3b4d2652731268fb0517678ed38508f5fa0fc2fc5288031c706ef95a2ebc09116b35a1587e4b42fb8e9b07667ec90f3727be0541d398acc1e8eb"; + sha256 = "106342053396211986095a4cca1ebef5c3b91f4cd06b93db8dadcbaf4822c0dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ko/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ko/firefox-79.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "9fe53ec1bb0e5b2ab583c2f7709101ef6ad8f7a246ed0ce9988dbd086640cf34321b49b753960eda5b47a09fc162b0a2a2eb103287e208f75a85c97ad7752545"; + sha256 = "5b57440c026c2815bea57df975697b15ae347f5b82cae855d4b01b21e82e36db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lij/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/lij/firefox-79.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "221ca319327c9bc4f68f12f93309612ab7b286f3df0971dba3f42d6e0ffaf12bb554cd0dca83a4bb9de4c9a239af724eaf5f70d0f0b594593b64f8338b4c7954"; + sha256 = "b3a7b7e78c228f73d3fcb5524d786e51fa9e4826acbb0b2ac9fad70ec6e02f50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lt/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/lt/firefox-79.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2aff555428cc9b04ed2134178e8c2da1ac702f1a77b3f5b648cad9bb4c59875277830ba657aaa7dff7652a4fc35fb39b6dbfce3013213a503cc39700156193bd"; + sha256 = "f2309fc6a904f33bd96902ba349dbc47b655b888169f451ba8f8eda952ebe94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lv/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/lv/firefox-79.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "540057409baa8b823ba2eb2ee1a823e24ff08510637caed97635d719c1e3be6fa12379f86f08a68e53c9084ea1d79bb89d188bb3520c723c52db2fef3ee8025b"; + sha256 = "70e583717b3b17fa68d9fab1a1c2470eaae52474e7b774f653183ba371041fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/mk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/mk/firefox-79.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "adde84f336cc36f23daf58b006a0cfef18acaade8892c2368b0a3b3322ddf2b26a0783f04a533e173d71a4e2f579fde2f6fa6a6c23d80506a1dfe1945a2fb073"; + sha256 = "ba20c3d5c88ecde3aa8fe382b8af4dd372f070fc6fae75644030315e33840859"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/mr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/mr/firefox-79.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "93b021845b9dcf173b4fef281dd4f51ae5a84de3bdf80c3861fd0e5e4d9431366b4592f0bd553d45fd2f9f3cf690ff82cfef6b32f9bab06fa916b417658402cf"; + sha256 = "f20ff1fc503b01746c040cadd0298dfbaa96892aba20a3020f0f69ec7bc6873e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ms/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ms/firefox-79.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "071217dc5109570a1f5a98a06ebc0120aa809a189b3a78a3cc19dbdce0ad1cae409f665eaf97cdc7b4df529c8406fa2fa2c57e5b34dc32e3a0f4a62d981aa2f7"; + sha256 = "6b1f0aac0028fcb24e45aade305e9e1315fff61c7e602d76e5a142326643c8a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/my/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/my/firefox-79.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "39fa770a4b6632d1dc0e3bee24ff7ed95caa26db7298c93a7e0f4732ef18d72a1f21612275908dd12ee94da0a89b08e2b575cb745340ef0d595263f554fc61b1"; + sha256 = "c5994f515d238efc6fc1eb0c9aaeb0b445970594ee26802ec80331614029657b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nb-NO/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/nb-NO/firefox-79.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f408f1ffa88b3c918e52c001ee95027730e4961e13a0b47a0c8c6d3c39aa8d7cab172329738ec546207051bc1d682b8d62d59ee9efae4d7533036cc9a6869f71"; + sha256 = "bdd3cbd3188b64fb29dfcc073bd66bb19ba92978c03720a348b04d2d8ceb4ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ne-NP/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ne-NP/firefox-79.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "6b8bda91d969a832ffbadd4d2241b9bb572637d0d34c910f7e5f14921d7c9f76b4a88e0e3bdbfa259a0090cc8b7cbe638f60596f05d8b8c5f48faa181393a37e"; + sha256 = "2c91bf86d1c6b5c9b7fbda1daf57ec554a69845d27cd1900c7089ea51b99aa52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/nl/firefox-79.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ea86fff04dfa7cdb8344af38b5b983dc9043b5b754999ac4b2ee1fef19df31fb4c43be6952e0e97ecd4af62c97b1a8c12914f0473dcb19d1a9fdcce4c0710869"; + sha256 = "26999404dbfa9cd673d22d32a8c310aa5e486bfa9c18890189358f35a676e42a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nn-NO/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/nn-NO/firefox-79.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9bb74a166716654e32f1b2931241dc556d399148bac3b1fc44a96a101f48e74413d40f380f6e469639c186a2483bd9131ee27b8acd8e442e4a3c2eec7361bf1e"; + sha256 = "7f6897fbdd4cefe9619f7c73b2c82ca951ef54939e353ea3e36fdf72b114ddc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/oc/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/oc/firefox-79.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "3d7445cf18226db6a4a875f2f006150d709b53a8837f4dbb2bfc7782149c01949473a1fa7ac0d5ab3ce269b2a41077cc93f7635b3b55a08c2a105973c926e62b"; + sha256 = "b06bbf9b56c67330dea919244ba5ddfc424eb48c2776df2c3059a5786d702a1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pa-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/pa-IN/firefox-79.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "0208389b74ca0070c727f6fde7102e12e28b460eaa062839c23a81f5f25f68ebf4596e5dfa661a2de7c21c233e09d621dca716233c6b73368c7eb7fb0aed6d93"; + sha256 = "c644a7e89020c0640085ff7925dbc8a3428b1d17b021822643e02949427e0581"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/pl/firefox-79.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "9765be62795d6a0efdac06a91d2993a1da2b015ea20679aca8ea6d70768b2a0f9603533d2ab81bd2cf33dafe842e9c78d0a0bdf2b705c74f22b7d9fc22cf2c32"; + sha256 = "baaf3ad6bbff585b82de9fcfbad371146cdc64fcca60daac2db018335472528c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pt-BR/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/pt-BR/firefox-79.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c59eb5f10a8f94e44f785bdb8425e8b889e0120434c1796def1fb521a77d5da356176d1c864a2fdef08cb650a1b6c71cd334a3cd0d1b2f647519d46d2d65ef8c"; + sha256 = "c0daeaba4f24cd35f2ba107817553c226368ab9133782245f47c92f26cf4b49e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pt-PT/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/pt-PT/firefox-79.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8fa1dd31772b0de062c1621ef9346ee1b0fa77629977c39a8111f0f22b00a1656e6bf143c3ac74af7abeb8f2c2cd26495327ec72b067c4ab7743957248b62e32"; + sha256 = "1515e964eb405bd368bd46a66354aac8cd0cc44f0922b50714f55d2adc98ec88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/rm/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/rm/firefox-79.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "737c5614d84fd72313c3ee4eb72779bbb339a40f249967417d591137e19d76b32e9ce528adb167415134ec75b796f7ee4dfa624cdefa4bd42e11148297b08867"; + sha256 = "a0772fc62a05dbe85e435bf218fa643dbf9a81292dda482df1d4d283bc88eae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ro/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ro/firefox-79.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0744ff66859699c611597113c77de6bdfb5ddb543768671a48f9cb83da888ea88ed6fbde5fb86f610a35fb6e7daaf0a4c6fec1d9658c700c16f37e04f7b41366"; + sha256 = "2e2d674cce4e2fefbc70689a5057cb6f19294cc61f37775879340dae5ac3ac54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ru/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ru/firefox-79.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "77e085bcbbb2ee78c486f85d86a5be43498ea094214fa1e769c3edf7af42821c833d6dd207766ad1fea9eb9ad2354229617b6ee49b38d869024092d317790781"; + sha256 = "0d6b8905d5ebdb0642ad5722fc547ff09b7b8a0453cd30b16872ec28bb68f760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/si/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/si/firefox-79.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "1742142be1d9fdcb13f6d68c5fe413b9ad019556491263855c172d350fe0bd00d467bd91683caae51eee3e512023e309ad97319e3327098ee47ab6be35d1a851"; + sha256 = "f7c83715895a77c87c7e711ea37eda5e58360f5616d35247e1919ead9535ab70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sk/firefox-79.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2c292ca74a5424315e22d595a688d14167389cd7afbf73e07342b7e77ca32e9b56300594790f26d048b32d0ec014d23f144b9226b01cdeea3233050998394f99"; + sha256 = "a436fc43f923baac4269a40e0f4ca06b782171f3aa7abb2d35c69cc44656fb57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sl/firefox-79.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d6dad078272c4afd6d0641bd53db9d9af4b9ff9ec34c45917ad313cd6088ccfdce614669765281d57c57dd83a5b7e428514e21c6fa13cea70c93e91690ece671"; + sha256 = "4580231b7220cc85e9cfbce8ab8d1c8a4071818344df3738a3cd0c2b4b83e791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/son/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/son/firefox-79.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7a382d02653006c00e4761a7f61746f6ee80ae2f922cb2eb027da3ec7f6cebfccacbd51c528a29186557dd9e905a744e6db7e07c273751a1f80a277a08a86410"; + sha256 = "310f20fb411aa27fa45d826008b39b4add9155af76347b7dfcee3363f4a40130"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sq/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sq/firefox-79.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0ee0ed873edeae765b624e1f76612b06bd6bc7b8df396656c76b59b1e1ef8d5b7f056a18a71eb2cf9f950382ca272bb9517ce24c6145e966f6e895b4ad843e6b"; + sha256 = "44ce349d3db8b1afb7f020da53a04613b31c906795bba259dae156dcb6ef1d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sr/firefox-79.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d8589397053bd3b5068885925ad69ccbece3b439ee61b787babce92f24a8cec9e32164616d73fbd35f34047d1f5ebee48e91bd9f1ddedda2dc4f19d5ba869afd"; + sha256 = "045e01214cc8d9c74d273960165982fa5b739bb8e18e91d59e576c815c5a4afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sv-SE/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sv-SE/firefox-79.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d72111d03ddd880a24590a5b1e17e950401fe9d61fafc7b4b256f877d8c950689ca393ef6fdae048566beb1aa46ccebc7f1de8273c22b8a02a651730a75e29b9"; + sha256 = "66a2bc65df656d98b4245c2d1611beb085c0403f87178fe9b7920018a2b0abd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ta/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ta/firefox-79.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8b3c549bd419861fbf8d3dd30e10482922af955454bc1974f0c9bbe065a6aa88aa55b8808b2c4865ea3bb5ec240490b882a3d1251291513b234cee3c075f28c6"; + sha256 = "2e53ff624eacf0df39db5d208aa397dc21751c97ddbfaa21b4850614c40f68df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/te/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/te/firefox-79.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "8d8c74aa0811c24d97ce03628d9fa3be139ae53356296d8599c5c4a9269f479a2dd720dace92e86560a3986fe68daf042b18e2bf1c4d4339033b5c42cbca0f26"; + sha256 = "3b98487fbb9339321c321c306d0c240da5b2f56c936f7581128493c91e7bba0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/th/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/th/firefox-79.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "7c6645a2287b0da7c346f1075e44658c72d9c95e4e47413d0e18024691471e0165f2ca58142658e4ecc605fa5398d047e9acd248e1090231809887189ab19926"; + sha256 = "188230c8eee66fc85c1e20d76d953d3cf3d2fa85d9803f1adf396fba8a4bf62e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/tl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/tl/firefox-79.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "d27d4f5815ebf6d92c9394fb9b187985eee43b89034f6378a862c5e0099156423d925e4f239da7f4dadde31a68053eef909d53814a2342157f42a1ffaef48df1"; + sha256 = "47612e155887b0de76a0a9b74c84d2894dd43f7999c252ee74346fdb74f60f4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/tr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/tr/firefox-79.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "e9001e4ac3d56a76955c04f2cc43915696e3ecf0ed0d7446a282bae6bd3ff7461ee6abfe7db40ad61cfe37361636089f2d4b353eb5f7f09a9af16f933c9e1ea5"; + sha256 = "050f115edc3ae514c0fa08174e9f15dbf3acf43cb1aa6bca9d3c4fcb5b9255e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/trs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/trs/firefox-79.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "9aa5a64c8ab17beccaa53cda383383b28b7ba311c08c21dc9bc097d2e43f351901399f315f2b12fddfcf101023212e61c5e416442a726a324c66c7872dea75af"; + sha256 = "8c02bc28f5951350c62be9aa9a6f8a76f33eb1f4d018b12f3860e26866169578"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/uk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/uk/firefox-79.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "8d33e4ff58711e2bd71144b00a96fde332675c6a81b09c1896eea25b6599fa37358c762d951e4515ed398f746b368216fe26beafdcea51cd3e927e132d26856f"; + sha256 = "bb131c9754fcbee6c62de6ba95a2d786775c2835d12ca69b2b3dc556fef7d2e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ur/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ur/firefox-79.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2f8e5d91c9f4119340762efe519b11eb69c4dca355a4add963cf71a5aa58b53c315c0315caab323b27cca293f383bc07325dcbc483326dadf95f305fb2ecd067"; + sha256 = "54fe4551d9095b8256d9d65dfae0f2433afc5d51055f47ec9fb9a5b538079164"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/uz/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/uz/firefox-79.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "b23309f728ccd814f7444c1e3e129034c66a1ad1fd216e6960c79470fe37d765314fbe9d221d8bf2f423ec07406657135029b280e2d5884c5f3a55050e0194f7"; + sha256 = "d1e874a0aa5225a6e8d95a6d40771689663148a6eb3b6d25581339370f345187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/vi/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/vi/firefox-79.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "698f917a168d753d7dea3f0e91566beb6cd96cb708abebfeda808115775ee5ee2dd906ed68f99cc571c752560d765dbb49ddf701de4f74df2ddc8a6642f9bb19"; + sha256 = "1335be8474044bff9a47a5c2952974f55edb80d7b70de25fcaf5aee5c0487d33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/xh/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/xh/firefox-79.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "1b1dc73a235218bdb832bde08f4de5f157fd9acc2257fbee5f1684e2d4bc2f14a22ab70e062d53612b36588dc3f252a6a1e6707cbff392d9d1b1365adfecb13e"; + sha256 = "dad0ac74d192b5d89d7e89dac553f3f18a781a51330f7e154ce4cb6ee4c45782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/zh-CN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/zh-CN/firefox-79.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "07d21c46ff1cad5cc9e75d6719224721e230895bde0adc34b69eb5a34f14d400206e0d2e4de80ba4e029de0b185b2c6ae0a44624b5838eee210726831ad082f6"; + sha256 = "a19ace9857172338831b1cf0b581ce1b09ff75e96417bc5ada5805c3074c0a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/zh-TW/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/zh-TW/firefox-79.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "13be3323975a7ed42f6a9ccb8bea4b71d875cd5dd8e1e5bbef8ed36d1020819f3189b6e933200ce58793bf89cd7d989e6e22dda60321c9ea3c5d3b776cdf8e5b"; + sha256 = "73914747c3472b6ff5cac485822fbba4be19c630dd4ddf925a6f2afba2849cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ach/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ach/firefox-79.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "383146225929a318a6dbe25e74880f7c8b630bedf4ee91adfda3b8c9626b2967d6e6e76573e05fec2a4efeefd0573c6ba63ab252acc453b691cca3f09dac7f1b"; + sha256 = "c95aa05f0a86fc30f20a4438ac66541b5ad03ecb904db4c19f50e659403d20f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/af/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/af/firefox-79.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4b0fdbdddd7c5eb18a25dfa03a95580826c940941f66c984a9d6e46f1ec88ab932b0db8d94644310dc5fa1519d44a3cbc24d8373a449b6987e2401b9bc2800c2"; + sha256 = "c20dc401907d2b42aa4f2e920833c2cd7fe1fed35788422e84837d401f48bede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/an/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/an/firefox-79.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "72495918ee96313318db942c8c403286ff6ccbeb59811ab2c595723cd18c2a57d6a42adea7d8779b22b9dfdd1e5c5c0e19b5fb438d198f9e770f3034a932e610"; + sha256 = "5b965e8d6c0baf11be096efe2ad3ba638bf7b10afbc39db7c29b9bbf6fe0c797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ar/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ar/firefox-79.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "61117afc0748e44daf713234b91911336875b8d9eaaeecf8e183d54d2c6bbabebd1cbf34c74a019ab660b06bfaa28c417d7ea3ae8cc476c26c9c40bb9fff5392"; + sha256 = "fba07c7262166659140132b7380f8f293194abe46045a3994e5f6c194709b120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ast/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ast/firefox-79.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "63f66ac824c1ace695000cebd357684d0b09c3e69f46021f44ffb2201327468c2d4d21597a660cb14f6fd08c21d58e0e47520f72595da8f59c808459ae8ef0e6"; + sha256 = "8d4daa8bc48e6975eea8229718b0a04698c0ab0aecc5ab767d14444e854187f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/az/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/az/firefox-79.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "481f350c51b234aa44091e7e6ba308364c84ef988bc11c0f66aac72511e0aaed0c0a4bd865e781516cad6a867bcb2e09fd4d1726871290f828837398712ca401"; + sha256 = "41c13d04350b9fdf5be5c385bb74ac5e8ab9296c186627b89e43e5a0ab1deff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/be/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/be/firefox-79.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1c4b35ac02bec3daf9f5a7fd984071beb274281ccc3f3a8979d8255709fa22396a1d2ab2606521f279943c872294e19b99e974b116f1293d63d10dae0f92e586"; + sha256 = "d46d199e66e4c4049496b29acf973731e1cfac1e3e40c45f8387444075dbfa51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bg/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/bg/firefox-79.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9bf06f95a1769a9f0a4e63ddc15f612d8f5f8678ac217671c58f3fe8669d3936186a2695b6b49ab6d37a052a2844ac53e6d65795f4539033467f2405930e191f"; + sha256 = "157571ec4956ec72ace64ccc156d565f96f42bfce4d79c25fe5e60ab62197388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/bn/firefox-79.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "7388dbc16b05f32a0c2cb69489e8dc5054c6ae785881b91571d2ef7bd010300efffcf322598c51157f681ba599f7f39791bd2dae217147eeb478be92efc82f7a"; + sha256 = "82a7018fb11e81f26d1870021266182c608433e64b38b4ef59422332261327ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/br/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/br/firefox-79.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "ca7fd9c0c46c92b26e1038a4b611f26690b4385cadae2651611f079323a6775f47d305d9547d98711eeebcc00374df5172fddafaacf44279cbe0c765c7fe011f"; + sha256 = "ba31697f52277171e4de631e161c319c9aa9b35ca128d9f1e94b4a43badcf5d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/bs/firefox-79.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "fcd846854ff686542a0159e722722a97b6be0a797341bbfb2fac62cd8b6bdcaa3aa2f51bbd6a7b2d90b46188af1ebc5c1b6ae6e6dc24f3f4f1a1bb26cf2205e9"; + sha256 = "a99c9753fd41832d4ab310d5bc31978dae09b217f046fe7bc3c5c52f9e82193d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ca-valencia/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ca-valencia/firefox-79.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "4e997173753a7eda937c5c04c1bfed27a2368e58db459d1e0918642d2c5878a5abf5437f96de9e47e0322f4f0d0e8782cda27bd24f6c5efecf685fdab3b9d149"; + sha256 = "630893c4edc30df6c41e2124be493be1a7927f94fc0638796b335a9ae3b990ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ca/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ca/firefox-79.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "c2ba20e8217134b641d9c97e3332167236549e027946d7cd4200ace74498639e6841eae76f753195ba8ffd2872dc3dc81576970a128cc618c51526497d14c1ba"; + sha256 = "9a38f2b2697d453b946486f293d4c8da0b63c22f0866c90ca42ab1200d27a5bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cak/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/cak/firefox-79.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e89879635fcda716916f5e0afe2372172a7e3e13db6a57310cc2d4e8bed95ebc76fd2a39d730ba548a8f2871e68ec6c80364a67a8a9f2f72e8770a6088cd489b"; + sha256 = "a78bc582617086d993bd35cf763e5da105c37ec1d2ce962c28c9d8761cc47535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/cs/firefox-79.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ce657c44e1ae63db3f206601b5be7107e0334de7be574c8ff9211fabb6d41936eca3aca33f58e05220adf1213aa96ccd20f183a72c4bfd7cd71c145e8e8c051d"; + sha256 = "466826a061e54f7e5d5aac5db9ce288588ba3d839db4d94e32d377e845aa869e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cy/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/cy/firefox-79.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "fa217e8a7dcf509132c35775c85c74eba600dbbbf2952a00a61bdf258396f134759667f6c3b8195bcc0fce8a6d896e70fcbfe514bb50346969fec258a8ce9342"; + sha256 = "f95226e082dd690f037b0ba60e8d47ce7d880005c0b7c8ff97db3f6d24f536f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/da/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/da/firefox-79.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ace0ea8fdcc68845f948656c31e142d5158eb2ebd0ead6c8d1752d6ffd4ad6d915b632034ac328751e69fe133d288309b2db0e97caa8cfcbf697150abc757839"; + sha256 = "ee5cdbe8be79834b0d81bfbe7f10c2c98f42d07bb511681eea566a2009d3a363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/de/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/de/firefox-79.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6e87302f9a5c9a08c7e9c56257a31787c013ce8b5b800d4a7be1cb7ebc66c32d9cee536312ba0042638c33b614fcee051f99b83b71007cb21716e0d12d380696"; + sha256 = "7a633122b530bce8d6869f5fd03d7ecae40f3b718cd862151b179d4e4c9234a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/dsb/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/dsb/firefox-79.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5f09de6e10b863e06699b9131c5bb819aae6afb40030550a1e2785555588fee83e18abf60825b27f8e458dc9459ed101db213c230a06507e95e9b43a0fb1fd58"; + sha256 = "d6c6ba8f3c3ac64fd847bf2c48cc57b025908fcfba43722db2056971d413bf21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/el/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/el/firefox-79.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "03dc3e0ee03c27653c42f314a3e65d9e45b717803a869827cedc5ed5351ef32dcc768f7c13a9cd3eb14b0ac8a0d386a8392e677f7481bf81699d4cd22f91cc3e"; + sha256 = "767d72120d99c6868859218abd2a19df545e00537d82f720d630aa2714eb1500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-CA/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/en-CA/firefox-79.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "9eefc744bbfd503e6cb0cc0c25a1955a3246775ad2f204b7004aef96f24e6268576b89a83853de93998c228208174cab91cc0615ca16d42c6f2dc043939aa213"; + sha256 = "9e52734eb1ad30092a1e51d9a1d2c0d9fef1657c471ff8af5a709654c28d9991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-GB/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/en-GB/firefox-79.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "66e3abfa4acd7b701285a8bf9a48f6be2401e8bafe19c694f1307b7b3437efdf500e12ceaeb5b41f3deaab29a3ac90b78ff79fd5521e94bae055b119d4918690"; + sha256 = "0b78313c516b2da9c3442c50a1678a7c5898acd53f8f55a0506f1e60ae1c622a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-US/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/en-US/firefox-79.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "38500788aeaa19cc295c038e85ab11ed7a091fd5b4105cc2b7202b22e271dd8f3ca8139586e87273f98b1e17b6a7f526131ded5e4bddd0c4e52896cb7f47c5c5"; + sha256 = "a254b48fc1faabe03db018a22166898a2363bcad6a507dfa2df3889dd4977e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/eo/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/eo/firefox-79.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "d3e5aad8cbf2b2a61cf52d3f17d99d050ee46567a7aefb04d0855922f86e7820d11c15d60efe6beea76232a7d1f43f2b5a4aca088844906affdb2d272364a492"; + sha256 = "decc99f94501b1a4ff11194ca4f02731aca46293faae7663c10b77d845b07c97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-AR/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/es-AR/firefox-79.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "81aeaf4e97d53db8dc93d0e6b163b4df6218621781dcabd85755baad71a4454f406d5119d16044ccb867f8f6826006943b72d97dd6b5d658daf196d16bac040e"; + sha256 = "561b1c3687b676b1bbbdb9730801a487bb97efe98efe5bf44731cd0245e231e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-CL/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/es-CL/firefox-79.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e22ece882fe8141864f1efd7d72774aa659cea88ac45380c709f8da92906b8f0d72ff959add05b6be57955b4687ae52a138b51bc4da81223c16ca40b76c056ca"; + sha256 = "5de4b0c90da0f5b9a081dfd12143fa406d3712d4693ee28fb1667947fe3f0289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-ES/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/es-ES/firefox-79.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "26b6d729d72b302d38d7a372e716dc9cf741658e3c42c7080a8593f3eb5e5e96fb40b5188082a2ff9eae528f387801f034744fd2ca47cc279461669550e29502"; + sha256 = "99aaf2c57fd51e61781053b3ee60ce1a89319b1101f95201f31f4128cec02905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-MX/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/es-MX/firefox-79.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "2069eacc1ef1ec020088b3406755dbe2cb178f53555371f7132636033b4ec4883973a00f5f89907f8d6588a1cbe7fbb2d0b6dbb9d42c74165698bb222669bf42"; + sha256 = "d1e7e80b55ed6567cc3d651ec28efd64512276178ae1a0c8af9cb4db37103c11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/et/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/et/firefox-79.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1c2c865b8a7106a91ecc223a167216da94be3373a4d43012165989e6482a3d0a90f685b163f5bba50d14d1f2abe1f0866d6f1f75871cafd5823b060d9f6272e4"; + sha256 = "9ff5dfd1b737f3eb881decea26a36af108c7b4d7729d19849d9834eec7b853b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/eu/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/eu/firefox-79.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "3f2e68d6fe86a59cee48023cb646d5002495e2ae416ee18c7ae51c3e48690969c704da16e574068ea7f91fd17cc581be7cdae8303f0666fda3025cd87f173c4c"; + sha256 = "3da605f9a1bc592f9bdf7ce041bfc43f2235c2764828af4bee017993f38b34f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fa/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/fa/firefox-79.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "6e6c7a29a1a20cab73b82f2c6d6167c8de66a249c0b02170c9a1ea052bc1eb8af5195dee3e83b597004127639fe96b4d89ffd020625a0aa0369dc47cc9560d05"; + sha256 = "1ea532fad20ae95df4bef6e68e6ca39a40c546edf14f164d052b9bcef3ba59d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ff/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ff/firefox-79.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3975634e0395df6377e7a240d4ae6328691709f50f115a0c364de9a9da849a6655c8397defd80df6e8edefb6f6b413bb877fccd847bc56b1bf71431e2151b114"; + sha256 = "0fc5478ea083211c952d0c6f43a6061e7ad6a1b4c44f419204f143f1ada6c46e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fi/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/fi/firefox-79.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1a96293cb6aad59b5706ff26f7324cb6dafeb9f17de4043c03aa789b9a81f7555218213923fac0abc16700cff4bc68848345f99376696025238122626a341177"; + sha256 = "3374b7bd157211e8ddb5b3c5b2b719a341387eefd59016ae0856a2bab71ae8f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/fr/firefox-79.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "1d3d243663ed47c7ee3ab68a578d87769b617a4e961572d3db2b34dd62b8b1c997d223104ded10b42a00a0f0382b0ba10c089060f613e30001253ed008b09ddd"; + sha256 = "024ce5cd0bafee4ef9060e75a64cc7e04023fd9e9a62bc7bfcbb0e7895316d54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fy-NL/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/fy-NL/firefox-79.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8f1a40d1a46e5b4bd9cc679f07893f407b1ba7de11cbaf0ac6889ed9d344ac6a9f10842359e85f92187256548365b038d619c58d62eeb80538ee592691aca6f8"; + sha256 = "76b362664bb225421a845171afdc859575b0f706549e1b60657cea47f3678265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ga-IE/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ga-IE/firefox-79.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e15f1d055f6bf4c81736370577a102dd4ffd548d66bcd6c74c807d4996d400979bc5761ae5e5053dd0600b9c7e69ca0fd9e4b03f8428032e4a1acd3485a47f37"; + sha256 = "6093099531b07d1e6a37703aeee8333cf5e486faf7712f444a8b9e439c599a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gd/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/gd/firefox-79.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "564f101816eb3812fc1498725562205f10590b8b2a97dd80fb2f5965a6f69d6dc10d42ba21171b4064107e8403ff81bd6a65da13d302d93a142ffd19dd13778f"; + sha256 = "0c463034000e2835bd13f4ba7f411ff155462590e161b07d89ab4c3bbc3726d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/gl/firefox-79.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bf67fab5222c481088dabcc92f1298cfb4420f5d4e93c5e320d6bc1c306a51a4fea98c7bff52821b61b70d02c7cbb2e0a8a01bd76a21bb5d8dd7ccbf1a2cca72"; + sha256 = "e743aa14124231717ad972f50b7ac1bf295cc67b9477b9db08cb688fcd7ec3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/gn/firefox-79.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "306887a8436502fbd8f6654b6bcff057cb279e81e01e05eba6394a109fd21ca5d5b45a61570b9b880a5d104b1a52b002a3efcdb4018b44a9437443e3ea4678ed"; + sha256 = "8c6811b5d5dd33d18e6610af344f97d62790d8d5750418ec0f21d9f9e0fd37f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gu-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/gu-IN/firefox-79.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "84a27c6b14035bd8a6679e954a7f62728a24b7720cf32f1dd93533c97dec7965a963bca8bad7ae1b1895f5d8b30a9356f8fb87a45ae2bed99661852107dc4613"; + sha256 = "b983b6d1f852c78f9930d4f0a8ecd8c2dfd552bd096e0cf29f228c3e1bc35fa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/he/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/he/firefox-79.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f9ab81b3f184c3351492deba6e4cdcf87306c378eca65813269d779467c68951e9000636d2ed6bc7d548453a5be59b50db2658e69d385bcb800eb452e360a245"; + sha256 = "ddfb93bbd03aa7d7bd52fa0f7b934bd46898975b728f6418e7318bd63c3efcf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hi-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hi-IN/firefox-79.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d4ee0b984ca5679fa4d5922c321ba2e96f7fb2f6e0c3221eb4e22b25cf8385869c195e668932cf95b28efb17b7f9946dfd3453e679047d74eaa49032f7f494ec"; + sha256 = "b2cafc34206987deb4357d3f7628cc85ba2df43df8c4b2e4ca1e0b997737372d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hr/firefox-79.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f8217dd5f3772500584eea717cf142cf7a16655ed02c2628edbb6ef43c8a53cc8c73e3b829bd71f98e1c3d8e54619155ba5db8f988a5435e86587367ee754ea5"; + sha256 = "03e543d215397e93ff41604909f81a74a45ed5fcc09ff6d17fc26e9ada47b3d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hsb/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hsb/firefox-79.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "1883d76849ff588abb135f594ec7f8faa7c6eed2dd899ce4d7fb5e3f20e0884cb91bd6c606248910dd1d680c516336faea352b043ef7f0cbf95c86b82fb8781f"; + sha256 = "c7fe91aeab07e566c817e6bf34c08bf2c7c2c126fcaa62bed9d666f89d9cecd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hu/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hu/firefox-79.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "36434f4fd5be4c50bdaa2b2a3ebea4ba1e89f18d51b337d17455a35169c3ec65d5b0aa17c6771f211b81f607175b6df754a28efc927a951e4d34072da343e0e9"; + sha256 = "8075abfc9e82ad812cb413440cb20c55b1f8807c05a164b5fb1658504639e13e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hy-AM/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hy-AM/firefox-79.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0b09ba2521e364fd839769725292bacee154806d94239e21dab70e4fd167b2295cac01e070cc5a50b1fc767ed57f50bdfa428fd5aa57a2ce6d2c0639c1b82807"; + sha256 = "e14e6d19c65fac2de302fa203760efae8804db439ad67bc4e8e604a98394ad34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ia/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ia/firefox-79.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "2753b8d3413bad99cdb40e4dc2576ffd559e4ea92a507e0617e04b8fa41abef34ee642d6e8bb58c973a837e1483d117638cc49f1df3f485987be96c2b6d0dc77"; + sha256 = "b8e500e10a6ebc05a7c666075851e4e37fcb2199b0bd0a0729d8a6a3a2a1ff90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/id/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/id/firefox-79.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a0f863f34f4ba67c049749453220d06f9737d855f6385c16e933a24c9a73f9a28928049fb99a89fe976db9224f40fd90495016388c5442eb0b977100bd5a8ff3"; + sha256 = "ef0684735d48f667df792036ff5917f8d1ce58bd2dcd719c8990ff077f5d47a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/is/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/is/firefox-79.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "4425c986b537b04ad0d9740bcd835388b1bfd3a719867c7ea264eb1665a96deca9f4fa58d84e6e9dc7e038ab9bc55fe86fc69381c055f88899fc68b39505f393"; + sha256 = "bf734b89739a181cfb8ed7eb5daf7412553e279aab1467d677cf3e1476460f7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/it/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/it/firefox-79.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4869bca5c889deced2e2d1029262726db3aee7a1aa5c79e928038295c1367ff6003b030ab2fa8940fa1920129c89636e059d9b20e20fa43f2dd938a44995b4fb"; + sha256 = "76eeb8b7466ac0eb3e0f12d393cd35d6ced9805dc78463327e0ad434af442dc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ja/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ja/firefox-79.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e4f288ec38c5a9723f3c653e3d995f9cc2c2dd86f285277a1b44f315df2bfe51e6ed58db00e7df1914b34bcad3b8258ae43075d02d4440cec2c1fd307baaaa9f"; + sha256 = "80899dafca1e9b9b9526cd611cc41e4e3c78fa6e4a700908e6c3749d1a6d4753"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ka/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ka/firefox-79.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f03488b30e3551cf670ee3a193452dde79c72fb5ed63288c41922e627ea0033cb31b1117a4b270260235492ef9d37ce7b6317d637c2495d1732c606aa2d5f6aa"; + sha256 = "dcc7c6540cfda312a3ab4f410969aabac19307b29217dc935f5f9f0d3f027211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kab/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/kab/firefox-79.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ed496b1cec1152db8f63a04f056479019b90338220b163f1da1022de11b1064dff1dc32299f92a0464073d4938551da813f88d5dcc8536c61abc84347098cd20"; + sha256 = "7bcb2bc74f9e46e69a218bebc63fef7ec86848feae475dc381f654ab958fc07c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/kk/firefox-79.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "01eef4b39491227ba2a0428066fe99b59222dc1d9c98d435254558d14d91b4cfc062a2649d87c86da3b83e327ef8a7889a78068ba1e118140dde8d696aaa4654"; + sha256 = "605adecfebfa0664fd97b621e22f6bb1835733c46f2c96aaffa7d73e9f658dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/km/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/km/firefox-79.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f284b80465c175a141210dc57b4bb472418981197ef5c7cc4b32c5d2d65898dc9def0f29a096d14eeb8d66328713afdbedd26e9b88a969a43ec62117c2d38d0b"; + sha256 = "9911c0e3e88888a4066151c9e7a0c6f70e3add4b8f99e496e5a0fe53d8af937c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/kn/firefox-79.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "1b3f97c710a45441fb66c83ba6b2e648f726d8fcd0d245f9f8121a86d878c6bf3b0b114878d70f64f6f18f057218f84c5e30ea0f4f4ad8b1921d22ac9aba5e7d"; + sha256 = "411a655cff2f061dca76bee33b723a286e3672950441be143a29b57269179f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ko/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ko/firefox-79.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4deaf19c5b1fd396566dabd7f9cefe416e29ec885781f7aedca1bfad37645c2878a884b516d1300eaf2292220616ba494be4b8d763998cacd1d5e9e5b7a902e7"; + sha256 = "82aba23c212ff220854ccff2b84932473037ff7732bc8aeace6f771732fc3add"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lij/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/lij/firefox-79.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "17bf34017b58765bc0f90d08ac8cd73065edb223e1d8222425122460c8a502ba2430caca3447e535ed9f444dc5d05b5958984e8a87e29dd1b713095cb68c130f"; + sha256 = "903ac88108c6b8973dadc412f85b8b241dd388f83508bf7d2aefd64234ffb62c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lt/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/lt/firefox-79.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "43240bde81bb7a27a9a9b9ecd95bfcfdcc701441a5820ef2abfc0d13fcb8eb41abe240e16bef0a5c1126d498216c9d2c5302c787c93093665cbadeafbd81bcd2"; + sha256 = "3b97cca86af3b94777b4ef389d7ba9027f482c3a48dd5f16dea3130d508ee20f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lv/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/lv/firefox-79.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6c91a4d5e746ce88522ee9ab1fb5ade7293365eb3bd67f5f5648fc8b298fdb41227408bfde8c567d238bf65ba5276021edb630c4b8f3314493a6f2d5face7845"; + sha256 = "f5100e1ebfe3e8df3873e487221b4829c9b05e995d02f93dcac7e4ddd37a473d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/mk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/mk/firefox-79.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "c9a29a67dba15e60aa3a08499c19c151ed88e4f9b108204fffc42a56cc2b73f2ac65460f1f6ead90595deb1b874a0aaec466d5decf3c975c9507f32c6708e4e4"; + sha256 = "78237d16087898319dd6f8993494a84bd8554ff68826ce1bcaecb0733375a46b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/mr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/mr/firefox-79.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e83006eb8bb225c5c8961e73c02dab509cc99be714a563f7de6203d7b1f9aeea61228de5c2c0353203bf206d113af6d95b47ab83793aedd0d8fc57c66774ed08"; + sha256 = "4ab019edd1a72b22faa8f294698f09d1b760855ace96396a53745d53013da407"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ms/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ms/firefox-79.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "30c08210314a0bb9854ec3ec7db222bc03a3118578940f28fd503a90b266b3d803b59e4d691be4d5d50281b6036d3162676a775de1b0d22d57473ca4f277331d"; + sha256 = "ced211480048fb2105bfb956430459706d4185d01a740f30d544b2da4de16282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/my/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/my/firefox-79.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "744153ef1626a18fc6295934e4ba53a12854f7f8eee73a451e996ff9497caa7c33a85a8fcda2ce8c510ad516568909dcf793acd69f2b183775dc2e2921280c6c"; + sha256 = "44a29644307d24b1e6f2c178c262858212fb0294bf46ddae8d6ebc5606541f0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nb-NO/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/nb-NO/firefox-79.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f1519f65a3437394906750a19b9581a2bbdd295f8491caac191a6d702cfd81eee31dc58f18297a2c77b7a3099c1cde191017590881613cec21ece0abb3b33b0b"; + sha256 = "00c84bfd35833898706297f35b78eb0bfd3767bdcb9688e4deac0731b99720de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ne-NP/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ne-NP/firefox-79.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c433b58a5c95c8bb15eba38fbbb443ddcd6e996809e382925284d46c5357901f3996d677cd1a7a4e3afb5d36fe9ff7aeeac9202f333a0acaf4cede1932fb9c1f"; + sha256 = "e7eb9deabda42cdaa0f5b94b9e216d7681bb95f271fb4a73fad216a7fe7b9ee3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/nl/firefox-79.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4a08f0571fb66742cf99abc582f761cc8dcd7297bc66db56f11f12bcbc5c46ad0030b6943d31d4f42faa9b2caed5b25576df34d4078ffad5712bc1cd7f9fb3bf"; + sha256 = "c73694c9c25f5bb45e657fbb47b5143c6812e15b62487036306074f5818ac107"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nn-NO/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/nn-NO/firefox-79.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "97768cf2279b49a5d2ee5dafbd1315a9645ae017d6658106c4dfed682079d8b1aaaed201d8b571e8c00a5a305e5390a7f799307f167c24930b6e08b601586071"; + sha256 = "defeb54e992715ff6f3e450d0ca2fe1dedf70a0f2776010d44e0ad864dfa2231"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/oc/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/oc/firefox-79.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "2bfb1e7d79c8c7256c7a4af08e33bd3cfd7bb3b5e214b06d50714d602b0ed44db5556d555d506b29d5779b86c8f15cabd6e9d4151e76e0c4e03003a49f1e2460"; + sha256 = "e60ab6dea689030851a07178b56a979d30f4f1247329692ff93ca81dd59d5435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pa-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/pa-IN/firefox-79.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e53b42fcc15613bef2201e2c8269269901130884fc7b3d4fbb5cc3eea1c9ff1a219503c2e2960643ae23ed0ee99287ba977f55f77df00c0cdbacd380623967ff"; + sha256 = "79dcb55f76031c0d05ff97810f0b9f6c11fbca3cf8a41b2b04ac06526dea5020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/pl/firefox-79.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "bce7db6d18de63080a806dbf8639bd2f6dd00876605b17b9fcc741678618f1f17a5d991c461daa765cd2f3f217d2f39971e572e2e607b91bcdfc8ca15529526c"; + sha256 = "5944423bd0bbdd744c66237fcfa6aa00eba60e68b5cfa400b47a39b9fa77baa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pt-BR/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/pt-BR/firefox-79.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "7260d2a9ff4fc0b29f5c72942eee47c36b4041982924ece2a32f70a5a821bbbff07ebd57a3b97c64700a6e7815e3f00f8fc521ca7f99192b25f3199089b33738"; + sha256 = "6efa3010b67b697211b8f83a1fae8e7b62f4207bef1d71fa3a02fb6d9d620195"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pt-PT/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/pt-PT/firefox-79.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "47f02eb60a50799c542ec8f82dd5e43a684ca03dd8daf487d651a33c7ed78ab12be1ab910c2a658e67645b2537f6f112d9000b59377be448c066f218bc9287a9"; + sha256 = "b817ad0bfbd0cd0f8f3fa304ca82b0b2f30bb8dd5542e7d3422237d53b31cad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/rm/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/rm/firefox-79.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "dcea73109f2c6bd570729175e136856d1a8141cd3e6caa04ad5a0b94096171587980d9567181c41fcc950da92c15155ef23402ff7e97939fd7cc4d3c6d349e6d"; + sha256 = "a46d4e796bc3771b076845281a07a83016880295b35db3ff8fcfb2f0485602ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ro/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ro/firefox-79.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5189292876c243ef963f552123876d9a392a258efdd3704d4ac2b4da26d98e3ff5d281dd54be89ae414c8a78abf080234259045326487eabca45a645a1ba29c9"; + sha256 = "5ea2f33d5274e4e1c105229ebe0a1cb1e8118c4157d059d62dafb893e7281d4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ru/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ru/firefox-79.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c4ced260fbae120147c18cc03be8ed6c604c5b98c4c63d3f7ba579154cbfc04003b5ff03c65617cb6a2c65a49c36c81fc1c1b2d6315e51ea368165d0c6fe971c"; + sha256 = "e5513faf273a108b271cdb4eb3f20600030ea8ccf095fb7e4992fd72537c6433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/si/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/si/firefox-79.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "84f62ba8c25c46cfde46e2dfd2ca6e9051d75ff4b930f1898da661714976103530571a39ba19f374beb4ecbcbcb30a390483d91433558e2f263d9106efaefabb"; + sha256 = "71b01eb76cc515af4ac1d4a28fbd27acea07cf57c26c84896ac70838cbc4d88d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sk/firefox-79.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9f9792fb821396d46c5ef30acd2d71ed224db8a8a533a6dc3f0afe3b8aa7c9915f425d921fc2f8adc11fa3f5d9ef2580eece36f488417cee4b4dd3988d9f7553"; + sha256 = "78e954e351141f5c92b0e975f6c3bdfa9dea259cfdbb195848f8a926009d8cbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sl/firefox-79.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "55d0c5d17f80d9a35ea5dffcc93ad6cf9af2414e8b74bb7f0681dc97b9c7292a95a9175400b1710ce5eb78e2aab6ca9a57deba96df68bc8b0949029a4fca55e4"; + sha256 = "50f8d47d6de655322ae96b637045c44c27461dd9781d05c7a5c68fdec9433a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/son/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/son/firefox-79.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a341592537300f4aaaee8010c58143204487642bfd72fc25086aaf94bf916aeef57ac1a8cf5aa6d3456759a4a9416da6c72a6e222a1011bf3dcef3a1bacc53fc"; + sha256 = "0225bbf879728bbc64bbaf8b8db1881cff37706865a85ba786d159607865e4e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sq/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sq/firefox-79.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ce6f8b75467d9a97732a9541ceae1611b37ad81c2cac1a150502e4d96b3d2f0a35e3031f534cc974a13810716e2c2f4bd30d71f84076a98c0bff85b37bcdd51a"; + sha256 = "3653b02ba5b32a2d5b2d886cbf5aa8279d4217a5066ba7757668c3bc4a7928b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sr/firefox-79.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "644cfbad8921ad9101eaa2eb20cc4764baecf8c2ac29e30ded8470df6b103cd39f2ac913b30a89cc92b8cd6e2a0a16a2c5dec61102a599e43675d9edf59ce2b7"; + sha256 = "5a5965f6855eecf7aa11a11cf752f354663a30daa7623cee72364eebc1e7540f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sv-SE/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sv-SE/firefox-79.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6b4805545d53241e6f4bd6de168fe642d502cdcb33d805f696e7622894b7e1e347870294b168f2be191b96c8d109bf567a0c102c727b0d6d399e4bf1f0e0464b"; + sha256 = "723689ff6da680082e1e3e3ac3c81b2e6378780150ec958df91c49e1b655304a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ta/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ta/firefox-79.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0681cef623d3266b40cf3081c19f5fd54b0aac447684553fa9205735099bacd615d024f2205329c2c14a4f48c81cb7356039cb8bdc76c0e68b0c4c85c821f0a7"; + sha256 = "2a3a062e0c00667d011d07c94863f93dec6197c2d627c32a3b7d53aa8cf4fd16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/te/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/te/firefox-79.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d1b4eab69607d6ce2b94841c2320aebdfbbf2ed71d09d2d34eaeedf18828b3db6c85062f52dfd7555230d29b5431db742ed261d76c7ff61bc8e652dd9af5eae1"; + sha256 = "56c8bafd594a4661618424fb0cf56dbcdbf8c7192b875dd9175ad0716f5aead3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/th/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/th/firefox-79.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2020ca64cc8aac6fc5cf45fb9201dfff33f29c453bd2e876456017876f7965bde5308464bf08eaafd457da2d51dbee385cdf35921ca8f92f651ed9cf3b900697"; + sha256 = "e8fe3a7ae603b2e10edabf6b7d21831f1e90ef33cd32ddbd42c2d51dbd2bf347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/tl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/tl/firefox-79.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "9cef23915220fd61dd699fae18ce7ceac585d5b704ebf8268365a36108d0e52a488a88deb49e0b942fc2cfc164d5306d1bcba9c2ebefaabcead775bde181f368"; + sha256 = "1843201fdd0c198f1b0a7faabbcf3eb1bf94bb90aaf17f637b3a21aec3fd46bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/tr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/tr/firefox-79.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "7f02a59ba18c59648c98f5965bd0e960149b2edf121ebc2590353d4aa8fc26a270ef2fb16f9a80fa69e604244d56cdaf3029c12149049aabe9796e347fcc4d77"; + sha256 = "f50155ef38be88543bfa039c293a5e405b6f0cc45988356213707c6a23e91c3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/trs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/trs/firefox-79.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "e1dc9905817bdff2db64f60440044204c9335c443b9db605915a4b412426ae877f5e7b2a83cb8b73ca534627d2b1b8b4b9a11306779baa8516ba06d85b3b9a18"; + sha256 = "4e25bb3f9a3e30b110dd08297c34db0a6df068117bd60a7ce1adc7541637fa3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/uk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/uk/firefox-79.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3bb99eda1b5c33418ae7267dfe65bb905c617818f405b80e775d70d6bb8a78f143843aa2256e442aa36304ae6f4284524ce4836a1c864ba06fe558c202f04258"; + sha256 = "037e10ecb056be944a039ed69cf00d5e26e423d9f224fb632256bdcb0df9fe56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ur/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ur/firefox-79.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e1f71eb9b6b5f0dcdeedd3cca964a6110e6d9cf4e5fae815922135b3dee8bd6ce42c97b893eb922e436c5088130035793d99293ec1c5ce8c70d4ae5e0a097f7b"; + sha256 = "79ec0515ed9c39dec7fc053bf1c0649494571d1d240737b9e99b7cf081d0ac24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/uz/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/uz/firefox-79.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "39cc68ab411bbfb784ea3a70306ad2fd27cf377e796f3cf39a1f68d70363923dd1fb0cfcd39f62efa2940439969ae0467191c0c62ac68dfb5205b29760f9a923"; + sha256 = "20007b42603acf29a32f20a900597928fead8bf550f5e085d20f75fd7043000d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/vi/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/vi/firefox-79.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "4ab8ee124d40ed7a26ff0cf7257c60dc8a9879c82b6b881ee0fbae1662fa8e26f672ad59993419dbe93458723c4d4b1a1dbec261ec3811c348449a1a352dd688"; + sha256 = "66826957d8668cb8e5970a812469f5cc8703b9e7251314c89ad79389c08834e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/xh/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/xh/firefox-79.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fea8a74c935e7213e551b1f9c2c00286eca13a2d1a987bf523ebabcd57bcc5dfdcdceb23b4d589e354f116900b8ace28e41a069fa0d8692656e70960025e39f8"; + sha256 = "1d304796883187c2d610ab171c72db38e915cdbd958f2b27adceb932d41bbfed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/zh-CN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/zh-CN/firefox-79.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a5b1dcc1fad60e62f3d7b258193f7c76a807ec3efbc766c50096649eb1e4bb523a981f4b30c9d93a1bd814dea1d99230ad3091a1f8502ac44e177073c0afcb3c"; + sha256 = "dbf10c078118dbb59d18504465f30cca18c76603679ef71e209afe1017711a1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/zh-TW/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/zh-TW/firefox-79.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3f82220802d5fee6502464faf62bc0dd7edcddd0bb93d9e9636da70b7a5e4760d1b1928976793d984c56c6aa73cc9bb13b687590b0a85b395137fa4d7ec72d90"; + sha256 = "97a3f9fe2527a6b1f74c46e63d75794eb616ecab1b98962dc591d2e5a634fad3"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index cb442f6735..6f5b18bd56 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -47,6 +47,7 @@ , gnupg , ffmpeg_3 , runtimeShell +, mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en-US" }: @@ -84,7 +85,7 @@ in stdenv.mkDerivation { inherit name; - src = fetchurl { inherit (source) url sha512; }; + src = fetchurl { inherit (source) url sha256; }; phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; @@ -106,6 +107,7 @@ stdenv.mkDerivation { gtk2 gtk3 kerberos + mesa libX11 libXScrnSaver libXcomposite diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index f9045a4cc1..fcf9e42866 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "77.0b7"; + version = "79.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ach/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ach/firefox-79.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "b377d891ec1ede4d13a55bf6dccf67e9cacdad118241902ea97a1719f784cd8dcae47fc015bc79e4bf7c4a76dd66472cc56a39173021ee1c259bcd5f0b7c3097"; + sha256 = "2a659a4c9ce537066033ad5b9b074cf7ed287f2d6a74f19629b12da972d4f8b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/af/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/af/firefox-79.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "729d7a9cff65d7d002e732a4224921621e3b29c1afa0575506863dece3290722d916ab6072ddf6701628204e9b78d19a5b0ee90c11fc27772ea2eb30ae62858e"; + sha256 = "3ae9a051572c9e4a1e4073b481b7e88d20e38141ae9d1e9bf5d52dfcd4ed5c64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/an/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/an/firefox-79.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7421dac51885269cbdea9514e4d96a9dc9a5acff496176f80fedf8dc570bb3113d3eceaaf25203aeadf2357b364e46b010df2d973f0d8c39cd6df7e408d286c1"; + sha256 = "0797cee34f6b9239ebebbbe4d8f8df69c72ed2082bfbe31baf480409c7775f23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ar/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ar/firefox-79.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "922cc579853ee87f9055b48c12df6ae5a756dcb0e6fef8907ea0befec3f7c2d53f158b4a089bd8bd42765104e0118328d27da4ca8924e732125b207ef72887d1"; + sha256 = "6c7d5f915298719685f9f0fdd7e1e723b1a211d1f3a2d3ffe8e4990c05074731"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ast/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ast/firefox-79.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6d193a8a8aa22a667de3fa4c2b53ce9d9a674919c7e3c95fa7357cb968e3dd36bbd123b2fec06a3cb08bc298e5fdd38c4dce690d10ff15bd31768c7694d0e6c9"; + sha256 = "c5f1e493ca669097f6fb55a55fa807a32811f04908a07d3226d15f4538c3904d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/az/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/az/firefox-79.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5048b6b859650523c1a98d6f0c471dce49833f6303a67f8bd02295dbd341981d145145671660ded3c777817aaf970b478e377bbd3fb367fcad5850402a16474b"; + sha256 = "71a2053e7111c7b2fee0e894233a9683f6642a99122497b0576afe7ae1394d5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/be/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/be/firefox-79.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0288debe1839fcbc9067e26411233b8b29960dbbe65c0878955eae67b91da7de0d51000e8adcac1e3f3e91d531c371f677e418366e50ed33337a4ce46c811b6d"; + sha256 = "1f31dc9330c9448da8e479f84c6c5afc0d9d3d35fc5cf69f3219a97587b1ef8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bg/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/bg/firefox-79.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "35821fcb332de76d2dbd039e9dc417631d8303921cb30947d39e6d0e57edd62f5fa1935238899076029189250a73dd657f25662f5bfdd193a5eb6227c706fb7f"; + sha256 = "9edfd72f9af794c5ae3a09f2f116030c54d0afe06885c06a0488383545a24015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/bn/firefox-79.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "82b553daf2ad0e93232b655fbe1c24928625c7f682ef755e1f1759847cd93f0b66bd000784274a40ab5ea0e89985018bf17835208746197b546244503138db55"; + sha256 = "13bf7557054b87ea9dac68f570ce74d7db2804b253c19fdb971590676a81463a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/br/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/br/firefox-79.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "69952a7d21006632a77c0e719bcdd3370d72760c98df348486d4f5c9d4d6ba73641b2133a615f8c5548e5708d4d68a499466d4ac32f690c9b76eea54f988325c"; + sha256 = "101e1695b473a27bd74598f4619990ebb174675de425b5c8cb61388d774751f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/bs/firefox-79.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fdf0975e3b17097469f54e57b99fd99b69ed8241263600524b1599db94640b4b7bc105a67edcf67b70766188ba20ba7e9b7e96b181c2ed6de020c112af75dcd6"; + sha256 = "0d31577767122a8d3efffffd8a5a9c185ef52211c6b29f640c23a321f7677e9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ca-valencia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ca-valencia/firefox-79.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "438c3e5e9f6a34bda35ffced50e00012a9b84ef589b8868a7746f4f0abbe4143e591f5710d075def1187d61b7f289df0c4a5add6ba4c37227d04509c2b645207"; + sha256 = "1c85f9c3cc3ff7e3c0ada13dd820253e1f40ba9a16ef1c3133cca96ff2365b88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ca/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ca/firefox-79.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "884d87560ea62da3218fc7bcb5b3b3fb9d98e70d5c13bf86627ce61e20aca5a8717db595b9141a302753fb0d704f1c1da99c0a8bb3e1f83fd3f6eddeeea5218a"; + sha256 = "bb9302215164d27e94b86987a7251fab10ca07a14187164fb1f4315504eec3c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cak/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/cak/firefox-79.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6525cd987abbd4e871122a20c25c4ba353272437b56f82e1a9baec9581a6a10637a85942bbc261a375842660606259fd030c59e325b05aa9fe7f3dda77864a7b"; + sha256 = "e3a9ec93be88bbd39936f889f922fc3e0acc863ea722fcfcf6594e2d0e43290c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/cs/firefox-79.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c3eb1d943b892fc41e25ee2bf15f0877ac297483595f7abea31332311e764353d8b12b7879044f688d8cc97f3104a7bc2b0305b02b8412a78e388e59b04d29ac"; + sha256 = "e5ec5ea8b0046268efb1c18c4c6658011937350e8e76cdbb3e3a0a23267170c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cy/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/cy/firefox-79.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0a66eed4424c392f5dfaafa6aa198108757abffb069f8f665c06bdd24dfca08dff314447c57cd81815fdfaf54edc87eb67a6dd5c190e3512a15645e31d5d8428"; + sha256 = "9d1213c853be161754bb043d05d01a78cb7a371e7d37bdddfb5f63f6d1591c24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/da/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/da/firefox-79.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e29aeeafc1f0d456dbe66d7ab07a632e91a25c62cfa03355eb3c4d9396529bf7908980b59acb9fe04204342b4c99f4f05ef5f440d638340272d20fd2bcfbc596"; + sha256 = "0fb13fee88dcd92efec4149ab9b9e59a5580c2d23db696ec3dbc8e3884b4f9fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/de/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/de/firefox-79.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b3aaec2e3d1a23976378bbe526c63503406690e23ccbf0e255f54c5eae34452491f414d5a8be6f9d8e7bf14d6d4479b9819289074b342691c607dd1a013db45c"; + sha256 = "cc4faf8b58e4ef0818c20a8b06dc16d20eef1ccc8f556e60de5229797f06dd95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/dsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/dsb/firefox-79.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ebaff33285d3d78e22deb21da917174a8db140d05d511ad75dd1125361e4c1e7c6530f5fa096634f3bbe364c42c55cc0e36ca7066c05ac21822b28898841c49a"; + sha256 = "361815297980f892965ceeb1973fae3497c7a63b81165b8d9ebaff2eb9974045"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/el/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/el/firefox-79.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "706fbbb44ecb6e7acb93d7fe8c1bd5f4fb3d3fad7a8e64648770fa69756309c0aaf0c2ff583b2bccb30c9f34450631ca886db0343ace3fa80bc1a6e7934cc134"; + sha256 = "0fb9e9a4a4fb751174b6dca7e08d64c90b216bf05986bb3dc22a9e43e92fb115"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-CA/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/en-CA/firefox-79.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "62206c436f7fe811149936b8c73d62126e21874d63f66c72e7aff0e8d4f9fa26496a8adcd842071a602638ee01a14451c65c0ba8a2847f0b30b3d7da9c2625b8"; + sha256 = "560acac5ae8b74dfb8e920fa305a0521dd21100612bdf4c246672d5fbc22028d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-GB/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/en-GB/firefox-79.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6481706c1f34378bc4c804216217b15ca90a214baaf6ad29ca0fd80cf050b4f5eca17d29427d0e4bb0a5c966b407ad7d4ce08c085a68a193a500480c9196c760"; + sha256 = "1a7b0655c42dde407bff4e080bd300b0d58e684988980f29833c99d377ce6eb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-US/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/en-US/firefox-79.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "74ece95a9a152addfc30de6f3daccbb64172c4081163467401d6459d4f7a65a7e459ec91663dd066f9cd7f867e7455e09fd1bad4fd9da7a6c3af20426474f95a"; + sha256 = "73abe84bfe269e88a5ae3166650e3e8003baaad070f20d02dfbb1fc7bd4bbcd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/eo/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/eo/firefox-79.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "fca83582fe7cf14948fc352981dcbbc136cafbfd19fc85732466aa8af27cfde37264dd3168e9388c12eeb624d9af561bdd4caeceffe8d42a393d1133a8c20277"; + sha256 = "496452c6cba42e034a06ff131422848482cac1f21458073807fe63a8c7a4181e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-AR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/es-AR/firefox-79.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "442f9e533a1fa892d19aef77ca64024938ab934f4f963268ccdef1a715a2c3f2feb73f9c2f6c46751217d4dba9f72dbe88ed1b1114be22e2839c0b34a68e8c35"; + sha256 = "ba4c710925d449742163879277cd09d3b78edcb07a47650ce4979742c1b78b2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-CL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/es-CL/firefox-79.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "29f4c00ccf180e239a6660f5832d6ba21c733ae0b90150b1da128e7cd072b6ff5974c6479e161c7b646f1367449b8373af9ffd7d072bad2a190e50627a17816c"; + sha256 = "f03b825ceb72e73a8bf338e218e9e31f67db0474915af7ad45e6b5274ba9cb92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-ES/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/es-ES/firefox-79.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f1d9ea6a116804e7deedf6e6d62b83224e1f7514255394f78fedecf500cc3343fc9fad1da1f690fde9a7eea4d3dfe0cd214a99a2f9bf3b83eb45ab00cc12de7e"; + sha256 = "05b8ee0cba2a66eebf519f8f81ff7cd5a4f71325a36d86fb32454190d8a74e47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-MX/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/es-MX/firefox-79.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "8d4be6d04c22e1c98953b1a1468b2768d956b4d0190638cd24273d1a0356dd8479dca22566c5d45b8ec18a074be472e9ba9726b5224fbd3a2b7f05af3b46c411"; + sha256 = "7007566a648ef1352fde0b4f27343e556eaa9d637c94130cbac4e678f323ed2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/et/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/et/firefox-79.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2c9962437d764aa27dc3d6a6c00e3cc40a456504cd74fe3a7f74a0f0216d54e9e4d9383fe6c5368fc28ae08d0b5424f65b9f50e33a7b6dc14c344a1aafb90fd0"; + sha256 = "8e312269718a58ac88bf906ac0f7eafe534467d224c131756ba7c17165eb495a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/eu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/eu/firefox-79.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c465778901b01e966fdf81e56b0f1b7667898ff0359711fd32e343692dd216704941e30c3ae7f4882f42fa297715f778e68094db85583c0e60a57cb91e95cbce"; + sha256 = "fb482b765f0b47184e9dffe87bf65320ad66a8bb98d34808bf2c9de65ee14a61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fa/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/fa/firefox-79.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e194a9be6f993b177031a2fd3d91d955abb6d7a4d249e8864d5a894f1f9af87c39034801ebc9d1cda5f934c8259706c6e7fdcea344b5602f6d4ea8008375ed53"; + sha256 = "ade51674f73223be4863134abb917a09812ca3a2a65bc3330d27916fd55c2e64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ff/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ff/firefox-79.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "613dd230689ca36df61d558db43d8d204da5168ed1172bd29e732e0a640d5f954ec4f5eb03e8c6abe5646139005981bfed716dba8fcfdb2e697627e563a6ba0b"; + sha256 = "6780ab7da6474f22ea9073a0b7cc4c37e484c6491e5d8c6f045aa3859d52650d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/fi/firefox-79.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "63dfc7ea59a29901165707b3c11f1087c6e23a27805de1d355d677943c84303b7c54c199d0610a714b930539bbde96991a79aa895fdd3f6952174548fe014d0a"; + sha256 = "4e62a2aa181272b82484635c2e333fa9d57e4e364d1e0216ff372abaac5a9c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/fr/firefox-79.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "477539bce633a1447937d5689972fedaa1592954ea3cd1537f648d1aca9801fba8441ba6c35cd2148646607982d84fec743bbb115da6807f29790c38d5c22e45"; + sha256 = "ee726f28deb98529e1570b4f2e004d2fe402e29b67eb1454023fed037ede7c8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fy-NL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/fy-NL/firefox-79.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "cab7637566adf3d41e25915b6e94020214da31aa12a6e913754d1de2fad0fac9abf61686af64bad21eb07e696f23ece8ac38d8255848d5bcc6b0c1ba4c9bd374"; + sha256 = "18e86d886a39a65132919363200a0dae1e814ae8e9ec48b7dd6f32bce54e2da3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ga-IE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ga-IE/firefox-79.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "843f136635783c6a586ed273f5d97f152b004406c53958e59d265f48e5390fd42246c2e92491ff4b39633bcfa15ab1c8c420b3749a468b87672ad900fbe23de2"; + sha256 = "0b9d03430637f573540c7a66995a67ff3f688baede86bb71baa64b6bdc02ba1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gd/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/gd/firefox-79.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "380ee84b44b90329eb253a604508584cb15fb3d36dd25a859dcfc8443cedefa54959fa958827132d1260cd040b70369d65319f8e18d06359aeb420b96068ea7d"; + sha256 = "8108759648e45d28d13b5eb75b326524a5c21e4088d5dd4c36f9a6d46d895951"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/gl/firefox-79.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e328dfe710d097c49062b9d0a54f42d4896177ad7ba174fb5e45b37baf78ada25089360bb0bc7211d605cab92a2f3c220cd1b78a7bc0c65ac17d15314c68dc94"; + sha256 = "4fbe3cf6a9eff16df3c2c2523590fc5b3d0f7b4109ed7604598df64728ebc088"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/gn/firefox-79.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "2f65aa3b62e2573cbfb0591e1ccc729f983035c3ada9159e9fb8014263f38731d19e5a2da41943c0c540ff1dbc7620c9fde82c24dac49da7b2d920c1d7faa4f3"; + sha256 = "61ebc91bcb8a5e5de8ccbefa28c5ae5b952711edfdbba4fb79510148f877ac3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gu-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/gu-IN/firefox-79.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2d756897a5e3f7f038d3e000bfe6f1976611eae436ced45d5c06eea140ba26041c08588b6ceb7fc5026945a19a46715b154d0860ec7744762183f17d07b5e792"; + sha256 = "f0460163bb713885571592f020254e9e6ef6270338509faf8b46d26142f13ef7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/he/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/he/firefox-79.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fb5e2142f842ca0afbc5473dc3031eaba2bbc1f7ebe412d88696f05d8ab7102d9d8c57c318e7f6a8106b07e9cd6d7832ec9012868cf6b7571367ae1514959cc3"; + sha256 = "40c8091ba8e9b5aa0ad944a9de91ad62df6871d34431744d0d453571d322df9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hi-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hi-IN/firefox-79.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5e779dc92115568c08ad511469e03af1b4018ed15638f88ff83df08cd5dacaf9bda39cb5877757f7eef3d0d47b43777eac5363ba4a2a4ea895663d8deedd643a"; + sha256 = "d1df833b5d69a2b403a3a15a9833192890e8998c065c7dc08739f16d7ca33b7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hr/firefox-79.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2d196ec8cecd41fc5ea76aa535d830f98cec1572f7d8e7d8999769c09a49cd2063c9cc59314748579b8fb0fa9446b22df96b43c4f462b25dab96c265ba4f4d41"; + sha256 = "97c98db6dc9822a8f4a99c547b4637422e2d60e99360237dc5e54bb340a6614f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hsb/firefox-79.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "647bf9dbfb8f5d053b84c507abc1b121387464542621264df72236a29accdb895e8c71ecef80f7a5a241ff4a18db47e4340f67a0653669e39cc56cfa622dbc1d"; + sha256 = "7b207f72447869a7702c386006207a48b41730715b5bec3b7ddd5c4470653b90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hu/firefox-79.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7a67cd7d6c4563189c93bc2b418423d6f787b36c5b188411ce49f763421d66ed37404b9caa0bf63ec4c150019df79de1992ef5a98600e63b5a8902ab44354a0a"; + sha256 = "974048bbb8330723eb8dc2eb6e714c41bf94e4003ce58e42ea14407b7a64bac0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hy-AM/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hy-AM/firefox-79.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3a9fc6e362af83a1776619e0a5b36ce6f5e59cb46d2e8f9be2c57bc35b7e4e2f82b5ba4b61e637bddb470342fa67993b0374f2065946ae0ce24af1e187695211"; + sha256 = "6cc431e37736bb5843e23f26934537c7e30d9243d73d292d24749c7c7a8ab61d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ia/firefox-79.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5eaa3a5d9b0cfcee453de81138ab9ffbf1abb58eedb97a6b1dddc73eeb919c89bf077138d7b86bf804bb545fdec404724f7f76936cb09fca3844a93c7008dea8"; + sha256 = "0e67c59fc97d0d0d1c4f41fb31a978bfe3305177e399980e1d3a94971a00b63a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/id/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/id/firefox-79.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "714c19533e92d23d7ceb7ba07dea6842d6f378c8d705ab9fd51769720c1b7faa8fdfdc9786dee881aeb5106e5a38b840aae4f5134962db225d0d13c0a9dd886c"; + sha256 = "44fc48465bd361f54807550cdc314e7b3df48e2a97157f4fd0f2de3778d61cb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/is/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/is/firefox-79.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0b7216b9c09eb67d774fd0b8cf1a1b43a6cfd14d5327f6768136de3190974bc2fcb250f920253de8e77f7c61efcd23d0790da1eac2aeccc77e4e74fb4cc5d643"; + sha256 = "385ce32f2924afcd2fd3622c6fb4ed74ecf727c0cd746176da8d153869deb56c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/it/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/it/firefox-79.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "898c073e7335e7f2ef15abcbe9411f31522c2da464b62c2997550660dcb068fcaec2ab5e12fa4818816a34b37cf2a46bf9c5b36f65697a521cd5b0c05960122f"; + sha256 = "da5ffed78430fe022067693988981d2479b58a88f122d9fdd470d28f01c67ab3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ja/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ja/firefox-79.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f6dfd4d7aa9c1a0ced11034b59de3add54ef2b30aaff30a14081824bcfbd7bc020ef840f8c12544329b506fad1567400d2c7f57ddea22bd1fd37c17ddbe851d9"; + sha256 = "2c900cf33ab97010d9b97a025afe627a76ba7387422e783c71a731608b4d6470"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ka/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ka/firefox-79.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5dfb93fa63f26772a52b7d52a0839f1bb624408097cf927de0222eb06fc9b9b7a9649475d2fc6a02e7c66ab1e6aecd8fe3d959452a73b1f9d3d1be6fa1aa018e"; + sha256 = "d3c0bbdcce1743c23e725f939db929c286e179b21246ca425cc0780f820d8971"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kab/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/kab/firefox-79.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "767e3793cbe7e4023f227818617819026693287c3927d18193883e603d21d23c0239173266c89d776afc8ab0cbfb40ce9b4516e4663a44928abdb7672dea3f85"; + sha256 = "9998b64b4a23d491d5d88fd7b788665f851b3966dbad4edb706c6a4c238df6f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/kk/firefox-79.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "b4b7147631146a53b9ab32f8a3319466f0837219284d4757e29588890bd518b45c7ce329cf73e3840c018a160a13f841851c407a0c4ea06cc3acce163be8cf79"; + sha256 = "61ac1d6176c8fa04fe6c41f01ef8b9b0248015fbeda318fd61700b0e525258a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/km/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/km/firefox-79.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "d3fc7706838fd310d34e9b45ee2fbdda352620b434e011a9b54aab598777001aaf24db2ea528da413356a486fa330729d121acf7e103905eac9bd914b5473426"; + sha256 = "5fe470f9e58d17637f773a729e05e30894f6b2bf7a86bbc6c543b9e0593f2712"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/kn/firefox-79.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "61621680b5dddd1058e58e741d2190a7d07ca74301706dc61d823b1577ba3b76c72cccd30fa64f4b5b95748e6ee4077945d6b7dfcc21d648f13ed7be62de2eca"; + sha256 = "56c2c34d30359b3eb2063b0794b21f4f47c71bf8d016f6c8d62b710abe65c807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ko/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ko/firefox-79.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "66677835319f120fbd2290d7a050f2846484229527820e3e49daf3b7f377acbbfd0a736f2e71c388691f1d04ee013864813119e7f7c5c7528887b8061b62bc0b"; + sha256 = "1d81122b44c6e6718a2477c2fc03d952029f7b7b931d54b8d6e1e6f29d4b6882"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lij/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/lij/firefox-79.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d590da1e993a5d598411717a9e4ec87876066fe106ae1cf37deeed77a0508885d47836cf6653d144be30dc21917a56cf5977f99f3c38d5e9843eb52d69a7d267"; + sha256 = "783389dc8efc184ac77fcd12c9609913b1f1fca0acffc33401bd37c3b19eaa92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lt/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/lt/firefox-79.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "450772baf4bec1a8077aa4ae1dd52d84ecefffcd4f93b9c486bbb4eec12c879a8daf2cbe51dfa2f81598abab6242bd63100d8243477d3176985a689eb2688147"; + sha256 = "6b2b629c1e1a34895293a2c03a4377096dca6ce646e7211726303c2fa410c259"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lv/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/lv/firefox-79.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3ef9bcbc9356a83b20f3f3fa83530790209866456f44f9115f8f22a1dece72bc28f485f24dbfb854c77d4306e2f3da5f759f7fbaf151ac8a8f303b2dd24832ae"; + sha256 = "a79d1cb7261e6bad9a166c4bb8d154852e2b55100813332e48007a341643a9f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/mk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/mk/firefox-79.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "59e8a7fdaa37513e11722397d9708db397aca75eecf3ae2e3b99f42a9e40e89b183c6ff36fccec1c310269b5a4ec3ff9f81985ece314a868585082e4d132012a"; + sha256 = "63534b4a079cc08a74e1a6ac121af5ce8bb40487b4b0b78b5063deedd8f5bb9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/mr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/mr/firefox-79.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "bb7a9577fc6080fbb82918601405e8a6da59662c9edbb568e558ceaf71e04e95aa3dbd7acfbc780759b0cdeaca4b67e24cec1aa57fec30473d8410fe717450c5"; + sha256 = "ea3e085da4aa2f7701995063457ff3ec10270fb19178cf61da9b207cc1616b23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ms/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ms/firefox-79.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e8bfbc9f54b3cb2d2a3f816329948f9e13723dc6c680c41e33cdf3bbe4825e89c9547144cf5dfd3ecebb0fe8759cbbedbe7caddd85c31007ab28b42219a8c159"; + sha256 = "97ba068e4ce9f3d12ce4c8b962ef519596a1849f93efb99bbf6fdc208afaeafb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/my/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/my/firefox-79.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b95c1800738ebf79b5ffc64fa1a11ef772614eef6f49faeb977677c31e545e4bbaec3c9c75567afdc75397cd40dd80a671ff03ac17bc62ede2bdf162323e6559"; + sha256 = "b889e3065f164d751c0169ec517b02046e7b617b401793ee5571411e0eeb431d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nb-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/nb-NO/firefox-79.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "505d68a0009efa7c8312fc5230c00e3d72c8412d6308360cc10257ceaeff98b3f22a5eea9ceaddd7566a9a690b4f0c04f91dd8a447bd338af02c915115cde506"; + sha256 = "a4fb718c5130ec72f6f860d81817428614221fc609202bd28276f593c528cc4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ne-NP/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ne-NP/firefox-79.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "01eb90cc8c93afdc34fdc0e47eb5b4a012c9fe7d3dde1301ecece240562766066901d80cd3789e97f2f7a7188d56aaf7bd67c56c4e4a210b30ad10a738ca5b1b"; + sha256 = "ed2e54b3c132b8728b9a703b0afbe15d363ef7a78a32ca4b31928480c976c182"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/nl/firefox-79.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "486aba5ffc551be80e8e9b35cd92b903e318a3870638c532dcfc10cf0a7d545825eb7ef54b74d76f66cca2e86e25614896f78eac63b3662b43ed313b853ad4e7"; + sha256 = "1850779e05bde3037ef1e46bf910d6296c22e536ba42ecb538cf794a259651c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nn-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/nn-NO/firefox-79.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b0e885c206d93c294997b3798a93738f99e4bbc459f7e8c7ff688414b73f69509686056f86b12407677a79b7d4bd7aa34f4dbebd5965c6a92766f3448a33cd79"; + sha256 = "a67f80c9adb05dfdc15d28d679ece1a3903119d1ef4504e7d695b232a1a0e7cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/oc/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/oc/firefox-79.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "1b04601dfa2110a2999dea0d6fcc19fc40b487296c705a403e741c9a9e0405fc90c774af7665c9335e605d6fcba3c8826701a497483b896e7911bae3a7ca7a80"; + sha256 = "d89d61ce305e6870dae9c59760710a5e87dc73b3eccc13f790542ae23dc5cf62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pa-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/pa-IN/firefox-79.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "59d6957fcd1b2527cb77622df7cec4267d84fea180dbd2a7397871c90b2c27e8dd0b01881229eeb7219b548258d72448e690d654262ee55cfdcfa9d4a337e102"; + sha256 = "9ff261de3081fe1e0c5f5ab9fe5b74b2c6efb5a6f4a25430ee22dd96c1b6d88c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/pl/firefox-79.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "1d18dc2e580238d59997198d9aeea8673aa1d32db329c0dae79e52d9e3e64b063f4b96695bd18ca0a449ac3fd5bf77815aeeae05c108c139dd73134199a6e599"; + sha256 = "1618c91f0fb1f3faace8e52285e50f720b32d2a244aeb9ea968ab2957b24bf93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pt-BR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/pt-BR/firefox-79.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "1d8bf57c135e56eb6fd823c605e870aa62f2b2c4d99f50447169411a3877fc089c588fb085d4c3a2dd62a2a955c5f7bb39cc6e8c391dad0f6c2d1f20f4a5944a"; + sha256 = "04a88b46f5ea749d1d645d1c3b373aa30153312680f151c459eeb41581201b6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pt-PT/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/pt-PT/firefox-79.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "41d3c18252287a172dbbd70c713e7176de8ff107ba0bff47c6f2546b8573bdb11508ca550fd8cc56d23172a84e30e1573dfa43232d4298c1862d5e8fa0ac2451"; + sha256 = "602556ee8e4cc6e7c1171aca0c5b0fc9a4a0e8e9ae2ce8a067fb7c5f5427b613"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/rm/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/rm/firefox-79.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b0b485f098475c1a1d422b8bf170e77ddd3ff2b7b3432bbd43dda975522767b9103368c74b8a74b7cf5639b6fe72690380b9c7c94995afa1badf728969123f62"; + sha256 = "4bc83e6f4dbe0b0cd2ae656edba3c2bc0477d33c4d27ea7562e444780c313908"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ro/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ro/firefox-79.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "ad8312d0ca6595dcf0073fc2de8a52dac61610e2714500372250ce142f1220ba4449f6cd5f0c0a2754eee11aef5a71062e82c08417ffd0222d771ea701943b3f"; + sha256 = "d43b2477c5b38440ee4a73e3c16cf6cf1fa7d67a8c5cd5a53c87032d376c8679"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ru/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ru/firefox-79.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ca9bdf02f34f92f0c752fbb55d6f69d17206f47b8745df9d224dca47d57ca1cc4b5646f374b37d1250733f66d83afe287bb698bbf783b08a6b7ddfdfe35a2e64"; + sha256 = "eb4706f05215ca613adfa6d662e0cdaabb9f53553b22d7a5f86e7a2c2ce3522c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/si/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/si/firefox-79.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "2c621f00a6b2f2978fdbc28fceadcf2385711cc56c0b47c536c690ff3c7549a2b9cae71c9eb1ce40c7a199cc936f1402e7d3f5055a70b98b015ac25006019464"; + sha256 = "eff6b3c1613e6c11323647eb66e400689c764a122f5cf4dfbed1efe4eee347b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sk/firefox-79.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2fbbdc40f1308513fb9064f6057a383af60d5a7f60d07a4918f6631d59762a2a8cc11b23de167ed0a7317c290436cc15443e6d893b92a53df1bae2b7da3098ba"; + sha256 = "4689f362e2e1ec2fb9f10d3081e15c47bdc288f782ae0297dcc342b48849f7a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sl/firefox-79.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7a993dea012e011c97b98938bdacba53c498fd15bb94b9deb05b27d7b842986e3748aef6a6bf96b1e288c8bf59df5ded37337ffd10063b3bf7afa81cfb1622f5"; + sha256 = "b612a245c461015c36cbc71a9ee6252753e9848085a6beef05ba8994b966e2e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/son/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/son/firefox-79.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "22acbd2b46bc7eba4003295fcd2fd01dd9e6ea7a45b7ecb595d55801030dd7baa7363f2d8b414554b07e8e4ea7418901b0412c43e5bc7a5c3c03bcf54318c5f3"; + sha256 = "c257e92147ab9b41cac22d4321c2c69605544adb26095db681bc8101f9767bf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sq/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sq/firefox-79.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "5e0f2a51073728b8b90eef284f9e632365360f45839b0622e6a52c34dd0eb41ee7ad07d320e6b3610ea6265ae48daa05cfc022bff0b2bdb97caa8dce1b38e0e2"; + sha256 = "b79017f3dd0fdafecd961db3d9a32047d61daa7ebcf3e1565b63be7e4065377e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sr/firefox-79.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "4bdd5193455e99f98ed90aa05349e2beae496c44718f07b6d81f81abe75d755f4a88fba8dc020998fd6199dcf1271dc7fff3177625e7872e1d271da743d4de00"; + sha256 = "fa42ebf34b9633906cf5bc879cc22e9e668eaeca329aed15e2ca12e4c0b7c711"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sv-SE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sv-SE/firefox-79.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "14e7db0c882d5a84439926602d6d706084001499aed5db4adae6a11cf7c25e95d0c77a59340c74bbe11c6cbf960500eac902a2ea23f7bbbffb9805b789242eac"; + sha256 = "257739d27dc7770756ba896b52e2137eca1f7e7aae44c737988821f0120ae5a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ta/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ta/firefox-79.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f0948c827cedd46641a26facc08c30c1b8292d48d8d703fd7fa846bdd1c9f631feb64b50457fc6d10b0b2a6effcf304b659e1d5f666215613bed75307de37a6e"; + sha256 = "bf837831d901c9be834ac9b5602cbd873ebd0416b042eb4e672423f153532c76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/te/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/te/firefox-79.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a0df152f09d0c6abfdaaa1c3c352282374c71fb2cb674199ae8fe4c53b891d98a5cbb19c5c20e92e7cb602bf4be1b66ccf6db295cb91190b639e2ccac9c68b86"; + sha256 = "dae3cdb82904e8c30d19e5811bf37c1dc7b43a5a74ac7adb537bf2530e99983b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/th/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/th/firefox-79.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "eda5d9fc2798e04addb6cf093548cd819a23ca480e392440838dc8a023e074b4b235a2df7a1ed26d4fd795c7e21c041be6f7c08d6dae35b05fefe9c31c79bb9c"; + sha256 = "7843b01b201421563a0df660a990779569a4363c16c5e9f8cf780693ad810b2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/tl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/tl/firefox-79.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "09aef5e2ff0eb455284ad185274fb6fefa2ff6f768a16e6301c58be9f97aa357bb18147d7a909694c69daae683ac636ebb16f800b6e0d7d90e931426f74cf3a0"; + sha256 = "13397743b49932fce379399bf9de6de1e4d45cd94786acb07db153b30aa16c47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/tr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/tr/firefox-79.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "f936b11f4fbe0ee2f31b5c4f773e3e0044468bec15806afe21ee4e3f95862909f6cd68e35731ba29a32aa7cecc8c06120c3722500d9f3bd2912a29702045251e"; + sha256 = "59aa948f6c2ba7fc6d6efcd7d8649638e4748eeaf968c65cdab6ea8130f161e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/trs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/trs/firefox-79.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "4089f69168225d62d89bb34bf8c2cba4c9225b1b768e9a94b13024bdffd485d83f3389a8d9964b6afdd5575917d70070d7779dda0bd0119a15946ceed2839afe"; + sha256 = "87a57b3d0e213d910c2eb3dbb0cd2130cf3c869d11119b664c163ed0461cccf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/uk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/uk/firefox-79.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4ecafcda0026949c745378e32a8bb68a1dcdaa292db74f7a88bd13e38dd39f2d1748a69e9e2827ad6e8a2a71f1872f0ec3cb846ff071954a41dee242ab233243"; + sha256 = "e4e816e4a9b01b77965b769c0d0234a06cca25249b3b5bd8a88e48a7d604683d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ur/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ur/firefox-79.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "25bf5543b9586e542968aba4896a0c0c00ab5eaf99b82c8d9b7354c82c33d2eab68dbae2295823230cd5708ef02817a51e9b9f12954a43aa0c0b131a44388d72"; + sha256 = "ca179ad92d133b5325621a48ffb45cb64bc2599c6d801a1eb6db64aca8f35e2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/uz/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/uz/firefox-79.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "90aaa4ed0f9377d17ec0b02ceb934ea775d5f378a01f8b4c0ba7cf5c67975bbf4f7ac59103e8002116118972eb6d2a48c6dd3d6cf515f766667309d0d515f994"; + sha256 = "e10632d9a14b6ee90b4aa38a9ecf40415ad3a1c8bd69527df5a2ba53d2379f30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/vi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/vi/firefox-79.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0fccb7e7aa3ae6f8b539864ed44c7d8349ef96ae5d55d9ebec33bdc1dbf470a9a831b440fb0cf008e86421290760422201ec55e704b5ecb388155605ddaf35a8"; + sha256 = "ca5b7b3940392caf5064b32f346db5a7bb029c312fb8b87e536fb0fb1e10f3bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/xh/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/xh/firefox-79.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "fd7d880ace4221cb8031bfcd9c90c07ed51fe345c9592791bcef61e52a29fefc035bce0a24a24594f310cb7113ebaae8525df0b2462f86560a45253b89b7a53b"; + sha256 = "af5e2b09e2924a643caa7b558df44a71a20d0ffa4fe0f4e0b388fc2a95abfb03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/zh-CN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/zh-CN/firefox-79.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d7c386894783434732c56460fa30de8ecc360041934743b4632c8a03c36b00227fa8e23d2180a7f5dc742cb324329aceb2eaa4831c9eb9545920a95ae3b7db44"; + sha256 = "c47b7a8d08cb72395ece3a447a23105f34f2ba05933023a8cef59d5f6b1c69d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/zh-TW/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/zh-TW/firefox-79.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "52a64ca3d152b0afa2be9206ad08fa1edef8411d41c23d984c4015b629bbc0ba21970c1059cda76041366221a193040db474218dabad7131766e53ed6b719d81"; + sha256 = "af463a670c52af7d4ba9dfcac8e38283ef6327b3f547bf8a3fa25669e7ddc3a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ach/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ach/firefox-79.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "d88c9bf2fc5b38d367a3e6210b59a4488092d42b380bf020bdf82b1c0527f03ecd48c08813a8bf73fcea48ff58a77fae80b2c907498f2d9f5275fc3a7f80c5a3"; + sha256 = "6327271b9604b848a71a0990d90b232f0484e2213e6d597290ea9482439db396"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/af/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/af/firefox-79.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "cb15b0cd5980a7021abadbe765c714604840a2127722f8b61bf9187bcce3b70af2e902220d5f0faa0cc7b3d513e64a250bbfe43a090d13ae4b8835db0c28428e"; + sha256 = "7b536fe21cf9b9b25f441bea18e152ef577f8adfb4e5a1411f99e28412f09b4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/an/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/an/firefox-79.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "8ee5673c42ba46e41ede5f3657a5fd7c9073fbf9f27e5583a0471802542012b67e8e0730cb58f0833fdb1d036dd887ed797b752d79290ad8982d3addf6739c44"; + sha256 = "db33ebc2b3786a849f7a1a2277465ef44b47774f7196bf9ab5b6c0054add1491"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ar/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ar/firefox-79.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "25a2d1144a734270e0304bfc6a42a6f6585bb79e7289b381791fb6a45b86891f570c9c4d6a71de2fb8f0aefc6533a11862363ca60bdff14f817704fed4e9bb23"; + sha256 = "ebfc4e893b639e85f63441b5d62614691c0d56ac5e0cafe42abb8f2037b53045"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ast/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ast/firefox-79.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "525fea1b71c9a51706033c4b2f523813e61666df6230ba51752a2161704c48c26ddd5d781285186beb53e90f01cb35e7de743723bb049b729fe26799eca6036b"; + sha256 = "0fb08980f64b7fb4abe662d63a29cd3161da8b62876cf0e24b4bd194302550cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/az/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/az/firefox-79.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "743377d9a76b6acbec6a7c005824c6286e10e26e30a6bce90a8750657d52e19f62cb6653513a241ff9a6f3cebb5caf63dc438293568db5418827cee6dfd94b56"; + sha256 = "ac07cda47ca5adfba148ff2838ac725a1e6c0d23e9491429d6c4dbf24895d6b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/be/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/be/firefox-79.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2b96da128311fbf97cbb31e3b4b6e0d1fe0158ff7892195d7074de67e0f5b7e22f82c8131dbc0ff209e043d89191d269f5b7af224f6d2646fb5a58168b2f0d31"; + sha256 = "250f9fcf7f5a30ef29f1b9f88a3829bd638db7bc6814977c1ed796de35304271"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bg/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/bg/firefox-79.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fc5712958fd93700d39bc60799a32e99ba0db868997e1c0b4750bf6258caab3296decc55d14a48d9ed065b9beabfcbd9b7979fd9289b4243d0449fa124267e2d"; + sha256 = "ea1833aef54f2d3af92fa233a1fde1e4d6d95ce1be10fc270302a747010f0437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/bn/firefox-79.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "eef007d4b60b487a1a8352ed7daab3cc5fa0f3e24a235f5fc28979c2fa69390032feac2590401533b66add014ef85f573e89613334b0b4933bad903c8576d566"; + sha256 = "13e2c4855bb08dd7984e9d9c8954613f1939f11e3e17c11ba0a97648df72a173"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/br/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/br/firefox-79.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "51f73c61512ac4f568161ea0dbc045a11dfdf810bed9e56a109c127b8e64b649cd368f02f06791433ef694190a08eb5b2efc66db48674244553c997b783d0610"; + sha256 = "36127db7c1e8631f5ef3ad5a91358e19e63973e3f1357899a2e59e26d3d23b48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/bs/firefox-79.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "71a6dcb6af95976882eaaf330dcbd64942decc76ad2a110e11721d8dce64c1fc28522520f2dfd1484b430c8c5a6f531c57ec96e533d35a7cb3bc3d688939ef8a"; + sha256 = "747036648519b96edeb77f4cb2761d9a052d208f6d7e2a6fdfbd58529ec4f95d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ca-valencia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ca-valencia/firefox-79.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "e18c221ca0781c3a9a95ca1b2542eb7bfd66a09c9ceaa88b9d0ef76396f21635fd5d79bcc4881432426673865fe9aea679b8c4986bae668587371bdd237a3a89"; + sha256 = "bc90c0ac17e94784e40f33ac720e9ea441308d3468de07fa71daacfc65103858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ca/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ca/firefox-79.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "76135be63a3da2968dd35055207d58fd58241846b4e680aba92541047ddcb97635ebb58b218dd86f86c94aaccc58162007e964a63099b26d139cb8537787ff10"; + sha256 = "d3cfbae13f2d66340dad938bf8522fed7f76dfe5f6766a9ca51027cfc0149950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cak/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/cak/firefox-79.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "088e14979cca1a9e9296dc0fba4507e2e5a04b71211fd9c4d64032b6e76f2c5060eb40b331762727dffaae5595883e7162b8fa6c7915666e0c4183889ae64089"; + sha256 = "66f4a2ddd79374bcd838d8f58f4d7590fde01c02eb785fcb2a88ce8240f8b4bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/cs/firefox-79.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "35dc0443d861b8345610448ec145b1933c6de5eafca6fe83580632d086f0ca2a818bfc03cab85e9cf1aeb32a7ded6f47e7f9af1859c1432d8ae47f09440d81d4"; + sha256 = "ec7c9a9a75d727cea5cdae265cd27d87576cfef4330038d0b2615b66c273d5e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cy/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/cy/firefox-79.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "5d3ffd08d02c2be15fe5e66c7fce402b2b3fa6534192fdfc38f718d3a341bdde25012a59e5f8481314986fe2cbeffbd9ed0d79726067fa4d3658d27855839af7"; + sha256 = "90fcdcb46042800214eb1d9cd3433742def627d6632ec238fd7350207bc35b6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/da/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/da/firefox-79.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "79dc2dcb1d1dcd17da99cc668086a42b25b32f867cd381016f5cf76529363680db5c7ffe53f2660d8883eafa965e320f3d8bfca00dd84759685dfdd2d3504f5d"; + sha256 = "196843914579725bc3b20ebb4fb8c26c566e783dd362cdd6b2e152395868d0f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/de/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/de/firefox-79.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "075639fd73e2595c5bf99632e0aac36664675a3aab3b1b96e9fa701fb4b4a6988a4d966cd111a206fae5a6d21a79286d7b24ebff44738fed2cba0fcb7af29ed3"; + sha256 = "2c5360c5466b9fca6b14298f5bec5e6aa235939a3a634d33811b20bfd380b585"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/dsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/dsb/firefox-79.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "05d5b528aad3ca76449300e4708c5ee8c13951e72c8343b8c0ae7587d2470c485e7320e7ef70bf806caa2530217d525ca72a95f046ad5a1576d5fdd69a971969"; + sha256 = "a919f0b74ac09426a2583eba117cb40a82e6ee2a07a2aaab60b4f799712a69c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/el/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/el/firefox-79.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "08334bae31f5ca6da017fc93889303d93f39be6d27bd79031e5f4f01038d78caced4ed5f407730d3c48b2094cb40448906f53f190415830d91bf7dda1463fbd7"; + sha256 = "f65942155da5ca573e31aa31899011fe13f34f0d7dad9647719433888c1cf89f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-CA/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/en-CA/firefox-79.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "054fe82f776c2b38175ce2ea6acc10f81c2e9f9ce3e6f96f49cd8d0521d447d26386384327011d0f7879e58a3af81c93b7f227ad4b5385fb8903ea29c28cb1ca"; + sha256 = "54e019cafaa8decd89c88f54292c4998fbc2e57055f0f5ddcfabbc8df9c73029"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-GB/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/en-GB/firefox-79.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "82e9e546f77e94d4f91eac13b9f1600bcbbe05a250c6049693489ca46c93a3ccfc791879123f1b49c82ba83c9f472e8f6f3d00f50794cc491a99d756ee9eff22"; + sha256 = "ab1549eff6ffc8fa7fb29eb77edb68f4597cf82134decd94b08823eb473aeac4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-US/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/en-US/firefox-79.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f8e5e352b94e9ff12c86f2b2d189c88b6e1c24cd912e3777eb256403e691c0a28e860c22e098d8a3b4c5d526580db2da2deb408f1e8bdea91deda5dd8cb94e9d"; + sha256 = "411a5568b8f50c14fe914aa73c176a0ecca2e7cf7e3d79c50876eeaadee11286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/eo/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/eo/firefox-79.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "c6a806f7b7655861c1e44837e6b116c70d64a158e5f38c13179d52230d1bad34121c04865959d0608f6a3193bbd55fe081d2b6b3f9ffe9c9a41a1ea8c24d63ce"; + sha256 = "f912580b694269cf7f1fc0cc800a4d47556cb9f4c2a2a55110b4f125d6c520f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-AR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/es-AR/firefox-79.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "c894fbce700c17200eee40d35fe423dfb19f5e4703b1bbf39925e4fae85e094eb5124b8dcd1e8f09f57e73be4793a92af32018b385bff09f7d111f8da06517ec"; + sha256 = "70f281c7f5230a1863988356006a29d1ce3741d6a7a53144911ea0f2c9362213"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-CL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/es-CL/firefox-79.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9896a7b6a72632a42b68e4bf0effb25b0882cbf1571c782045de452a5e58608b41fcd2027cec5677d31a454f6bc82b8104df7490bf1c4b1b05a36aa170fd2e7f"; + sha256 = "dceecdc644217bf766b5c541f21a059728d96d7afaf7d7994c108dd4d8288df6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-ES/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/es-ES/firefox-79.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4708a94835a987f040e27342d73adde1094de3824ae444d124f2e02223de5f4bc280fbd954631eaff8f17d839896c02050c78e00dd54b4a166f291faecedf1a8"; + sha256 = "10d45c94bec1726d53a2a124c335ad09b8a98ee0b620675747ca5f377664ada8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-MX/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/es-MX/firefox-79.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "430c0ea67e09e36b5736f039995b3f6ee4a7bc83327366acf34cf2ac11d79c49d37a336b9b0a39a61381fb4d9c47b0908f25b4f303fa4b21242fc46749498c17"; + sha256 = "6a01c307f080a365cdfd466ec465b53f2403864d21523b898edc49c1b6796122"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/et/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/et/firefox-79.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "e200e5b679a45d6a03784373861a7e78151289888f05561c9f58f4afd9cec36df5df85865d790483989b23435c1d762e8020863d0f3dd6e02f3fca31fbf642f6"; + sha256 = "8a5a86438c66846de40d0a6a37e75c4a50979c37ac30e651184c37777818e690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/eu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/eu/firefox-79.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d7d5355aa60043fe759a86134bba37fb99ccea19978b0c56298f1acd465e5ec53d50761671e2636c535cdc6003fa82f8e99027969d254a3f0003995ba7db995f"; + sha256 = "1e4bd58c05cd690ed5ce9b924d63d42869e30f36a518416933167b4fa82577ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fa/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/fa/firefox-79.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fb174f97e2e21f6ba70fa8eab316a445a0c01a32fb00237790cddd4e6a32e461e89977238a47317ef2c11268d75ea34e84ecf96eac346661da6a4e7fd1509666"; + sha256 = "effec9e39b683876a0eb878729614db9c8eec0dae10efd000a31bc1f555e7d28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ff/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ff/firefox-79.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "d453cd657ce54da24179b74723e2e0c793d6253f31bcfab914ce5cce9992266a3533b0358f53ee17aac0b1e616bc9c5c2d32112a514ac85061da61bd7b8a425e"; + sha256 = "4ee25c22f150d3a0c15f27cb7db24df9c28dc11819aaeb278fccc7d7d549f6f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/fi/firefox-79.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ddd65dbe5e8a9cc59b1c44b40b0f836d56b1042b5a2a37fd021166929485fe013acd14ac59f0c985b6a691b1ccd8b62f5d0bbe89ba341c414003e73fbe839546"; + sha256 = "6fd82fcfbdf0a35c4387ef094fb6c74fa016f6a0a5298cb994b81ab26e193fbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/fr/firefox-79.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5473918598bad367a0f8cc71f50b54c899fc6ff015c78884040c09f558e0a80508dd104112b9ebfa92b8fe5f328262fb2c784dc8726c588ac84e41bcff95f943"; + sha256 = "450649d04f0f07faf1727262f40f6b099ccdfbf8ad2d7f4b104442dc15c23b0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fy-NL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/fy-NL/firefox-79.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5e49d9d3a9aaace6192a838697ce0220ec347b93c0896dcd1cc46f97cee9a7835aae967d4413d71770feaf917eb984a5547d1dd5b6587baff7bb895e5c2fadbf"; + sha256 = "bbeac2bf3ce08afce827aa8a54b84afed226f3239233541ed1c8086a671cadf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ga-IE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ga-IE/firefox-79.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "84b39f6aa3f9845d2d34ce089eddfbaad0c914a21bf68dc64e649a358739eff111e3809e48d882de0980b96537472e90b922ed2bb17a340e92000f0fedd17b4d"; + sha256 = "295edafd0cc283cb6b76f4c8b41f96b55a80260d5659e854add0f427b9508a10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gd/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/gd/firefox-79.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "88657692e941513807522e7513f480915f2f40278ed3ba36855a03e47879eea2c17d48bb626543e71a19eebd7b554d797f522b499066e7a52f8a4363c8987a44"; + sha256 = "9b0c82c457dec3b6437f4e85d5fb0e8b83f4f42ab79af80d5ca239bb0e3bb9a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/gl/firefox-79.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "21cd90d9e5010ee858fd5b499b64cb1b0a695ea04c7551fff884e426895bf80e041244a5a27ca4e37a6a283b9058723b9b62ade273446a5ec9b0f5055c612a6b"; + sha256 = "e36e7e99186eba6248100b0ff30c60017d00a4ffc4e03bba432143d2c13eeca3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/gn/firefox-79.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "23ad0e28b4d5bf1e83983e3b498d78019b78f821f17cb9c1e9b18a2f98b4c044ee25ec2de8ca43381366344010c81979c6f568ef9ccd70cf67bb933789b96179"; + sha256 = "cd4495331d98faeee35580622c6b71daebe8c9215dc53e66e61f09dfb8fb4caa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gu-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/gu-IN/firefox-79.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6914fe4888f878904eced34e13392dfef90b313c4b66fbcdbdd02070b62a8b12a397267012267551f8ea36e826912e26e5563d0f2d8c320589ad7c572786316f"; + sha256 = "7063ad601882e593e3bd8e21b31045ee08dc5a4ac16e974c17bb79f8d81b5773"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/he/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/he/firefox-79.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "453bd36930e6749afc97dc995565d72dcc8e1196d719b8ef3eba080796392297d698e439a2ffbe2c388dc78c7296baf40e2a02e539651f1c1b8bc62f9a294226"; + sha256 = "99a831c67f0f921342948a48d307918299c6fbfe90b1870d95a546381c5b23f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hi-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hi-IN/firefox-79.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "67570140e8087e721ca4951fc7f8845164f6d6a6ac2bf7cbb84c2cdfc522bc1c8578a11154207097893b3556b415ee2724403ea377a59d2bca53bf1cadb78895"; + sha256 = "2500af40403eb26d589f7df03d982bb9f3b5c36840e58ae865d54b1d8fd67809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hr/firefox-79.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "949d494a971d4abb4a0a7f41d994758cae50ede8db4be8c240382ee2f33b21e383bf9fe9ee53a1f767960c5c01005285f899f4c575e734dccd2ab95f6fbcbe73"; + sha256 = "a475c6dc89d4157194a9cd3dce3c3e0735d5e87291ad3f1a53c65937bafd0646"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hsb/firefox-79.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5987ac4a7b8ff18604de100f2dd5099d3f7b4217e1d921e3804a86b340686188761eee33240d8416aa6ec7cc538026039082953df34d2978d30992bd451c8e53"; + sha256 = "56fd6b3cc09829f992a17470455dcf77d17007eb77f739faf875c031e0db1a27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hu/firefox-79.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "438344b07b4f788496de76cf361db5b8a8d43b71dbaabf025f05b24bb47f0fad17d93d683743a0a7673727339324d82196053e67eadccff901c5ad02b45b15bd"; + sha256 = "9bd2e510e1b1d86e0e3c18a74500b545bf991e13048c0a579037077367da4318"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hy-AM/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hy-AM/firefox-79.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "123f20b8b235009474b3b7e3d57619131a4f607dbd600ae23bb52a8f726c458a23356fc12929fb0557da96c9eca489ac8b87909b43d2f0bf4024b8a306e99148"; + sha256 = "fdb30d5912a582bec4210316084b6e4d72af7f694c734185300a18b6c018de9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ia/firefox-79.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "afcc7cf79d5d8f023699d6a9d2c35897329a9372f5161f28188b75126f5b843d105e50bc49968a7ec8acdb290ecfab5ab06731d7b002d2721c0161cd46dcd01b"; + sha256 = "db5433abfd49f87cb521c770c5c9886cee3d05f46bb2c438eb276b3d1a4f0678"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/id/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/id/firefox-79.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "3b505e26ba7fb53c27aee55dd47771abe2e16ddce33413cf61d21d757be2f9744b7e406294ed86a95f2ed645c73efca2714e405a6b0947e08e19f3c667f886ad"; + sha256 = "c3cb2636848f07a2f612b6a173d14e9cdfd3d43cbcba6b4deeb1497d97931143"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/is/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/is/firefox-79.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "7444d0cd5ab0f667a46f6e6ce685102a4a3940d422c671bcbe4c454333714dd17e2b6784cd3d865ff13fe9b5fd63c6bdff79a17188038baa2b558d0764f31d10"; + sha256 = "26e4a0d6b984ca0b052456e3f60cf0fadaf4ca3c6aa057cd4e3cfee9d1bdde26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/it/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/it/firefox-79.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "675f81a6a7266855ff6ebb8effa0646b3bf48da50246bc4aafcaf35aab52be107df98767e51f3aafdee7ad7b866f7304c859aabf9039ce08ab601df8f3aaebf5"; + sha256 = "47d0e079f98f231ec70a87add9c79a50e0d05280084f6b0754001a5bba73c472"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ja/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ja/firefox-79.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "296f7a8ebe0e685e854d5f2674af347c2c3dbe0735bc763cbb1b12ed7862cc44592795b0cd1b01030e36b3c933e3e5cdd6288e77283633655c60182f1b91b0d4"; + sha256 = "fdab4bc84626eff91a6217b6375effe868763facdba10475de208958c7072909"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ka/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ka/firefox-79.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "514409c1bebc87ac575edc28d461d165e64779e95e54a27f83b0f9194d86d7c3473b29e34c2666e4f9ee04a0365e963c0ad54dd0d34b979b0d444c2059d3681e"; + sha256 = "e6d63c57823b7d2092483b42b6c2cc0a513c3e88503d946092d110acb51bdc94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kab/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/kab/firefox-79.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d53d3b7fd5cfa7c96ddc528ae531d111998c95e8ddf0fb44a5e3e55f3223492680acf87590d1fb4d26278604eda2ed48b8681cd62a398a779ff76429df7bdb5e"; + sha256 = "e1bda5cab5ee3cf3116ffb1cfae2a3ca1fed37ed37199ae4f7a0f8124b6c52be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/kk/firefox-79.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8a9fb7e5070ee73dc8d87935cf0d328616ddeb67f1f3955678cbcec6e240ec375117daca8a574f4379677959e7acd30efb65114e4941ffd204c3cfdbb848c570"; + sha256 = "d4fd96e4197dc6b0209fd2705538f1fee05eb7df7aa07cd4f4fb2b4e350d2b02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/km/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/km/firefox-79.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "754254377c41865d6a5aa8f2e338353987885a6e54a7738c36b1566249a0b3becce3bcca9419905be64d935d97a90b3108f0020a313621c64cfdc568f663cc2c"; + sha256 = "a1baed9b2812f4e971334c669ea3c7d7d070d5c5ec8c4b7b2dbc798c7678d37f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/kn/firefox-79.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "79cb8cb3f8daacd1015a2d23b8cab568f9622396a983cbf1a3c6e231929d8bcc40ba84ba2787c9b60a1c9bdbb0729e2637ff3bfc87501bb0e156ff29c3a98148"; + sha256 = "da83a68df08aa7414d4704e953de2ad4ad3dbf84b82688a2583ec453056c4bc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ko/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ko/firefox-79.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "262a471319ecd41cfced36e353dd32f22c1aa79224198d203ed029d21f858bf283db75b33f3af7abc48cf3a995d7ed90d75701d70e371c8a937d6259ef50e7ca"; + sha256 = "a43a33e313917c4af3125269a7c4ad8156b14caf245c398e355d94a8d065aca3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lij/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/lij/firefox-79.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "59b93c56ebe8022ac3ff72acec539639cf290c0339e825a27e6fe0a6e85ae02c6c4ac62ac056ade775eddf0462131e2c7cff99639c1626f2a6d979d2d340ed6d"; + sha256 = "ede64a7caf7ef5154276f95f9c7e8b6034a973c3a78304f27a81e2c9e5df1e8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lt/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/lt/firefox-79.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "7578bf3f0d9428345d0d5f16c1cf6557d6fc0962382df1359e9a2c3b94feb3ef279266635da41cca1a90660640b0d5c0d20a415130a860aade0ab554b6fc8415"; + sha256 = "8ad8928b7b798968f27cfc7e24277fbc0d6d8beebceff32a75209553dc0b1e99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lv/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/lv/firefox-79.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "610f14f6e3ddc8b2f732e40e79ad07e40e5cedc2e92dcab6b39b3b3895970d9c82749f4af90f034b7431191faef6bb0f61e230a3374efae7c5715e096048878f"; + sha256 = "45f07bf77ebd1d13edc198d17d55b97eb3ae8121bdffbfdd299dd8ce23ba064b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/mk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/mk/firefox-79.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "cfddb67634a2e05d41c3595f62b88e53c05f5b07973ed16128f7620cabc9422a8f028458118e404148a2f5187fd0209910be1d5fede135caea25a2ee076811bc"; + sha256 = "3e04acc10056a6116b009711340b0dfc9c1aed7ecd391c7472136165f3f09ce8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/mr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/mr/firefox-79.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "5bb458faf0495b24600395250f8800587f6cff04d46437fdfef4dfd1fc240c7c9bcc49f6679258bb761f587b2c8115f0bbb6ef5c0b11421b79cf8d534e70c8ea"; + sha256 = "be5bc1739252fcd43840d28072d28e72b4ade4c6a781d0f305e9f0d003fb1a64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ms/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ms/firefox-79.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0e509780c72eb1d6154e3b3d804ca434be340f6fe8e706b87e2fd9e00aff3b82002a8b1a2f5d6994da2b566f5678f1b489e3b116af95776b323da7f5f674ea17"; + sha256 = "bea5d4b9c75358d6ddcae33317fedadb85ac3fd7d330eea2dd1f3d087e4d468c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/my/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/my/firefox-79.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "2a036f00f40e98a5dade0d380e416f869d0c42f4004878dd1a51e99386a118cd88ad603915b741e91e16a7bedc0db9029d8627037e17f275c74736cdd69375f8"; + sha256 = "7473dfd9a71e07f8a9120b7b7095b29769f20a6d07d901b5da81fdd655241f22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nb-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/nb-NO/firefox-79.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f289ad816331cebb6634def4c7faf5ff6d1c6000cf5677502027a7823c34becca72a0cec5bbb13d5c4c16ca22fd87da941d0569b47369e1cf5ce00cbad326693"; + sha256 = "25567b6a2f0f43b4cb521248dfa05ce66887b8effc470ac4f0c0a0f437a41ddc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ne-NP/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ne-NP/firefox-79.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6084544df0c3f45562a3bd380386217c4a4a6cd4968159006e3c24ece9cf6c178731c4e8fb0466ddf484776ec533e838e24018ed3d41bc5f54d9757081a963cd"; + sha256 = "95cabf92a9c94f9bde7b61d72d413fe4b966f421801d0930efa33f1bc2ab86f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/nl/firefox-79.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1d31ffd4e7e9cbf728d552cc1cf6692037f62884cd396ce5ff3c96f89096d44a9fd789ecffef1516cdc0d66413a30ce67daffaff224854dfab2e9a3fa37e6150"; + sha256 = "5c48347c90e9a4ae2d2872a7746a5ca8e4721270aaa055ad4a93f1b1484717e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nn-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/nn-NO/firefox-79.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0f97a3a2807b1087e1569e0f31cd80ef2995b89c69743c3441ad974a5786b789793c94828935027cd45f52b738a28dfdf86b1e95c5026d34de2e1f20107bf784"; + sha256 = "13ab88ef1ad4a2c4059ca026d4ec57c2c182d5994f418e24adea134baed5743b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/oc/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/oc/firefox-79.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "91f5dd7f7c4ac97bde1235e9bf9594623f531a5558ed06d5ba61fe8cd584d80e6b01fdb070fe53b7c702893b2689fcdfedabd28c440ff865decbe4119bf4ef06"; + sha256 = "cde496e5042cb13241893033ee422eb3bf04f30d133014027dfbf20a798aabde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pa-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/pa-IN/firefox-79.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "763e900df5673e5f88fd326ff6ced28502ebdf09001fa06fa37912317bab9d0ab6c737233baf8d644de286766a7d4dfe740242ab70fe938c0c3bbcaa1aa1b314"; + sha256 = "6c0950038162d456a19fc13f757e12775de5fe587d65cc798a81571683168f7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/pl/firefox-79.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1aeb0dff591ad21dd506da2cc89d7082044b762e7c987e364631cb6f28bb07618d51d138d9d7a936f244841cc4f5208dfb9bf8dcd1ee0d839fca5e6e58823c1d"; + sha256 = "4d1c818f9145b9470a94812928c352ba7e6d7c87480e13c0bf1f846a0b59edcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pt-BR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/pt-BR/firefox-79.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "643a666005cfcb726a18dcd81c8af6d3fefb77861c2a4db884227044c39d907659f1b2abe640950c4cf31ff3552d4d12a52fd9e7527637a68543aecd93a61763"; + sha256 = "b6dbf7818ddc5c042afe7291aadf06b30f1b5c475d2d4d5d795d5398ccaac21e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pt-PT/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/pt-PT/firefox-79.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f17fff22865d6e64ba77069012072d24ab79abdf783652337a7dae7d9a901569f00f9d3cd20c2e3a268fc81188b478b9036229dfa248bd5b1ddd7a0f9c7b7201"; + sha256 = "a41d15c3f7df4da81b6ccb886d9e3ce87d9e067c8d7a3dd8ccb7f6df84dd66cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/rm/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/rm/firefox-79.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3e105652654c1691bdbf8ab51f20f4ebb9b62d6a6d09f0f6527079bbc1f5832f4170800e6b200c00dd43f62dde531e7e8bd6bebd0ce27fd058552672d423a967"; + sha256 = "832c780415d6bccb98a0a26319d5e66cc880237eccc8390664598c97cbbd277a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ro/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ro/firefox-79.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5062a90cc4712f30c9dc428d8ccbfe3bc1d0a50de3e84b5c475fbfbabad09394219fcb03db9313d7773518e24e5eb5b41dc16723ee235a87677dd07bdb1e975b"; + sha256 = "dafbc67e6fd92cb6aada9e5ad8a959ff604df7d87d42f86830f0a1168320724d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ru/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ru/firefox-79.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5b457059285c31381a03b9e0285874989cbf93cb264a74ee875ec9e120027d5bd921a666a95275c56631ebbe3f435764890852ba25d199b0c8c8258d5b8a5807"; + sha256 = "2823297a82e53780f065d533c654597e11a24bc4ee81233e0b76e264db9b89a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/si/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/si/firefox-79.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "4f8ec721ae19da2466a31e363ecdd9743f90a597d0bcfba12c12120207545ed03685a552515c9fc1deb27e79dac41345b8c87efc025dddef6c0347d21c2809a2"; + sha256 = "d89cc0407d9c2845e1db4fc0fddd4677767288725f427dd5b6386cd745971570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sk/firefox-79.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4953e879c353d7a9a71e517454ffdd793546d5c863676ffae3a1bc725000b5f69f0f74fdb9ba979fc54d809d576918e6def88ec1b1b7a81cdb6d1dffab624093"; + sha256 = "2f863d3bc1a5584bffa215b8b4b4601e193e1250f10dc2763295a098b7b11651"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sl/firefox-79.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ce930f05f2a6f3716ff54a71af907cfafb1398d4f86999e8b161771197c60260abf82d0431093ecd8894d2de2aabc317ee5b6f348d8c05f3a823ac706bce0b2c"; + sha256 = "37f3f5237807722b09ebfa154650856111be5f23cea2bc91a267269a47628550"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/son/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/son/firefox-79.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "1862101ca5ae8d8e2543f55e6b283dc8f935eacf38dece8c0e1b62a0cf83342065b467ab001a9709dc25f305294506f84a1036ce618bd7d47ed8d60f89b838db"; + sha256 = "26f388b1216810b7efe4dc31a4bffe49f13be24c5aa795b1aa498055d93852f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sq/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sq/firefox-79.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "511b7f3dba5083414d62090ff1202599d8b6d4623df06d8749c0bae2c18249b3370af71eacb87b77711982a196fac380f982c55156b2bc589572796607128763"; + sha256 = "291e9b48894185bd9f69d45a4691b6853fa06d0bba7da5768c79d9620d0fde31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sr/firefox-79.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "372420a6a308e94a438b9b220a268264f3dbb0c45ebf5053fb0826948fb6f5e0598567f2e237a4c753431a135274a9867fb8d092f1abc3b90900039fa2be5322"; + sha256 = "0b27689121d07127e853e359c4e76185586be41691388d917f8191e79abb4b0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sv-SE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sv-SE/firefox-79.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "cab258cbae1aff73f16f4be2217274f0be2e82bd587ffa45846308b90d0bac043953828706fb3ad33e33d06ca4eba6d0fb4d96caa684dd18f9fc96a33e1b8445"; + sha256 = "0a5663b5c784f124ae4f94093fb56151b00c55246e314d46d91e0f23ed267719"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ta/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ta/firefox-79.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "dad1630c0fea645199cf5577d3928cdb06bea5bd718d4da4ab27b194aa5068107b0bcf433ac530c53050137a42b700834fc30a778834885976c090a9a6817840"; + sha256 = "b258c0eb4669d2a17b9ba32aa58ad11806ad061ad194d7a38d3a3a3895e7c433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/te/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/te/firefox-79.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "7b903192af9e954b8b595e6f7eb7b176fa7fa91dad3891f364c676e0627a5eb7426b1f676c522943eda22565d459d049a5e10b2584e65b1e1fdf7bc27a7c2aa9"; + sha256 = "8cf33b851b93a874c2f8142c121ccb1cf67a43c21a2b860dde9d094732726151"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/th/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/th/firefox-79.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5ddba062f7ed0de1b9b7782ad34acc32762ec5b4a33cbb3805eda39ac667d239ad23bf81777b8ea0d9dbf82d688c9a2fb273c635b4d44cd7afbe887a16c34ee6"; + sha256 = "cb8f9854ac12291108ac80c054b2a6360cdeb1dc6a7e50dd1dd5d42fac974670"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/tl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/tl/firefox-79.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "8f78278bd75240622edf86bcfef0563d51d671a7b7731195b698f3e6baf2e467c0864ddbafe38fa7728ff00c4ae059f2e60c1cf67a81772445639cfb75fddf04"; + sha256 = "2f0c4d2b0ab11c21086cfba3dc5fea6706d232aaeeba2f55678b4001eff67a59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/tr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/tr/firefox-79.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "20081f6fd914bdfa14ddf0a7896986290f3e7f35d7c77c90448be53a0ae09c5697b37ff8b63a0138ae20327d110a1eda2bcb5a41ce1927e36eb222795fb492f3"; + sha256 = "825e7726a9db2fa1242116b6364161b0edbf046ebe4ad9d22b608f9765176c71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/trs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/trs/firefox-79.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "023b6a4cc9069ba73e0072c8e4ef8d782b4e8cbbd9ab4810c921998d6eb87f8d631fe8e62771f8c3e5b0da83f43aac8a7d569a8309603e75b984b4233dd7b652"; + sha256 = "2e9cb6ac8fa41724f1610dfc9c70a5acea342aa018905959912d74aa5103ee44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/uk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/uk/firefox-79.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5d9774938c64271ccd14a498151436feb8ac3a2b46f8f093c7c11bc84b7f49ec559acd620ed0c4e1d76b6f466f8be5d19d64af4d84606c12271814cca88801fb"; + sha256 = "c5a0d18bcb92b29b8858636ef6834ccae3919417b459d4bd758a179f52ffbe15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ur/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ur/firefox-79.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "73aecd84a201e7047ebddc71695cfbddcff8d7866f1ed1299217bfb81c49865ce4140deaf0d3d0ca34f82bfeb1e3598059f299f163e816fc4f85bf0a1b8d93c5"; + sha256 = "3b29b93415798ca9c380f5e7ee443a0b3eeed5642439c7548ca614ce8f5b5350"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/uz/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/uz/firefox-79.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0b0a0f8bcc7a96222ab09c113b537b2e56d1ae38f198c9a0efd0a7defe917aae30b64b81047b404e09953146ca78588e8184127d1ec86ed05c642a8f03b0478d"; + sha256 = "c601dab737b448849aaf8d1036d84e2e41ba1f3a0e843bb2ce7c90f9261fde82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/vi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/vi/firefox-79.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2b41d980f54907cf4f84ac5159ecf3d0b4ee4d6ff0003d2d26cf8ef51befbb67410c99eb75bfdba3f8afbc64c1911011946cc8ad23ec7f514982d522857a8304"; + sha256 = "190eacbfddda5cd842a09d80a67bbc601f651c85add6aeb9e62c41f8de3abf12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/xh/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/xh/firefox-79.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9f07d1b5b54ccd5764aab35df797ef866cb6dfc705bb6db0337168eb0453d847d6068230ddd00368ef27f3f58300f8009c9848a9ad1dc3a459d90889e2f7c5aa"; + sha256 = "3d88d444b72832855ccb1bbb136bf02ac8f7e65beac61385c4113591f111bdfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/zh-CN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/zh-CN/firefox-79.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "1a5c6b1abab116fb0cf3e98e50024070c894e64334a82a3cff7c3a755b72a0ff8992f3a4c631cbb5489e2c03b5cd5dc5918dad56d5818c6050eab32335bf347b"; + sha256 = "792f06b36437d43915668fae21165f362f95780774d366f3793469cf71cd0e08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/zh-TW/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/zh-TW/firefox-79.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0b16ba221c9c681e44bcb8ab6ebcbc0698dc8ecdcf31d14b9b4818afd396fa8608b389cedd372d15dfd833e4e7e028dadc7087af21c4c2d423fd97e1d2c0030f"; + sha256 = "972d9963ec88985048f583752064194b897c21e540aad8ab668e29c547a6ad20"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 464eef9f4b..972349a96f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "77.0.1"; + version = "78.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ach/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ach/firefox-78.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "12adc58633a67921e1d1944501191510baf3b0308213f417a202abcc09d5abad3155a478c2541508273d6e8b07bd3c13f7f8ab6e40855927429a94cc8d989888"; + sha256 = "5aad5e0c356b6efc6abe23c7f1b38a0ecfaf6af8c968c322b9a934fa26047f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/af/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/af/firefox-78.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ee58827ac139f48b870d3c30d8c317857ad5973593fa99addd7d09faa1fc53ae5ae31e36cd1f5c9dec6ff56ab31b987baccad98d4c8f8e009830e2e5065b8a4a"; + sha256 = "6ed9ee81d9c0dd58fc809bb2ac01c8c90a043d839e1e269e6d878bdacf6c61db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/an/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/an/firefox-78.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ba8a36a8e7a8638c88355ce68ca4f320d13b60522f7699dbefd056ad01c4476799c38c3cb5817d5c506f29ec32532b533bb6aa5a592cef971f1a617d353b12aa"; + sha256 = "8304f82030b794ceab1ba16d3008ddeb4f9e388aaedd6f886c82f9e1e7c35211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ar/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ar/firefox-78.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "507a3c9487f0d2fd89b91473afbb9607d2c8fe2f642e331a4c781078d0f474b5345827a83167981c0d9b06556370b6d7baddd9eb3355dfd8c64014d139483e06"; + sha256 = "0bbdabc0af5b019acce60f3e52ea63885d6ab9ff3fe68152d7b97f44f39f44f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ast/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ast/firefox-78.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "70df4d795059609d2935243ca1af753e9e57d303f43df42f72a423135d095b8a295cf06fc3aa0284f68415c77de46b6925b34fc19987309a9b3f749e8234d9c5"; + sha256 = "a625f09a48d8124b0f4a7519864ffedde91998ae54c8ce76d4b1238ecbea4508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/az/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/az/firefox-78.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "34a95a03400f67bc17a405767d174de67103a57cfc2154621e4452b914e070344b361547876b2a17813638405440642f28684f84782285960d3ed5bd0d8c0eec"; + sha256 = "fcd60944d39bf8b8ea962381910556a868ad26608f87de1c3cf2e46db698b2c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/be/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/be/firefox-78.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "66acd13f56a2a3c79cc49f3cd5cd203c7b7e1f7f978a1ce1eb90f702f35f501bf7b16b1fbc9be8ba9b176b103bc37d0868aaf765ca485c854192c2c4d27b1030"; + sha256 = "9ef44215fe4242f1c5eb609b7adcdbc9718dcc7743f25157d91427388b64fb25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bg/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/bg/firefox-78.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "44f3dc39fb73c03461d16a34f1fcfeb385722a0b4deb7b75199a8f8fb40fe85cec8116e11eb2f7852580a4ce9925d8f022c6133647232f6547db689b6d87912a"; + sha256 = "6f89fb6d6520a1ebd493579a072b620fb9e6bf202d12e99b30b28ba2c7e98584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/bn/firefox-78.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "2ecc1a1433eb8301cc7e9d66dadf1926aa20b609b7683e69004dd56a12b3a8a2a1db19ec85113bdb0bb0759c29b0e70a157ef6f2f7ba29a121f22d39cb256c5e"; + sha256 = "c37062eb04923935c5b13a76a3334d26b76c57b2f587b75e3a5d2f9bd7e38700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/br/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/br/firefox-78.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f9561f0d2f00da6736af19dfc2ec21a25a46b0a2c0ae195e0725a59f8df0367be3c0dbbfacc4b79ba82bce7643b00127b9a9431379e533c0393d49c6d3017ccf"; + sha256 = "39375e3b6eb87f73fcba1bb5249499e510b52cbe0e395a6dcf150ec0a478f711"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/bs/firefox-78.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e76982df74ee812f37f802d3e82a7ba842d6a211be3beff4fe6347a991ed49601678f11c01847a9708ce36ec2ca956f452b2d7b1fe168a7608ae7999113fbf22"; + sha256 = "88ae4e89793a0888f1bc204443bc82aaa38fc7fbee10b43f3dfab0907e5d8d65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ca-valencia/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ca-valencia/firefox-78.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "a2633b6e009edcb98c4af62df6cac991254a0f370384c2d0a3b81f8c4e49648ab6cdc580888a628668acd0a4daef1bf6b65633c58441aa0e9aaf84dfccfd10fa"; + sha256 = "3e66b6ee68025fed584b554dc96ee8c1cdce903834b5f2c1ceef2de90ff36e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ca/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ca/firefox-78.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c8ba559b912670a86f94188e1b3c0962093955a527b2751e4264699bdf343050999d76b93857f6819c797dbafbbd0980032cf5c497b0d34a50c5c8395cd07cd9"; + sha256 = "99333eab1c65a83e4f24db638ec72325e66b3787338c7e331195745acc596de0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cak/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/cak/firefox-78.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "52f446f2a2c4bd6d79f680ebdb38e2f62e0830d14fc98dc6ad01c5b404794da1e59f4b8da2d7f4a0483187f4725a212e41edcc2006190818e6229a5a9af8a597"; + sha256 = "f2e34487c829092156c6adf3f41e68d6e2fb9adcae48b7f3fd1fd71254246f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/cs/firefox-78.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "91d8dbd3d8dd6e242943d9b416534492125746694a721fff6c9d51f811e2f93b5d521f63357addd0e11bbeac80d3a07d2fda0133d746eb3d4d5d086e59a713b9"; + sha256 = "3099d37be06f428c5d1633b675ae15b7c80f6637d1d2e24a7bcf7faa649b1456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cy/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/cy/firefox-78.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "14a04b2d97ea473b45602ab44d8ad08f35f21e98621e93b901ae25731fd86d207b4949bca3283e39cf22aea7667e110c94b948b51a370551c4416a3009f10854"; + sha256 = "b6f9e6f4df07355cd03b26e15273b9bfeb25e4ff6fe05c3702fb1b8786258064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/da/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/da/firefox-78.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "5ff9be1796f70f608e12732c71f46c6c4f636e52ed03cb445ee1fc35d4db2897ee1b8f231ba0a5724696d3f7db04845dddf268a3ba59b26a869f65729abd57e5"; + sha256 = "e32ee0e47f07d69f8fa2fab9287d74d1a047200f760cdb0402c7e9dcbd7a062b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/de/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/de/firefox-78.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b15a90114ea7f2c69fa94bb6e9c2559be0f7a7a0b7c4c1042823153000bc6a04a27f62c9373cb4c73535e676c41b23dfd260396fa691f2ac0319badb7a087f05"; + sha256 = "97fb2da328de58011358c5c3b25b156c56a4eec313599f5b527f1223158ed44b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/dsb/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/dsb/firefox-78.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "bd10d40bb2f52c1b5cae9c7d91d53b3cc33bac0415a6f0b37fa5e1e2f5249ce5313a45e0e8b8b218ad961b2e3b3597c7132486a71eae76acdc61805181cd7220"; + sha256 = "0cd8573516b0cbca2162cd91b001a8264ac7162ac194ffbd0af8771f8f9dbf2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/el/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/el/firefox-78.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4c28c9104085d2ddd024a1418f0f54cd4c57d0ad5fc59bbd26d28bf173a78999eadb025618f0221273c5cb697708f944764a88fe9c08695b10694c68ec54473c"; + sha256 = "55fcfe3914c5a8a465ea3274b697b3b724aa22ba65ac3de51ea90cd0d4963cf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-CA/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/en-CA/firefox-78.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "0722520753a1bdb093e696cebe1e9074661b7602b5d8285b41f62acd462e740cb0833b751d870d602e7473bd11f3bcb3e5dd8e84ca00ca3babeea3a19d45974d"; + sha256 = "f7263b5d399298aa7db61fdaa67964d9fb67870c87a67f6b6a2f4e551e0d9f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-GB/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/en-GB/firefox-78.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8f6aa14f4dddadf19661e3bf11573d930c5e931f383498fd22826cb1e61f97bb5cc5db7507e5363648fba3368c7d49d7395bd4d68c6f9787db65401e990a62c7"; + sha256 = "8aa1309a5584a2fbf4d162de6019501d1d837a11bcc5afe7a2a30e004eaf37ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-US/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/en-US/firefox-78.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "28b0f843220a88759893813c48f9b02a255c26fe954632e530f956f43c4cda6441546f3e9d827fd61bca0d61fc6a5580d3134b8d5315cdab90fb57aaf96fa5f8"; + sha256 = "b50d010f2db643bebd3f54d13a079833e25f03e4b163ffe98771596fafe8c487"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/eo/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/eo/firefox-78.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "da2d5d3d337c39236ecf39291dc44ce5c023dc0dc0b093c73b17425befa5f8b54239f166831b2d2b88d3556b9ea1e3dddcda8bdf2907fa7c5a63d78ef222b214"; + sha256 = "a89d7d8aa8150ace037471f18c43108c8b2eb90517a8acaa0c5d7ea29cbbca17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-AR/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/es-AR/firefox-78.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ffece84feea0c13e2f1b40c41ddf0c6bcb9db03d5d377c509421abc2bbab7d04134e14f9eda5bb87bf7a63da57ac214cf88a054fd58cf7785e620e37076b5820"; + sha256 = "35d7087253e811603b07ff234cd5a86ec42c9f0a2d78d1f95be45e4e70efd507"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-CL/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/es-CL/firefox-78.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "649bcc8ffa5ae82a26c277ed648e7e02bdae3df782c2716ae15834f46230105ec4c33bf838a7c5dc7cd1ab1ef92f9babe9bd39e8dd5d34376ae76121119e7a2a"; + sha256 = "37950144b29c8fca29731d8fdcd522fe01d9cd8319ed7a76ab56a438c81e0187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-ES/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/es-ES/firefox-78.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c292b0f01d5289ca978b0af87d15a0472748db192ef4f09b36f5fcb1a671edc9a3286d3981e482bbe0b33158f930ee1514cf0e8b18cdf31a47a2c72b0e0dbf19"; + sha256 = "efdea0c75644dc815294247efe2a226d737f9dec15be7e22fc8cfa63086aed57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-MX/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/es-MX/firefox-78.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "969f18a23691d80f7cd7df0ac43c6a725eaffbee73d8044daf90ff4ea0baf504cba9e73049f74b9cf8619b78326797d831f247f86e5181a791fb4ae211b20e46"; + sha256 = "beb8cdf6d0cfb8dd24ae5aaf453463d0d7158f0617883f69b1bb93d65152c467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/et/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/et/firefox-78.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "cacc56bec434d5c44422f2178bce9db151249b4298df079a00c378995cd353d6369b6a1edc841928eef26a5dfa23d44f25cc33f0dabe96b44c13004bf134ecf4"; + sha256 = "8155983b7bbb879cf3e72953b4308fa90ba7f3fea64e18bdd2c58826d984cf5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/eu/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/eu/firefox-78.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a5fcf26a1b614006463f0b2503c39c00009ccadeeeef54c7ade12717837858594037cdcf96983cec88c5816e436e97eebacd07b40182504c016d238207bd3e62"; + sha256 = "7dfda92d871b35a5289380a424bed691a90613454d3da40f1d3bed0b71015116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fa/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/fa/firefox-78.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "68a2938aa4f190941595e66efad29adb7770657dc755725e926a19e189f15f83a5e234d896f589c693fc3665e50b5da95fb3538238a2c2c2f955caf08d7a9cd0"; + sha256 = "d6c690936403c9bc4855fbd67cd4b1cd0647a625445a61ba4bf35ec08cc50fa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ff/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ff/firefox-78.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "28298f6619a3c485f08d25fd9cfcd9ff8c60014c702ff7e4b6e462a0877b7225829d4a5014a653a3073d4d51dca731859bb6600ba9a66fdc488734af7487f9a4"; + sha256 = "4deba894e2248b466d20990abdd882272e0a1ebf1ae2aa9f1e1293c16307a0e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fi/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/fi/firefox-78.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "fb4ee19b0b71d6d51f82cdfa384a4229e4cb735e0901ef9d246dd192ea5fab010de5549a0236917ee0002de0cb28b0328692079087184f46511c429b4c0201f5"; + sha256 = "d73c08f58f284c4949e46a8ed170aa6440013e8172c25f25d05a65a4c9d46a11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/fr/firefox-78.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "73a06198b1b62ce230c76d045b8950008b0ea608a967cd7a143b79b745ca269b6d5960232dc2f20a26af6b9df785785db535182b2fcea2bc1fb6d46abffa1659"; + sha256 = "10cd4f0ce5d3435108fb3e8d3f09880deffa646f3c2f1d91ca05c4a7455a2712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fy-NL/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/fy-NL/firefox-78.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a7a2ae5b4e1c5b6e0bee93e4dba501638d4f6aefb094833eca2e1a4c342beb29102d92840ef8c898106c8689d585548a2dd192dfdcdfae3a0c7a9fdffa604008"; + sha256 = "2e8b78dccaf84bc6799b6ac004a2ee4b2ca22b59c447cfd02de19fd187a1791e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ga-IE/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ga-IE/firefox-78.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1341a646c758c1b879464722a536743cbe406b964ba289d9bd36ac973db8cfe008331f1736a838c1b0fa5c2c3a01e12fd8a4b3bbc073e0772ec3d50da7ea7159"; + sha256 = "ce1c7e26835d41d5bd4c28e17ce3b5e892423fff6a84b2e019f188ecd687a2c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gd/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/gd/firefox-78.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d7996916bf60c44df2a354c2f09bd1116c2bf1f20bc4445686e16f1eadfa6606e772fb0f9f3086231b8666a5a22a4dd549a4efcf7aad4529ac57a49adf9a7777"; + sha256 = "299101dedb51a7eeb02c0ea20588d453011bf359a3d8247b34a7ab13658443b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/gl/firefox-78.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "38068429fb33f17451babe535ed9692f8d97aa9bd10a419016f6b61c8a02232c801a2e018bb6164ddcd1c4b3216fae71c1cc7f00cbfab3e20b85d3aabda02727"; + sha256 = "d69d9d51f7ed5c50dfbc6d39f3dcf5e69f9916e4f97ebee41a8fc5513e42051a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/gn/firefox-78.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "ceedc3f1e05ca7b33e03bea9e0da10eec1930ebe30cc5b539e6b928da8a19eaa619289f25188888799c3a0d91c12a6873e38411e136fa684f5ad27d6ded6d6e0"; + sha256 = "afbf120a9ab7aec22783d929fd95b518380239dff24d5dca38ab562bd1522e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gu-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/gu-IN/firefox-78.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "f2497076febb3f19964b3ffa29de9061cd64706224c29ea8680a4e7277131de559b67c0012d6d7a8905143e6b19ebf27b5ddccb3263d5fb3bfcc8aed1f93b294"; + sha256 = "6cb8a13af293cff3937f8dd3e8e22f10b9d5ee881e1edc9b900554f9964ac6c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/he/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/he/firefox-78.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d91a982c027d2b68c449fcaeb719d8943d089c778d017534d72b571b26af8c7e01ed9ee37309394b6984daec3579b91c901a3a1d9ecf5485a2a0a1a8f93d522e"; + sha256 = "93662462043dd7ba2926c69a121f13429eaa49f9bc08a9b5adaf0f55715fa76f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hi-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hi-IN/firefox-78.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7aa929a279e568ca517f3727b4c51417cb4acb6e2606da30658c9a213fb789dba9191b51d62037928a47daa394ddb5baa0e2746f68a4c5569bda3632be17a719"; + sha256 = "873874e4906228b134fee0d069324fbe85bfeb1be262dd3d1b5bbc05345feb8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hr/firefox-78.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "07fde2ae76e5b9ffe81ed5d68114f66aacd7209e5edb353d1962a9509c7cf75bd42ae21ee8cf30216f502e31af5caa7984676192a714712bd279440659dc1661"; + sha256 = "a0544483d70126e51571d82bf49c3fa002f329895ce901d7568cef216d118801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hsb/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hsb/firefox-78.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b591a29c05f751374fbcf9c8557d208842ee26eb27ec0be766fa1f5c608c4eac7311e667f27f95bddb4d55b984d1975533e4c6d3267c69130ec21ddf189e84ac"; + sha256 = "563402e8ce08191fbbc34c121752a9d83dfbc9334fc4b1ffd1cb2af5f07167a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hu/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hu/firefox-78.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "cd5f400c8e66e201f34155450eadf6d920327a19e87f0d0d1f7728c481c03588268b7711c865a011a207287ba16ada555b6d370badb28ee3ea2b469a76f0a03a"; + sha256 = "381ae08bb0fb06104d6886d3c7c98355a6508a2df52da447e3d252380c2ace7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hy-AM/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hy-AM/firefox-78.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "f08d7c0d8db0cfefad662eece31ef9d23de333f88aac225960bffd20a9de4bdeb4f2c9835be7351e20615f24024861231a79ab7ee598caa83dde88e810d973f4"; + sha256 = "3706cf7d73d84d9fc86f58f60b9eb196a19f93dc151c3038390077ac2f9278c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ia/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ia/firefox-78.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b5bc06630095041dffff149743d7dd43fe0d4c698f514f2f91ec0d8dea62273501df4a304903dd96532e9fc1756a8330f052a5833e331bb39478397dca5fe7b0"; + sha256 = "ec8571c07f78fd95ac10ab57f06d248f0287971dbfcf00581277df8774d455f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/id/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/id/firefox-78.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2960c0551aadd142c5fac2e99b327be4393bc2e5515d3c67cca617cdbbf6dac8e20898d124960420a8804bc7e1c61a8bc3de715fe43ff7c5a9dba62d515a4e10"; + sha256 = "b181d9005f59c8cfc2d7cf3902d9be442701dce47941460792b6f36473efef45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/is/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/is/firefox-78.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ca9be0a8d2ed5cbaa3228de5d5cbc4ed6a0b14c5bf5f1e978e28fa1840c00d3cb32334f24cd9846e9aacbd61e04f79949f5271d061d62b5654a44e95f813b397"; + sha256 = "4143e19a8e5824031073623ebcc9d0defc4daa11af26d0776d29aa40f9807382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/it/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/it/firefox-78.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "20259f0b35d85a75a90182851cb57f33b9e043e358a2b80e9d3e4fc5e6b0f3ce8bfffd9dca4f574304d66070f307c3832647d4829169202b119a998cf969ef39"; + sha256 = "29bd01248dc9ccd879480d455633312c06e5e1851442fcdca3eac526f2fe2649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ja/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ja/firefox-78.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "41234ac1f73c3f93f61bb6f1dda395d7e6b969627b86fe36f93f33353c1b28b4f9302014ad7cde6b3e8df2f84b3eaf0bb75c6df884de0a9a77ed2d133beef863"; + sha256 = "31ede3dd2c135940b10e25fafe90064fcf006f5378bc83298bfeebfc5084c4df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ka/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ka/firefox-78.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "be9130cd5835cb103c3149dc53dc325c54c1cc5f5006cbf3598314be2022c1f51928529cf3218052abc5f7f6f649e862f69ccb5b39ab5053141e231e56113ba1"; + sha256 = "778187230d455f7776a0fbeed057916c808efc240079c5f0d5c7c18abb05fdae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kab/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/kab/firefox-78.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "75d15e95416f3f61e49164b7be43f9335049f62f8350cb4abcbe3c7df6848a124ff5b5e43f81a4eb2f492ad3a61ab1c0979083d14998b684b2ba8988c94d6b57"; + sha256 = "9a2e7efb4678eebbc2b1da6f559d439a1fed1a0ce654418c5cf3fc77e532fcf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/kk/firefox-78.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "df7ecfd04df63351d35425f74bcd5b0b342302b6c7b24deb35394aff9ed3f025ea9ad1c1147d46a789a2a11d8dda924c15584ee826819fb4b1fb0509aa71cc9e"; + sha256 = "b30be1cda17eb0df00403dca06840798f9949518a88994015e31177c8197b7c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/km/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/km/firefox-78.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "811876b5a4d070aba73426b2da43ffa5e9f9beb1a4ca37ecfb5e058100c60d3455e6284e9a71d5ae58af8cb9fe9e3e0703847ffb16fd963b4eb1410a3921f260"; + sha256 = "2027addd64176ffb83195ca72c4c9295f8bb9254a421ce48510eb6a44f083e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/kn/firefox-78.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "8c195accc9adbe3662abf62435d3b42ae4e2affcc41cefbb8f5a702ef75ad8566cab07eead40869118ef9164fb6529e1b4203970b908ed7d3f0cf43190049b2f"; + sha256 = "bd0e388c7c75c7457518bb2425fe9c2c5bd96c610627144f308683505111a493"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ko/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ko/firefox-78.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2c571a931e88a49e4c977728bfe51a2008d4c384aae55b759dea665bf2810e5929a693f633c82c5ee26e1236cdcbc003a9a39e0e01ac46db71c9bcc20eb8d17c"; + sha256 = "1ae0fa8d0a6d0d84d88068f9e66d5ce6502f130a2714344f75e937029357bbf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lij/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/lij/firefox-78.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d624ab2b73c03157d0559a3a41a7a50f985364b8b2c03466f949d2cd212d206bb39957eed9ea769796f4091d7644cf7191fdd0881eb8101e2cb8944923c677ca"; + sha256 = "dcf622e68696e832ffec3f4e0017a391364c1519f4fe4bb71f2e895a87ed2922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lt/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/lt/firefox-78.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "72607d7201c562103dd241f18cdc2b681fcd5d28302f5afcf9e03f8aded2339a88e2b8c2b81fffdad5e10bfef94fe39810116d61a415f9625d0a48c794078bd4"; + sha256 = "fb15def9bfa73a98f55a9f32b545c45587a1e130e1bcb3e891ec461426f0cb92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lv/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/lv/firefox-78.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f928e22f29e46bd9405f5d2bc902c82093ad8073d8f6ea52af20c93805b0c7b5523f489f9140baae1b04b015b7c185ba27398ca857b00c171dce32f38ea0d706"; + sha256 = "b5e4f678445a7279a1a41f75c5e8ea2189b622d4089ce63d80294f4fd22191b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/mk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/mk/firefox-78.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f6c7bcda5da5d3315a0a5a47d7a0b9ec0d4a6d4b0daf8fc11d41a8a8376fa05607889d108d38f3a6085c0f9cfdde86a6486993f72f44822a75a97b1b9dbfe185"; + sha256 = "c93d014fb127e777e7bd15ab8f4da7667f20614025adea8800fa5677eb5de120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/mr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/mr/firefox-78.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8a41b844c5faf640f78615593343dee0bde8dfc2c20977b80a6e9de37fbe10e997345c801b025e4eb79627aac27a92169e0c332e7595715227b2d3015b2c9b3b"; + sha256 = "9ca0f0f682afd0fe01fea717589c9ea75d6b48b8473a72bc6b8d6c7fc86bbe45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ms/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ms/firefox-78.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "866daf16e535cf9e404a788c8b792c8cbb391c43912738d7eafa723c5e6eaee7290d94c39324708533b4c8514391a0eabd62626029ee7591934e5ff6abd72969"; + sha256 = "1fc671c5e591aad4916625a30b6f544f01e2b3c58fad3c4bacc94de10a34df6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/my/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/my/firefox-78.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "94ba7fa3a0cb791daaeaaf9998b0c574759f7afcafcd388b0b5aeb9bb1ce97e36671378f0c56c3d5120872ab2ca48933b2a304f3ef3e194a77741c492e8e75bd"; + sha256 = "cd94de7c4c23d1fb824c7c055f049f2a61b0e6707ec4c18797cfaa55728aeed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nb-NO/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/nb-NO/firefox-78.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c46ada870f940387fa6bff044176aa59f3fb376a8d8b1df1715f6abbe3bf87f932a49e53f2c4bde967bdc04c930fa2e426f7c4f66c22c64353be68220d9ed94a"; + sha256 = "b61f7c2f291807c2cac621039b5f128f84a32a660e7cb2967ca44633abd4e3a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ne-NP/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ne-NP/firefox-78.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "005aac3f43e0104b284f1805062eea457e81e8b29940b8c034f99de7e07d38dcbf9077d62a1c44a1f2dccd65258b1346889e08b7736d9fc983f03df788fd5e2f"; + sha256 = "b3c50744eab38f32356dae4fbe0212b98c92cfb0a8b2996e4732979e5aaf9198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/nl/firefox-78.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9d00c7ebf4589615afffddf6a33f0e75172059fa3e9ccd56d3fe720b01c521fa30a88217b77cb2ebc37b088ce69ad280488da6ab53525170cb1fafba64816235"; + sha256 = "540b2e37699b6d9eaa5acdf7ca3bcb5f89b636b73e333a97a15af91805e5ccaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nn-NO/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/nn-NO/firefox-78.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5a9ff27a1355497d57056826ea0ba465d9f10fe0112628634267b262b4bdaa07b0133fbacb8a5644063cacbd0d59526a09a6b98caef78d25c39173934445432d"; + sha256 = "462c44b8b569a66daf73e4079d266f91014fc97e5d5319646b84bc3793ccb94d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/oc/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/oc/firefox-78.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "02e1519ec4097a990325cdcc2e13e70c16b25febb466d9d06db64b8b0c689c7246546d0666a71003a533d73d0b73b472aa8312d9bc59463dffde979618570ef8"; + sha256 = "a616e29cef4c871c76325b671c71b68eb3bf039cfd69c09544feab228058301c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pa-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/pa-IN/firefox-78.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "9f7218eeb5abe8f2196b2a43cc24a0cf6cd13dcf8801f7b57100336a90550bce23579dac36353fdefe542714e67bdb86102de734ef74e4ccd29a55c8f79a2689"; + sha256 = "ae166632baa40d939d46b951d3d74e0e32154db62ccbe53897d38f0b1d9c91a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/pl/firefox-78.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d986bfcc489a89a9f49defd9383904043d36d4b29b02715186977cd60add217845dd1785fb457228c71ae02243d10a110b563f18fe5352e68e315ffa8290848a"; + sha256 = "4c073d6a3f2d8d2b0b4be765312c5e3b0766972e376174f26cc4522644074d42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pt-BR/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/pt-BR/firefox-78.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cfb4d9510ec5e35d25d53302e553c9a85f8eea4120a236dffc5f2350b70868016b852bb1d43eddcc03b7dc9593f8f76e133fc8329c000f315f68f2e4ae5e3201"; + sha256 = "124c0d726cd7f42e79e02109eb410f229c7ada0a48acb09f98179d34ca47c79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pt-PT/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/pt-PT/firefox-78.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "335fa2e31e66f0ee0323a50154dcbfdb1516b8376a587f0097e40c51c93e3c019de3e1c4af19cbeb4f57c1b736703b82dd63af91e53c2af5532eac42d80fd800"; + sha256 = "58eba625ae060d62578eb942cbd0a4939ab286880dc729b7e3f000f160bb4fbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/rm/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/rm/firefox-78.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f7f06e4ad2f0f01f398afb5e95c4d88e6c045d57c86d7e004aac3bc79c29043853aeeb4a6162fe004ebcdd7278055a19f6c25d60887ed451905ec4e376eed175"; + sha256 = "622ef32b6b292648c02b18b08623e7edbc0c00cc93501c1725e4be8af1c109f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ro/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ro/firefox-78.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4017ef08f0f1d7fb82bd9b7afa72a617a3f781ef6296b97b9c351528d8107523df5c2dac5aa1ca112cf6e6b5aaea818195f3458cbd20b9f0cf88b3acf09699f3"; + sha256 = "ed0f8979494fdc797fe2024f8702852dfab743be6ea08e8f8c77338f3680c4a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ru/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ru/firefox-78.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "7aa2ade09571ea44e08b12f2c758e56fa66eac8cbd49d90c28abad04b99f9fe005eaa04f5b6b238cdf56cd7a59ca388ff769c862310dff0a41d952d35f1cc7a5"; + sha256 = "6ff91ca25f69bfaf659c799bd7ff58575cfd7b6f8bf1dd77b802aac709c8239f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/si/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/si/firefox-78.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "668df6d1741a9d300e975d1d25b42931a7eb3c2883c33c4ce1a585ed7a065a589ff569732e1ee04ef8f25c84d69ec3458f92263aaa5b2a36fa6da8a1ccacaffd"; + sha256 = "fe2fe584022a2728a7117138abedac24d3f0bdf7448bc20f6d34cea05373f6e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sk/firefox-78.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "e295e69e84a768ba070f087aecf3cf041e67bc297f144af5eed9a75758e0d322f730b797601fa0733b1b9260f5d3225c899ccd80a3861fdc77ab1ce9179dc589"; + sha256 = "3ee13740f47361aaf14f3f35d242a5168495152985552f3fe62ba0afdc4c2075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sl/firefox-78.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "63dd33ca7ce582b4f3284e936f54469a4c31ae1006dcd95ec5952dc4d97b2d524a91adfebc041e8a7b9358f5af847a6fb6af35b41af744c2701d408f64d181d6"; + sha256 = "81ce00f5e3d83dc51a93706461c6171efadc5beaad16e49f6abd4fa20a0ca30d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/son/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/son/firefox-78.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "801bbdd3da93480dedcc13589c77dd2bebed151df9ff468e8d9d2358f69fb57c22f8916a9581e460ce4fefed6bff651126f92ca588392169556444c21a4aaf42"; + sha256 = "8b3edd3597a380b27fedaa025dec1be25cab6bcda26ca982c3c555fda04c613d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sq/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sq/firefox-78.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4eff5f67eaededa77e962609ef7da1af2b10f5510f3d354d5d8065957aec115d827da0c0ea056d02b5d7c11f05db7e4b91cfdd6bb0f879ab92f6fe84a1e137a3"; + sha256 = "4e6ac31130dd0f1880ba191c282e4fa76717c2137f674f7f3a1376eeadde5944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sr/firefox-78.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d688aa2911bd7925f6be1307bfad521ac29364f047b8c7d683328b95b871a7ca0f382c103babffd518f607eea0298177d6ce145511271f3c92b8e2de81da06e8"; + sha256 = "81d26236cf54d7f60ec6dedf98e31874bd1fa459e554c3e0a6f4cedb021a65a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sv-SE/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sv-SE/firefox-78.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "27fad5bd1e0a2b2a06ff48c90049ed2d03fe8c463ce5a5a5b5a83a24add6d1fb72ec83d02f4c9e2e741c3d43b86e9fd3a821cb6d158d3fc940fadcac9d040061"; + sha256 = "37fb9ff154227fdefbf67e1e83f9797774b714d8ee752e0a608bd0a66274ef02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ta/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ta/firefox-78.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1dc96ca10fdedd37369037126c48940c060ec1b0238cb4c592db79b3154c8e1ed167152ebbd33bd7375b241776109222c1c3e886dacf4f885319eeeb7e33ee8b"; + sha256 = "cf40e8d62c9a829dcf7848d31ce4986aa62752059f14d39f52acbee1877d738f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/te/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/te/firefox-78.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "4c203815b896aec1a94416ae2baf96dda2c0c035da00e592ed16eadb9b729710d5cca26cd0d03fc654576b9458b4c2fc50be159164e6ef1f1fddf90609221eb3"; + sha256 = "7eadfbe6d78ca286ac65ff9f033778c6859ee412c6dd068a1f1ce203cfddd11e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/th/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/th/firefox-78.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "22ae877469cd895afd487175ebf04c6a10b42cd7b408e5dcb352143e457690bc13561395abe15db0bb6594074f2298609fc381d2137c5e1aef2af273f17e2489"; + sha256 = "b7a4baa22f40eaba2a8fafc307bd17f1ea4bdacd0f8c6d735dbdb97f8c17d905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/tl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/tl/firefox-78.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "10d60e3389f43f1206a3eb1252897d0a047cb14272f8408c61f34eaeb227966e8e43f9fbb92d246bbffde77fd139e5354fd2abdf0abc91b8631dbbb64635b549"; + sha256 = "e9cec461fa882a411e7c99b0167ebbd85748644812dc9ef5a280e82e8a65b975"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/tr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/tr/firefox-78.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c17c8ae0e97b130ee437752410eec9d2bbacc84aa2e5f13e0c52147d7540fe6f76e91a01b0c94aa81b1a67f2a7d8ac29fe9e21197b659a6840c3c9933603c119"; + sha256 = "648f8cf98e6f08e430e8f737506b1cccd7c445b499c1170cd0e185be01e2f7d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/trs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/trs/firefox-78.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "df664c21640b9d36c487030a5db3f83a2947f375a7bbea3fef9a86add22ebe23f482091cff6205ef22e8544dacad43345302a7b34f0a4729a8da6670ee9ec9cd"; + sha256 = "fa5c302529a10aa7ffdd9a14ac44cdcf3368489b261fe7ac0317a311f61d7ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/uk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/uk/firefox-78.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "68f6c6a804b40441cd5bccab2e925864ae8642dd2be6433e215e1a786043b50eebb8e00299d47c19d5b3c52a86c8a0877a511f3142299b906ea2bf4bcd92099f"; + sha256 = "b7d31cf904b77098a1a52280d6ff5a407f85ae5a9d81a9b337901e6cd782293a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ur/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ur/firefox-78.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "05751d956fe5c5d3662c722bf97af4056e32daaff5b704e0f514a16529d8110ffb6caa4207747745b9c46bdaabe51be658b15b54168fea4f0b27287ba7ae9173"; + sha256 = "f4ccf602756892e6191c069858fb9b1350f86a42aa8de8ec95327cf3c2706ecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/uz/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/uz/firefox-78.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "bbc479208f90b22da1a8cc154870b1b2eaaed25395525820c5add437186c7e3a391545f5efef0d1b11e6ff82d5cb7ba85d1a0872e919cd681eca7abf92aefb92"; + sha256 = "b43ef80e02f4f39d87f761bfc46ddc5aef80c702fadad80d229e1e2f2fabe264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/vi/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/vi/firefox-78.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "9414e3c51efde79c1d959036d6365416cb421d0cf37bc5e2fbfadf7673d5bd87d506e0ee1914949292c4cdb9061dc93ec50c405eff5cbba8bfe5f1870afb4948"; + sha256 = "adb9748ee2381ea0d90db9c51e5b5a5cbeed35915dd589b24158892b2ad4f4da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/xh/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/xh/firefox-78.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "61c8b31b28f406eb63688258757ba072065eccc91cf0195f03721cb774ac3e5d5aca0fdba27e09933be8e4106e30ba39ba4cdcfa85d3bda1a8e976695a3e47e8"; + sha256 = "fa98801bfa8768c867698eb3922213f1998393a52ad30a9a8d697b81869ea2db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/zh-CN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/zh-CN/firefox-78.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "4fc2046f4f2cce47c27876cb63a7b07024b639e43cd01c771bf01ffbbaa70943dab0a17e08ecf63d47b66416a7fbf89cd37cb06dd0eb5d589f0e58168632d6ab"; + sha256 = "985208be2099f0990f854598c063da2592ae4d1c75024202695b1ce87ff06c40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/zh-TW/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/zh-TW/firefox-78.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5eaca5f3d81588547f0df7929f8591527c2a331d52136b23aca547e7d97b711ef45d1b5309d63b08eef44897fb9ba47d91b0b94f077856dbc5e6db3bb62ae441"; + sha256 = "6180f8249b5584d83b21928c2486fbfe42fb9d5817d62d3194949d27e54a1dab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ach/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ach/firefox-78.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "10723c4bfb26d00637f4e190330bcce602b80b4693c4321b7fd7cfa58cf7ee33d8829c0afd23c17c836ef82f03d5c7da98695248bf932264697015a2949a3576"; + sha256 = "c89cf2d01f7c9ca6a587a23f07f59eaf79fde24ca8ff014be3f26cd3e3185606"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/af/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/af/firefox-78.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "276a26621d0fb37f9c57bb5de992a3213cfc97ddf891b6fbec331722455221d71b1dbe6f5ec63cbb552a1dd0addc2ca8549451facd83d9b3b3b5d88fc0e5537c"; + sha256 = "1491ea0bccb1e671f26d337d9cba7048e57cf1346854051fb4fcdda23c89810b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/an/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/an/firefox-78.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2cd26f8507a49676c32fb7c9c8ce43a9df082a965d59340ec794f11e85077f126a2052c86ab78edc6087a1fbbed3e58e773930f20a5e3e69fece29df0931aa1f"; + sha256 = "16ef600fad5aead2c5ec00cf4b510875d1b4517932fe4ff2bdcea023d0080e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ar/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ar/firefox-78.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "80a4fa4279f0121fddc956ebec61b9ad2fc4417f8e41461517e50fbbd6d44278640590e4d4ae383a3e1d732382f037ed7bcbfe599fb08ab21a0d98b52f32d0f8"; + sha256 = "fa414c361c5b0a60606fb1e5bda4c96e8c9d5e59658edb8f8b6086713cf2add9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ast/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ast/firefox-78.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "68392bec35e5ae6913311c7f6187d916dee6e3702663e0812a557e331a5cc4f30cf8cd6555abdf132ae7d638100ddbcd485bdbbe1519693ba34d607e32c361e6"; + sha256 = "d002818bd100522da0c861d995ae7a40f586e128e1c880a2ab13ee2d6aab6391"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/az/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/az/firefox-78.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e15dda365436f32ce3b553f63e459e5d32c5a00aa3b4413899c9028e0b18d1a575c33747cd621d1b8e08a84a77ee2ead5c5fdd8b4077055dbe96cbf2d223cb05"; + sha256 = "5f15e231fe0e6eec4f220c94a14ef6b35b134b27bd43bf7db389ff7c42f41bca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/be/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/be/firefox-78.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "46dc546bf28e57f7d2fd462733eb7486f88d4198159e77873a5b566590fa1b81db8ef4149dffcf60cbc6aad1529be11b8eaf5aa4fc410600a4a1eff3b576f0e0"; + sha256 = "0316de461e10d11d5756f4323f2eadc20715e6b10e406c2bd1d9e9111cfec52e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bg/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/bg/firefox-78.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f44fbeb1b25249a28a9fd77dda908c3247f85f788ba22dc131155e6c21d80450975687e546a63291832974555745e29bc8b8b177c338bf911c212125a10f95c1"; + sha256 = "4e4b5df75fc249fecdb1d0c15b05b449da1b2729def99c933beeac0677a4088e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/bn/firefox-78.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "b2fdfb72aede045bbdf03feeb38d0f8530edbf6f2e9ecd9723b481365eaf0827e879a38136e6d72efb666138403205c13cdb10a1018e5d255a847d8fda4a2507"; + sha256 = "76e72987d1318f5075b7af623e2448665ce2b6e17e1abe7a8e2e336455db8be0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/br/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/br/firefox-78.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "68cd1a7eaabab81400c78e1fa36850dd84fae8f2b05d5c57a4769beb7948d050b6cdb5b4b6928afa3a70ab9cd97e37214d67ccc5cebf62d09b7c1194ff410b24"; + sha256 = "9a44caad51de4d6df551e789e695e9df70e2bb004d4c23017fc26dc9528d7e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/bs/firefox-78.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4fa4d41a85e4746e383bb514aab8222a9c0aa4ebb1779009a50e891c672e6a1002ba454ed24d7d4fc4f0f79ca53a985ff56981acb2845762085570bed93da3f2"; + sha256 = "cb03ad4830b8c50a1bb72bb138c27c41d40580c6e7c04bb52cb1c6c4933a463e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ca-valencia/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ca-valencia/firefox-78.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "23b3a60a34fdc9dc31e54141e5f62d21fc118b9932ed5b0eef6614535174c107b113bbcb3c42a940fcf6a86d1e734d5478dcf840f882cad6a772c6006c8944c6"; + sha256 = "96fce58cfa724aa955a4ca363d175f91568c9b19a9ee5b82cf543705295cc33f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ca/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ca/firefox-78.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "227cbe52a302f4030fe610ba816c70c5051c58732964fbe64462b62e879df0e35069b0a5d5a862bed87c21f36387fa43bdb82db827fe58b1e1d80c966f0ccf5f"; + sha256 = "97506abbc549f71a5f8dc1b418e49c34a3a3fcf06b87f488230ba9fd7a5531e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cak/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/cak/firefox-78.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "5a615b7de8caefaab8f4f75401b13f40f3cc4ea23404f9a998979402789e8b2493c1cdb88b56a450b3a0bdc075a42722d963c3f65241ed3b690398d0d71dc196"; + sha256 = "eb89fffe9719d4cd6e7aa4f8ba131692a25ee8f3e65f5be59c214f61cbad6ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/cs/firefox-78.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "75f06c1697372e0432e8c6e9691497e0cd328ed7e050a0bdf76acd3513328994d734c4ebddd923e2d19b5a83142c4570e16f3079fa6e0406ac83de25e3fe6e42"; + sha256 = "49fd5a768feb1d18d0870c9acfdec949bd976ec9dd4b3e50d6f66eafc84ffa5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cy/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/cy/firefox-78.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7636a99636e77e4a6b6ea20c6d73eefc11c91691d0418d75a3fa7033d844c8ab652cc5dd1caa1c574dbf4c1a143ed738c08346af4ff4323493aca461fa256b44"; + sha256 = "f7a22c11243f79d1e4c54759c887cbb5017a18b69ac3cecb602b6f0871ab7d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/da/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/da/firefox-78.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0a591e75f79f196dc45630b32e237e8b28cc2ae8463ababfb36b1fa9ae4f271eb53d7cf31834de8ebc0e453b89310e5789996add2f57d0035d1d9a80369e6ae6"; + sha256 = "a5ac75543a1e7fdd8ce0d6c832499897338072e2762d5138b1ad11198810429b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/de/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/de/firefox-78.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "fcbfe21676ccda69d67f945260ec5a62a7513b5d4c4a51dadd252d083860f2b0d2ca0882714af55485a0e11b36a0059c87db682032901506973ca54a8e341c38"; + sha256 = "db5a34e13161646c050c6813e1f0e222af5bc589eb010a64488d8cfae479f62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/dsb/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/dsb/firefox-78.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "76e8200017f7a89b0418ff555ef8028e38012fa520ca2fa83239290eebfbf4c1e063d42bbe288e6d32daf9dd27d463cc6fde2d8c60e7a3b8ab2cd442742da450"; + sha256 = "ebcf8f4a160024e32d959a71c775b0fdc2e8c53cf658aebd5288badf2fd68503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/el/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/el/firefox-78.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "73f5a0f278556b0c99eb479407401f19ce228cfef164ab1cfc61c766052beac10ad9ca3d8bb2e9684d31db75b764572203ad22682f48af3db9d74b3b2c7e327d"; + sha256 = "88126297c43b743a2d317760c83efc81110409320ed396521e434521babcabe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-CA/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/en-CA/firefox-78.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "51d76ddee014df74e45fcf960fbcf61aff4500fbd86d4ce99b9f52223955af2b7f81bf6c66501085460ec759471a8ea45d45b09295d3be8f9d03a3b55d788570"; + sha256 = "c46f059c7cf77bfa89da21efa5aa4a5672a5e87de6ae190aff9025881da47df1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-GB/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/en-GB/firefox-78.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "93aa0d761f68c2b5b6c387284418795a77491d5f880d3cc0fa9ccdea2971563326545fc9dbb1f5ca0bae19e7199553c757320706e95afb2b77c00c2e06fba911"; + sha256 = "989e7d728bd85e9a82c935f78cc74c54a3c56cafa985abd9510fd2132b86a474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-US/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/en-US/firefox-78.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "b3da650b9da5df10c611aeb5e08a6f96be431a85edc0c3768221faabfc3b302bb23677b33527d23d9df37aac7b83daf869f4a373d461893a9be83d1b74937e87"; + sha256 = "8e6d63f2ff1c3a2644cc0d392db079b2a1228a9ce587c046245feb7d0a0a53e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/eo/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/eo/firefox-78.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "c089b6425c683a1a75956fe50be90e9027693eb4bf3dd7b19efcfedcae36cf8c989898b5d6e69f15810be0a2485a353fd0d6a1ef9041e50ac62888769e9187cf"; + sha256 = "95f895d076e0b77806fa66978e98cd338f7abc34d4e7713564ab1c574403b622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-AR/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/es-AR/firefox-78.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "369fe08d54a48e9d6c5260b03c4af124ab43676ba46d96eac08f71b4bcd3a9776563e6bebf37ed523828463735792f6a160e222cba912cea9020a84b92136d31"; + sha256 = "933d4c73bae24c4d5b81160c119b14498fb3cd48b370d2d69d88e4ef09d23d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-CL/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/es-CL/firefox-78.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "dc9f850c487209b414b77d9bbebfbf3c32a8ee5644dbb2a9a119fb0f9da6d3d711a3783a4151dbf3036b9f94c28273802893add63238ffffdbf77cf213686c12"; + sha256 = "a13dfe2687d9772894addb74a9c5c9e06438e6611cc2c4c7bf73a816d69091f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-ES/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/es-ES/firefox-78.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "331a100f8b71ad1e33e436e0d03c37438e0c7dfaad9f280d627dd02c2c28e28756d7856d36e407b84c254ca45b88a761e9a940955a8aa52c0c558fb98b4e6bc2"; + sha256 = "21a0454e6d9559a0e6f9a8bcbfe7b4a99d462d5cb5fbdbf10002573385fcef91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-MX/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/es-MX/firefox-78.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "c4ce60e070214ca4901e153c3033e66cfcfe8d0ebf9c1d1e448105467b8a129e7904a3293fb3d895a6380a0e54bfd007e5d581bba4f1d2ee7ba3cd44b5117705"; + sha256 = "273c0354086bd8653d310f06a0d02193791f3f81c00d2c1da5fd15a741fc1d54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/et/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/et/firefox-78.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "bae0eec7d0578f8ba911f71505d803efcb8b7005e6e6ba0bc7dc36093f462c7f704c1244dddad5d38249204b553cdf8b0efeb12c235db171d98f5e2827d085eb"; + sha256 = "589dd668ee1ded914444baa4f85fbf9c6b854052420f8235f658d6e38f82a3de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/eu/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/eu/firefox-78.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "821d3b331ac1bda31543c08ca678d141f640e862986da1c5b0e8c48981fe88252cacbc728b63e4552fbd83dcd086268420f63a0afad5a37ab0348e7d29828d03"; + sha256 = "5e1feb02c1c352fb04f9a3f845a56e3a24f33865521fafa76fbdfd2cb44bc586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fa/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/fa/firefox-78.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "1ded2445623c10c5b348041935c03050eebfe1af1fcbc9ca9c2bb630a38a095408f3d09e9f4ecb9db4e06ea51d9aa139ddde8531db0072f6a57c7932fe302e80"; + sha256 = "88cd28899d3b005ffda854e2c8b1ab04dcefaa31986e93df3eb81062f06afedd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ff/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ff/firefox-78.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1f3a2d9c0c981c20f1dcabcdc5c8b6a8170a238f4381004183f8381bc1059d65d650374f03d124d22e821cb8d9bef59d59aba6ef132dec991b72af4c77f61d8b"; + sha256 = "2f8d4bd367498d5d71e83c4b26cf707c5ec537e3c9c0fb3782589d1574b71012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fi/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/fi/firefox-78.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "8f4737e9bbdfae980faae68758906099aede135167cc99b3ee98eab85e6d9d22616e8043af7f02981ab96b885312a89869980a06fc0ddc117806b1d5f9b2d3ab"; + sha256 = "b20a202fe6deed40dcde94981ae3fa544bea847cb85cce95448e10e4b0432d34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/fr/firefox-78.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8680f38e6b9d56f3339f243e99cb5d541d6b2eb10a7210d8cd81bdc91f35dedd0de3b551e1b857b216806bda223c3a638cdd7e786d97674c5b7ea6710f669304"; + sha256 = "111013fc87df1b4a7950fb92c51e58d40a6f422ea625051b154e1da0231b9958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fy-NL/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/fy-NL/firefox-78.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "aa34dde7faed1b86707f71fe190abde730f0ecf33351c487d1a2fdd369dd67375d122a266fb5dc2b28aba87c93663a5606c43fe3092597b04cf9adc752c3bcb4"; + sha256 = "2a52f517b441ab7757f04a650320c71e7bd7ab9d3b0c99d11e2e8fac7b6149d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ga-IE/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ga-IE/firefox-78.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bb1988e6b4b718cc698a5de87b9f339dd28a2d552906c24fbe9d67385c70e3669eb284220f506f3afe03949be5df0178af1d13c727716e1bcc07d9020c180661"; + sha256 = "f666a3b7c966fc29f2d22c66b02175ee41b61b6424860db060fb11a160a629af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gd/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/gd/firefox-78.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "57b665e7bf404a0ae8c7602b88d987ff550d66a2a72c47ad8d163d9a697cef18753dde981d46471c5276002ebc5464bae54316e595d1d2aa8a00ca07bae25d69"; + sha256 = "d89530f83cf6062fc607a483bcb83d15e40b9af4c00b0e7ed395eadfaa5e08e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/gl/firefox-78.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "409cec1407ab01070aa75a0234ecc82e974f00ef7391119828b1a2ab019c62b5986a15226f620bb1fb403288d9aabded3bad1226ae8ce516476929a181b0ffad"; + sha256 = "a8a8fae4ee159cbad1df8ed33242bb159ad0dfab4c5541c05e8aa476c06c9b64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/gn/firefox-78.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e2db32222279de40ae37392af9df330ab6d3bc1d1a583c93530262ad541b4d3139392a5d0043d6e9d0841fd0eaeb40c53b5e6f3f8fea762ad160888012dc7428"; + sha256 = "2f82570a839d818a8831ba53f6355b1d4d7ce2e0ae21e92d56008856763aff01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gu-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/gu-IN/firefox-78.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "99bb0e4244ad5c406259d627161c8abbf5dbedd664c83ecff6767656af8e4101c8d62081ded7a8cd1842d739689cb6aaee02bba593ab162dad3139d5b03ad3cd"; + sha256 = "2704f9d6c02ac5b45952a07af1c43a501a409ac7ec0781cb1997f848b7236f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/he/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/he/firefox-78.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ec00d7c46d50f38d0d43efe2e98d6e404398676eaee9640a4148e3cc196cb73ac62711a188d32c167c48bf048a5e0155db714172ba0bb7024dce6c2122c656ed"; + sha256 = "e08f3e7dc6efe0bde863c5d8efcf3af0bcd13a39a706323a8c7518a86a1914cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hi-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hi-IN/firefox-78.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e107c3042a1e9ab1896a7b98dcff5918b8b3adf35d3e50fea5847337c505d2cb4073a9a15fd2d3b4f6949615cd8b0376541e715d686388e418d5ce64c1001e0b"; + sha256 = "a78980364cea6c3f37395bf3fbe78be68b26c76a9a7ef29e9a820ab15d31ddf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hr/firefox-78.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "cee9eb9a7b13944d2dd4c52456cc44404b2377062972eb3c9992499f3835d352567fb05560829ebd9db083f62bf9722d9c0e9610d439fb5d79c2dc120542970f"; + sha256 = "e800b9a6180402a8412b201979a6d75a9e435f517abdef2ce1f512279b28218d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hsb/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hsb/firefox-78.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7936c949ac42d69b573f8b6be4055cf3b4cc62a8ad7c5c060ee4be8aaf0ad1e9e3c651289dab7c159e8ab18584374023dc605629233f58d944f13ca87db574c7"; + sha256 = "4f833efe2058cde1a6824bdfe065ecef37c3df38984ab4cc2d0be21ecebc0f70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hu/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hu/firefox-78.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "a68299f239c80c1346a5aa559fc5dd6f6e6dfc13f883c2e7be88c267725c837b6ca3c4dda06e5bf6c81ecd16739a1921c21bc71c3caf72944797915f452ba450"; + sha256 = "3d933b93dfced54e4ebff9702a059078de87b76e8dbffeb1c171c71f4d418faf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hy-AM/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hy-AM/firefox-78.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a8ef4b5467d58ef6935bb4525363d38a9167a00a8ad84665b2971cae231c60706ac46618d62d183c19ca2eaaee04d0f386c845cefe6eed3a3e12dae188524f2c"; + sha256 = "2b0fca77dc8a54c0bbf5b7c053f509bba352ee24ddcbac44a9ac20e4e9d14992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ia/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ia/firefox-78.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "5c3b30a18467b416b109e2ff48e3a50c1cf10e550b22436115a44d13aaa03696443a5fee6c978e3560ada583fdd2806f3f1ec13c221dea097768b2d282d12160"; + sha256 = "4ba45963aad03ddb2fd1f5977296ef198c52616a6ffce00d62874bacdd156a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/id/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/id/firefox-78.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "bfbd86bd3eef27c2eed900c23c29a0236884b1fd4d858ee8bcdda2a071abe1d042624b31ef258f9ea415b04ff1d17e70333c6507ef2a534033f1869e742e8b82"; + sha256 = "8cd8d557276e0c69899d71c78f89294bb00f397b91ec09226e1b7d6ae42c04e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/is/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/is/firefox-78.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "459e4c9686952467d7e179c1b4f9f422e6445509813b0e0fba200e46468dabbefe59210a2cb218b226a6c41a333a64bc17005380be7e319015d722fa70a600fc"; + sha256 = "be2a639ebb6a47695595112dbcc207f93ec3f17556dfa16d0392ee926646f046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/it/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/it/firefox-78.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6cd7c36d28e6abbcb92582b14022e56b048481cda7832b93c5dec6b0b4e38bd99de121c433eb0e90c9ebaad2bd00f681f22fadd09acfb1b669c0886544ebd8d4"; + sha256 = "f69ad6eec0940dacdf5838eea86dbf834b262d392a1407260bf47bae3e1488ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ja/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ja/firefox-78.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "cecda310147fc3298bbdb250d4d7a5a66225dd96f1bb0317b1846049a15c47bd2b7579982dac583dd4eaa1cd8bf706e7213b0c7bbe48ca980070f413380a133e"; + sha256 = "1d58965235f20566ae54b7962f4107df72af023b19f91b166d63ad629ef3cb3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ka/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ka/firefox-78.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "ad29814eb9cbe19061b361c23c896f8bf8cb21c67d36942a1614af74a5adcb225df20dccf3af8d34dba27036d38feb758a945cb69a66c6ad1ec0271fe1c316b6"; + sha256 = "45fa8441ff7709fc97fb7f3b6e846f8fc8eab90886a74baa82f3bd4608b1630f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kab/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/kab/firefox-78.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "cadd0cb80e9d00d2a4f6f5a5274d85b23eaf802874c813a87fd7464d4cf7ac528c4b2ff30446c7cb438fd1faa514c80a2576d1d6b36779ab983fac5fd6654317"; + sha256 = "bef3c739000d41a332b96ce72ea675cc1e795ca5e55d30046a454433f69bcf84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/kk/firefox-78.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "033bdb4274c05b06b2c1fc3822a220aceb7b39bff310de6fbe2e59a097eac77a6aafcd275be690e84334ea7bf70c6bdb1a43f4bec0b82286e42db7797348ee57"; + sha256 = "57cc17d222211bf4fd2561bd2c8c7fcf2f78b9c70bc8a6a3204df2d8e0225dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/km/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/km/firefox-78.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "d028d387c7546ccba6b3001d006d0243300d770b1e255cbe02841bba759a8b4d75a55a68dc5f8a7dcc869badde9d7bd38f572e26d544444190ae05c23ff4b9c6"; + sha256 = "70394cbd7718f907d269889bc4b8b446b740984e7082d15152436c4736c1afba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/kn/firefox-78.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e7c17380869b5f47359bcbb82fbe6b2b16d814536218bfa1447432f0affae78d6c53e68a7ff7153e0e2ed72979c026edf6e8a9689b0cc90ff3d10919b3e06061"; + sha256 = "f22617316ff43c5c158e0cf7d3f68244d327b5b6506b603b8451d9d95f5feceb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ko/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ko/firefox-78.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "bda7e81ddb11dd7a197a9e6e286b3a8cc10e3c3d2a627f5c970643427a158c7615901aa05fc4da737586d5bd86eb4411a23e5830c1f6af582963f18c169eaa05"; + sha256 = "ebef054846bb8b085d71846957baa7653b6baac4a7a3b5769c3fe51973fde1f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lij/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/lij/firefox-78.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "4a2a07e90d9ec3aa26557523c0c20d1aef34895ee06ee02dfedbb6f3d612623c23c84f10eaaeaabb35133e3f69b9545dd8720929ea04b73af8c9c3acac53901e"; + sha256 = "d43b61c1ef5049fb222b918716f778ea3cc46e00f5b8ff8170c96f154f9286b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lt/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/lt/firefox-78.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ddccb22c9d0dac8abe9c81782293834213a53b182ae0650b7904c6cc8f5777255ef642cb442345c64a1cad96d0ec8f45ce6d6cafb0e6405474c2a8e972250254"; + sha256 = "e6c590c5eb7d0cfaf366c8167f442b4fb259cd9b01f8db776e3633115c605849"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lv/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/lv/firefox-78.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "86af4440803d27a5f6312b8a7dbd0d5f66fd1cf90b0e9b1cee8c4ee3b555927830a8cc3a06b6c72a66cee4e75d7e11168060d8681fa1f7c39ea2522819dc893d"; + sha256 = "9486890eb34d7879ce793ac752ffe0640a0730faa9049ca79134f2327cf30acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/mk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/mk/firefox-78.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e3876258021cd0d3197af334eff967ef2d1429eee880b63ee0d88569b94f0ab938b5843153cf4b9e6608c4c63c50682671ef4f6c15d8298b43748885f8d57c17"; + sha256 = "0c290397ca8c65ba7f4762e5619d7a99a49335cd734ad3e6c5835634771c42d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/mr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/mr/firefox-78.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9b7379aef1061ffc24f9f70e28dde4c5828315bbff4848cec7764a7d373f3590539a052e6578e1e87d214263f009c831dd2890f3d7a7eb071b0011f75402ecc0"; + sha256 = "ad720c374b4b35532db70aec599ee65ee83582476bef856b57b7b8fe01940be2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ms/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ms/firefox-78.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "36d44b200a554476da7c63918b709d57c31741901bd33081f493d9ef8bfb27969d491381ccbb8f4a21e48693cd35bc1630144121c8871dbc0d1a87a730d467b1"; + sha256 = "27f4185cc4c62272b4bb535e4df792d61c16a3056e306c14d48d4c9a682f6075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/my/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/my/firefox-78.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "4e290ea118b8b2ce63879a926d7992a3a231343ae98f9d6f61de720c5c39e2b4dd5b2e63ce8937945b02cc6b2acad1e7ee6aa3c2c15441e11270d817ea2615df"; + sha256 = "7da3e0e7fd8490fcecae456fa3590da460e84b00c66578e670cb156e05daf671"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nb-NO/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/nb-NO/firefox-78.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "82820f7da33b522f6e4547f650ff85e8d05e8b2142d2e113b9e0d94af560792ca3314a1afe98d3f18d3fc0fcf887de601bc22e93101908cc31a2238af359d150"; + sha256 = "8b00a6c3c9d7897f1d5d9f5caa7ba865fdcd3458254136d43eb7bdb1b29681ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ne-NP/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ne-NP/firefox-78.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "591699f34737fcbfdf9c72b12be83ba5bc83bc027ef439c40f5b0eb22014fac54b5661da9fa0f118ed82bb5290147445f4d703e40a152ad4f7d2cb7153b9586b"; + sha256 = "8ea41529ada045c1fb1ae6c02b407883a422dbc7b872880f78451989def7ba07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/nl/firefox-78.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "fbeae8de6a8297a9e0fab0a10e2c95aaa2d82af7304bbf49fad7cae69f26c5a9dae9de4d84614a1061cf9a82f71abb7eba2e8cb4988ad93d1b5667912ee537fb"; + sha256 = "602960ba0797076f5de41589251fe31a3782f53b4ada1485c9f5d9b3f14cc190"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nn-NO/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/nn-NO/firefox-78.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4cbef717a02fec48d29a9f0ed80c8db34fcee2ccd1f2cd6e0fbf0d2b0d36cb5101bbe794c59c8bdafe28c6286eb4c0fa28942c77b3d4a4c047a97bd66c41b7c0"; + sha256 = "334648b97b2fb9fac84cbc84e57a5943a332317a53d4b80b461070a87f3c21e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/oc/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/oc/firefox-78.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5a1cf2f3b9200c0fc039ff7c961eb7fff97464f0259c4b6a5fbfecf54d7d333abdc8b052d3138278c87726769bf7b10f2bd4557493e6e666f96187386289c8b0"; + sha256 = "9b94d4e24e6d45fa043a1ab4f171c46880ed581fdd14323e9c1f95872de66966"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pa-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/pa-IN/firefox-78.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "355656300dfd9bef921e2123ffcc633d0562798b5ac692506c87204f2951f3800c03fc3e9e85c6dc9110644b17e40fe5058149b805255f43b1217b1cd71aacf0"; + sha256 = "7cf729c1eec65582dbc6113d52cd9791f3f381a40adce84a0d8bf908f931cbc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/pl/firefox-78.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b677c207bad42145fac04efb40d9c48800ca0796536ece583d6588f612a3e7c1e5dfa8476e38795eac7362ee0cf4ff60e803bf4263bb6ef875337688d2f9897b"; + sha256 = "60c9e642ecc8deacc54ad5e5e863cbfb415d0ee3df421c4b8aa5d30ae2da5d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pt-BR/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/pt-BR/firefox-78.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "96e99c72d3131b7e920652a9adfa0794ed67932adfa9193796a8375e907a6c7817a21a2aa41f852e5c58897f41de8394c8e7e81462d74900fa45e2b3b5837d51"; + sha256 = "a45e792f37b0d0987191c20b1f4824df3ad848742d965af735914ac86b9634b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pt-PT/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/pt-PT/firefox-78.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2c119a0774f6ae8802a15ae24f2a1fae50da1d4a2f676e3fee7349745ffac497859aafdfca3d092dd3b2dae7f51307953337281ca3274a2746503161b93ff2d3"; + sha256 = "868cf0e555fccc09b22d257e5eccf3116d7580fb5988ad61b7044b3485f32fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/rm/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/rm/firefox-78.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "09c9669f36b03be27b4defde30cb3c20ea2790e18a05a2059bc79ecde006f019053cdf6c8f0eb2523de0c8d0fca3b2f0bd9cf02b8e2b6d9890ca3ecd51abe965"; + sha256 = "719b76ed84b6edc2ca8f3b5cff8c48ec8424a5902952c235d73bc034bf7bcddc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ro/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ro/firefox-78.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "24b1b5587dafc81a45e6ed89db33cf0bdf054f14a4d7e883a4f779573d17fc04cde1065b22243d0e0827c73accdc0dd08619a56e8caa04986e7500a57916f95e"; + sha256 = "5c335832e7941826d4b8140af4ea57ff774edc1e4efa7d8dea578824556b17e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ru/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ru/firefox-78.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "dbb9654c696ac29966551843b6c27d0867750565c21e84c9e71b6443bb5557847e109826ff550107bd56008e913c625e89ac60268f4cd140d2278a4eb82b1a67"; + sha256 = "72c3296d0586329bcae7e35e7ecb9789f868f5202c298d9d7781236c521628a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/si/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/si/firefox-78.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a47e67c9b3e6a33dcd0dc489e32d95f44345593fac2e678610045fe5408928e12445551011ae87d4e6e242f35c11ee0edad2b6955485394d1f55d3d4e8f68dd3"; + sha256 = "974cb974f6a5e91b85e98cc615c74cd89a4457928299e17799568351e92acbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sk/firefox-78.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c73e183daea5adc333c04b0c473af3189c2d24f84ee352733b211925e62c02cdcd2125c4ccb12fa15b08a48bd0a690a06e39c364108ce47b834b321268cf5488"; + sha256 = "73fe3359a214f85ceba9081b4464a1ed1ea3a68826ee862474fe37480dda791b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sl/firefox-78.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7f64f829c83b5483fd3a839aca41dbc0e3506576d633f8c6dfb9265a5bf783aeed537ca801fd07f8356b71aa47719e742b1bcf680f4a6d6c21469327bfa0b9b9"; + sha256 = "ae2cae6900d90a2627472156c137ab2e2c53f46831e0fe2b60085e662717e09e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/son/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/son/firefox-78.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "fc8120011f886f996840420c07bd7502622f63a1b53b7d918c16ba1b60ed76a737bc6bd27532f03262671cbfc0f094e41422f5485b4c6854d78d4f95422141da"; + sha256 = "ce62da5619b8d8f4867330f267471c8bcc49255e6d85253ab06bd0278f7fd4f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sq/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sq/firefox-78.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9116b54651b0ed2caa04f7c9327cb1fb977242364ee17ea19e114d8fcfad03c08cc3706ab6e355f91ecc3d1f6232955db0668e5f7f290d191a051b214f06b779"; + sha256 = "ee4db0cc3867d2e67349563f477827400a13491bbe09171342ade977792bc496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sr/firefox-78.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ec0ac112222d35bf2345a91f448677ccc24f213710a1d5cda976c6ac15b8d3ca28bc32790f301103cfd3f2ae52ebfdf41464b6fb95df4b0f8535238b714649de"; + sha256 = "67e71fdad5b24d0a354b3c390c81957a9c495273ee109779fe24c76a55ab4920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sv-SE/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sv-SE/firefox-78.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7e3a6c8da1143c3cf19e3f98542ed6b3e9dc1bab0667a2e64ab82c5f68f9623ed2196ed4378174998070e72a77bf00d5d9bc9d727b319d1c7699992a7bb67aef"; + sha256 = "cbc069bfe4830e4376894452b6ac663b386936e7c68629428e455bf3ee7a5a15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ta/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ta/firefox-78.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5e3d653003fe036687bc55f4f5f0a2f1008ae58a196047654a1a067d88c7cf06b132207a3647ad5d3a707d85322d0d9eee21222c832daf67b9dc2895e6cf75ce"; + sha256 = "68c5543c8f7c3cbdc0e41aff3035eb5a179a60ef6e7df6b082e56fa6f7f286aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/te/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/te/firefox-78.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "2f42f73eb590ed605e1871d11217027abed2dfe0d2bdba2e9c29c6cbcc5c639b48e4bc26b8a6807c316dde23005e5e1010ebef4c4dfb385bf2e41a4710acf12e"; + sha256 = "2936bb8eea12cb582f07cc2f53928372ee318c8e71e7ad3080fbaf351a2b513a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/th/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/th/firefox-78.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "49f4f6d2f5dacf108debe915116905f5da4c65bed1c13d7f2a65b8b21b0734a34add68c6b56c340e90f6f82ba1f8cbcf9b7fb2546ce64e33c73e2a73e9b3bb17"; + sha256 = "47614e34c16e0bd0054b3ef0e30566e2ba23bf8ac74bdba793395afc80b93d5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/tl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/tl/firefox-78.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "6e4368b4a0ebe0b296eae341563f8712567f08c7889b0600cd5c0ab881b1de1f5bf8e657b5ac497746fdfe087c8bed902014bb6daa0ce4c2d3712dda614b698e"; + sha256 = "d6787a009449f224b7df2df183bcb06ea7c7cd0c87530688ef311d63e9d8a1bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/tr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/tr/firefox-78.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fedfa95f6516d3685d73ec3997148eb0954a8ef6713e8cffc304080937a1962a26cf384a85e937a9394150d52fc9db14c3a85b8b483d18615759dd06bb04a558"; + sha256 = "db682a21db0b9bd25f7e1c7af33e1f5c4d9ff1ef63a662e2c7312fb58506a37f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/trs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/trs/firefox-78.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "3b165460a7a34e5b2a059101a508a6353ca7f89c03c9eeb7b062e734c2cb1786b1cd2f9415cef7fd3ca2aceb72b4311b2b5da778f96b51f33aeb39cd7e69f1e4"; + sha256 = "9909d50bfe7f5a9dad3ca1464cd5d7c07040d5928829dcb71b65081b087d670c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/uk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/uk/firefox-78.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "02c39e86a144dcb6ccffaf4a6c6620088409b8a098e3d2d92268d5b2dd7098c01b9a55878a9ebf1a91552b3f1be8dc86a6a8ff514e3988ffa51e581dfcf43b8b"; + sha256 = "8244e8a3ff8e2fd93b9a37442e764ba147488441d541456610dc16ffe1b6512a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ur/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ur/firefox-78.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d244301b2ee17b78a1ab20cb7a8fe362b6ac86e0cdb9d811afc11c0637ad3fe1e1dffb721411f36960ecec011b7b691a12df1bef1d257c22ae45d345096b7166"; + sha256 = "995948932e73b0eaf9d598c4d976d00088ca2950553ccc924e1900806d473ba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/uz/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/uz/firefox-78.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "8fc3cf2b1eca9b229ada7ca632fd362e42bc1063ad1bc22df1f6781cf996d179dd8e8fa231e02ffb12dcdfccd6f6641735e0b4b28c6e2a1a9372d80c0dc8fd78"; + sha256 = "e09c9a3984a7d825b1dad0e4a3ed694151d16deace9f755703a6e95c44205a45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/vi/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/vi/firefox-78.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3676a6246a7fbd49a5779fb2b9ad3e14be809228e15bb19f81ca3b880ee5d584c4aba07d1a94ed2cdb6ec7549409d7738750422d06fa2415722d3424e948ab98"; + sha256 = "27517480370afc6a2b420f594a497b2e0aef1235cbe81cd4b5b3355915a805a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xh/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/xh/firefox-78.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d4a8d251a4ad5603f301ad45f7eb3518066f06668a765d1583d067e0b89caa87f6699e1e06f67853527dd352b903c4b3a063d5ad7d19d297a040671a98aac2dc"; + sha256 = "81553d014accbb50a034d609337635a5afb1cf7f00f3d2c3d78e0bd25b6152e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/zh-CN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/zh-CN/firefox-78.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "2137ced68047439bfff22eaa7bccdeac3b0c30c7e71e3523c54f47a3127a8f0ecf6ff3a3ff789e05c5df525f3c3d32d616eb731f022fe063170d3c67e459b093"; + sha256 = "54f1e45e1230ac9e4312150b6d296058a36b08e2f94d01b49a11dfb330770fff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/zh-TW/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/zh-TW/firefox-78.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "23efdb7382ea3483784589fe0cfb9919630f34e5418734de9bd52ad9e91438a4d86f8760b1c4a4c127e1fe05de19ed24aedd0e21c2bdb32c5ab62183bc32fb18"; + sha256 = "3029202fd7761b2df915549d852e6638d716d930507cab8aef8958f51ccadd42"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix index d6593be889..03815a7033 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -47,12 +47,13 @@ in writeScript "update-${name}" '' grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ tail -1` - curl --silent -o $HOME/shasums "$url$version/SHA512SUMS" - curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc" + curl --silent -o $HOME/shasums "$url$version/SHA256SUMS" + curl --silent -o $HOME/shasums.asc "$url$version/SHA256SUMS.asc" gpgv --keyring=$GNUPGHOME/pubring.kbx $HOME/shasums.asc $HOME/shasums - # this is a list of sha512 and tarballs for both arches - shasums=`cat $HOME/shasums` + # this is a list of sha256 and tarballs for both arches + # Upstream files contains python repr strings like b'somehash', hence the sed dance + shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/` cat > $tmpfile < (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used + assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used let enableAdobeFlash = cfg.enableAdobeFlash or false; @@ -65,10 +67,10 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva ] + libs = lib.optionals stdenv.isLinux [ udev libva mesa ] ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos - ++ lib.optional gdkWayland libglvnd + ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash @@ -83,9 +85,9 @@ let exec = "${browserName}${nameSuffix} %U"; inherit icon; comment = ""; - desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}"; + desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; - categories = "Application;Network;WebBrowser;"; + categories = "Network;WebBrowser;"; mimeType = stdenv.lib.concatStringsSep ";" [ "text/html" "text/xml" @@ -124,8 +126,8 @@ let --set SNAP_NAME "firefox" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ - ${lib.optionalString gdkWayland '' - --set GDK_BACKEND "wayland" \ + ${lib.optionalString forceWayland '' + --set MOZ_ENABLE_WAYLAND "1" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index fb30bbfd2b..8d711b6de2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -105,6 +105,12 @@ in stdenv.mkDerivation { cp -a opt/* $out/share cp -a usr/share/* $out/share + # To fix --use-gl=egl: + test -e $out/share/google/$appname/libEGL.so + ln -s libEGL.so $out/share/google/$appname/libEGL.so.1 + test -e $out/share/google/$appname/libGLESv2.so + ln -s libGLESv2.so $out/share/google/$appname/libGLESv2.so.2 + substituteInPlace $out/share/applications/google-$appname.desktop \ --replace /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/kristall/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/kristall/default.nix index 34f23f4523..4028f8622c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/kristall/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/kristall/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "kristall"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "MasterQ32"; repo = "kristall"; rev = "V" + version; - sha256 = "08k3rg0sa91ra0nzla5rw806nnncnyvq1s7k09k5i74fvcsnpqyp"; + sha256 = "07nf7w6ilzs5g6isnvsmhh4qa1zsprgjyf0zy7rhpx4ikkj8c8zq"; }; buildInputs = [ qtbase qtmultimedia ]; @@ -25,6 +25,7 @@ mkDerivation rec { "Graphical small-internet client, supports gemini, http, https, gopher, finger"; homepage = "https://random-projects.net/projects/kristall.gemini"; maintainers = with maintainers; [ ehmry ]; + license = licenses.gpl3; inherit (qtmultimedia.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix index d58fc8fd19..0312c3b689 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "http://links.twibright.com/"; description = "A small browser with some graphics support"; maintainers = with maintainers; [ raskin ]; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 8d51f5c888..911030dee5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { icon = "palemoon"; desktopName = "Pale Moon"; genericName = "Web Browser"; - categories = "Application;Network;WebBrowser;"; + categories = "Network;WebBrowser;"; mimeType = lib.concatStringsSep ";" [ "text/html" "text/xml" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 7735851835..f65ae2f469 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.12.0"; + version = "1.13.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0pywyhi4v6ymxpn85grrdr1agmcxsnm5jfqf3rlxqx5swbnxbfs1"; + sha256 = "1xq0a0mcssc1ss4fvhhwr75dhlh3nr9w46i2gmqczzh5cynk1sfk"; }; # Needs tox @@ -61,7 +61,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { dontWrapQtApps = true; postPatch = '' - substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser" + substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py '' + lib.optionalString withPdfReader '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch index d54a37fe71..828fa5e107 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch @@ -1,4 +1,4 @@ -diff --git a/quitter.py b/quitterb.py +diff --git a/quitter.py b/quitter.py index a42b9d0..f544ccb 100644 --- a/qutebrowser/misc/quitter.py +++ b/qutebrowser/misc/quitter.py diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index 9d6c7fada7..4b6c332218 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -2,7 +2,7 @@ , makeWrapper, ed , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null -, gcc, nspr, nss, patchelfUnstable, runCommand +, gcc, nspr, nss, runCommand , lib # package customization @@ -67,8 +67,6 @@ let # The .deb file for Google Chrome src = upstream-info.binary; - nativeBuildInputs = [ patchelfUnstable ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index d45a3c9f86..663d8e7f6b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -4,7 +4,6 @@ , nspr , nss , fetchzip -, patchelfUnstable , enablePepperFlash ? false , upstream-info diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 248980e5b2..0ec400ea46 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.0.1874.38-1"; + version = "3.1.1929.45-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "03667f8rlk8shxq6ghjg4q9hqhsaw4gwpqnjpyili49qczd5423w"; + sha256 = "0pg16zs9fcr6b360igszpkia3i8i5xf4m0hs1b2a17lf8vkldix9"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix new file mode 100644 index 0000000000..d107581707 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -0,0 +1,108 @@ +{ stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper +# Build +, python2, autoconf213, yasm, perl, ccache +, unzip, gnome2, gnum4 + +# Runtime +, xorg, zip, freetype, fontconfig, glibc, libffi +, dbus, dbus-glib, gtk2, alsaLib, jack2, ffmpeg +}: + +let + + libPath = lib.makeLibraryPath [ ffmpeg ]; + +in stdenv.mkDerivation rec { + pname = "webbrowser"; + version = "29.0.0rc1"; + + src = fetchgit { + url = "https://git.nuegia.net/webbrowser.git"; + rev = version; + sha256 = "1d82943mla6q3257081d946kgms91dg0n93va3zlzm9hbbqilzm6"; + fetchSubmodules = true; + }; + + desktopItem = makeDesktopItem { + name = "webbrowser"; + exec = "webbrowser %U"; + icon = "webbrowser"; + desktopName = "Web Browser"; + genericName = "Web Browser"; + categories = "Network;WebBrowser;"; + mimeType = lib.concatStringsSep ";" [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; + }; + + nativeBuildInputs = [ + gnum4 makeWrapper perl pkgconfig python2 ccache + ]; + + buildInputs = [ + alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 + unzip gnome2.GConf xorg.libXt + ]; + + enableParallelBuilding = true; + + configurePhase = '' + export MOZCONFIG=$PWD/.mozconfig + export MOZ_NOSPAM=1 + export HOME=$PWD # Needed by ccache + + cp $src/doc/mozconfig.example $MOZCONFIG + # Need to modify it + chmod 644 $MOZCONFIG + + substituteInPlace $MOZCONFIG \ + --replace "mk_add_options PYTHON=/usr/bin/python2" "mk_add_options PYTHON=${python2}/bin/python2" \ + --replace "mk_add_options AUTOCONF=/usr/bin/autoconf-2.13" "mk_add_options AUTOCONF=${autoconf213}/bin/autoconf" \ + --replace 'mk_add_options MOZ_OBJDIR=$HOME/build/wbobjects/' "" \ + --replace "ac_add_options --x-libraries=/usr/lib64" "ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}" \ + --replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}" + + echo >> $MOZCONFIG ' + # + # NixOS-specific adjustments + # + + ac_add_options --prefix=$out + + mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES" + ' + ''; + + buildPhase = "$src/mach build"; + + installPhase = '' + $src/mach install + + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + for n in 16 32 48; do + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + cp $src/webbrowser/branding/unofficial/default$n.png \ + $out/share/icons/hicolor/$size/apps/webbrowser.png + done + + # Needed to make videos work + wrapProgram $out/lib/webbrowser-${version}/webbrowser \ + --prefix LD_LIBRARY_PATH : "${libPath}" + ''; + + meta = with lib; { + description = "Generic web browser without trackers compatible with XUL plugins using UXP rendering engine"; + homepage = "https://git.nuegia.net/webbrowser.git/"; + license = [ licenses.mpl20 licenses.gpl3 ]; + maintainers = with maintainers; [ TheBrainScrambler ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 3ef2412a9f..4f05c90cff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles }: let # Argo can package a static server in the CLI using the `staticfiles` go module. @@ -19,19 +19,21 @@ let in buildGoModule rec { pname = "argo"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "193nxc27fh37wf035mclvwwwxjjfc8nnbncg009fg19ycqmvmgvc"; + sha256 = "1di6c8p9bc0g8r5l654sdvpiawp76cp8v97cj227yhznf39f20z9"; }; vendorSha256 = "1p9b2m20gxc7iyq08mvllf5dpi4m06aw233sb45d05d624kw4aps"; subPackages = [ "cmd/argo" ]; + nativeBuildInputs = [ installShellFiles ]; + preBuild = '' mkdir -p ui/dist/app echo "Built without static files" > ui/dist/app/index.html @@ -48,6 +50,13 @@ buildGoModule rec { -X github.com/argoproj/argo.gitTag=${version} ''; + postInstall = '' + for shell in bash zsh; do + $out/bin/argo completion $shell > argo.$shell + installShellCompletion argo.$shell + done + ''; + meta = with lib; { description = "Container native workflow engine for Kubernetes"; homepage = "https://github.com/argoproj/argo"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix index 0152f80afb..19a62c1dc1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlantis"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "1ymixbix9sxhzmixqm9yjm9181aqnwnllqnswr0fq0nljw4018dn"; + sha256 = "1g1bh1v3yd3dz80ckjrhspmsf78nw8hc907hh9jzbq62psqg4459"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix index 49d3aaa298..5bbd101412 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cni"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - sha256 = "02qn1br8164d99978acalisy1sx294g1axnii4yh1wji0fc735xz"; + sha256 = "16i59dhiq7pc7qs32cdk4yv4w9rjx4vvlw7fb6a6jhq6hxxjrgiw"; }; goPackagePath = "github.com/containernetworking/cni"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index 0c5a716aa8..83c03671bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,12 +1,12 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256; pname = "docker-machine-hyperkit"; buildPhase = '' - make docker-machine-driver-hyperkit COMMIT=${commit} + make docker-machine-driver-hyperkit COMMIT=${src.rev} ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 60d478fe15..2e2115b4b7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256; pname = "docker-machine-kvm2"; @@ -10,7 +10,7 @@ buildGoModule rec { ''; buildPhase = '' - make docker-machine-driver-kvm2 COMMIT=${commit} + make docker-machine-driver-kvm2 COMMIT=${src.rev} ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 4354d72a5b..45480e8c30 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0"; + sha256 = "0bfib5pg2cbip6fw45slb0h3a7qpikxsfpclzr86bcnjq60pshl1"; }; - vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp"; + vendorSha256 = "0a5sv11pb2i6r0ffwaiqdhc0m7gz679yfmqw6ix9imk4ybhf4jp9"; subPackages = [ "cmd/fluxctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 5e51fe4267..bcea26746a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.2.1"; + version = "3.2.4"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7"; + sha256 = "1plpk8qnv11d47qz93h57abjchyp6ahgyazyp0c6rv24vb9fp9zi"; }; - vendorSha256 = null; + vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 856fa51437..e4a6f63b01 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,28 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm }: -let version = "0.118.6"; in - -buildGoModule { +buildGoModule rec { pname = "helmfile"; - inherit version; + version = "0.119.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0zbvz8kn52c1q4yn8n9z4rrf761h495fhjw72x9q1nh44hr7npwd"; + sha256 = "1j9b0xw59w5ailwa7dqgbsdigviw8ng5r4jbsk9b80izcig805zz"; }; - goPackagePath = "github.com/roboll/helmfile"; - - vendorSha256 = "0xj14f0yx7x9ziijd1yka1n6kbmmhbibsk3ppp8cn1pqrwgqk7pr"; + vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy"; nativeBuildInputs = [ makeWrapper ]; - buildFlagsArray = '' - -ldflags= - -X main.Version=${version} - ''; + subPackages = [ "." ]; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; postInstall = '' wrapProgram $out/bin/helmfile \ @@ -36,4 +31,4 @@ buildGoModule { maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index 5fb0b36588..840a46ebf6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "0jbinnzdw32l7zh02k81gnw9rnqi8f5k5sp2qv8p9l9kgziaycvn"; + sha256 = "01vjghak2szif0p82kall5jw7mbfh4fg7fcjkblmic7l0vlqhfac"; }; vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index 304a3c6fa2..2f93d566d3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.65"; + version = "2.1.90"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0zkp0z5qpqw44bjnl20xna7s251k7jsxccqnqkdqqrzmqjpkkwgx"; + sha256 = "1m2gq1hh8fjgxwx2sipq56q5mlz0m3npnbsw103n2kq4xv1qf3f6"; }; - vendorSha256 = "0zi2n8fywzy87yfwcx7di74s8mx0468zmg6kwjln7mwhr6q23adf"; + vendorSha256 = "0kj6x7323fx1qhrlg789a21mh1fvhil7ng2fhmbmlwq0fcrngdnj"; subPackages = [ "cmd/jx" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 4be3398f4b..6664886277 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.19.4"; + version = "0.21.2"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "1ya3lrw31pxd1rxzf88l5hzilaxwrng1a3ibawgn57my333hrmf6"; + sha256 = "06yjc4lrqr3y7428xkfcgfg3aal71r437ij2hqd2yjxsq8r7zvif"; }; buildFlagsArray = '' @@ -18,12 +18,12 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "0vvzv5v7j77v809h2ial9n23244j1sy3xhkarsv0wwkifc3swvq5"; + vendorSha256 = "1hmqvcvlffd8cpqcnn2f9mnyiwdhw8k46sl2p6rk16yrj06la9mr"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; homepage = "https://github.com/derailed/k9s"; license = licenses.asl20; - maintainers = with maintainers; [ Gonzih ]; + maintainers = with maintainers; [ Gonzih markus1189 ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index e34f7e8412..282890ada5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -57,12 +57,12 @@ in rec { }; kops_1_16 = mkKops { - version = "1.16.3"; - sha256 = "01j7r89vim12wgb2dv6p2pib8wj2daain179cawlyb5kjyyb3jnq"; + version = "1.16.4"; + sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f"; }; kops_1_17 = mkKops { - version = "1.17.0"; - sha256 = "175fi7pdzncqyv2gyaf96rn96zaywlyqrb6669n42faxilhyjbw7"; + version = "1.17.1"; + sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix index cd946284fa..c51e62b30b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "0.4.0"; + version = "1.0.0"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa"; + sha256 = "0b6rsiq3pwp7wknmblgd8kszh9bd7nhvlsnyyamqnhlfjl97929x"; }; buildFlagsArray = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix index 5b1f124524..6f6c8dc338 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,22 +1,31 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kubeless"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "kubeless"; repo = "kubeless"; rev = "v${version}"; - sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd"; + sha256 = "0x2hydywnnlh6arzz71p7gg9yzq5z2y2lppn1jszvkbgh11kkqfr"; }; goPackagePath = "github.com/kubeless/kubeless"; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/kubeless" ]; buildFlagsArray = '' - -ldflags=-X github.com/kubeless/kubeless/pkg/version.Version=${version} + -ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version} + ''; + + postInstall = '' + for shell in bash; do + $out/bin/kubeless completion $shell > kubeless.$shell + installShellCompletion kubeless.$shell + done ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index d1dbac56a1..0e9e34fd26 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.18.3"; + version = "1.18.6"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "01r6yym74x8ysvs4i23082nm8maisg6ipy9h41y4h8glvnpha0h8"; + sha256 = "0ijcssalzb0gx23va23q6q6haj2m9dy36l9i7lq1726m75fa5yjv"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix new file mode 100644 index 0000000000..6b08f43589 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kubespy"; + version = "0.5.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "pulumi"; + repo = "kubespy"; + sha256 = "1p0qmn6458pa9la6zkvyrkgs2rhzfwsk9m3rk5fkmcfbh7b031r8"; + }; + + vendorSha256 = "0q85is01cbgxflnqdvxc9w5iqdizgvsc44h8z21j712bm2w7blqq"; + + # TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed. + # postInstall = '' + # for shell in bash zsh; do + # $out/bin/kubespy completion $shell > kubespy.$shell + # installShellCompletion kubespy.$shell + # done + # ''; + + meta = with lib; { + description = "A tool to observe Kubernetes resources in real time"; + homepage = "https://github.com/pulumi/kubespy"; + license = licenses.asl20; + maintainers = with maintainers; [ blaggacao ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index c409bf4712..7e2554330a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,18 +11,15 @@ buildGoModule rec { pname = "minikube"; - version = "1.11.0"; + version = "1.12.0"; - # for -ldflags - commit = "57e2f55f47effe9ce396cea42a1e0eb4f611ebbd"; - - vendorSha256 = "1l9dxn7yy21x4b3cg6l5a08wx2ng8qf531ilg8yf1rznwfwjajrv"; + vendorSha256 = "0wcm7kw5z7d0ch59nyx5xlv5ci7jrwnzspmsh1yb76318cx2aghi"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0y761svwyrpc4ywdd4vr9hxkg6593wg4wwqzn8n86g0zcz6qg11d"; + sha256 = "0bvdyfx5vjcgnkqd23rpbbhxf1zigpzxlqpay2sb6dpldsj0nhdk"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; @@ -30,7 +27,7 @@ buildGoModule rec { buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; buildPhase = '' - make COMMIT=${commit} + make COMMIT=${src.rev} ''; installPhase = '' @@ -40,7 +37,7 @@ buildGoModule rec { export MINIKUBE_WANTUPDATENOTIFICATION=false export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false - for shell in bash zsh; do + for shell in bash zsh fish; do $out/bin/minikube completion $shell > minikube.$shell installShellCompletion minikube.$shell done diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index 0689fd096b..c75e48d97d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -1,22 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, go, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "qbec"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "0vy1cqqyga68qjbvyhsgl281qkbsvhvmwbxc93hygsxzm9kczy4p"; + sha256 = "1g90z155nhcblr48qypw8qw3l8g4dz33iflv4cg4xrhwjp8dfbv9"; }; vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/splunk/qbec/internal/commands.version=${version} + -X github.com/splunk/qbec/internal/commands.commit=${src.rev} + -X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go} + ''; + meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; homepage = "https://github.com/splunk/qbec"; license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 3a8ebe635f..1952aac880 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -144,6 +144,7 @@ let elasticsearch = callPackage ./elasticsearch {}; libvirt = callPackage ./libvirt {}; lxd = callPackage ./lxd {}; + shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix new file mode 100644 index 0000000000..2da6ae9e73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: +buildGoModule rec { + pname = "terraform-provider-shell"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "scottwinkler"; + repo = pname; + rev = "v${version}"; + sha256 = "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l"; + }; + + vendorSha256 = "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg"; + + subPackages = [ "." ]; + + # Terraform allows checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postInstall = "mv $out/bin/${pname}{,_v${version}}"; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Terraform provider for executing shell commands and saving output to state file"; + changelog = "https://github.com/scottwinkler/terraform-provider-shell/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ mupdt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 080bc83254..34c4d30221 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -118,8 +118,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.26"; - sha256 = "1f0n2zdk1jyqcmchsprqfkiivmsmdlpsf5b7x5f1dmvms9jw3268"; + version = "0.12.28"; + sha256 = "05ymr6vc0sqh1sia0qawhz0mag8jdrq157mbj9bkdpsnlyv209p3"; patches = [ ./provider-path.patch (fetchpatch { @@ -130,6 +130,13 @@ in rec { passthru = { inherit plugins; }; }); + terraform_0_13 = pluggable (generic { + version = "0.13.0-beta3"; + sha256 = "199rrw0kjp9qwa8llwmihgnqrgs4vr0zrbik5w5bfkrldyqp2ynb"; + patches = [ ./provider-path.patch ]; + passthru = { inherit plugins; }; + }); + # Tests that the plugins are being used. Terraform looks at the specific # file pattern and if the plugin is not found it will try to download it # from the Internet. With sandboxing enable this test will fail if that is diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 74f576b9a3..d65e15373b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.23.23"; + version = "0.23.31"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1087zs5k73rhhzni8zdj950aw4nsc7mqjj8lgdcc8y3yx8p8y5hy"; + sha256 = "1wpb749hc6pbmxcba1k4yrwcg8547rnsskxb45bzqyqyj1nj775s"; }; vendorSha256 = "1xn7c6y32vpanqvf1sfpw6bs73dbjniavjbf00j0vx83bfyklsr4"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix index f399aeaa98..df266e18c2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 -, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch +, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: stdenv.mkDerivation rec { pname = "feedreader"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "jangernert"; repo = pname; rev = "v${version}"; - sha256 = "154lzvd8acs4dyc91nlabpr284yrij8jkhgm0h18hp3cy0a11rv8"; + sha256 = "1agy1nkpkdsy2kbrrc8nrwphj5n86rikjjvwkr8klbf88mzl6civ"; }; nativeBuildInputs = [ @@ -32,14 +32,6 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; - patches = [ - # Fixes build with libsecret - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/jangernert/FeedReader/pull/943.patch"; - sha256 = "0anrwvcg6607dzvfrhy5qcnpxzflskb3iy3khdg191aw1h2mqhb5"; - }) - ]; - passthru = { updateScript = pantheon.updateScript { attrPath = pname; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index 74a43f00ca..18c3958877 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,18 +1,18 @@ -{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses +{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses , asciidoctor, libiconv, Security, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.19"; + version = "2.20.1"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "0yyrq8a90l6pkrczm9qvdg75jhsdq0niwp79vrdpm8rsxqpdmfq7"; + sha256 = "1i9dpkdlsm3ya0w2x4c8kplrp3qzd8slbkcqvzfpqggb67gvczvv"; }; - cargoSha256 = "1q3jf3d80c0ik38qk8jgbhfz5jxv0cy3lzmkyh2l002azp9hvv59"; + cargoSha256 = "1ykffx2lhn4w56qm1wypkg9wsqpvzzrz419qkl95w1384xf3f7ix"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config asciidoctor gettext ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix index 6cfc5ed3a9..d8125e21d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.8"; + stableVersion = "2.2.11"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -15,18 +15,19 @@ let src = oldAttrs.src.override { inherit version sha256; }; - doCheck = oldAttrs.doCheck && (attrname != "psutil"); }); }; commonOverrides = [ - (mkOverride "psutil" "5.6.6" - "1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd") + (mkOverride "psutil" "5.7.0" + "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8") + (mkOverride "jsonschema" "3.2.0" + "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1qgzad9hdbvkdalzdnlg5gnlzn2f9qlpd1aj8djmi6w1mmdkf9q7"; - serverSrcHash = "1kg38dh0xk4yvi7hz0d5dq9k0wany0sfd185l0zxs3nz78zd23an"; + guiSrcHash = "1carwhp49l9zx2p6i3in03x6rjzn0x6ls2svwazd643rmrl4y7gn"; + serverSrcHash = "0acbxay1pwq62yq9q67hid44byyi6rb6smz5wa8br3vka7z31iqf"; in { guiStable = mkGui { stable = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix index 7a0861ee3c..7cdc74dfd4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix @@ -1,12 +1,9 @@ { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, stdenv, python3, pkgs, fetchFromGitHub }: let - # TODO: This package requires qt5Full to launch defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "3.2.0" - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; python = python3.override { @@ -24,9 +21,10 @@ in python.pkgs.buildPythonPackage rec { }; propagatedBuildInputs = with python.pkgs; [ - raven psutil jsonschema # tox for check + sentry-sdk psutil jsonschema # tox for check # Runtime dependencies sip (pyqt5.override { withWebSockets = true; }) distro setuptools + pkgs.qt5Full ]; doCheck = false; # Failing diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix index 26553b9aed..1ee204b069 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -4,10 +4,19 @@ let defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "3.2.0" - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") - (mkOverride "aiofiles" "0.4.0" - "1vmvq9qja3wahv8m1adkyk00zm7j0x64pk3f2ry051ja66xa07h2") + (mkOverride "aiofiles" "0.5.0" + "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af") + (self: super: { + py-cpuinfo = super.py-cpuinfo.overridePythonAttrs (oldAttrs: rec { + version = "6.0.0"; + src = fetchFromGitHub { + owner = "workhorsy"; + repo = "py-cpuinfo"; + rev = "v${version}"; + sha256 = "0595gjkd7gzmn9cfpgjw3ia2sl1y8mmw7ajyscibjx59m5mqcki5"; + }; + }); + }) ]; python = python3.override { @@ -31,7 +40,7 @@ in python.pkgs.buildPythonPackage { propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools - jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles + jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles prompt_toolkit py-cpuinfo ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix b/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix index 4753cd464b..318867922c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys"; + sha256 = "0r91cq39n89hfy8sbdy5vjzqfrsfd7cdhd41gwszpayq65qhbsyp"; }; - vendorSha256 = "0d8yfmsl8rycbq8gjnvc657j14644lq0zmr9l88ik360szw6v6gc"; + vendorSha256 = "1r5qg5cx48yw1l5nil28y4a82fc7g52jmy9pckaxygppmmn539pc"; subPackages = [ "cmd/hydroxide" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 0b6f142f1e..c4d780d9ea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ bitlbee glib ]; + buildInputs = [ bitlbee ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 7801606561..07e7b74a43 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - buildInputs = [ bitlbee glib json-glib ]; + buildInputs = [ bitlbee json-glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index 155ea5edc4..411cd78927 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -3,21 +3,20 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; - version = "1.4.3"; + version = "1.4.4"; src = fetchgit { url = "https://alexschroeder.ch/cgit/bitlbee-mastodon"; rev = "v${version}"; - sha256 = "1k9j4403w6x93f4ls3xj8nrabz8ynjby6sigqdmhb7cqv26l987p"; + sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ bitlbee glib ]; + buildInputs = [ bitlbee ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee export BITLBEE_DATADIR=$out/share/bitlbee - ./autogen.sh ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 14a3319c14..8cb7f6c37c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bitlbee autoconf automake libtool glib libgcrypt ]; + buildInputs = [ bitlbee autoconf automake libtool libgcrypt ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index cf3f2549c8..7b1256b657 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -14,10 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; - buildInputs = [ gnutls glib libotr python ] + buildInputs = [ gnutls libotr python ] ++ optional enableLibPurple pidgin ++ optional enablePam pam; + propagatedBuildInputs = [ glib ]; + configureFlags = [ "--otr=1" "--ssl=gnutls" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix index f383daa6fd..28cc383605 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -39,7 +39,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { desktopName = "Blink"; icon = "blink"; genericName = "Instant Messaging"; - categories = "Application;Internet;"; + categories = "Internet;"; }; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index bd71166be2..0143e401c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -1,8 +1,6 @@ { stdenv , fetchurl , rpmextract -, patchelf -, patchelfUnstable , libnotify , libuuid , cairo @@ -40,11 +38,11 @@ stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm"; - sha256 = "06lcpkga8h0zpl2wlysj6n979f0yg361frp3zr0vwzln3fiil2a7"; + sha256 = "180hc854ngwfn6y6nsrfn74rv78cxhq6sgshrca5zqv6wq3l98g0"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; @@ -96,11 +94,11 @@ stdenv.mkDerivation rec { mv usr/share share rmdir usr - ${patchelf}/bin/patchelf \ + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --replace-needed libudev.so.0 libudev.so.1 \ opt/BlueJeans/bluejeans-v2 - ${patchelfUnstable}/bin/patchelf \ + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ opt/BlueJeans/resources/BluejeansHelper diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix index c2af3e4d3e..0ee84dae35 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -4,7 +4,7 @@ , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb -, mesa, nspr, nss, pango, systemd +, mesa, nspr, nss, pango, systemd, libappindicator-gtk3 }: let @@ -35,6 +35,7 @@ in stdenv.mkDerivation rec { gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver + libappindicator-gtk3 ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json similarity index 81% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index f9a5ebdbeb..0a0983af00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -1,10 +1,10 @@ { - "name": "riot-desktop", - "productName": "Riot", + "name": "element-desktop", + "productName": "Element (Riot)", "main": "src/electron-main.js", - "version": "1.6.5", + "version": "1.7.1", "description": "A feature-rich client for Matrix.org", - "author": "New Vector Ltd.", + "author": "Element", "repository": { "type": "git", "url": "https://github.com/vector-im/riot-desktop" @@ -38,8 +38,8 @@ }, "devDependencies": { "asar": "^2.0.1", - "electron-builder": "^22.3.2", - "electron-builder-squirrel-windows": "^22.3.2", + "electron-builder": "^22.7.0", + "electron-builder-squirrel-windows": "^22.7.0", "electron-devtools-installer": "^2.2.4", "electron-notarize": "^0.2.0", "eslint": "^5.8.0", @@ -48,21 +48,22 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.2.2", + "matrix-js-sdk": "7.1.0", "mkdirp": "^1.0.3", - "needle": "^2.3.2", - "node-pre-gyp": "^0.14.0", - "npm": "^6.13.7", + "needle": "^2.5.0", + "node-pre-gyp": "^0.15.0", + "npm": "^6.14.6", "rimraf": "^3.0.2", "semver": "^7.1.3", "tar": "^6.0.1" }, "hakDependencies": { - "matrix-seshat": "^1.3.3" + "matrix-seshat": "^2.1.0", + "keytar": "^5.6.0" }, "build": { "appId": "im.riot.app", - "electronVersion": "8.0.3", + "electronVersion": "9.0.5", "files": [ "package.json", { @@ -81,9 +82,9 @@ "linux": { "target": "deb", "category": "Network;InstantMessaging;Chat", - "maintainer": "support@riot.im", + "maintainer": "support@element.io", "desktop": { - "StartupWMClass": "riot" + "StartupWMClass": "element" } }, "mac": { @@ -99,12 +100,13 @@ "directories": { "output": "dist" }, + "afterPack": "scripts/electron_afterPack", "afterSign": "scripts/electron_afterSign", "protocols": [ { - "name": "riot", + "name": "element", "schemes": [ - "riot" + "element" ] } ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix similarity index 93% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 30e1c94647..d46c1445ec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -1,14 +1,6 @@ { fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ - { - name = "7zip_bin___7zip_bin_4.0.2.tgz"; - path = fetchurl { - name = "7zip_bin___7zip_bin_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz"; - sha1 = "6abbdc22f33cab742053777a26db2e25ca527179"; - }; - } { name = "7zip_bin___7zip_bin_5.0.3.tgz"; path = fetchurl { @@ -50,11 +42,11 @@ }; } { - name = "_develar_schema_utils___schema_utils_2.1.0.tgz"; + name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { - name = "_develar_schema_utils___schema_utils_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.1.0.tgz"; - sha1 = "eceb1695bfbed6f6bb84666d5d3abe5e1fd54e17"; + name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; + sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; }; } { @@ -98,11 +90,11 @@ }; } { - name = "_types_fs_extra___fs_extra_8.0.1.tgz"; + name = "_types_fs_extra___fs_extra_9.0.1.tgz"; path = fetchurl { - name = "_types_fs_extra___fs_extra_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.1.tgz"; - sha1 = "a2378d6e7e8afea1564e44aafa2e207dadf77686"; + name = "_types_fs_extra___fs_extra_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz"; + sha1 = "91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"; }; } { @@ -121,6 +113,22 @@ sha1 = "7cc1358c9c18e71f6c020e410962971863232cf5"; }; } + { + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + path = fetchurl { + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + }; + } + { + name = "_types_yargs___yargs_15.0.5.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; + sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; + }; + } { name = "JSONStream___JSONStream_1.3.5.tgz"; path = fetchurl { @@ -193,6 +201,14 @@ sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; }; } + { + name = "ajv___ajv_6.12.2.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; + sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; + }; + } { name = "another_json___another_json_0.2.0.tgz"; path = fetchurl { @@ -290,27 +306,19 @@ }; } { - name = "app_builder_bin___app_builder_bin_3.5.2.tgz"; + name = "app_builder_bin___app_builder_bin_3.5.9.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.2.tgz"; - sha1 = "fba56e6e9ef76fcd37816738c5f9a0b3992d7183"; + name = "app_builder_bin___app_builder_bin_3.5.9.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz"; + sha1 = "a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"; }; } { - name = "app_builder_lib___app_builder_lib_22.3.2.tgz"; + name = "app_builder_lib___app_builder_lib_22.7.0.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.3.2.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.2.tgz"; - sha1 = "d43e0bdff91d484c0bd07d7248043dbb2665b8ac"; - }; - } - { - name = "app_builder_lib___app_builder_lib_22.3.3.tgz"; - path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.3.3.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.3.tgz"; - sha1 = "9a95a3c14f69fb6131834dd840fba561191c9998"; + name = "app_builder_lib___app_builder_lib_22.7.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.7.0.tgz"; + sha1 = "ccd3e7ece2d46bc209423a77aa142f74aaf65db0"; }; } { @@ -346,11 +354,11 @@ }; } { - name = "archiver___archiver_3.1.1.tgz"; + name = "archiver___archiver_4.0.1.tgz"; path = fetchurl { - name = "archiver___archiver_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-3.1.1.tgz"; - sha1 = "9db7819d4daf60aec10fe86b16cb9258ced66ea0"; + name = "archiver___archiver_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-4.0.1.tgz"; + sha1 = "3f722b121777e361ca9fad374ecda38e77e63c7f"; }; } { @@ -425,6 +433,14 @@ sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; }; } + { + name = "async___async_0.9.2.tgz"; + path = fetchurl { + name = "async___async_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + } { name = "async___async_2.6.3.tgz"; path = fetchurl { @@ -441,6 +457,14 @@ sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; } + { + name = "at_least_node___at_least_node_1.0.0.tgz"; + path = fetchurl { + name = "at_least_node___at_least_node_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; + sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + }; + } { name = "auto_launch___auto_launch_5.0.5.tgz"; path = fetchurl { @@ -514,11 +538,11 @@ }; } { - name = "bl___bl_3.0.0.tgz"; + name = "bl___bl_4.0.2.tgz"; path = fetchurl { - name = "bl___bl_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz"; - sha1 = "3611ec00579fd18561754360b21e9f784500ff88"; + name = "bl___bl_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz"; + sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"; }; } { @@ -618,27 +642,27 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.6.0.tgz"; + name = "buffer___buffer_5.6.0.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.0.tgz"; - sha1 = "b7007c30126da9a90e99932128d2922c8c178649"; + name = "buffer___buffer_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz"; + sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786"; }; } { - name = "builder_util___builder_util_22.3.2.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.7.1.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.3.2.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.2.tgz"; - sha1 = "23c61aaf0f0006f994087b33a26e47cdaec7aa8d"; + name = "builder_util_runtime___builder_util_runtime_8.7.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.1.tgz"; + sha1 = "23c808cddd650d4376a7a1518ec1e80e85c10f00"; }; } { - name = "builder_util___builder_util_22.3.3.tgz"; + name = "builder_util___builder_util_22.7.0.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.3.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.3.tgz"; - sha1 = "62f0527ceaa1a2e4a60596a9b38ad1ffe3e20ae6"; + name = "builder_util___builder_util_22.7.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.7.0.tgz"; + sha1 = "0776a66e6d6e408a78bed7f17a7ad22516d9e7f0"; }; } { @@ -745,6 +769,14 @@ sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; }; } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } { name = "chardet___chardet_0.7.0.tgz"; path = fetchurl { @@ -970,11 +1002,11 @@ }; } { - name = "compress_commons___compress_commons_2.1.1.tgz"; + name = "compress_commons___compress_commons_3.0.0.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-2.1.1.tgz"; - sha1 = "9410d9a534cf8435e3fbbb7c6ce48de2dc2f0610"; + name = "compress_commons___compress_commons_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-3.0.0.tgz"; + sha1 = "833944d84596e537224dd91cf92f5246823d4f1d"; }; } { @@ -1169,6 +1201,14 @@ sha1 = "3b72260255109c6b589cee050f1d516139664791"; }; } + { + name = "debug___debug_4.2.0.tgz"; + path = fetchurl { + name = "debug___debug_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz"; + sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1"; + }; + } { name = "debuglog___debuglog_1.0.1.tgz"; path = fetchurl { @@ -1298,11 +1338,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.3.2.tgz"; + name = "dmg_builder___dmg_builder_22.7.0.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.3.2.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.3.2.tgz"; - sha1 = "4c052f75d601e3358da1ff9d7d57738e1c01b157"; + name = "dmg_builder___dmg_builder_22.7.0.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.7.0.tgz"; + sha1 = "ead7e7c046cbdc52d29d302a4455f6668cdf7d45"; }; } { @@ -1394,27 +1434,27 @@ }; } { - name = "ejs___ejs_3.0.1.tgz"; + name = "ejs___ejs_3.1.3.tgz"; path = fetchurl { - name = "ejs___ejs_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.0.1.tgz"; - sha1 = "30c8f6ee9948502cc32e85c37a3f8b39b5a614a5"; + name = "ejs___ejs_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.3.tgz"; + sha1 = "514d967a8894084d18d3d47bd169a1c0560f093d"; }; } { - name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.3.3.tgz"; + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.7.0.tgz"; path = fetchurl { - name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.3.3.tgz"; - sha1 = "0a417af35c83b067096bd3217b6b7bd75c6c48a9"; + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.7.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.7.0.tgz"; + sha1 = "8d6f09d541c039f52202935c66d592c38575ceff"; }; } { - name = "electron_builder___electron_builder_22.3.2.tgz"; + name = "electron_builder___electron_builder_22.7.0.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.3.2.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.3.2.tgz"; - sha1 = "902d150fc0670cb90213262e5e0aa3c4f299ffa4"; + name = "electron_builder___electron_builder_22.7.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.7.0.tgz"; + sha1 = "a42d08a1654ffc2f7d9e2860829d3cc55d4a0c81"; }; } { @@ -1434,19 +1474,11 @@ }; } { - name = "electron_publish___electron_publish_22.3.2.tgz"; + name = "electron_publish___electron_publish_22.7.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.3.2.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.2.tgz"; - sha1 = "d2e60caf7a9643fe57e501c20acaf32c737b1c50"; - }; - } - { - name = "electron_publish___electron_publish_22.3.3.tgz"; - path = fetchurl { - name = "electron_publish___electron_publish_22.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.3.tgz"; - sha1 = "7d1e757a20ce0558fdc42900b6e3d773fdae9d9e"; + name = "electron_publish___electron_publish_22.7.0.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.7.0.tgz"; + sha1 = "d92ba7c4007c9ac1dd070593e48028184fb2dc19"; }; } { @@ -1753,6 +1785,14 @@ sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; path = fetchurl { @@ -1801,6 +1841,14 @@ sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; } + { + name = "filelist___filelist_1.0.1.tgz"; + path = fetchurl { + name = "filelist___filelist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz"; + sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb"; + }; + } { name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz"; path = fetchurl { @@ -1905,6 +1953,14 @@ sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; }; } + { + name = "fs_extra___fs_extra_9.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz"; + sha1 = "910da0062437ba4c39fedd863f1675ccfefcb9fc"; + }; + } { name = "fs_minipass___fs_minipass_1.2.7.tgz"; path = fetchurl { @@ -2097,6 +2153,14 @@ sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; }; } + { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + }; + } { name = "har_schema___har_schema_2.0.0.tgz"; path = fetchurl { @@ -2170,11 +2234,19 @@ }; } { - name = "hosted_git_info___hosted_git_info_3.0.2.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.2.tgz"; - sha1 = "8b7e3bd114b59b51786f8bade0f39ddc80275a97"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + }; + } + { + name = "hosted_git_info___hosted_git_info_3.0.4.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz"; + sha1 = "be4973eb1fd2737b11c9c7c19380739bb249f60d"; }; } { @@ -2626,11 +2698,11 @@ }; } { - name = "isbinaryfile___isbinaryfile_4.0.4.tgz"; + name = "isbinaryfile___isbinaryfile_4.0.6.tgz"; path = fetchurl { - name = "isbinaryfile___isbinaryfile_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.4.tgz"; - sha1 = "6803f81a8944201c642b6e17da041e24deb78712"; + name = "isbinaryfile___isbinaryfile_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz"; + sha1 = "edcb62b224e2b4710830b67498c8e4e5a4d2610b"; }; } { @@ -2649,6 +2721,14 @@ sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; } + { + name = "jake___jake_10.8.2.tgz"; + path = fetchurl { + name = "jake___jake_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; + sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + }; + } { name = "jimp___jimp_0.2.28.tgz"; path = fetchurl { @@ -2681,6 +2761,14 @@ sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; }; } + { + name = "js_yaml___js_yaml_3.14.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; + sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; + }; + } { name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { @@ -2738,11 +2826,11 @@ }; } { - name = "json5___json5_2.1.1.tgz"; + name = "json5___json5_2.1.3.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.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; }; } { @@ -2761,6 +2849,14 @@ sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; } + { + name = "jsonfile___jsonfile_6.0.1.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz"; + sha1 = "98966cba214378c8c84b82e085907b40bf614179"; + }; + } { name = "jsonparse___jsonparse_1.3.1.tgz"; path = fetchurl { @@ -3074,11 +3170,11 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; + name = "lodash___lodash_4.17.19.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + name = "lodash___lodash_4.17.19.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz"; + sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"; }; } { @@ -3154,11 +3250,11 @@ }; } { - name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; + name = "matrix_js_sdk___matrix_js_sdk_7.1.0.tgz"; path = fetchurl { - name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz"; - sha1 = "103d951f61945217b110962f55ae43996756f615"; + name = "matrix_js_sdk___matrix_js_sdk_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0.tgz"; + sha1 = "b3e3304e890df45c827706831748935168ee839f"; }; } { @@ -3210,11 +3306,11 @@ }; } { - name = "mime___mime_2.4.4.tgz"; + name = "mime___mime_2.4.6.tgz"; path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + name = "mime___mime_2.4.6.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; + sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; }; } { @@ -3273,6 +3369,14 @@ sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f"; }; } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } { name = "minipass___minipass_2.9.0.tgz"; path = fetchurl { @@ -3321,6 +3425,14 @@ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } { name = "mkdirp___mkdirp_1.0.3.tgz"; path = fetchurl { @@ -3378,11 +3490,11 @@ }; } { - name = "needle___needle_2.3.2.tgz"; + name = "needle___needle_2.5.0.tgz"; path = fetchurl { - name = "needle___needle_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz"; - sha1 = "3342dea100b7160960a450dc8c22160ac712a528"; + name = "needle___needle_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz"; + sha1 = "e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0"; }; } { @@ -3410,11 +3522,19 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; + name = "node_gyp___node_gyp_5.1.1.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_gyp___node_gyp_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz"; + sha1 = "eb915f7b631c937d282e33aed44cb7a025f62a3e"; + }; + } + { + name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz"; + path = fetchurl { + name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz"; + url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz"; + sha1 = "c2fc383276b74c7ffa842925241553e8b40f1087"; }; } { @@ -3425,6 +3545,14 @@ sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; } + { + name = "nopt___nopt_4.0.3.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz"; + sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48"; + }; + } { name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; path = fetchurl { @@ -3537,6 +3665,14 @@ sha1 = "8272a71c19634d0dce9c35a5daf8ee589cbb0f52"; }; } + { + name = "npm_profile___npm_profile_4.0.4.tgz"; + path = fetchurl { + name = "npm_profile___npm_profile_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.4.tgz"; + sha1 = "28ee94390e936df6d084263ee2061336a6a1581b"; + }; + } { name = "npm_registry_fetch___npm_registry_fetch_4.0.2.tgz"; path = fetchurl { @@ -3545,6 +3681,14 @@ sha1 = "2b1434f93ccbe6b6385f8e45f45db93e16921d7a"; }; } + { + name = "npm_registry_fetch___npm_registry_fetch_4.0.5.tgz"; + path = fetchurl { + name = "npm_registry_fetch___npm_registry_fetch_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz"; + sha1 = "cb87cf7f25bfb048d6c3ee19d115bebf93ea5bfa"; + }; + } { name = "npm_run_path___npm_run_path_2.0.2.tgz"; path = fetchurl { @@ -3562,11 +3706,11 @@ }; } { - name = "npm___npm_6.13.7.tgz"; + name = "npm___npm_6.14.6.tgz"; path = fetchurl { - name = "npm___npm_6.13.7.tgz"; - url = "https://registry.yarnpkg.com/npm/-/npm-6.13.7.tgz"; - sha1 = "9533a3ddc57f9792db8a8b303efabaf878047841"; + name = "npm___npm_6.14.6.tgz"; + url = "https://registry.yarnpkg.com/npm/-/npm-6.14.6.tgz"; + sha1 = "1a81ce1fac2bf5457dbf6342ceed503627ff228f"; }; } { @@ -4226,11 +4370,11 @@ }; } { - name = "read_config_file___read_config_file_5.0.1.tgz"; + name = "read_config_file___read_config_file_6.0.0.tgz"; path = fetchurl { - name = "read_config_file___read_config_file_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.1.tgz"; - sha1 = "ead3df0d9822cc96006ca16322eaa79dac8591c2"; + name = "read_config_file___read_config_file_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz"; + sha1 = "224b5dca6a5bdc1fb19e63f89f342680efdb9299"; }; } { @@ -4305,6 +4449,14 @@ sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; }; } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } { name = "readable_stream___readable_stream_1.1.14.tgz"; path = fetchurl { @@ -4585,6 +4737,14 @@ sha1 = "e4345ce73071c53f336445cfc19efb1c311df2a6"; }; } + { + name = "semver___semver_7.3.2.tgz"; + path = fetchurl { + name = "semver___semver_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; + sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + }; + } { name = "set_blocking___set_blocking_2.0.0.tgz"; path = fetchurl { @@ -4682,11 +4842,11 @@ }; } { - name = "source_map_support___source_map_support_0.5.16.tgz"; + name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.16.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; - sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; }; } { @@ -4978,11 +5138,11 @@ }; } { - name = "tar_stream___tar_stream_2.1.0.tgz"; + name = "tar_stream___tar_stream_2.1.2.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz"; - sha1 = "d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"; + name = "tar_stream___tar_stream_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz"; + sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325"; }; } { @@ -5002,11 +5162,11 @@ }; } { - name = "temp_file___temp_file_3.3.6.tgz"; + name = "temp_file___temp_file_3.3.7.tgz"; path = fetchurl { - name = "temp_file___temp_file_3.3.6.tgz"; - url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.6.tgz"; - sha1 = "bd7a1951338bf93b59380b498ec1804d5b76c449"; + name = "temp_file___temp_file_3.3.7.tgz"; + url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz"; + sha1 = "686885d635f872748e384e871855958470aeb18a"; }; } { @@ -5241,6 +5401,14 @@ sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; }; } + { + name = "universalify___universalify_1.0.0.tgz"; + path = fetchurl { + name = "universalify___universalify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz"; + sha1 = "b61a1da173e8435b2fe3c67d29b9adf8594bd16d"; + }; + } { name = "unpipe___unpipe_1.0.0.tgz"; path = fetchurl { @@ -5610,11 +5778,11 @@ }; } { - name = "yargs_parser___yargs_parser_16.1.0.tgz"; + name = "yargs_parser___yargs_parser_18.1.3.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_16.1.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz"; - sha1 = "73747d53ae187e7b8dbe333f95714c76ea00ecf1"; + name = "yargs_parser___yargs_parser_18.1.3.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; }; } { @@ -5642,11 +5810,11 @@ }; } { - name = "yargs___yargs_15.1.0.tgz"; + name = "yargs___yargs_15.3.1.tgz"; path = fetchurl { - name = "yargs___yargs_15.1.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz"; - sha1 = "e111381f5830e863a89550bd4b136bb6a5f37219"; + name = "yargs___yargs_15.3.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz"; + sha1 = "9505b472763963e54afe60148ad27a330818e98b"; }; } { @@ -5658,11 +5826,11 @@ }; } { - name = "zip_stream___zip_stream_2.1.2.tgz"; + name = "zip_stream___zip_stream_3.0.1.tgz"; path = fetchurl { - name = "zip_stream___zip_stream_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.2.tgz"; - sha1 = "841efd23214b602ff49c497cba1a85d8b5fbc39c"; + name = "zip_stream___zip_stream_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-3.0.1.tgz"; + sha1 = "cb8db9d324a76c09f9b76b31a12a48638b0b9708"; }; } ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix similarity index 51% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index b05f64c138..9faaba1170 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,44 +1,44 @@ { stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron_7, riot-web +, electron_9, element-web }: # Notes for maintainers: -# * versions of `riot-web` and `riot-desktop` should be kept in sync. -# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh ` +# * versions of `element-web` and `element-desktop` should be kept in sync. +# * the Yarn dependency expression must be updated with `./update-element-desktop.sh ` let - executableName = "riot-desktop"; - version = "1.6.5"; + executableName = "element-desktop"; + version = "1.7.1"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "1snmfn98z63a8ahh5c7y7h00i8qsdq6wsnidmjjrkzcz3mchfq60"; + sha256 = "0sl45mxgp0sngxnba8ilsghzgv6cv36ggah1k2204ggzby13blg6"; }; - electron = electron_7; + electron = electron_9; in mkYarnPackage rec { - name = "riot-desktop-${version}"; + name = "element-desktop-${version}"; inherit version src; - packageJSON = ./riot-desktop-package.json; - yarnNix = ./riot-desktop-yarndeps.nix; + packageJSON = ./element-desktop-package.json; + yarnNix = ./element-desktop-yarndeps.nix; nativeBuildInputs = [ makeWrapper ]; installPhase = '' # resources - mkdir -p "$out/share/riot" - ln -s '${riot-web}' "$out/share/riot/webapp" - cp -r './deps/riot-desktop' "$out/share/riot/electron" - cp -r './deps/riot-desktop/res/img' "$out/share/riot" - rm "$out/share/riot/electron/node_modules" - cp -r './node_modules' "$out/share/riot/electron" + mkdir -p "$out/share/element" + ln -s '${element-web}' "$out/share/element/webapp" + cp -r './deps/element-desktop' "$out/share/element/electron" + cp -r './deps/element-desktop/res/img' "$out/share/element" + rm "$out/share/element/electron/node_modules" + cp -r './node_modules' "$out/share/element/electron" # icons - for icon in $out/share/riot/electron/build/icons/*.png; do + for icon in $out/share/element/electron/build/icons/*.png; do mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" - ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/riot.png" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png" done # desktop item @@ -47,36 +47,33 @@ in mkYarnPackage rec { # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ - --add-flags "$out/share/riot/electron" + --add-flags "$out/share/element/electron" ''; - # Do not attempt generating a tarball for riot-web again. + # Do not attempt generating a tarball for element-web again. # note: `doDist = false;` does not work. distPhase = '' true ''; # The desktop item properties should be kept in sync with data from upstream: - # * productName and description from - # https://github.com/vector-im/riot-web/blob/develop/electron_app/package.json - # * category and StartupWMClass from the build.linux section of - # https://github.com/vector-im/riot-web/blob/develop/package.json + # https://github.com/vector-im/riot-desktop/blob/develop/package.json desktopItem = makeDesktopItem { - name = "riot"; + name = "element-desktop"; exec = executableName; - icon = "riot"; - desktopName = "Riot"; + icon = "element"; + desktopName = "Element (Riot)"; genericName = "Matrix Client"; comment = meta.description; categories = "Network;InstantMessaging;Chat;"; extraEntries = '' - StartupWMClass=riot + StartupWMClass=element ''; }; meta = with stdenv.lib; { description = "A feature-rich client for Matrix.org"; - homepage = "https://about.riot.im/"; + homepage = "https://element.io/"; license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix similarity index 71% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index cc4eb4161f..9284af07fe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchurl, writeText, jq, conf ? {} }: # Note for maintainers: -# Versions of `riot-web` and `riot-desktop` should be kept in sync. +# Versions of `element-web` and `element-desktop` should be kept in sync. let noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org piwik = false; # disable analytics }; - configOverrides = writeText "riot-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); + configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); in stdenv.mkDerivation rec { - pname = "riot-web"; - version = "1.6.5"; + pname = "element-web"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0mx7ql76cbivc0d9gzix51bc1rdp9yg9vjx05mbf5r9sxrwmihz5"; + sha256 = "1axmf5h0k709kbpgh3ldsf6f8k9n2q623pk4j0nrshlxa9ighsay"; }; installPhase = '' @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; - homepage = "http://riot.im/"; + homepage = "https://element.io/"; maintainers = stdenv.lib.teams.matrix.members; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh new file mode 100755 index 0000000000..ecca3018e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix + +set -euo pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates the Yarn dependency lock files for the element-desktop package." + echo "Usage: $0 " + exit 1 +fi + +RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1" + +wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json +wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock +yarn2nix --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix +rm element-desktop-yarndeps.lock diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix new file mode 100644 index 0000000000..e0f56e2783 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -0,0 +1,19 @@ +{ stdenv, mkFranzDerivation, fetchurl }: + +mkFranzDerivation rec { + pname = "ferdi"; + name = "Ferdi"; + version = "5.5.0"; + src = fetchurl { + url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; + sha256 = "0i24vcnq4iz5amqmn2fgk92ff9x9y7fg8jhc3g6ksvmcfly7af3k"; + }; + meta = with stdenv.lib; { + description = "Ferdi allows you to combine your favorite messaging services into one application"; + homepage = "https://getferdi.com/"; + license = licenses.free; + maintainers = [ maintainers.davidtwco ]; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix index 0c5090574f..52bc60b5af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,57 +1,19 @@ -{ stdenv, fetchurl, makeWrapper, wrapGAppsHook, autoPatchelfHook, dpkg -, xorg, atk, glib, pango, gdk-pixbuf, cairo, freetype, fontconfig, gtk3 -, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: +{ stdenv, mkFranzDerivation, fetchurl }: -let - version = "5.4.1"; -in stdenv.mkDerivation { +mkFranzDerivation rec { pname = "franz"; - inherit version; + name = "Franz"; + version = "5.5.0"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "1g1z5zjm9l081hpqslfc4h7pqh4k76ccmlz71r21204wy630mw6h"; + sha256 = "0kgfjai0pz0gpbxsmn3hbha7zr2kax0s1j3ygcsy4kzghla990wm"; }; - - # don't remove runtime deps - dontPatchELF = true; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ]; - buildInputs = (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver - ]) ++ [ - gtk3 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc - ]; - runtimeDependencies = [ udev.lib libnotify ]; - - unpackPhase = "dpkg-deb -x $src ."; - - installPhase = '' - mkdir -p $out/bin - cp -r opt $out - ln -s $out/opt/Franz/franz $out/bin - - # provide desktop item and icon - cp -r usr/share $out - substituteInPlace $out/share/applications/franz.desktop \ - --replace /opt/Franz/franz franz - ''; - - dontWrapGApps = true; - - postFixup = '' - wrapProgram $out/opt/Franz/franz \ - --prefix PATH : ${xdg_utils}/bin \ - "''${gappsWrapperArgs[@]}" - ''; - meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; homepage = "https://meetfranz.com"; license = licenses.free; maintainers = [ maintainers.davidtwco ]; - platforms = ["x86_64-linux"]; - hydraPlatforms = []; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix new file mode 100644 index 0000000000..d1206cdf9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -0,0 +1,89 @@ +{ stdenv +, makeWrapper +, wrapGAppsHook +, autoPatchelfHook +, dpkg +, xorg +, atk +, glib +, pango +, gdk-pixbuf +, cairo +, freetype +, fontconfig +, gtk3 +, gnome2 +, dbus +, nss +, nspr +, alsaLib +, cups +, expat +, udev +, libnotify +, xdg_utils +}: + +# Helper function for building a derivation for Franz and forks. + +{ pname, name, version, src, meta }: +stdenv.mkDerivation { + inherit pname version src meta; + + # Don't remove runtime deps. + dontPatchELF = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ]; + buildInputs = (with xorg; [ + libXi + libXcursor + libXdamage + libXrandr + libXcomposite + libXext + libXfixes + libXrender + libX11 + libXtst + libXScrnSaver + ]) ++ [ + gtk3 + atk + glib + pango + gdk-pixbuf + cairo + freetype + fontconfig + dbus + gnome2.GConf + nss + nspr + alsaLib + cups + expat + stdenv.cc.cc + ]; + runtimeDependencies = [ udev.lib libnotify ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p $out/bin + cp -r opt $out + ln -s $out/opt/${name}/${pname} $out/bin + + # Provide desktop item and icon. + cp -r usr/share $out + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace /opt/${name}/${pname} ${pname} + ''; + + dontWrapGApps = true; + + postFixup = '' + wrapProgram $out/opt/${name}/${pname} \ + --prefix PATH : ${xdg_utils}/bin \ + "''${gappsWrapperArgs[@]}" + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index f7fad7f4c4..c2402f9893 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -2,19 +2,18 @@ buildGoModule rec { pname = "gomuks"; - version = "0.1.0"; + version = "0.1.2"; goPackagePath = "maunium.net/go/gomuks"; - patches = [ ./gomod.patch ]; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v" + version; - sha256 = "1dcqkyxiqiyivzn85fwkjy8xs9yk89810x9mvkaiz0dx3ha57zhi"; + sha256 = "11bainw4w9fdrhv2jm0j9fw0f7r4cxlblyazbhckgr4j9q900383"; }; - vendorSha256 = "1mfi167mycnnlq8dwh1kkx6drhhi4ib58aad5fwc90ckdaq1rpb7"; + vendorSha256 = "11rk7pma6dr6fsyz8hpjyr7nc2c7ichh5m7ds07m89gzk6ar55gb"; buildInputs = [ olm ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch deleted file mode 100644 index 7b5ae45d61..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/go.mod b/go.mod -index a07e991..ba5ae99 100644 ---- a/go.mod -+++ b/go.mod -@@ -9,6 +9,7 @@ require ( - github.com/lithammer/fuzzysearch v1.1.0 - github.com/lucasb-eyer/go-colorful v1.0.3 - github.com/mattn/go-runewidth v0.0.9 -+ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect - github.com/pkg/errors v0.9.1 - github.com/rivo/uniseg v0.1.0 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 025b66852f..4fb6b1852a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "VoIP and Instant Messaging client"; desktopName = "Jitsi"; genericName = "Instant Messaging"; - categories = "Application;X-Internet;"; + categories = "X-Internet;"; }; libPath = lib.makeLibraryPath ([ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 0a41c9666b..74406f217a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -43,18 +43,18 @@ let in stdenv.mkDerivation rec { pname = "mattermost-desktop"; - version = "4.3.1"; + version = "4.5.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - sha256 = "076nv5h6xscbw1987az00x493qhqgrli87gnn57zbvz0acgvlhfv"; + sha256 = "1p44vxs7i9f15h4xjyr99g8x73qygv909a32lfkqip1fh8lk7sf4"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; - sha256 = "19ps9g8j6kp4haj6r3yfy4ma2wm6isq5fa8zlcz6g042ajkqq0ij"; + sha256 = "03pn853z2famqxcsrwayqb94pzghlpfb0qs2nfi8mc5zzsgcic7z"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index f3b304564c..2f5316c9fe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -24,13 +24,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; + sha256 = "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s"; }; nativeBuildInputs = [ @@ -38,20 +38,6 @@ mkDerivation rec { cmake pkgconfig ]; - cmakeFlags = [ - # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or - # https://github.com/NixOS/nixpkgs/pull/73940 are merged - "-DBoost_NO_BOOST_CMAKE=TRUE" - ]; - # commit missing from latest release and recommended by upstream: - # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619263903 - patches = [ - (fetchpatch { - name = "room-ids-escape-patch"; - url = "https://github.com/Nheko-Reborn/nheko/commit/d94ac86816f9f325cba11f71344a3ca99591130d.patch"; - sha256 = "1p0kj4a60l3jf0rfakc88adld7ccg3vfjhzia5rf2i03h35cxw8c"; - }) - ]; buildInputs = [ nlohmann_json diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index be7a8725df..d58688565f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.6.3"; + version = "0.6.5"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1h1z701sj1qgcqlsk3pnzifnbcg9fshl7v6271h9x54hm3d6hg8a"; + sha256 = "1pjrq71fkpvsc79nwhxhwjkqvqhj5wsnnwvsgslghaajdaw3n6wd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 369ae06932..a269eead70 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtk2-x11 +, gtkspell2, aspell , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream , libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn @@ -29,19 +30,24 @@ let unwrapped = stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; buildInputs = [ - gtkspell2 aspell startupnotification + aspell startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libxml2 nss nspr farstream + libxml2 nss nspr libXScrnSaver ncurses python avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl ] ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) - ++ (lib.optional (libgcrypt != null) libgcrypt); + ++ (lib.optional (libgcrypt != null) libgcrypt) + ++ (lib.optionals (stdenv.isLinux) [gtk2 gtkspell2 farstream]) + ++ (lib.optional (stdenv.isDarwin) gtk2-x11); - propagatedBuildInputs = [ pkgconfig gtk2 gettext ] - ++ (with perlPackages; [ perl XMLParser ]); + + propagatedBuildInputs = [ pkgconfig gettext ] + ++ (with perlPackages; [ perl XMLParser ]) + ++ (lib.optional (stdenv.isLinux) gtk2) + ++ (lib.optional (stdenv.isDarwin) gtk2-x11); patches = [ ./pidgin-makefile.patch ./add-search-path.patch ]; @@ -56,7 +62,8 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-tcl" ] ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) - ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) + ++ (lib.optionals (stdenv.isDarwin) ["--disable-gtkspell" "--disable-vv"]); enableParallelBuilding = true; @@ -69,7 +76,7 @@ let unwrapped = stdenv.mkDerivation rec { description = "Multi-protocol instant messaging client"; homepage = "http://pidgin.im"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index f451702501..ba10ab1626 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.1231"; + version = "1.4.1407"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "0m5p8is8nk3g0cbwiq73cff9nn2y09fcnh1pzc6rlqqhmz1acg4i"; + sha256 = "0gp5rk7km2fzw109wil6s9x49x5q1qbw9mnkjs58dpzvxn74ylhw"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh deleted file mode 100755 index d6e7259f19..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix - -set -euo pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the riot-desktop package." - echo "Usage: $0 " - exit 1 -fi - -RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1" - -wget "$RIOT_WEB_SRC/package.json" -O riot-desktop-package.json -wget "$RIOT_WEB_SRC/yarn.lock" -O riot-desktop-yarndeps.lock -yarn2nix --lockfile=riot-desktop-yarndeps.lock > riot-desktop-yarndeps.nix -rm riot-desktop-yarndeps.lock diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index dae1513884..781847a4fd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.2"; # Please backport all updates to the stable channel. + version = "1.34.4"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0l0i6v6n6iyq1zb2rlgfjnsk37kzjqgglk824vl5kp8qbq0li6b6"; + sha256 = "0250ys1lvfl417n8z9w3z6vqflzdlg0sff8l7wbzhv87nnc9kzg9"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index e7ba1e7f9a..0b89e5cc42 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.60.0.76"; + version = "8.61.0.95"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "1y919ki0c17vip90fln17impwky08qgprw0j1dgz239qqpwakn7a"; + sha256 = "1g8m83invqdkvswxy01gxin6ws7z6dblzwxjcxah1aqscndf17jx"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index ad831eb82a..f46a293be9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -158,7 +158,7 @@ let mkdir -p $out/Applications cp -r ./slack-mnt/Slack.app $out/Applications /usr/bin/hdiutil unmount slack-mnt - defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES + /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES ''; }; in if stdenv.isDarwin diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix new file mode 100644 index 0000000000..fda83066a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "ssh-chat"; + version = "1.9"; + + goPackagePath = "github.com/shazow/ssh-chat"; + + src = fetchFromGitHub { + owner = "shazow"; + repo = "ssh-chat"; + rev = "v${version}"; + sha256 = "04yszan6a7x9498s80xymf7wd10530yjrxcdw4czbplyhjdigxlg"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Chat over SSH"; + homepage = "https://github.com/shazow/ssh-chat"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/deps.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/deps.nix new file mode 100644 index 0000000000..4fc4b4b490 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/deps.nix @@ -0,0 +1,84 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/alexcesaro/log"; + fetch = { + type = "git"; + url = "https://github.com/alexcesaro/log"; + rev = "61e686294e58"; + sha256 = "1ckd5crq9rd12wpclahg2q0wprfg0whd6k9zbfzzkr6l1qpmmfam"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "7cb4b85ec19c"; + sha256 = "1qyhjd6wx409g9cq3xbpbl2xl41nm00mxzcxm5gbqdlwsd0z80rv"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "v1.4.0"; + sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; + }; + } + { + goPackagePath = "github.com/shazow/rateio"; + fetch = { + type = "git"; + url = "https://github.com/shazow/rateio"; + rev = "4461efc8bdc4"; + sha256 = "1isy75cmm71q18mvs6xaizgdjqnn6pllkj4yvd42brfgfj84qz0w"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "884d27f42877"; + sha256 = "1ka5kqpw3wr3iawwxq4swmrwbww6v1cmds86z1nm0qb8fvhvpslk"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "eb5bcb51f2a3"; + sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "1957bb5e6d1f"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + }; + } + { + 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 = "90fa682c2a6e"; + sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index 6b5acd8344..e3b664e5fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.5153"; + version = "1.3.00.16851"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "13c7fmij0gcg6mrjjj2mhs21q7fzdssscwhihzyrmbmj64cd0a69"; + sha256 = "1mp4xq224nwv2ckb5zd7iv3yvkg3gv6mk9dvx3f60jgain7qr0r3"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { # Includes runtimeDependencies in the RPATH of the included Node modules # so that dynamic loading works. We cannot use directly runtimeDependencies - # here, since the libraries from runtimeDependencies are not propagated + # here, since the libraries from runtimeDependencies are not propagated # to the dynamically loadable node modules because of a condition in - # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) + # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) # instead of EXEC or INTERP it expects. # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index eacd5ece8b..5f5e0f9e9b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.12"; + version = "2.1.13"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1b9kgib9dxjcfnw2zdbqd12ikcswkl35nwy9m47x5jvy3glxg6m8"; + sha256 = "0mq3f7faxn1hfkhv5n37y5iajjnm38s2in631046m0q7c4w3lrfi"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index e82fbc7beb..2346beb356 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.1.412382.0614"; + version = "5.1.422789.0705"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "07xb3v5i08wq0a3my9id91gizsxj5ppqvxmcbdy04j7yn4i1jm9x"; + sha256 = "1sc454xadxsbxxyb68qi7ac20yq0vymzzw1i07z19c9idfpjy75f"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix index 773a07dd6c..c864754403 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchurl, makeWrapper, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "insync"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook ]; + postPatch = '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix index 7a9d8f6397..c4c893f699 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs-migrator"; - version = "1.5.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "ipfs"; repo = "fs-repo-migrations"; rev = "v${version}"; - sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm"; + sha256 = "13ah5jk8n3wznvag6dda1ssgpqsdr9pdgvqm9gcsb7zzls89j9x5"; }; vendorSha256 = null; @@ -22,4 +22,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ elitak ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix new file mode 100644 index 0000000000..8dd545494d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang +, nixosTests +}: + +with stdenv.lib; + +perlPackages.buildPerlPackage rec { + pname = "convos"; + version = "4.23"; + + src = fetchFromGitHub rec { + owner = "Nordaaker"; + repo = pname; + rev = version; + sha256 = "0py9dvqf67vhgdlx20jzwnh313ns1d29yiiqgijydyfj2lflyz12"; + }; + + nativeBuildInputs = [ makeWrapper ] + ++ optional stdenv.isDarwin [ shortenPerlShebang ]; + + buildInputs = with perlPackages; [ + CryptEksblowfish FileHomeDir FileReadBackwards + IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall + Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginWebpack + ParseIRC TextMarkdown TimePiece UnicodeUTF8 + CpanelJSONXS EV + ]; + + checkInputs = with perlPackages; [ TestDeep TestMore ]; + + postPatch = '' + patchShebangs script/convos + ''; + + # A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in + # the sandbox, we replace the this out from a substitution expression + # + # Module::Install is a runtime dependency not covered by the tests, so we add + # a test for it. + # + preCheck = '' + substituteInPlace t/web-register-open-to-public.t \ + --replace '!127.0.0.1!' '!localhost!' + + echo "use Test::More tests => 1;require_ok('Module::Install')" \ + > t/00_nixpkgs_module_install.t + ''; + + # Convos expects to find assets in both auto/share/dist/Convos, and $MOJO_HOME + # which is set to $out + # + postInstall = '' + AUTO_SHARE_PATH=$out/${perl.libPrefix}/auto/share/dist/Convos + mkdir -p $AUTO_SHARE_PATH + cp -vR public assets $AUTO_SHARE_PATH/ + ln -s $AUTO_SHARE_PATH/public/asset $out/asset + cp -vR templates $out/templates + cp cpanfile $out/cpanfile + '' + optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/convos + '' + '' + wrapProgram $out/bin/convos --set MOJO_HOME $out + ''; + + passthru.tests = nixosTests.convos; + + meta = { + homepage = "https://convos.chat"; + description = "Convos is the simplest way to use IRC in your browser"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix index abb296d647..d6b19fc77d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix @@ -6,6 +6,7 @@ , pkg-config , dbus , openssl +, Foundation }: rustPlatform.buildRustPackage rec { @@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; - buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ]; + buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; meta = with lib; { description = "A console IRC client"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix index 9682aa3169..dc4e7f245e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix @@ -8,14 +8,20 @@ let pycrypto = python3Packages.buildPythonPackage rec { pname = "pycrypto"; - version = "2.6.1-10"; + version = "2.6.1-13.1"; src = fetchgit { url = "https://salsa.debian.org/sramacher/python-crypto.git"; rev = "debian/${version}"; - sha256 = "10rgq8bmjfpiqqa1g1p1hh7pxlxs7x0nawvk6zip0pd6x2vsr661"; + sha256 = "1mahqmlgilgk0rn5hfkhza7kscfm7agdakkb6rqnif9g0qp3s52f"; }; + postPatch = '' + for p in debian/patches/*.patch; do + patch -p1 < "$p" + done + ''; + buildInputs = [ gmp ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix new file mode 100644 index 0000000000..ea6303a3c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, fetchFromGitHub +, python3 +, wrapQtAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "maestral-qt"; + version = "1.1.0"; + disabled = python3.pkgs.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "SamSchott"; + repo = "maestral-qt"; + rev = "v${version}"; + sha256 = "0clzzwwbrynfbvawhaaa4mp2qi8smng31mmz0is166z6g67bwdl6"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + bugsnag + click + markdown2 + maestral + pyqt5 + ]; + + nativeBuildInputs = [ wrapQtAppsHook ]; + + makeWrapperArgs = [ + # Firstly, add all necessary QT variables + "\${qtWrapperArgs[@]}" + + # Add the installed directories to the python path so the daemon can find them + "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "${python3.pkgs.maestral}/lib/${python3.libPrefix}/site-packages" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "GUI front-end for maestral (an open-source Dropbox client) for Linux"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + inherit (src.meta) homepage; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/maestral/default.nix b/third_party/nixpkgs/pkgs/applications/networking/maestral/default.nix deleted file mode 100644 index fe611892ae..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/maestral/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, python3 -, withGui ? false -, wrapQtAppsHook ? null -}: - -python3.pkgs.buildPythonApplication rec { - pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.6.4"; - - disabled = python3.pkgs.pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "SamSchott"; - repo = "maestral-dropbox"; - rev = "v${version}"; - sha256 = "06psbjd205qj6vx7k7ywhclz1bs5zp43xnf275hf0k80h3b064sn"; - }; - - propagatedBuildInputs = with python3.pkgs; [ - blinker - bugsnag - click - dropbox - keyring - keyrings-alt - lockfile - pathspec - Pyro5 - requests - u-msgpack-python - watchdog - ] ++ lib.optionals stdenv.isLinux [ - sdnotify - systemd - ] ++ lib.optional withGui pyqt5; - - nativeBuildInputs = lib.optional withGui wrapQtAppsHook; - - postInstall = lib.optionalString withGui '' - makeQtWrapper $out/bin/maestral $out/bin/maestral-gui \ - --add-flags gui - ''; - - # no tests - doCheck = false; - - meta = with lib; { - description = "Open-source Dropbox client for macOS and Linux"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - inherit (src.meta) homepage; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index 5841283563..5609b48671 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -4,15 +4,13 @@ , fetchFromGitHub }: -let - rev = "ea0df7bee433fedae5716906ea56141f92b9ce53"; -in buildGoModule rec { +buildGoModule rec { pname = "aerc"; - version = "unstable-2020-02-01"; + version = "0.4.0"; src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/aerc/archive/${rev}.tar.gz"; - sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9"; + url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; + sha256 = "05qy14k9wmyhsg1hiv4njfx1zn1m9lz4d1p50kc36v7pq0n4csfk"; }; libvterm = fetchFromGitHub { @@ -22,7 +20,7 @@ in buildGoModule rec { sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6"; }; - vendorSha256 = "0rnyjjlsxsi0y23m6ckyd52562m33qr35fvdcdzy31mbfpi8kl2k"; + vendorSha256 = "1rqn36510m0yb7k4bvq2hgirr3z8a2h5xa7cq5mb84xsmhvf0g69"; overrideModAttrs = (_: { postBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix index cfaa7dcd4a..a85e4e4d04 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alpine"; - version = "2.21"; + version = "2.23"; src = fetchurl { url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz"; - sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30"; + sha256 = "0yqzm56lqgg8v66m09vqxjvpclli4pql5xj8zg7mynq0bhhn2fkr"; }; buildInputs = [ @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl-include-dir=${openssl.dev}/include/openssl" "--with-passfile=.pine-passfile" + "--with-c-client-target=slx" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 5f5e66597a..a000cad470 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -30,11 +30,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "claws-mail"; - version = "3.17.5"; + version = "3.17.6"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1gjrmdmhc7zzilrlss9yl86ybv9sra8v0qi7mkwv7d9azidx5kns"; + sha256 = "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix new file mode 100644 index 0000000000..5c93db3692 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server +, sqlite, gtk3, webkitgtk, libgdata, libmspack }: + +stdenv.mkDerivation rec { + pname = "evolution-ews"; + version = "3.36.4"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0zfq02h3r1qbxak04i49564q4s2ykvkgcyc3krjgndan9lq3kvvn"; + }; + + nativeBuildInputs = [ cmake gettext intltool pkg-config ]; + + buildInputs = [ + evolution-data-server gnome3.evolution + sqlite libgdata + gtk3 webkitgtk + libmspack + ]; + + # Building with libmspack as reccommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews + cmakeFlags = [ + "-DWITH_MSPACK=ON" + ]; + + PKG_CONFIG_EVOLUTION_SHELL_3_0_ERRORDIR = "${placeholder "out"}/share/evolution/errors"; + PKG_CONFIG_EVOLUTION_SHELL_3_0_PRIVLIBDIR = "${placeholder "out"}/lib/evolution"; + PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; + PKG_CONFIG_LIBEDATA_BOOK_1_2_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/addressbook-backends"; + PKG_CONFIG_LIBEDATA_CAL_2_0_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/calendar-backends"; + PKG_CONFIG_LIBEBACKEND_1_2_MODULEDIR = "${placeholder "out"}/lib/evolution-data-server/registry-modules"; + PKG_CONFIG_EVOLUTION_SHELL_3_0_MODULEDIR = "${placeholder "out"}/lib/evolution/modules"; + PKG_CONFIG_EVOLUTION_DATA_SERVER_1_2_PRIVDATADIR = "${placeholder "out"}/share/evolution-data-server"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "evolution-ews"; + }; + }; + + meta = with stdenv.lib; { + description = "Evolution connector for Microsoft Exchange Server protocols."; + homepage = "https://gitlab.gnome.org/GNOME/evolution-ews"; + license = "LGPL-2.1-only OR LGPL-3.0-only"; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 + maintainers = [ maintainers.dasj19 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix index 8341cc6309..5747da36b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,28 +1,49 @@ -{ stdenv, fetchurl, gettext, gtk3, pythonPackages -, gdk-pixbuf, libnotify, gst_all_1 -, libgnome-keyring3 -, wrapGAppsHook, gnome3 -# otherwise passwords are stored unencrypted -, withGnomeKeyring ? true +{ stdenv +, fetchFromGitHub +, gettext +, gtk3 +, pythonPackages +, gdk-pixbuf +, libnotify +, gst_all_1 +, libsecret +, wrapGAppsHook +, gsettings-desktop-schemas +, glib +, gobject-introspection }: -let - inherit (pythonPackages) python; -in pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mailnag"; - version = "1.3.0"; + version = "2.0.0"; - src = fetchurl { - url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz"; - sha256 = "0cp5pad6jzd5c14pddbi9ap5bi78wjhk1x2p0gbblmvmcasw309s"; + src = fetchFromGitHub { + owner = "pulb"; + repo = "mailnag"; + rev = "v${version}"; + sha256 = "0q97v9i96br22z3h6r2mz79i68ib8m8x42yxky78szfrf8j60i30"; }; + preFixup = '' + substituteInPlace $out/${pythonPackages.python.sitePackages}/Mailnag/common/dist_cfg.py \ + --replace "/usr/" $out/ + for desktop_file in $out/share/applications/*.desktop; do + substituteInPlace "$desktop_file" \ + --replace "/usr/bin" $out/bin + done + ''; buildInputs = [ - gtk3 gdk-pixbuf libnotify gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gtk3 + gdk-pixbuf + glib + libnotify + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.adwaita-icon-theme - ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; + gobject-introspection + libsecret + ]; nativeBuildInputs = [ gettext @@ -30,20 +51,17 @@ in pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - pygobject3 dbus-python pyxdg + gsettings-desktop-schemas + pygobject3 + dbus-python + pyxdg ]; - buildPhase = ""; - - installPhase = "${python}/bin/python setup.py install --prefix=$out"; - - doCheck = false; - meta = with stdenv.lib; { description = "An extensible mail notification daemon"; homepage = "https://github.com/pulb/mailnag"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix new file mode 100644 index 0000000000..3bb68d7805 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, fetchurl +, autoPatchelfHook +, alsaLib +, coreutils +, db +, dpkg +, glib +, gtk3 +, libkrb5 +, libsecret +, nss +, openssl +, udev +, xorg +}: + +stdenv.mkDerivation rec { + pname = "mailspring"; + version = "1.7.8"; + + src = fetchurl { + url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; + sha256 = "207fbf813b6da018a5b848e5dc1194b5996daab39adbd873b2cecb0565c105ce"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + alsaLib + db + glib + gtk3 + libkrb5 + libsecret + nss + xorg.libxkbfile + xorg.libXScrnSaver + xorg.libXtst + ]; + + runtimeDependencies = [ + coreutils + openssl + udev.lib + ]; + + unpackPhase = '' + dpkg -x $src . + ''; + + installPhase = '' + mkdir -p $out/{bin,lib} + cp -ar ./usr/share $out + + substituteInPlace $out/share/mailspring/resources/app.asar.unpacked/mailsync \ + --replace realpath ${coreutils}/bin/realpath \ + --replace dirname ${coreutils}/bin/dirname + + ln -s $out/share/mailspring/mailspring $out/bin/mailspring + ln -s ${openssl.out}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + ''; + + postFixup = /* sh */ '' + substituteInPlace $out/share/applications/mailspring.desktop \ + --replace /usr/bin $out/bin + ''; + + meta = with stdenv.lib; { + description = "A beautiful, fast and maintained fork of Nylas Mail by one of the original authors"; + longDescription = '' + Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. + Mailspring's sync engine runs locally, but its source is not open. + ''; + license = licenses.unfree; + maintainers = with maintainers; [ toschmidt ]; + homepage = "https://getmailspring.com"; + downloadPage = "https://github.com/Foundry376/Mailspring"; + platforms = platforms.x86_64; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index b88e70a168..ec4778cd4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.4"; + version = "1.14.6"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1hykkq3m7kqic5r7vzg45xaww7415fv5i2d03slzykqb47w5d3na"; + sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7"; }; patches = optional smimeSupport (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index a03f559af8..5a567863ab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200619"; + version = "20200626"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0dhdpd0wdk5bam0q7cvjy4f451ai0mapmyrar7r7m5dnn6lcwvfv"; + sha256 = "0r16fy02z61dbjdxc28yzj5i4f6r7aakh453gaqc8ilm1nsxhmnp"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1f14ee3ae4..3a8f6f4b80 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.9.0"; + version = "68.10.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ar/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ar/thunderbird-68.10.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7e0a07631f2130d2876e020f7f28817cbca343e0666abd156d8f5c48a7f4bb0f4775f6366deeffdcd0676172e3b75c48c02635d018a5f1050f635f334834908d"; + sha512 = "2f49abd71f7542042ef2823cd420e225bb1015684dc258fd7e8eb1104ac9865957b0e6c975043e3611d4d884c085ad670ce21af8c8cab1da80f08aa302078059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ast/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ast/thunderbird-68.10.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "47ef45548aeb20dc8dbd4f35bf12913b642986cf6071f060611696da99da30a2b10c9c8aaff8974f4fc02403026146b516e84f8f2244932f290202ef2aa59853"; + sha512 = "91043afae8c2f31f6d2aa5b7f6c7f874150c7f8ef0ef7401132b12822bbdde8c7d7f24022f3f5d0cec262100a2b8791f440a55f0ed00c30acb9429290aa290f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/be/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/be/thunderbird-68.10.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c704c3e4be866d70c098b07bacdd4a1020ec109e92eb85c9c04d20d90db668a36bfef711acbe8bacb897543e3b8d499d35e54875bbe10fb3fc5436f8759828c3"; + sha512 = "6167bd7fe2d980af40a0d5594e67dfc262bb7ab5fb76ea07c919136d967505e84b4d27448d883a31323db7aafd33b4222cff63d27d10ec914354ba4264736459"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/bg/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/bg/thunderbird-68.10.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ac31e7ceb3042c2f2ac4c833687a9a44b6ec593b2d50da2edf9f11fa9bba378dea192cd472470cb7cdb2a0b708b84de688f2988f6161447cf00e5a13fe6cdd9f"; + sha512 = "885c5ee186933eac265ed530f9b8b3cabc934e1ff4efc50b10381f8e53ddc39fe385e21e22041d93ef987e031ec41c2b98e898bcceacec004542bcaa35d0ccca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/br/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/br/thunderbird-68.10.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1c3342c2cca3061d07be17f57d967b1e9e478f5ff91cac1df1dbc901e102e2fbeb68375af20ccc0b6922364c62fcc44a6d7715aee43fef0b2165ac091427708c"; + sha512 = "e5c31ab8b32f9f0bd72a03207d4c9a2ca75d0c5f28e497456850bf92f75020784258725942079e52f6b38c0740e7d2ec80ef24bd88aca9fe35e9386f65cf7c1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ca/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ca/thunderbird-68.10.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2a0bca4b9fe58bb7872265384151ae7d2ed87122a9372ffd52752a11bec29b24a8d28f0e3102c0d6f84e545ccc6004fdace3bba7d68de206a3be5c72962c1a9e"; + sha512 = "2d727f09dd202291cbb908c2e7805ecc7ec29302bb2481b63a5df1f43c29c39d1ae26bcf3b5dea550619391a96982d3d2bb831548a9a2331e986345c64b4b6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cak/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cak/thunderbird-68.10.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ef27a17f5a44072596b753cd110ed4d24d7355649ddfae988a2d6622871421088d1502866226fc1f18bf8233478b5c00e98f10cf3f920ad6b4a7bad9c5e9cae2"; + sha512 = "1e74db72b4bc0ca3db90b9ae678dea551293dd54eb5cc5e5c124c51e61ef0d4cb074769bf807ba2d680db10f6086bb3bbcf5d082e815bff10fb8c6ae14c5a72a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cs/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cs/thunderbird-68.10.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1a68ecf3ae228078c67b296a1642578d8e5a7808707e8a7eab4cbe8191a6b19057fca8e3c4faa660d6a64732ca3a052579fa652bbe5bb30a85d577f7b702e55e"; + sha512 = "9c89e7328879f82cec0e2c5f7efb2711242cb3f36a4ccf6a014c6ed589f0e02748c997ea98909d546ca33478022bc9143987710945eed1e191517d1348f8a064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cy/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cy/thunderbird-68.10.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "4d3cc4a57f3e210129ba47c2fc0798d852e4369a62dfefaf3b9a8fc77939431a7cc5839c667a062231ccf49e6eeedfc60c5492fdbf5eec080233b851203305f4"; + sha512 = "46e234560ac4a9e7c5b54816bde0f22f2677b6ea117ce5c528260222e940b5e47b12d8b08b24d2ee9bcfc4dd72168faa036207c88f5bc573051fd7eea2281fd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/da/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/da/thunderbird-68.10.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "79e655f62bc95b65640e3556d2690725ff012a16b2cbe656223a118294915c5619563fbdef9b88fd5db3f982cea5e8ad85a9bc389776ea95ab155539d6a4c217"; + sha512 = "8ef4fb0210a21df0be22e1866859ac316890cc90e6b157e0cad2725d59360b06db068aa000627ffa750c05cdc8314cb564c32476dcea3975bb63f66b20873059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/de/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/de/thunderbird-68.10.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "cad5d0c08e07f6d1247cae9737d0747875b9b35036892093230423d92530fe2de2975174dfd6ec0d2e2d7ddf86027601d37d3fce14343ad4cb89be5d68052785"; + sha512 = "b3c7673728c8af318c0c8e0c3af8e1b7ba457bfd2c5a67bf3df4df6c3c990970d45e1a0884c03aa0a3d973efb12983afea40de55c8831d2b254acfb742c71478"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/dsb/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/dsb/thunderbird-68.10.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "15ca27de99125e4be3f6cf79ebe5e897efea14ea469040ab39ef2e0ab4a6ce61bb22f9afe95a670fcf9e1cf077512b8214226946e4f4a02e7bb04d136390bf6e"; + sha512 = "adeba633f288fff864e7247e36b4d7f49046a3901de0e4f93f12ada6fef275578b494441d01e820400045d5f7d64048684554934be678d1b7259910a162a4ed8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/el/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/el/thunderbird-68.10.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8fdda97681d04d9247d8030535d15888d24f3462ee8d91ac86ae9b0489ca4a2c759bbbcb151548786febed90de2ff4bf6e77fa55b8bc2b1cd4c8faef374fcc45"; + sha512 = "6ed60a3cb194de3e2bcffbdf1d0c89460b2c2416878f348c913aaaff911f43e9a624a8de87d46df366c8bd608c47f6a6de8b90fec9c0c82e38afe860ca760f65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/en-GB/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-GB/thunderbird-68.10.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "51ccb86fc17862c9264823568fb2453318a8b6625f1d51eecaa150358a9efe4a15126c1a132bc57834645ba3d5799f75dd48e7cacc6305970698bdcad85c0bfd"; + sha512 = "a09f578de9b8f23c9b24123092abecedc70e5b48c9c15089505ca049258621f14d8a4f02c8154f7d2c729ed002814af17e08bf211708fc59e5345c92cb259fa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/en-US/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-US/thunderbird-68.10.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ed6caacf356c6487a489e983275a2c3d00eac3b2282445667a1f26ac9ce217afb8261a929ccc9aa2bdf7a89101a86faee2ef87c16f0677ecf5abcc727397275f"; + sha512 = "3f7d4c844185b0be0ee3354130112ecc034f06cc2335681998e210b79537df7365f251b005387f319b0a2d2dd6a6337fd6287a007fd54ac03c39315c42893dfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/es-AR/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/es-AR/thunderbird-68.10.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b8e75f5579740c8d0ae7ef30afb133b827c2e217bf9b0acdc8f117b6ffbd6c2674ff8670db87ede6db3c842af8d6f820bfa4370c0d611b7e74e99e8ad67a31b8"; + sha512 = "a028429230c625b0dcb9e200b2e21c6d4db8e96a93313881701b5965dc25db31a0992d4d6da6072a6ed73eb5891d15ac71f19f343172796db82d6e98355baa75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/es-ES/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/es-ES/thunderbird-68.10.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e51df8034b18c8dc0d7fa024c3e58317a614f4da4d286c837efac3d21c59d1e58a786cc2ae0afae8730f81e96a4f0263e4fa09b552df3b58f915fd0cad133c62"; + sha512 = "58afe4eb60993bae1271fa03a45ce13611a1d83e4defc1f237ed47b243785881c8309f5fa8a5257fa5b343e2dec7595c8ba6143faa63f49749453ad229ee8102"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/et/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/et/thunderbird-68.10.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "a81e2bf12df9ba23b8d330599eb9d32d25cb862d3cbd109183c0164ccfd2036bd327aaba36248e85f738d02d15d59f9fcaa837101b154834b53b04d2925ad666"; + sha512 = "402c33c3fd7194a3f5c0d6afb81f639fd4a0cfebdaa61043858938fb5b2690844ec2fabfe9f73d41f45c26d56adcb121234fb1baa76b2455c87863dd79cf065d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/eu/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/eu/thunderbird-68.10.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "98a3b4e765683a9fdb9f1b128354ddc8f81ffb7bcdfb3ecc04431e84862d65184f220cddf86ba2a3442f87c27ea990a2868ebf68dce7328857718f9e02ecd474"; + sha512 = "ace87496370c17b663971365da8c1f88000b76247aba2a6fd5d29a31b5d4b02bf9b56e101c477d48553ca56416e73209aff7f729ea2b8c044e33b9307009321f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fi/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fi/thunderbird-68.10.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "75d0523e83f9f95fdef45fb8b6de632eedb8b274225ac5c6d6d460cc7c129f7e34f735262cbc44e8f99957358e33eb8c8e2ce0cdbbd59d237dde468991139e6f"; + sha512 = "775c937de9d9ed49ec70850a1d8ccbe22c964e12a932c52d3dc360425643f2be5487857caa811556e341d94bc62ed9b8dba5e94039c2cff6de50bdf16e364c89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fr/thunderbird-68.10.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c7b070e1b5dbb682e6dd119436512c5e2200105294f1c4e84c88fc8326f342196da1abaf8b7b4882397cf797070a524c19b640fc41d532885b9ce867de46d055"; + sha512 = "1ac4d3e23f71bedf77a8d2dd4fe8d02fbd1083977a8892d2c6db394a9d345bcff73a916f34a078ddd0850e8ac1bb0486aec06d6e36875eafcac0dab08bdedde1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fy-NL/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fy-NL/thunderbird-68.10.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "bd93c4d482231c0c5444b653c045f4951d73c0c4c1ef9126757c41b30280f0009fddec38d8532af2c2e379a26128fe3b5e8db2857709fd2ed226d2fa73f0d88b"; + sha512 = "b62676e5302cc265a6ee65de7a31585bade7bfd51395bd56257f733fc9a6f4c391e5318aad3b48441464e5d8bcbe3606cca1edcd6fca6517b205814b9e39b635"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ga-IE/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ga-IE/thunderbird-68.10.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "f6da6b1635d44f217b1ffe9e446d4ce8fbc82ecd5fa8a0421abdf83a0bdaf46db35343a5345b009fdf09a8237475b393d2cf0cd3f52fa16cd2cca63b792a546b"; + sha512 = "81ba90087282fdfcd15a534e9065fdd94a859dedd6a85dc9da94de4af698eef6b31a19d3a007eaa27e08944682c9f6108a0d0991f1e394451da881018e5cc70c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/gd/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/gd/thunderbird-68.10.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d6e4c7e51432c4bc81a9470615349624f2d8eea0d6092e53afb833a2cb4a9e770ea4c373fbef424e9139a1668cb695841fe2cf8c752befb650d0e72185693c5c"; + sha512 = "1db39cc3ea8990ec8d9ff214d554bf95a6f2699e3f1bf625180b7f84ebc3284e1eec8e2cfdcf87b3a31b466ef2f84dd0a56d771078f4cb06962a28531ee085d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/gl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/gl/thunderbird-68.10.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "763f2dc852ac4ecc4accd7140ea9c1945bc343342a01efe8b09470cc41f76fad4f61ec25c9456b10a16f9db528fc6aed802d949252b12e0d73c89c299ee813be"; + sha512 = "dbaa3cd2341d8ad4834b9db4982b731fbcb1125398cc4a7ce6a9cbc44db7218a165392781e144b68618781ed8d26216f11e1bf172ce4ba9b18515cce0feb9bf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/he/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/he/thunderbird-68.10.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "82d66c85f843978d9b2e3e0353e831c7779a16cc3a977f225ef93c92cd8eb8ac98afd255e40b1da0c21a356a7f290027b7f2c1c2ecce656524f21d3f8d962a4d"; + sha512 = "547795f844b60b347a10abc8e609f7d311b63ae4cf76b2b0cb0b0605f597ec0e1c7ec3347042161a4b15201f816f99c391851004de9a957754aca6f50a055d7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hr/thunderbird-68.10.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "7c013aff2eb1d4d2330df3ec81dd4e6bc99f4ec9b620fd13cc487a02825669f7fbab84d8f9a2cb76cc34290dc301522505352b0985f75b7f26133cc0987d30e3"; + sha512 = "6c72a46406396578c329b1ba1c47a46c124f22fb5c47eb1f16af7672e4269bb84f62ac4c1d9b61a5e8e46eaa4c91e5169b59e9908ad61606b243ed21ce31d859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hsb/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hsb/thunderbird-68.10.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "707059d39c02b2c95f18817757a4ab5fcdef4eba63645c93a8e1cdb37dd013633aaa7b67628d357e8c530a7d9394448d61fde9fae32befdb351502c27db3cd93"; + sha512 = "e06eeaceffa7b39810faf42640f22b8edef8ad501530f1602a7b13265f5a9b34a1d9304a19a514e3beff2b3c7e8ba92c72aaae6b34cede15e6fa59125344c026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hu/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hu/thunderbird-68.10.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "238047229050a38375a05d9d16514c88c5312d56857b179d7818be4421e3fb6450558f378c18035707d2abbbbb878656f1aeff461fb9f6b0f7a1b9e7e9863b96"; + sha512 = "9ab3e1b47a3120b74adb1f0f0ec657443578203f4c7f7e00804ef61bfeb2c7cd36721256943e8c86e0a62f90c1576e16a9051b33dc9a0006cb7fcf55bc90fc0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hy-AM/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hy-AM/thunderbird-68.10.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "871c444b878cdc2c63d96d389ff0ece2773862e825bf00bb4534475130f4b0b684dcad1002bc1d183f6c81b730bb3af1098d29b81dd7d07a5321e01fff3c39c6"; + sha512 = "614da904a59666d5e67852296eb22ea0ee0d137764ba9fc4f60edee2f547b91659147d14849ca83927671e94b32847f748f97df4bcd93569d46f3cfb0f8f372d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/id/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/id/thunderbird-68.10.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "518ce09cb9cedf086549873f6cc868235afa24fd04be3e2af00d92dcce8c1f08c7855c7af9c4cc21d2329187f2a28ddcbcdd46fb5a7f26f2993261e0f2cf7afc"; + sha512 = "13e01f8fe23f10d24b4399da8540c2afdeb762b1068f10984945c0920882b67bdef48f0f26180786a8d944ca1ea601e3c51bbf6f0cb64697fca0c0b0acb08b84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/is/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/is/thunderbird-68.10.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "855c8d301067538bdd1494fb9a6b57e0182e94deab34a9aadc65dbe6a5829023145d88d4233f10702947fbbc7361812fea94b6a1352f687bc006988618781816"; + sha512 = "176492bbf4ac3b2bb4367848f1283c7dbb805b5bfe6c71cab6c8893578f1d0ca1b9edcbc1e736748d04f2d0ca78f4d6edb21671b78379e26d41d9c43e8727075"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/it/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/it/thunderbird-68.10.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d447dcae327ceab2edc4302235d9055d1b11ff0407dc3a05cb1f16f8a53c6bd71dbaf5c33766f5c343ec357cbf8a8702c637c0748f658aa2083d244de9fff968"; + sha512 = "41d10acbb84fde6556530253ecb5926ba4b5d81a38349a00281a7273669cf37245640f789dae7363c4e1a0224127885fae3dac701926dab6e4512df723d39548"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ja/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ja/thunderbird-68.10.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1ad5d5c0c7cb04fe7f471ea85557f8c4aac62eb9b7276b53fcc3111d3e37a7eed56e2e4521c1e978acc32c973618d84c05792b4100fbf9175d2a5db0c74eac1c"; + sha512 = "8124ccd221818d37d6d22f204baaf34bd87e7907c50ab380a3a1bf252432b41caa71dc3ba2b575903bfd255f16b702cc89d91903f494437547a7b8fa16469cbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ka/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ka/thunderbird-68.10.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "0d0f376c9a13165978e1b5d77e6b098f17ec552baa9e8e64d32b5d33c5b2d52f78c6e45ff92901f6c94cf9efc1d0349025c3dd7baff9693c9e5ce9f62e0a7c4f"; + sha512 = "464a9e0aebda0fa6412665e4cf2d6f590d44636bc395f8a03f96ffa7e8f5423e51499bd801f9ffb65c0c931960b761d00df3ac8f391b2157ab411ad49c7054b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/kab/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/kab/thunderbird-68.10.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "76927cd9f2630d8aa4b501a8ff49ebdabeaf75ecf5dc166aaccc254d38493a94df7dc6d432bb68511b78b5e31b483859503bf846b4c2e7fee2ea4d40e4506db9"; + sha512 = "d99305c424e0475ed2c1890e2c5cc96d1e4925d329948c33ac0183e3affadd960266e76e380c4fbc017e24538428439888d96f49d73468f9f6162dcb51a358f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/kk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/kk/thunderbird-68.10.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1a0d0a328341a7efffb6fa5ebb7bdced15f8202d37520b1e2972a3f82f37053669d52e0a8a815a8a9f2cb439227fba2c6f25a5967f459b1d2d7140e16315cac1"; + sha512 = "9398172a5d2f902256b2b36df5f936a39e5f2d253ee4ee566109f67a49f2e2bd4239b92802475b459d79acb5af7e4839f6f5f0a5db1c7da10fa35873c470003d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ko/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ko/thunderbird-68.10.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d4b654cfc6f0f8be641d844a52eb332c2218b419c7a699852ad693b90958d185ef29c2c1bba5b7b9e397e05fe1572b80b0f0df01e83b65edede368e0c6ad9ead"; + sha512 = "80e7f9929a197ea4b431376f168fcfaf42718b1744bbf0bddf8672346ff08e65c35af5816a21effaac6794d9e55009885037007e87a05571e1d7eaaf7c86f30c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/lt/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/lt/thunderbird-68.10.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "fdedc91f7bffbc4f464682f3a020ab161592015fe5c50180899eecf951e9f775cf5ef3cc6b5baf7faa58221f00e19fe99074f60d292ca258cf44dad2db0d0d69"; + sha512 = "74ca7346f87b078cb9f598e79278ee39498b09370be5517a3893dc4bc2d5efe81f9b9076b27891be0c8d170802a02ac67dabeffa022fe222e95b73455b40ff34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ms/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ms/thunderbird-68.10.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1ecb61c99626dfbc8386364b747e94de7080facd6434813c8afeca60373d3cf07d2259ba90ed6de01c68a65e8b8408e58647d4e72b62f150f82da4a81e78f861"; + sha512 = "90c71d0b3f598c21026441dd5b34efca7276f34153ffacd327f09d2c78296c9dbc2ae9eb8e1f7635b8e3cafed15f07cc3c19254405de2e6c9e1fd4300b844876"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nb-NO/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nb-NO/thunderbird-68.10.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "45ec1f8def3d2b57e29a3fd22bc38f08a9c7b1ebf44e6dfb736ee13d09cb1bcfcd632c2f8594e3c531d35aa7b696d45ffa1bf5c4cad7e1304fa92763f923df43"; + sha512 = "08da0c8a887c820d246559bb7c1394282a68f2971ba2f2943084ebf3cafdd2580477ef5a9ca06c1e5aac353287276aa88aab8346beb95addfa95d5014cd4974a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nl/thunderbird-68.10.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "20dd4c7e946e0fca871fddc3481f2f44b72939de3a7f5064ab8f062981ea717d47f2a3c09af32c9913556e2f5fc01fe1dd78c2d35b5fd44a7f35cdef1e4252d7"; + sha512 = "f846e221c2bf3cebd93961e6af10c24215b698cb8318c6446224f5de5b533e887e76818b6b902adc839a3f7c5ec24e9b13aae63b5d601d6716643f64aa29b7da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nn-NO/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nn-NO/thunderbird-68.10.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c366bdbd0cda3143c7684c1cfd948965c2b80bd5076878cf3e98b9b5fb82baa6df419445ab0da134209a969baa0e36d759297bfda701d2ea4cd8c6720b61f123"; + sha512 = "c33a600e2d64c94cdda74f2a94fc54f05133cc543c795dee70909b00b92eb5a48b183600f328f45fc8c9bdabb59f455a4875e68e6e62ce4f6309cfc0aed24fc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pl/thunderbird-68.10.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "163130f55ed9e0cbc68b48c41541748aa320d7a8fdb954c38fc25ca7e2dac6fea98b30b2653b6e8b31230ebd8364ca12281551e00375e4dd64b87515f08e6bec"; + sha512 = "555b0fb0c4117521f020f7d9846b19dd18ccbec585cd89282384e0a311dd5bbedab84101bd55064c7ae20ecd811c70f31948da26befcb12abe0937ed2736b9b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pt-BR/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pt-BR/thunderbird-68.10.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "5e362e0c53f898d1d156c53415469fe965162047bf5ab55798ece681a33322d677a874b80f9f934067a847da9f2c45a62d63753b866e368585ac5f0844e410df"; + sha512 = "a51b74e5d9394ee2ebc26149e1e01766b9c4cde5815fcd915bbc5307095a851e6242fb007c8e93027ea0a77b3074679041c65a1996528435f30f7f17b06959a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pt-PT/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pt-PT/thunderbird-68.10.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b322096fd6fb0778fc26146b69fa9a63f249e927de6d2ae3fd6093e3e24b4825ed29a1d09cb68de274aebeb06effdec78e6445fa5282dd6a733b2181ead21248"; + sha512 = "4912989c47a3c021a28ed56629e308d2326a07ec99dc00b624889a10013f36445fbfe11a8cdde7ff4f69c965b0d2221c61c246933cc313df9f63ae3ec65db891"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/rm/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/rm/thunderbird-68.10.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "715075dabca54e27001f68b11e6c3c99fc5e20f1fcba637e7613584d84a97520e06fd73761bc6c780ae8abbec3121504fb1b51b615a35c0d8660381d71f94eb0"; + sha512 = "70298a29589b928748d32adcf83b12c006d23cd3a171af1eb790eaa34eae4b1a8e97056fc71f9a795a9b9e07f5d8e2a9f4ffc475eaa4b06b9390976fd6359668"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ro/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ro/thunderbird-68.10.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "fc279090426b3baef609f23228ac11d4665fd805d6118a4ecc2bfd1dd7b36d37004033db4be1095275c677a092026a083199e699b553c6eb82192db0190d844d"; + sha512 = "7c36cefeec21820b90a8acc09856aaedf4cf94215cae71daa8142a1d166de79dd0114495b92d954f978d1be88c06ad5fa269fb33ae0b307ca05f3d7ae90844d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ru/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ru/thunderbird-68.10.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8c575c2749cd719878ffba2c8158597222d1d494f2c3749c6b5253a8d75607f42a45799a288f85042d8390225f74ac55d7497abc76a8fc870f89f8f7b7a3c699"; + sha512 = "b7dbd077b0271818ba33d8651fc60e371f9a89771020113ce2a0785c2d228b90d219fcf944e6ee2645fd683fbc1d597529382c4b808ee4cf81f7123e1de9d583"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/si/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/si/thunderbird-68.10.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b2edb098eea69332528f24a352e2cd318161ab3383cf13f878c7fdbca14f923f74a769fd494b435d0ef2fd760d4b7cfead063c91112fd44dfd3d4a47d4597549"; + sha512 = "b9217a815c7f042bb33e0ea2ef9129e8ef1c825af315d0cddb6c0760bc87f1b8932b6f7cca747d50a29a55ac66a21d8113febc360e5f963566399a38e3b5a2a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sk/thunderbird-68.10.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2dde57c16b15b823a698f7c17d98eadd5528ea29cbc50d22a586c3ad7357289f2c4719edf8ba47c59c3419383c64b8ff948582a58356719990340f5db0be84c9"; + sha512 = "494ffad5906f35f9b3141fb06f6900e0d82553c16c8f3d99b50d6718643cac21fbd6a205af146df54125c009f190285281b09bb42996505a2fc120dd85bde882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sl/thunderbird-68.10.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "0014d8985ee139ec3ffae5ff18bcb8ac6f0921930853bab3ddcdcd6d21b9453aaa0af058068770dacb04bd1521b555945f9bfa7d9f47ba4a2adfd667fb067d78"; + sha512 = "d34836dbf915e4d5157a1f8760dae8d8659ceda2ceb594d737da7384139f245915f01a0b025585c117762f2d3261dffdf1c7efa5c2e1f920fe5a350d85406015"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sq/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sq/thunderbird-68.10.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "5aa41dfc73adbad839452077b436ff302d0e611fb342998a7f6bffe98fd634d7995a30f49f8640645052b9f68c149c71a6bcdf0fd2df7e3c67783bca3c4ef511"; + sha512 = "909aa9e820cb984459deae17b80488db09718eb428e32a35ecb1723fa3c8d7ed974f6cb17a07db8e642cdb51b885291a3fca518542372fe2c2b3360553b3527b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sr/thunderbird-68.10.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "266d0030c7d018dd68d5cd8496eeba061453e1d5a37e99c1645aa9c677492d0da397b2a9e70aed5d927c2e955449ff5b75efbad74d60fea4bb4ef90c36d765ec"; + sha512 = "aa39d12ff81a371722609a4ec401021512f651c4f592159f8ef9bcfcb641b55a8f6ccea970b4d8375cb326e0cfd5fa18097ee3131e7546c53b1e29d14058622f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sv-SE/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sv-SE/thunderbird-68.10.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "6ce755bf48a29522e1f0805d6fb37bdbf145f75a4b6fa176c06562bd1b6b272d752a3d638ab66bf66dd6dc67fd817d76e70cc31fdf9b201f56c6bacd058e49df"; + sha512 = "3f373131df39c343579ddd851e8c5eef3147650a5c75a5fc3ce84c2e1a694494cd6e3ab12b3cf86018880384f02ca38a54fcca8cc04f3074699fb89c4ded78e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/tr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/tr/thunderbird-68.10.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "302b03ab2e23f6c0cac0fff85cfeacfcebabea838fef824b7d1733054fd9a3cb766dcff1dad333b199ea876a16ab7a059fe4e01289aef4ed481126c27011b4c6"; + sha512 = "2c91ad17ddad9db19ff2eb47ff7a10253febd30faee710301dcb96ed0472f81153de5d7d906b3dc706d39ff058eefcdb9210ac274469fcc02a39cdbb99a126f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/uk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/uk/thunderbird-68.10.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b3d59d62dd3d3e6e9ce8be3c4c746c41a0a0962d1327d1187b0b2034d0c1691970d181405cc7ab7e2f1fcafec6caaa26863020f5edae4479e453718619b7d02e"; + sha512 = "d98a132e14a5921b6a75a8fe7cf3c1aaf22e83c4c8252dcbd5aa0434b98a7d9d88711b68cc470e6007027e6e588cf9ea00dd78a2d97b48b975adef1cd059e79d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/uz/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/uz/thunderbird-68.10.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "73d36534f000d00a52988825c0145288d8d1eb944065d11231501f6e2906e97b0beb89d59b796d3f2828054ed9393e8f65866cfcaed6eb7f939cf657b6f3d740"; + sha512 = "dac94504203e7862608333f1f84134d7afe0e1f534eec9b91ec48a850e0143b625f4be311c2e6e716a16c941d3c2f5dd2101abfae205c802749ca95428b7e754"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/vi/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/vi/thunderbird-68.10.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b3ec66f92f5d023933e8dae18f0827f0fc8c5880890f9986b339f06b4e565cbe228bc2b0843924bd2a524a77ded7667e63c2747d2ff6c3789d57c8a68e440714"; + sha512 = "684626eb432e89e85b9d3270198ee20470e675ea7294222755b5b588db7e318c20fd8d2fc9a0c95374e8ed53e792ab0e24e826709aa619fbab059a77e6341213"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/zh-CN/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/zh-CN/thunderbird-68.10.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e61e72c3dcd376d74e732d76c5a49203b47e2ea31c86bcdcaad673583795f5c01549fa2c5526205857e565f2a72b8abf8b2aa4e7ede45a94b218428607662a1e"; + sha512 = "8a25fd27a555b18bc41ae31f024e80adc1b06de064bf2391c1db5510869af8c145780a01a26f6cb465d2c6b53f4ceeb924657eefeb95f7ae2ac584ddfc4a56d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/zh-TW/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/zh-TW/thunderbird-68.10.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f47bfe43ec5b570863ed1fc81828a23beb250db24fb77d2df2dfb5ec60a9c750f188cbda1a0f2927688865219f6a36695d87e4a8eb1fd642c4c9650dcf2e9063"; + sha512 = "8f202b1a79ae831bf5a28356a06213586bb2c0f4410516a8121c73a8902d0ce7e54f8e6fd7d2c74b300c9692eb3ad4a9b9290cc93ce3205f73842d93a46cb77c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ar/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ar/thunderbird-68.10.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "83a77d9f39196a8a3ec72469c038c835fb6b50872a2dd611519b178f5e46ef40293bfbdd908b3ce236681205b9b3ed133c845e357abb70285f9920401ad90cd2"; + sha512 = "868f092cc144611611133f50be9317161cb34ba2d0012d238789f2d1124b547c52d2aa02d4daa090322e327a4652808cc882835195f02bbea8e67818d22ca8da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ast/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ast/thunderbird-68.10.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "83084855cf03e66968d20d2caca749a9ff9d47b0cfdecdcedf0320b4bc7e628ff5f3a971ae1f6472c5a44facfcaee419250f55ebb254bff9f344c64772f54791"; + sha512 = "bb077167ec58446aaaaaa7439e04332946d62cc6a35ff00bdda20a03eccf80b09bce70524c3b3351fe0b821dda0762cd666c66b00314751301a67d635c2d37e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/be/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/be/thunderbird-68.10.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "722bcaa29137994e36f70a438fddb5be55355cd85d414fcf70cb8bbaf66a9ab0fc21408cf282272dbe977f46b5aa63575c7504bef8292adbd8d4c6e308655411"; + sha512 = "a8ec19464c57509ccea6f83305d441aa9c61ddf0bfe2af172df24f67d7abaf2e568eeabfdfea9e0a843d42ff9c6d2610b1e1e5c060ccb50bce4045b47586f204"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/bg/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/bg/thunderbird-68.10.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "95464ffd5256fb181599ad795fbfe5d9cfe8ef0c02a7830174ee4732761cd94a2cca75b6a686559e07d996640f5e973a660fc857f0839d6bea5594e61f2f7e4e"; + sha512 = "9c8ef811f0bf04066f3c55e4b02107450d88a1774417ee503027423917bdf16ab9b102eb0f7f4c777ee60039998f8391164f1719bb8abc4d79774664041fa6c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/br/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/br/thunderbird-68.10.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "fe09bb21248975aa60ffd74a970c9dcfbef578c1188bc1c3704c7411c2e94f88976ac7ac5e52a69ac6235723332f2fc76757ef9118092833fe64bf0a05e3ecf3"; + sha512 = "e94fa2e49fca5bd6e6f1139adb86604482deeb1160cc8fe348a1cfab2bb19c8ba694ca5743ed6e5da81c9789521e8b6018db4ecc68ec91c8a277916c6a553521"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ca/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ca/thunderbird-68.10.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "01ac3c0090448f1ffc7c97623df8576a7a3c184a2bc1a2761f0e3451a18dee6d4f6bc37b305dcaea89930a1750a9541116bdf03f613b333ddc47d5f257b3bfc0"; + sha512 = "4dc73850268e885b9791b29573f35704d730e9a9ac833265f47413eadb2e3d359b8b56405ebfa58816b8b2ba390077c14f17a769fec94870652147d2a2915243"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cak/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cak/thunderbird-68.10.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "27dad086126a268f2c6700a5f01006c40e911ecbc95dc994da7cd2dadc3f2bd3bc94d5da15a297b2e72e8b20254d40c757456c308b70bae2c1d451ec6ad7d1d8"; + sha512 = "569d8b373efc412180cf01ad9333a1b2f05687f3b8cfc4286c81c9309681d390d9ccc2767248e36db7931e2b941dce6ca209a00e7ba5dbebea6d40c710dc2cdd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cs/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cs/thunderbird-68.10.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b99dc13bf43a9aebd08f13fb113186e6e4a72c68d609895afc8a52c4909a0506f646ba394c705004272d1b91db4efc81a5518bbd06e359a8a24c85f4fbb30102"; + sha512 = "e87eebe5c3486b02f46784209019b5f5dbfbeb36be8914604416c194bfebda2827861172019ca33bf754bc86ad91327ce5e29ecabcc77390d84be80c2f682e29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cy/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cy/thunderbird-68.10.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "36c1557a9955e461128929b7be0f679a02592b65e4b401b052ecf1f467a231ba725c92eb96b8118bb75d49ae45f8287bb5fbeb22d94ba11dcf311cdb87170ee0"; + sha512 = "e97bde29c976e200f418b2ec150969459e4e17872184dfef548b08e16286f948259d2fc84d0d07965a5dedae8d5e3268c3a6ac0794cb0c3a739ffc86b2a6f748"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/da/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/da/thunderbird-68.10.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e81b41e38b322f2eddfd68c07f326ec9d716bdbdf31c3a02d22d9377002fd21b58a68a8ac952fed2ed164a02f8b20e9f6678c52fbaca741a4bcde1079ecbe38a"; + sha512 = "7bfbeb6e8bb427e7e3aee31e897d025e338a4c4da59eb2700b52dd08cd53efaf6dfe1d33e456572c0203fe6927bc069ff297288cc47dec2ef9835e047a5d2938"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/de/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/de/thunderbird-68.10.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "da6a44a2a6545b10bbe12644e433932c4410471f5948278b919baca1c6eb0181366114c1a6f611b897c71bf4091a6734393fd36f997c118f49466faa8dd2264d"; + sha512 = "15da351e919e0b931dfe48f77b9eeeaec40e94c973de507560c62a86e2b106f7d4afa7602186829fad2984f9964ad23792ca88bd5b94976972bc103f0560ee4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/dsb/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/dsb/thunderbird-68.10.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6d19a0010553d1b08bc47a22c0c7f23bf4c86ca79ef3ca26c970cd502e6db003ccf045488f88d68a5b1b0ece4436de55d65592b314126b9b5792be30c9def553"; + sha512 = "1b8c1b12b8d7979a0ce45db282bc2a3b933bda3711c07097533a8a04b38edae3f0bd00298cbd485954ab09fa57b10aca5238e8a7bf4e23ea80ebed2dba1d73e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/el/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/el/thunderbird-68.10.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "67e6382474356c4ff25e6f49a7ee3859eba5bb29a4e795668e1ec52131dbaf0d87b9cfb8ffe1fa855bf8f34e841b8fac90c356545f47a711b533e3593219e957"; + sha512 = "67c5dad2a95ff1b8b3ab2ebcb0c1c4af87c5325e22d43c24f4f1c0df9ac328b43b0b25247408c8c95cb5f98b9396a1714b0cb39cd2e43ecd04b28f8bd1dc43ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/en-GB/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-GB/thunderbird-68.10.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "f4e1d9b10ffc96aa7ef4202e73445d98a06082abcb87fb60d951ce491ead7cee4bad5c1009270004540d03aaf383eb5b8203845f84335b523d92bb586ed5932c"; + sha512 = "c9feebac54a357470523029377699fc9c0bca08e4705374dd1b8756cc8461237426cded2d9ee994b7ee529c60d50a555e4e1c2d9ec71ceccb7fccc651e35058c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/en-US/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-US/thunderbird-68.10.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a8fcf918c869e8064c2dd39a03bb768616b1a5e4e1c6121aa544d72626bfb790625e2cc48dc973443b947c6e619f9481cb20239d544b10bdf287b7fa4e05128c"; + sha512 = "9280a58b42f93b38f4c9ab26b8b6c2956ccb135ae959c61799cd3ce3b3419c9642f86418ac53e9c4f69e0430508c0619db4cf856a28d233a8d319e262755f4a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/es-AR/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/es-AR/thunderbird-68.10.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6b98ed36080e8eba879e305aa34ccc77e1735700d104f592095cf9810545bdf25665dd36a527e19cf12ec4cf782a6387e30f7b4406b76230c08a350f4cfd5fcc"; + sha512 = "9c17d648a2ed9c2b6dc7d403436dc9aad91e10e63579e26e4dafe3d5b3a15633167c87b67924026882a03f1aab05673566a0c5f0d84efb656b6b3d7d4b812e5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/es-ES/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/es-ES/thunderbird-68.10.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0cf479d98ce943e20871e7073188db3c9162dec8cf2b0abaedbaabfac9b29411dad39fdf44c038680956c42f7f7e303d5e2bf8d7ef9225fa093821ce760e9974"; + sha512 = "d22ba4fbd7e8d22f70950b61354b99ffa6bb1c298504f8f05297cbc20f0c89a9d657c74ab367480906cbc4b699df6c603d6f6b936ccdb4213e178f3eb153a314"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/et/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/et/thunderbird-68.10.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "51584ee5c76710a9b805d4da528d5463f1e51e3efa6ca3b9cf3fc6bb6b953cac6b7919f908975905f619d9be75e4b9ea32980bd5f198f77dae0f75795465fc23"; + sha512 = "107fa0cd997edeba0a88d365c52fe48ea0d355ca8bf8723f5bf2ad4a930711e8fcdad27b457d309a5d4dfc0f29f6988f2b04f153b83384484ed397261c07db7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/eu/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/eu/thunderbird-68.10.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bbcbd4a91856ebb9418c00feed41f00c93ffc5eed4af7c1c27585c707aa8dbfe4e48b0204cbb236a8205a219f0044811dc43f4cc94b6610f30d38120e3ab4b21"; + sha512 = "ba50b4fed2d682f1c46699f72d86b219a1bb398b1b2180cdfd246bf4eaffd61e34e24222bcd82ebcc68b9cfa9f98f56fe859cc6d5bd744a7223e7264d6d4f261"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fi/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fi/thunderbird-68.10.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f03014cd7a28b4d85c2d896e8e2a5a1db959c7290c98cfd0c12839170956e98e0087685ab4304fbbdae42b06a8ff7b5563e70c9bbe0a787d2d9b4103019cf31a"; + sha512 = "6f4fde19af18845d50f591940786402233bb77f518f1f8f9cda727bd458e21669f692681cc691617a0ce05f8516383ce38b7b51445e3937ff8c1868e84a92ae0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fr/thunderbird-68.10.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "ce7b187a572da6bee677cc7849bd5123545bf437005b16a855d9e4bfcd58a10f3b095a3b0a767d5a67aa113c0a9e0d437827c37fe1c8bf84a3fc8c8d2c702a8d"; + sha512 = "7e9dc42478dae325a51f44781048a55fea3e2bedcbf663c534510404e59dfa10216dfc0df4efd40e0bf1f4fea3abdc9867b6c6b33f199e406ab07d68b68acfe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fy-NL/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fy-NL/thunderbird-68.10.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "2062090196c7b07ce148a2937027637469e7593ac092db0bf7139286faac51d350c786c0bfed6e32903bcb7f2ddc4e3df6e993f8637fc68c1aae1be89ceddc98"; + sha512 = "1b665dce92e8c1de000063f1a12192a2fa5aff2c65db9aa6769ca16604e7e97a602baad9761110124c65dc479fdbce7640020701fb280b3c62e5c78368fb496f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ga-IE/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ga-IE/thunderbird-68.10.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "fb11eadd35e46081a16116843a4a134b8197c4e8e1d1a52981a085f02bbda7ca49dbf1d9a88f4a7fe2542a99ff24f6d35fc661414cef1fb50edecb98c6693f4f"; + sha512 = "42faafcbe85ab995b549bf072942dcc2e87780099b3bcb2974ca3eff6acade40be7bd8ded5cb0db6a02bfdc255c60e252061a767543b2215719a1fc2600fdd81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/gd/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/gd/thunderbird-68.10.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e9b985732d6619555c24ababbbe38303998750986395c647aadebb0c209467fcdfe5f9dca99ecef0e0b747aa8598f887ef2218140ad1d97e7e3d73b430dad1d6"; + sha512 = "e1455ef926d71ecfdad24ebcf4b3de59d04611bf641ba381534bd1b94c2f7b730687cf2e8412e6910d37e402b58f32588482089f4d12308a7b9cf6af82b66e97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/gl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/gl/thunderbird-68.10.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "3b8eff0004db222eff3b4f42be4eff168310fd0e17e676ae92fddd9c11e3a6d4826c63a35f9de37095a7fa88f7f4931e36bc17ace548e36f91bd8334fa53799f"; + sha512 = "344d619a5437d0efe2e522680849dd809b07c3aa9cf2831610aaf7ce28e81f16782a4a8174c01cc339914e02a23cb3ce603d04dd0dca8eb4f547e0d0e780d8f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/he/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/he/thunderbird-68.10.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e3dcd319e08ddb5aef2bc576f136eae7838e3aca3c9160aabdaecc32332f0c250201a80f31724233a77f4dd2857684f2bcd9b194df5ec965d69cc04a9e9b7da9"; + sha512 = "c081d81f3c1a61d2922bdad144a97c8568326e97fe29909d4319ca9019d9bd466dccabc6f2069eadafaa6bf6bb5bd50e8cf0c070dd992cc095411dd909b43f06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hr/thunderbird-68.10.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "84164d00d087e507ab79aa4db6567311bd0cecbde1cb1be7337f4ffc42abc8c7cd0f4fe9a3aae2e35b01683f96e1bfbc816fa96e6fb872157cb473128679e19f"; + sha512 = "2c142b9bed17fc1fef3e4339f0477d3f469923083a37ec3b2dc3d4690a44ee34d5a23faa37876cec2f3bcd02c1048ec343f16bd02a1771296e77cf3f63ca787e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hsb/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hsb/thunderbird-68.10.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a3fac91f5e2fbf739d2f2c164c6d58ea89026c1e8250a41c51ee11640bd7831c73a4c3148cd80ae2b40a2e1a369d47d3832f96a276dae2c80ba2d90d6990d062"; + sha512 = "fcbcc78b1d5620c27b7cfb7ee88463dc81664f5eba679a81920ac6923b0e3f05bc70b99ba7268017b59219872921e76860a113fbba757cebf942641ba0591517"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hu/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hu/thunderbird-68.10.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "002c42f700616d2ddcf1753d37de064959965e4504112e96507a8aaf2398fa25f650e1fcb50189aebf3bc3d0c3de795b496d1f8e1550fc0186d74ef312a11d74"; + sha512 = "d59024db516156a89cbcc0148a5bf85059ac2393f41709e224f109abca6fea693b822d7c4a3ce5e360435c8700010aaeb4b26ef9e163827bcc8b6cf1761d3781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hy-AM/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hy-AM/thunderbird-68.10.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "41fe16657886ccde1c6410e3e62ade72d8890a50e77526994e82cb929c8296110d0aa32d8d02dd7d1482d594322325d28cfa54afe113dc69e2520dcfd56516f1"; + sha512 = "17876cefb335375b7884080315690fef116983b7559421f86ad0ef787bdfdf5aed283d84114cc1c1d3cb3119d735f50e975f94ead6fcab6046c207d4c1a8fc8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/id/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/id/thunderbird-68.10.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "8fb8703220a801bb2d29e436d28325a3310b61f6a22d3d8964b98bd9cea9e74f9e53cd41c8c9a501057d1915a6c71f6f5d27fea267b802082488d2690a0ee088"; + sha512 = "0c74ca260ffee635cd556c0710a13ed091a1f2eb63a1b1ac2a745ea0e86d42b52b08b00f648c406356e1e170c77242d43d9a4d2b2f0bb1fb26d4dc83b4179a8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/is/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/is/thunderbird-68.10.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "09c59bca1a0282416aff4043b7d64e5f8ce308792efd35e197b2d91125715453769b482e5815c9f33cd0d9d3809bbe898c40e767c13786868673bc7f041f1c17"; + sha512 = "97fdf5fa7dd6fade8ec7efc179f6a65bda90cfb285341e3e98b9b2ab70ba91ebc8c47bf8948189d4c181566c9ed950fbd0fb6b4d4cd96b2e3329c0085e32771c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/it/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/it/thunderbird-68.10.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c3f09f2681d0aa197084b0935855dba98517d6f5595595385d93dd7a998ff5b0c98f35141091f41ea8e91ea10b25f6464f242218cd7030351347f77f35396ca2"; + sha512 = "3d42b5a8c55519accb3246c5a7f50def9d854ccaffa0e34b20e6e2f51cc07a787a9ab0c0b205e28b40d9ec4f55f1176f391ff9156076327f8a4416a9ff6ea8ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ja/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ja/thunderbird-68.10.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "4bdea34b50edfea5b3dd3bb80935e1148b3ad926c95d84a3d265268f783ff3c487527726b0151643c8f3eb5d061d441742da23f6cb03297894a8076a87275574"; + sha512 = "bf90c9c27abac84ef91a2fe3ceea142ac7041c10d41a0e5a2ee31742f9f64b2b24a331af769e8ae93c7b09bf8645dc4d274524281fbfe69a908fd22aaac7c2d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ka/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ka/thunderbird-68.10.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "ec029d7a58aa502742160e131eab70f50f83851124297fef72214d58f1309f047b9881d824432a8bd3841dd158493ca2b41e41f4f9bf9dc043db9ec4df1a1d24"; + sha512 = "8e2fb192c6776ad702ea7aaa9bc9dd31b20c1c66e2ce4dd91aa10eda5528172680740e28f8a7bab52a7c6eae92578822669d6ad068bbc85a04d97c91a4b7e08b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/kab/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/kab/thunderbird-68.10.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "cf291b9d2924e72b9871a4eadf10118cd0299e2206151c67bf36fe0c766b75c9e67e9b11e8612ca5d95c50c6cd3d90e95210e9625ed8eb1c14ba5a8d45bb997b"; + sha512 = "10b9418db83b328353afb73b7630add081309cc0b55fac8aec38f6e09036968082d3d12386efb6b4347b33977998bbd906501adc45a8c8d27dfd0f8d98288bde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/kk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/kk/thunderbird-68.10.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1031db4a9f0716973fb1ddbc8e12b2252bdb8450617a6c642ad4001c119cd3eb3bad999b861e8204a85699b415fdc5d768b6aafa6fee2c5b9efb7e9a3558eda2"; + sha512 = "7dcfb10ce402c90452815523d5672a1cd60201b33b997c5b769341e904f4840ff57685eab61dc3073f789bf042453f3d144e54bec32afae2dd65367a0f1768a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ko/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ko/thunderbird-68.10.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "bde75ae38856970c4da871cdbd63d96f31021f707869be7517d4c719ecce3f505f886c65e9faad8bcc0ac26885777e070246576fd47f75669b77f0247689954f"; + sha512 = "fddcd08f00cc4f3de59993c8c917e20e77918d87e2c23e989e8e8aaf78c6130f42e546acc17eb6f8c9a24550c596ad201d63f325e7ba078a6c791fc94589e0a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/lt/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/lt/thunderbird-68.10.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9459b50e1fd01ce742bfe6f13ac26241958ad5307c08e3980ed5a84023a12be009dc6a83085ad52c68e162e6a45f4f430e79e21e4d19f67e470ab07151c40bc8"; + sha512 = "ab221093a0df2876f558ff2e0df090b95872281e1cae8ac23c9753dadd6305608c6e7ec5104d491ca3a3f1c1ebd830b8094080ce99bba49b19b46e617238cc87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ms/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ms/thunderbird-68.10.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0632af25fd5245ec2a15a09a075db24a64e3020ea6353e88f72fa74f929d8507cb868cc617da8e97f01efff19a9108c9b2b30adc8e58b0e7e6353332219e658d"; + sha512 = "ce6b0e1ba8a1a1bbfd4d2e265a45430c2d931530d13eff67fea4179c4a8e2a204ff35103c921073bc33c3e2a8f8f3f55fb91b3218cab9718df76da696ed09750"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nb-NO/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nb-NO/thunderbird-68.10.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b16523b5a40dbe496537df487d72f8cb16ccf338c1a96e6ec3dc7e1a5d3073991c12ada23fc6b31f34d2fb712050334eae145a45420994c607a63799ed42d264"; + sha512 = "07e73fd67e0c1974c5e5b90d74e555b75820b66ae9bca0470b6d291e848e5f28fea680cf09c2167dd56b0765ae0e3682b5f2ab7f33cc5b059e60252236dc24cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nl/thunderbird-68.10.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "82f0ab2e4969323ea8294f732b13144ddd453a613a68b582ff398cb85aee88874a5fb5eb61627f142ce8124b476f49fa6cf68cdaa41fdaf3621519c53c4ac16b"; + sha512 = "a24ed7d30e53058653c0de6b96867fa9621118fa43e109940502eea798a5c7b8688c65bf08d765f3c6dc6e8ab0dabfef98ae005e00c465f847454b384953276f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nn-NO/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nn-NO/thunderbird-68.10.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "815d0010de5f6d9144a182a2170c59a502b167f18eec65d23987e4b73e6d5bae46be18d7f55462a3ec8634466639aceca03ad9b772c7e8b232eb874998e6148c"; + sha512 = "4bddbdd0a2353f8c43e65cbce5974911809cf28c3d7ce521d662d782f8858b469575857688a5c674f6d028acd55869c062edf9f55dfa3d387fab8fb60f6f2fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pl/thunderbird-68.10.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5be434a54c91097d4f6477767af96f8b862828912783eee48577cc450a14eceee2e067e9c10697633a2833f473b9d10bea33b3c6c6377b898a18d3d7c6568f96"; + sha512 = "953d9e547eb343a0d7f96f501bb87ece71e2f860f8517fb13b76301c7b3e77d7f572a8106fdd43c2b390654457e43703b22566bd3159ace962af2eb1f8bc6ca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pt-BR/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pt-BR/thunderbird-68.10.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b7b3fd6bb8535f2328ceb9259d7517bfd695cc881130720d3857d5a27197deba4fe683e163f49613054ebec2827e805a31a62c9a9e578f4ffb760f421a4ea506"; + sha512 = "b3807897100857c33768478c9dec57024f968a83188b51bd2708b7caf7c53edb39b15cc8dfb5f73ca937c298fa83551edf82d7f43c065bc2fc25467a02343d20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pt-PT/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pt-PT/thunderbird-68.10.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b9561a6f55c25cff2bec9bda78e46204dc85429c52bb42f33b6ae972c0bf16f3a99ccbe3f283ef08cca955d31e5eb6d91ff9d8b50e85bd75443998236d6e08b1"; + sha512 = "e50bf636697714fc4dfd04e1a8d6d7d87239553f01064bb566e218395a2e5d9b16ef22c01509f18f9f562b75eb19a2616d8c7f8a4d212a9a445b1eece17527f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/rm/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/rm/thunderbird-68.10.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7ff72dc448c9303a70403558ae46cd720e645c24681dabbf265db783ef872e92216f8ee9169e155904d3fcd3288f2ee0ad11ca22bbf041b380884d57b306876e"; + sha512 = "1480eb4c77d88fc461000f423179e5bc693b2f25abe5c6384f4c98494f698c620fdd53e65d75ebd17ce9546c5fb00ef8f40bfffd9b31114417cd10262569a54d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ro/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ro/thunderbird-68.10.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "7f585b942076749269ca86161694ef1b9f4e68e75300d60ea4141b2404be0c79761a2658c123787d67e65992e4b3dd5b7406acfee6084846bdefdb0f82d9baea"; + sha512 = "d9cfc8f03d75f3a58fe103c34eb0fdcb3530f0ebc68c0acae7fe1b783bf11c0585e266556d16fa3db174aaafcc319cef9cfa363361cad7b1053a504101b13880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ru/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ru/thunderbird-68.10.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e4ef9e081cfdb3567f1823866ffd0e3e5fbe8596fd3a7dbb94869a8d1ebd328938c490669c8f46bc6575d6b8c5c351e387faf8dd2a33db263cb2fb5ddb2974f5"; + sha512 = "d67f550615eb195b80f7338708b7ecf7455203f86aff1682f2e8e654d019fb49c6468eb1c099f7fc78797b97d41c9f42aff5498f27b6cb458f049fd8b6aa3d4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/si/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/si/thunderbird-68.10.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "42db8e43c4bd722102778d4a9cdfb0ba54b0151882b7963e07c0b8cd653d7303eb22a541a8fc3a5b93c9db09c1a24db8f5c3365b5654e997c17d3b4b2c2a5f38"; + sha512 = "6dd9d78a9f2ef4ed28a95e83e76e9779d02c950ba906ca14d8fac0bf7300ad2d7d5ad9cfa3973cc8c861011dc8f1c58a6ea5909206443cd2f24bf5bcfe8c5673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sk/thunderbird-68.10.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fb025203b739cd89169bc25b36e6d541ebaf8726720c0b51e58a33fd0e71c2a4ae46428fe16547ed5e639e81ce35253a5519a28de9a8baa952a1b1af184b77a3"; + sha512 = "ba40286898a7722533f8a65e1e9bb494bc28212d2fe21c820f64b1a8bcaad6d0ca1d7a870d5289792a79a6c4851931236b13c1ba07b812b591b3d4c6004ff78d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sl/thunderbird-68.10.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ba392d3748b697d323e63c7217ce3c3aa4eaf6b994d798655a1667644733a6f19b23b95df420b2235e9ee000a868485d4f32fbe5d737ef5c7296c085738168bd"; + sha512 = "bc8e926583e92f4cfe3081a1bb618d7c5fbe9e1f93af378040a72820b820a38915ff1c74deb6069bbaf2957adc536b78faf1df853e8ff6390a9396d909ee040e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sq/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sq/thunderbird-68.10.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b795928265f2b50a1032ab8fcce954f6d0d35a6dab2b381f11ca1b6b204aa1ae91b0ceb221da5ccadcca303f20792715d0f770c215dc59654df1b325ccc3e42e"; + sha512 = "084bce04b0d83ab24682d04f4c788d61a2a6bfe0777f44f4c9a07d8fd7fef4251464e9a0e523f4e111bd5323ceb398fa09ae3391295047beac3157ce9d2e8905"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sr/thunderbird-68.10.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "274c3675cd3d5264c2ce74b101b7c87bfd1703645e4341f6499c25b4905781395f514ed8412b22289ad097994e748ee7b527f1d6081022429292a64155d2df74"; + sha512 = "544ed1f0cb8beeac3ac1b2ed02078c3acc5961d6fe4c3f0722b1a36208740226053236453a215e564371453cc5acb541a6f307d594524081a5f4c96aa077c21f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sv-SE/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sv-SE/thunderbird-68.10.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "318ccb06cf2c9f5fdbf25fe70a8c5e65c20e5d7ca375f52f64724410d2afa8a852f9e9e77b673c1f59e26bddd6fde74783a96f69f7bd73a1b7042633b624b310"; + sha512 = "806ea4d93a8cb3e5dba8cbc59dd25adbb19e048306124ffebbf1b2a56d49f236d9a79d0e14b5fc0c15537c266a85408ce1a5568e8e6e4417dd94f1b98d9bf36e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/tr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/tr/thunderbird-68.10.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a86a69a8c146a0765e9fb7c835c1cc774a0a7fc309fa7f6627f427bc2cb4bd1b3e18f4aa61288cb68483f267b0be02662250abcdcafcb6619f1b4e3437cbb908"; + sha512 = "cf30e9ebaf5770437415377c9a13d66b44a7de7c85bec9b980d9e2e059db7f3756f2c3a888ebf9185c59451e2473440fe2c1ff28a979e066225719effecb1c38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/uk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/uk/thunderbird-68.10.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "86407123381e64df9f97190b0df253792582b0ba5296d6663bc0d8faf3004e3ec95cbc0140c9292928a7750cece1cc6887086a9e218f3169bee2246232643685"; + sha512 = "a7f5f6b0f1bc849a3a48a30edc8e408eec0c5e544bb4444a8ade969b1fe7ef1fb9d26a0fea3d4d31bf88eb67570e895fb5d916b9ac88c2a8455abcec60d56ca0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/uz/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/uz/thunderbird-68.10.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2d31a86952df2f5b339479cc6dabd1cbcc000119514775b07ca086e01e8310fe0d0d2c63cc57cb936588c59a5f72a5d9dae0e0a6e2f9b7cdf6225e400c24bd31"; + sha512 = "716e1c0a7b9b0ea33d1464930b68f3f817ce3310bee9000199f9e6bdc4d0d68dc6098665423ada94d7ede600cb0c965adcbb413068adf1415cbc048a7f847ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/vi/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/vi/thunderbird-68.10.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3c241242e918bb69d811289879323205c070620829e05488e224450e7edb2be32b0f2c36f3182fcab95a1673fd133635e89801feaf6a34fa1553d8fea3b57641"; + sha512 = "1667ab35ed705e739c5192246444eda912ec86a153dd1fc3ed83a5ed61d47d5849270492015198cca82827720bc019fa561e710df5fa77a758864e6cfb09d4aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/zh-CN/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/zh-CN/thunderbird-68.10.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b4932b43158a5f8627ec951a3cb726863575a81b9d7b93ab35a9168224cd91480ecde55a1e7d4c01b9ed74f92440724475980010f1645db9b2ef0b6c42e92d93"; + sha512 = "4ef6c9933ce8671442aa86f804085b4ce9a73aa4f8cd598b7d41a844be37d54cbd8a2dc39d6ab97f160856435475093f3240f960a206e53d327a4b2e47fac45d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/zh-TW/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/zh-TW/thunderbird-68.10.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "018fff050295932a492433992a97fd01acc36685f7d1f96bba2f41972fdd6cd592c117434d2de81d0d018595c8473427aefe5a7b66194bc18d127c2e7eab5a34"; + sha512 = "ab19d7c1114835a380e035dafc2e30849e8084cdac9175eb5eb3a9fde81d49cb710d9dce21652780a35011d139e070c0f61840275aa8d0e99252bfa5a8aa1735"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e9ae6696de..6cb27055dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.9.0"; + version = "68.10.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "3q0dikgkfr72hhz39pxi2f0cljn09lw4940qcn9kzfwfid2h290j7pihx6gs0z6h82fl78f9fl1598d064lwl1i2434dzx6bg4p4549"; + "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d"; }; nativeBuildInputs = [ @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ - ${stdenv.cc.default_cxx_stdlib_compile} \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${ lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${ @@ -336,5 +336,6 @@ stdenv.mkDerivation rec { pierron ]; platforms = platforms.linux; + license = licenses.mpl20; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix index f383018e25..6f885dd18b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -19,12 +19,12 @@ mkDerivation rec { pname = "trojita"; - version = "0.7.20190618"; + version = "0.7.20200706"; src = fetchgit { url = "https://anongit.kde.org/trojita.git"; - rev = "90b417b131853553c94ff93aef62abaf301aa8f1"; - sha256 = "0xpxq5bzqaa68lkz90wima5q2m0mdcn0rvnigb66lylb4n20mnql"; + rev = "e973a5169f18ca862ceb8ad749c93cd621d86e14"; + sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index 93a899742b..265c8add27 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.4"; + version = "2020.5"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "17xi8g2k89vi4d0j7pr33bx9zjapa2qh4pymbrqvxwli3yhq6zwr"; + sha256 = "131z6qlpjwxcn5a62f1f147f2z1xg185jmr0vbin8h0dwa1182vn"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix index b83e98a558..8490c0509a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -128,14 +128,14 @@ let } source; source = rec { - version = "1.3.1"; + version = "1.3.2"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = version; - sha256 = "1xsla9g7xbq6xniwcsjik5hbjh0xahv44qh4z9hjn7p70b8vgnwc"; + sha256 = "1ljn7h7dr9iyhvq7rdh0prl7hzn9d2hhnxv0ni6dha6f7d9qbfy6"; fetchSubmodules = true; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 2560bc806e..bc678cd164 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "1wr57qwcjfzbpb4p0ybfjpw2hhwp91yrk2n3ywrqywcvjj38jg1q"; + sha256 = "0r2n9l383drnnzbyywnbqljh9kxm3kz4g0mv7bnrp6b10b2ma3pg"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix b/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix index 679e966373..03159a61a4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation { sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; description = "Offline RSS/Atom reader"; - license="AGPLv3+"; - maintainers = with stdenv.lib.maintainers; [viric]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ viric ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix b/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix index 8ee265743d..02e05fac65 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "0kahqqchalbyzy51gkxzmw91qignh8sprg57nbj1vmgm84w1z6kw"; + sha256 = "1p190az8llqh3089aygwash10wqqqfnjl2wvksn6bvx5wm5dpg1p"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix index 3fc9fedc41..a487da6f5a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite }: +{ lib, stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; @@ -12,6 +12,10 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtkeychain sqlite ]; + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" + ]; + cmakeFlags = [ "-UCMAKE_INSTALL_LIBDIR" "-DNO_SHIBBOLETH=1" diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix index 98fd41e8bc..276cabfa2a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.11.0a"; + version = "0.11.2a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "192v8f80jfly12bqzsslpxlvm72kdqm3jl40x1az5czpg4ab3lb7"; + sha256 = "05dn6mr86ly65gdqarl16a2jk1bwiw5xa6r4kyag3s6lqsv66iw8"; }; # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index d59cdff34f..9d37f1f439 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -57,6 +57,9 @@ in stdenv.mkDerivation { ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] ; + # Doc has high risk of collisions + postInstall = "rm -r $out/share/doc"; + buildInputs = [ openssl curl @@ -72,9 +75,6 @@ in stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; - # Reduce the risk of collisions - postInstall = "rm -r $out/share/doc"; - meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix index e62bc21ab5..e2870c58e9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-cli-ng/default.nix @@ -2,19 +2,20 @@ python3Packages.buildPythonApplication rec { pname = "protonvpn-cli-ng"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "protonvpn"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0ixjb02kj4z79whm1izd8mrn2h0rp9cmw4im1qvp93rahqxdd4n8"; + sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; }; propagatedBuildInputs = (with python3Packages; [ requests docopt setuptools + jinja2 pythondialog ]) ++ [ dialog diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index 9425f260e4..3896e06838 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -22,7 +22,7 @@ let icon = "anydesk"; desktopName = "AnyDesk"; genericName = description; - categories = "Application;Network;"; + categories = "Network;"; startupNotify = "false"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix index a62b1bf5ee..3a6054db35 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -1,253 +1,25 @@ -{ stdenv -, lib -, fetchurl -, requireFile -, makeWrapper -, libredirect -, busybox -, file -, makeDesktopItem -, tzdata -, cacert -, dconf -, glib -, gtk2 -, atk -, gdk-pixbuf -, cairo -, pango -, gnome3 -, xorg -, libpng12 -, freetype -, fontconfig -, gtk_engines -, alsaLib -, zlib -, version ? "20.04.0" -}: +{ lib, callPackage }: + +# For detailed information about the Citrix source-tarball, please refer to the OEM +# reference guide: https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/ let - versionInfo = let - supportedVersions = { - "19.6.0" = { - major = "19"; - minor = "6"; - patch = "0"; - x64hash = "0szqlfmigzgf0309i6ikxkizxaf4ri7qmhys75m0zi3bpwx6hzhs"; - x86hash = "16v3kgavrh62z6vxcbw6mn7h0bfishpl7m92k7g1p2882r1f8vaf"; - x64suffix = "60"; - x86suffix = "60"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest.html"; - }; + inherit (callPackage ./sources.nix { }) supportedVersions unsupportedVersions; + mkCitrix = callPackage ./generic.nix { }; - "19.8.0" = { - major = "19"; - minor = "8"; - patch = "0"; - x64hash = "0f8djw8lp5wihb23y09yac1mh09w1qp422h72r6zfx9k1lqfsdbw"; - x86hash = "0afcqirb4q349r3izy88vqkszg6y2wg14iwypk6nrmvwgvcl6jdn"; - x64suffix = "20"; - x86suffix = "20"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1908.html"; - }; + toAttrName = x: "citrix_workspace_${builtins.replaceStrings [ "." ] [ "_" ] x}"; - "19.10.0" = { - major = "19"; - minor = "10"; - patch = "0"; - x64hash = "1l4q4pmfiw9gmml6j5b3hls2101xf5m8p6855nhfhvqlisrj9h14"; - x86hash = "000zjik8wf8b6fadnsai0p77b4n2l95544zx503iyrb9pv53bj3y"; - x64suffix = "15"; - x86suffix = "15"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1910.html"; - }; + unsupported = lib.listToAttrs ( + map (x: lib.nameValuePair (toAttrName x) (throw '' + Citrix Workspace at version ${x} is not supported anymore! - "19.12.0" = { - major = "19"; - minor = "12"; - patch = "0"; - x64hash = "1si5mkxbgb8m99bkvgc3l80idjfdp0kby6pv47s07nn43dbr1j7a"; - x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; - x64suffix = "19"; - x86suffix = "19"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1912.html"; - }; + Actively supported releases are listed here: + https://www.citrix.com/en-gb/support/product-lifecycle/milestones/receiver.html + '')) unsupportedVersions + ); - "20.04.0" = { - major = "20"; - minor = "04"; - patch = "0"; - x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB"; - x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; - x64suffix = "21"; - x86suffix = "21"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; - }; - }; - - # Copied this file largely from the citrix-receiver package - # Leaving this here even though there are no deprecations yet - # for ease of future maintenance. - # - # The lifespans of Citrix products can be found here: - # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html - deprecatedVersions = let - versions = [ "19.3.0" ]; - in - lib.listToAttrs - (lib.forEach versions - (v: lib.nameValuePair v (throw "Unsupported citrix_workspace version: ${v}"))); - in - deprecatedVersions // supportedVersions; - - citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: - stdenv.mkDerivation rec { - pname = "citrix-workspace"; - version = "${major}.${minor}.${patch}"; - inherit homepage; - - prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; - - preferLocalBuild = true; - - src = requireFile rec { - name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz"; - sha256 = if stdenv.is64bit then x64hash else x86hash; - message = '' - In order to use Citrix Workspace, you need to comply with the Citrix EULA and download - the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: - - ${homepage} - - (if you do not find version ${version} there, try at - https://www.citrix.com/downloads/workspace-app/ - - Once you have downloaded the file, please use the following command and re-run the - installation: - - nix-prefetch-url file://\$PWD/${name} - ''; - }; - - dontBuild = true; - - sourceRoot = "."; - - buildInputs = [ - makeWrapper - busybox - file - gtk2 - gdk-pixbuf - ]; - - libPath = stdenv.lib.makeLibraryPath [ - glib - gtk2 - atk - gdk-pixbuf - cairo - pango - dconf - xorg.libX11 - xorg.libXext - xorg.libXrender - xorg.libXinerama - xorg.libXfixes - libpng12 - zlib - gtk_engines - freetype - fontconfig - alsaLib - stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null) - ]; - - desktopItem = makeDesktopItem { - name = "wfica"; - desktopName = "Citrix Workspace"; - genericName = "Citrix Workspace"; - exec = "wfica"; - icon = "wfica"; - comment = "Connect to remote Citrix server"; - categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; - mimeType = "application/x-ica"; - }; - - installPhase = '' - runHook preInstall - - export ICAInstDir="$out/opt/citrix-icaclient" - - sed -i \ - -e 's,^main_install_menu$,install_ICA_client,g' \ - -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \ - -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \ - -e 's,/bin/true,true,g' \ - ./${prefixWithBitness}/hinst - - # Run the installer... - bash ./${prefixWithBitness}/hinst CDROM "`pwd`" - - echo "Deleting broken links..." - for link in `find $ICAInstDir -type l ` - do - [ -f "$link" ] || rm -v "$link" - done - - echo "Expanding certificates..." - # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates - pushd "$ICAInstDir/keystore/cacerts" - awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt - popd - - echo "Patching executables..." - find $ICAInstDir -type f -exec file {} \; | - grep 'ELF.*executable' | - cut -f 1 -d : | - grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729 - while read f - do - echo "Patching ELF intrepreter and rpath for $f" - chmod u+w "$f" - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$ICAInstDir:$libPath" "$f" - done - - echo "Wrapping wfica..." - mkdir "$out/bin" - - makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ - --add-flags "-icaroot $ICAInstDir" \ - --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set LD_LIBRARY_PATH "$libPath" \ - --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" - - echo "We arbitrarily set the timezone to UTC. No known consequences at this point." - echo UTC > "$ICAInstDir/timezone" - - echo "Installing desktop item..." - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - - # We introduce a dependency on the source file so that it need not be redownloaded everytime - echo $src >> "$out/share/workspace_dependencies.pin" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - license = stdenv.lib.licenses.unfree; - inherit homepage; - description = "Citrix Workspace"; - platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; - }; - }; - -in citrixWorkspaceForVersion (lib.getAttr version versionInfo) + supported = lib.mapAttrs' ( + attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo) + ) supportedVersions; +in + supported // unsupported diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix new file mode 100644 index 0000000000..36ae194a16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -0,0 +1,203 @@ +{ stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more +, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 +, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 +, gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 +, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin + +, homepage, version, prefix, hash + +, extraCerts ? [] +}: + +let + inherit (stdenv) lib; + + openssl' = symlinkJoin { + name = "openssl-backwards-compat"; + nativeBuildInputs = [ makeWrapper ]; + paths = [ openssl.out ]; + postBuild = '' + ln -sf $out/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + ln -sf $out/lib/libssl.so $out/lib/libssl.so.1.0.0 + ''; + }; +in + +stdenv.mkDerivation rec { + pname = "citrix-workspace"; + inherit version; + + src = requireFile rec { + name = "${prefix}-${version}.tar.gz"; + sha256 = hash; + + message = '' + In order to use Citrix Workspace, you need to comply with the Citrix EULA and download + the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: + + ${homepage} + + (if you do not find version ${version} there, try at + https://www.citrix.com/downloads/workspace-app/ + + Once you have downloaded the file, please use the following command and re-run the + installation: + + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + dontBuild = true; + dontConfigure = true; + sourceRoot = "."; + preferLocalBuild = true; + passthru.icaroot = "${placeholder "out"}/opt/citrix-icaclient"; + + nativeBuildInputs = [ + autoPatchelfHook + file + makeWrapper + more + which + wrapGAppsHook + ]; + + buildInputs = [ + alsaLib + atk + cairo + dconf + fontconfig + freetype + gdk-pixbuf + gnome2.gtkglext + gnome3.webkitgtk + gtk2 + gtk2-x11 + gtk3 + gtk_engines + heimdal + krb5 + libcxx + libcxxabi + libjpeg + libpng12 + libsoup + libvorbis + libxml2 + nspr + nss + openssl' + pango + speex + systemd.lib + stdenv.cc.cc + xorg.libXaw + xorg.libXmu + xorg.libXScrnSaver + xorg.libXtst + zlib + ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs; + + runtimeDependencies = [ + glib + + xorg.libX11 + xorg.libXScrnSaver + xorg.libXext + xorg.libXfixes + xorg.libXinerama + xorg.libXmu + xorg.libXrender + xorg.libXtst + xorg.libxcb + ]; + + installPhase = let + icaFlag = program: + if (builtins.match "selfservice(.*)" program) != null then "--icaroot" + else "-icaroot"; + wrap = program: '' + wrapProgram $out/opt/citrix-icaclient/${program} \ + --add-flags "${icaFlag program} $ICAInstDir" \ + --set ICAROOT "$ICAInstDir" \ + --prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" + ''; + wrapLink = program: '' + ${wrap program} + ln -sf $out/opt/citrix-icaclient/${program} $out/bin/${baseNameOf program} + ''; + + copyCert = path: '' + cp -v ${path} $out/opt/citrix-icaclient/keystore/cacerts/${baseNameOf path} + ''; + + mkWrappers = lib.concatMapStringsSep "\n"; + + toWrap = [ "wfica" "selfservice" "util/configmgr" "util/conncenter" "util/ctx_rehash" ] + ++ lib.optional (lib.versionOlder version "20.06") "selfservice_old"; + in '' + runHook preInstall + + mkdir -p $out/{bin,share/applications} + export ICAInstDir="$out/opt/citrix-icaclient" + export HOME=$(mktemp -d) + + # Run upstream installer in the store-path. + sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst + ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)" + + ${mkWrappers wrapLink toWrap} + ${mkWrappers wrap [ "PrimaryAuthManager" "ServiceRecord" "AuthManagerDaemon" "util/ctxwebhelper" ]} + + ln -sf $ICAInstDir/util/storebrowse $out/bin/storebrowse + + # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates + echo "Expanding certificates..." + pushd "$ICAInstDir/keystore/cacerts" + awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' \ + < ${cacert}/etc/ssl/certs/ca-bundle.crt + popd + + ${mkWrappers copyCert extraCerts} + + # See https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/reference-information/#library-files + # Those files are fallbacks to support older libwekit.so and libjpeg.so + rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so + rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so + + # We support only Gstreamer 1.0 + rm $ICAInstDir/util/{gst_aud_{play,read},gst_*0.10,libgstflatstm0.10.so} + ln -sf $ICAInstDir/util/gst_play1.0 $ICAInstDir/util/gst_play + ln -sf $ICAInstDir/util/gst_read1.0 $ICAInstDir/util/gst_read + + echo "We arbitrarily set the timezone to UTC. No known consequences at this point." + echo UTC > "$ICAInstDir/timezone" + + echo "Copy .desktop files." + cp $out/opt/citrix-icaclient/desktop/* $out/share/applications/ + + # We introduce a dependency on the source file so that it need not be redownloaded everytime + echo $src >> "$out/share/workspace_dependencies.pin" + + runHook postInstall + ''; + + # Make sure that `autoPatchelfHook` is executed before + # running `ctx_rehash`. + dontAutoPatchelf = true; + postFixup = '' + autoPatchelf -- "$out" + $out/opt/citrix-icaclient/util/ctx_rehash + ''; + + meta = with lib; { + license = licenses.unfree; + description = "Citrix Workspace"; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + inherit homepage; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix new file mode 100644 index 0000000000..cc0d8637b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -0,0 +1,58 @@ +{ stdenv, lib }: + +let + mkVersionInfo = _: { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: + { inherit homepage; + version = "${major}.${minor}.${patch}.${if stdenv.is64bit then x64suffix else x86suffix}"; + prefix = "linuxx${if stdenv.is64bit then "64" else "86"}"; + hash = if stdenv.is64bit then x64hash else x86hash; + }; + + # Attribute-set with all actively supported versions of the Citrix workspace app + # for Linux. + # + # The latest versions can be found at https://www.citrix.com/de-de/downloads/workspace-app/linux/ + supportedVersions = lib.mapAttrs mkVersionInfo { + "19.12.0" = { + major = "19"; + minor = "12"; + patch = "0"; + x64hash = "1si5mkxbgb8m99bkvgc3l80idjfdp0kby6pv47s07nn43dbr1j7a"; + x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; + x64suffix = "19"; + x86suffix = "19"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1912.html"; + }; + + "20.04.0" = { + major = "20"; + minor = "04"; + patch = "0"; + x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB"; + x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; + x64suffix = "21"; + x86suffix = "21"; + homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + }; + + "20.06.0" = { + major = "20"; + minor = "06"; + patch = "0"; + x64hash = "1kpfcfg95mpprlca6cccnjlsqbj3xvv77cn3fc5msd304nsi9x1v"; + x86hash = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194"; + x64suffix = "15"; + x86suffix = "15"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + }; + }; + + # Retain attribute-names for abandoned versions of Citrix workspace to + # provide a meaningful error-message if it's attempted to use such an old one. + # + # The lifespans of Citrix products can be found here: + # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html + unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" ]; +in { + inherit supportedVersions unsupportedVersions; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix deleted file mode 100644 index ea475ae6db..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ citrix_workspace, extraCerts ? [], symlinkJoin }: - -let - - mkCertCopy = certPath: - "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/"; - -in - -if builtins.length extraCerts == 0 then citrix_workspace else symlinkJoin { - name = "citrix-with-extra-certs-${citrix_workspace.version}"; - paths = [ citrix_workspace ]; - - postBuild = '' - ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)} - - sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica - ''; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index 414e9d1b90..11f97206b6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "1avfsx837rjfk50qv3xjccx2309phn04rq6imadqvqpfnyx4ma66"; + sha256 = "1yvi7zd0ic0rv7njd0wi9q1mfvz4d9qrx3i45dd6hcq465wg8dp7"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/putty/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/putty/default.nix index 804a40a614..61e82726f3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/putty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/putty/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - version = "0.73"; + version = "0.74"; pname = "putty"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - sha256 = "076z34jpik2dmlwxicvf1djjgnahcqv12rjhmb9yq6ml7x0bbc1x"; + sha256 = "0zc43g8ycyf712cdrja4k8ih5s3agw1k0nq0jkifdn8xwn4d7mfx"; }; # glib-2.62 deprecations diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix index c72c7c6da8..0393a5bdeb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitLab -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, openssh , mesa, lz4, zstd, ffmpeg, libva }: stdenv.mkDerivation rec { pname = "waypipe-unstable"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "13kp5snkksli0sj5ldkgybcs1s865f0qdak2w8796xvy8dg9jda8"; + sha256 = "0bkmibask7gfnwkn3fg3l6zaabp95n1zsdnz3dwng8j80a0kakyy"; }; postPatch = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace "/usr/bin/ssh" "${openssh}/bin/ssh" ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols @@ -29,10 +29,6 @@ stdenv.mkDerivation rec { mesa lz4 zstd ffmpeg libva ]; - enableParallelBuilding = true; - - mesonFlags = [ "-Dwerror=false" ]; # TODO: Report warnings upstream - meta = with stdenv.lib; { description = "A network proxy for Wayland clients (applications)"; longDescription = '' @@ -41,6 +37,7 @@ stdenv.mkDerivation rec { makes application forwarding similar to ssh -X feasible. ''; homepage = "https://mstoeckl.com/notes/gsoc/blog.html"; + changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix index 9b06676b01..cdc2f5e147 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - x86_64-linux = "17vw4kyggmi8phm91jx1skkd7vrdhbahibv6d6zm14q87r01a56f"; - i686-linux = "0yvy3lif2g4jchcp5q1r5b8ndj8009pcq5js7r0kl20bmmcmzklg"; + x86_64-linux = "1gdjpwdg7cpig68wsl3b8w1y12391dh5ipg7g19kr30s6wr3avvm"; + i686-linux = "1b6pzckaixfzhjf38amrkg8pahh2p3jg6cgfacswdx7cjb4a0c4i"; }.${stdenv.hostPlatform.system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix b/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix index 991780bd82..864f10553e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "scaleft"; - version = "1.41.0"; + version = "1.45.3"; src = fetchurl { url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; - sha256 = "a9a2f60cc85167a1098f44b35efd755b8155f0b88da8572e96ace767e7933c4d"; + sha256 = "02hsn64kg22pgga5ldjwhnqc6jq8w03mwf40dfanln1qz38x9nx1"; }; nativeBuildInputs = [ patchelf rpmextract ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index d025222b01..8d4a6d7312 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.4"; + version = "3.2.5"; variant = if withQt then "qt" else "cli"; pcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1amqgn94g6h6cfnsccm2zb4c73pfv1qmzi1i6h1hnbcyhhg4czfi"; + sha256 = "0h69m9maq6w5gik4gamv4kfqrr37hmi4kpwh225y1k36awm0b2dx"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index b2ad47e9b4..bfbe32fba4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "rclone"; - version = "1.52.1"; + version = "1.52.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1v91c3wydpixi0p0afclp4baxchigy3czlm1mq9hn6cw973z6spf"; + sha256 = "1da6azr4j5sbzb5xpy2xk4vqi6bdpmzlq3pxrmakaskicz64nnld"; }; goPackagePath = "github.com/rclone/rclone"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 9d5ce848e3..5f23fa0e02 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.6.1"; + version = "1.7.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1lhbx1mh2hdjjwks3s17i8y9vbl3fnapc1czaf42pp7nf8245q3j"; + sha256 = "0jz1xfbs5ql9z7zdldyxc6wr0y5b0pf3vg8vzva5ml9aiqjcs9fg"; }; - vendorSha256 = "12g63a6jsshzqjgww792xmvybhfbkjx5aza4xnyljjsp453iky7k"; + vendorSha256 = "1gmdv0g0gymq6khrwvplw6yfp146kg5ar8vqdp5dlp0myxfzi22b"; patches = [ ./add-stcli-target.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix new file mode 100644 index 0000000000..6e30e03531 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix @@ -0,0 +1,24 @@ +{ buildGoPackage, lib, fetchFromGitHub }: + +buildGoPackage rec { + pname = "utahfs"; + version = "1.0"; + src = fetchFromGitHub { + owner = "cloudflare"; + repo = pname; + rev = "v${version}"; + sha256 = "1hpwch5fsqlxwpk5afawa1k5s0bx5c1cw0hvdllp7257lgly19fb"; + }; + + goPackagePath = "github.com/cloudflare/utahfs"; + goDeps = ./deps.nix; + + meta = with lib; { + homepage = "https://github.com/cloudflare/utahfs"; + description = + "Encrypted storage system that provides a user-friendly FUSE drive backed by cloud storage"; + license = licenses.bsd3; + maintainers = [ maintainers.snglth ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/utahfs/deps.nix b/third_party/nixpkgs/pkgs/applications/networking/utahfs/deps.nix new file mode 100644 index 0000000000..a144211fc9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/utahfs/deps.nix @@ -0,0 +1,327 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "a6b88cf34a491498e4c7d15c107a31058693e2cb"; + sha256 = "0ilqqymrphg546c66jc0npd48dlr88wbgrg462h1jgm2ykbnq1ba"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "420cda5d6383f94f7d9c231aa44bad3325181950"; + sha256 = "1mp0c9173328r67iica662013jnshiv8yg2p5zgs0kr5sh3ri0ws"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; + sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/readahead"; + fetch = { + type = "git"; + url = "https://github.com/google/readahead"; + rev = "eaceba16903255cb149d1efc316f6cc83d765268"; + sha256 = "19l6a29yyypgpqf7v5877ni0bqgxfp41q7ffp2xj57rvikimwiyb"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + }; + } + { + goPackagePath = "github.com/jacobsa/fuse"; + fetch = { + type = "git"; + url = "https://github.com/jacobsa/fuse"; + rev = "cd3959611bcb6bb23d49f1598d98f2bf44476805"; + sha256 = "0qy7gyczmdwclhml0n4js3rai7qinnvlr8xz1wn0g6z0vqc9p9iz"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "cc1f095d5cc5eca2844f5c5ea7bb37f6b9bf6cac"; + sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75"; + sha256 = "1zmz6asplixfihxhj11spgfs0v3xzb3nv0hlq6n6zsg781ni31xx"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/pquerna/ffjson"; + fetch = { + type = "git"; + url = "https://github.com/pquerna/ffjson"; + rev = "e517b90714f7c0eabe6d2e570a5886ae077d6db6"; + sha256 = "0lb76zvdi045r3kab529p9ippccsi9vw84xhinddyr4qrxvs9b06"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "4ab88e80c249ed361d3299e2930427d9ac43ef8d"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "31bed53e4047fd6c510e43a941f90cb31be0972a"; + sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "3f98efb27840a48a7a2898ec80be07674d19f9c8"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "d835ff86be02193d324330acdb7d65546b05f814"; + sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "738671d3881b9731cc63024d5d88cf28db875626"; + sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "ed3ec21bb8e252814c380df79a80f366440ddb2d"; + sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "244492dfa37ae2ce87222fd06250a03160745faa"; + sha256 = "0vm2q44phz4vjnzq9428rjk58c82fxf003whczp7c9ryn9fazh7s"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "bf48bf16ab8d622ce64ec6ce98d2c98f916b6303"; + sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; + sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "e8dd451b4bcb2ef4a22627699ed7d9df7653d6f3"; + sha256 = "0a088x8gpq7y0nx7z5baz2p9n1br908yrwjqnh2f9b4mv38kagzi"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-api-go-client"; + rev = "c24765c18bb761c90df819dcdfdd62f9a7f6fa22"; + sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "971852bfffca25b069c31162ae8f247a3dba083b"; + sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/go-genproto"; + rev = "43be25429f5aa0b9a3f18fa4e32583729ca30b78"; + sha256 = "0rj8xjyn4b73wvfg6v0fff7brnc61xd41500vxa6lw8cg36d51gr"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "142182889d38b76209f1d9f1d8e91d7608aff542"; + sha256 = "1m36rg3w2mf4r3383yf0r1pjrz890mdw506h1lpm6bkc8w3kyqz3"; + }; + } + { + goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; + fetch = { + type = "git"; + url = "https://github.com/kothar/go-backblaze"; + rev = "7594ed38700f5ca3fc7da8f8c7b91b0526ee66f2"; + sha256 = "0zgd5jwwdrqrnx828yxkzywh1dnwqi9y8pmq0vsndi6bwdp6dvkb"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "508b5eb18ee2f667ce06235ed383647038e2afc5"; + sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; + }; + } +] \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix b/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix index 22eee857b2..3cc62aa9dc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.2.0"; + version = "9.3.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "0rdnbx3zfz3lpgka7bb8jzapkr81l2yvgsbmn8hrhva5k61xwx3d"; + sha256 = "1gsyxkkx04vhp8ii0xbln5h8wa8x3dj6xhh2fyjs4z0bil4hlf06"; extraPostFetch = "chmod go-w $out"; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix new file mode 100644 index 0000000000..ea0c321f8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix @@ -0,0 +1,53 @@ +{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, installShellFiles, + qmake, qtbase, poppler, qtmultimedia }: + +mkDerivation rec { + pname = "beamerpresenter"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "stiglers-eponym"; + repo = "BeamerPresenter"; + rev = "v${version}"; + sha256 = "0j7wx3qqwhda33ig2464bi0j0a473y5p7ndy5f7f8x9cqdal1d01"; + }; + + nativeBuildInputs = [ qmake installShellFiles ]; + buildInputs = [ qtbase qtmultimedia poppler ]; + + postPatch = '' + # Fix location of poppler-*.h + shopt -s globstar + for f in **/*.{h,cpp}; do + substituteInPlace $f --replace '#include = 2.4) jwt (2.1.0) - kaminari (1.0.1) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) kgio (2.11.3) knapsack (1.17.0) rake diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 041f19226f..7156347be0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2382,10 +2382,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0invfvfb252ihsdr65rylkvd1x2wy004jval52v3i8ybb0jhc5hi"; + sha256 = "1vxkqciny5v4jgmjxl8qrgbmig2cij2iskqbwh4bfcmpxf467ch3"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; kaminari-actionview = { dependencies = ["actionview" "kaminari-core"]; @@ -2393,10 +2393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mhhsm6xhmwqc7hfw7xnk1kdbfg468bqs5awcqm5j6j8b9zyjvdi"; + sha256 = "0w0p1hyv6lgf6h036cmn2kbkdv4x7g0g9q9kc5gzkpz7amlxr8ri"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; kaminari-activerecord = { dependencies = ["activerecord" "kaminari-core"]; @@ -2404,20 +2404,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kb5aj6iy1cwcq5548jd3w1ipxicnzmnx2ay1s4hvad2gvrd4g93"; + sha256 = "02n5xxv6ilh39q2m6vcz7qrdai7ghk3s178dw6f0b3lavwyq49w3"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; kaminari-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r2n293ad1xr9wgn8cr53nfzwls4w3p1xi4kjfjgl1z0yf05mpwr"; + sha256 = "0h04cr4y1jfn81gxy439vmczifghc2cvsyw47aa32is5bbxg1wlz"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; kgio = { groups = ["default" "unicorn"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix index f7851c6adc..797329c613 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -11706,11 +11706,11 @@ }; } { - name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz"; + name = "swagger_ui_dist___swagger_ui_dist_3.26.2.tgz"; path = fetchurl { - name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz"; - url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.24.3.tgz"; - sha1 = "99754d11b0ddd314a1a50db850acb415e4b0a0c6"; + name = "swagger_ui_dist___swagger_ui_dist_3.26.2.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.26.2.tgz"; + sha1 = "22c700906c8911b1c9956da6c3fca371dba6219f"; }; } { @@ -13226,11 +13226,11 @@ }; } { - name = "xterm___xterm_3.5.0.tgz"; + name = "xterm___xterm_3.14.5.tgz"; path = fetchurl { - name = "xterm___xterm_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/xterm/-/xterm-3.5.0.tgz"; - sha1 = "ba3f464bc5730c9d259ebe62131862224db9ddcc"; + name = "xterm___xterm_3.14.5.tgz"; + url = "https://registry.yarnpkg.com/xterm/-/xterm-3.14.5.tgz"; + sha1 = "c9d14e48be6873aa46fb429f22f2165557fd2dea"; }; } { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 47453cb5e6..c7a1c41498 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1ilam0dz121nn4852jgkgyzyrvk3hn5cqnivy8gk1qg815mh4763"; + sha256 = "0ls8nwx3nz26pibphw54fg8pxqb365zmmqx95lqrxqqyf3d972sw"; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix index f20ebbeae3..ad540c4641 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix @@ -67,6 +67,16 @@ in let --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ "''${gappsWrapperArgs[@]}" + + # We need to replace the ssh-askpass-sublime executable because the default one + # will not function properly, in order to work it needs to pass an argv[0] to + # the sublime_merge binary, and the built-in version will will try to call the + # sublime_merge wrapper script which cannot pass through the original argv[0] to + # the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is + # very simple and can be replaced with a simple wrapper script. + rm $out/ssh-askpass-sublime + makeWrapper $out/.${primaryBinary}-wrapped $out/ssh-askpass-sublime \ + --argv0 "/ssh-askpass-sublime" ''; }; in stdenv.mkDerivation (rec { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix index a8fb944319..7a0c0d1f1e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2011"; - sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; + buildVersion = "2022"; + sha256 = "0fhxz6nx24wbspn7vfli3pvfv6fdbd591m619pvivig3scpidj61"; dev = true; } {}; } diff --git a/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix b/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix index 9374d2dbc7..2dd6b12c14 100644 --- a/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { pname = "avidemux"; - version = "2.7.4"; + version = "2.7.6"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "1acdb3m37vdzzbm8mwyibcn8msi7birb5v30qfi7jli5r00src3x"; + sha256 = "1kwkn976ppahrcr74bnv6sqx75pzl9y21m1mvr5ksi1m6lgp924s"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix index 2eda7fe1da..0e39ab0568 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.12"; + version = "3.8.13"; src = fetchurl { - sha256 = "1nnph6sn4mpdj20hngwr57ripmdp60w3vrn89s8ssy7cjv500ngd"; + sha256 = "0ryaha33m41y0xjrspa838qqr4iy2c8vbvhbb334qimpqn1hj3q5"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix index 20ab4d7503..9d6ffbd439 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix @@ -12,14 +12,14 @@ with stdenv; mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; pname = "mapmap"; src = fetchFromGitHub { owner = "mapmapteam"; repo = "mapmap"; rev = version; - sha256 = "15km6xmfkxhrflq4sl9m9r85zi4shrr4k5h15x17v7x0qkc3xgsh"; + sha256 = "1pyb3vz19lbfz2hrfqm9a29vnajw1bigdrblbmcy32imkf4isfvm"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 68f3cac1bf..9b2c8f8357 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "47.0.0"; + version = "48.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1s8y9khyfjg06mr7rmm26pk0b3nbkcrs56r29a9l57wbkqyl7qp9"; + sha256 = "0lbl3w2m12blymda3m00afl9racgahvl0z4b2clwbawhvypc5vfc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch b/third_party/nixpkgs/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch deleted file mode 100644 index 475788ba3a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 247baa7e9210bbe5462b6155014c3dcd4a60e56a Mon Sep 17 00:00:00 2001 -From: Peter Simons -Date: Tue, 24 Sep 2019 10:27:17 +0200 -Subject: [PATCH] encodedock.cpp: connect to VAAPI via DRM, not X11 - ---- - src/docks/encodedock.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp -index f2d64fc8..63d20787 100644 ---- a/src/docks/encodedock.cpp -+++ b/src/docks/encodedock.cpp -@@ -766,7 +766,6 @@ Mlt::Properties* EncodeDock::collectProperties(int realtime) - setIfNotSet(p, "pix_fmt", "nv12"); - } else if (vcodec.endsWith("_vaapi")) { - setIfNotSet(p, "vprofile", "main"); -- setIfNotSet(p, "connection_type", "x11"); - } - } - setIfNotSet(p, "width", ui->widthSpinner->value()); -@@ -1890,7 +1889,7 @@ void EncodeDock::on_hwencodeCheckBox_clicked(bool checked) - QStringList args; - args << "-hide_banner" << "-f" << "lavfi" << "-i" << "color=s=640x360" << "-frames" << "1" << "-an"; - if (codec.endsWith("_vaapi")) -- args << "-init_hw_device" << "vaapi=vaapi0:,connection_type=x11" << "-filter_hw_device" << "vaapi0" << "-vf" << "format=nv12,hwupload"; -+ args << "-init_hw_device" << "vaapi=vaapi0" << "-filter_hw_device" << "vaapi0" << "-vf" << "format=nv12,hwupload"; - else if (codec == "hevc_qsv") - args << "-load_plugin" << "hevc_hw"; - args << "-c:v" << codec << "-f" << "rawvideo" << "pipe:"; --- -2.24.1 - diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index 9c0435a351..f907179bd0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -3,22 +3,20 @@ , qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: -assert stdenv.lib.versionAtLeast libmlt.version "6.18.0"; -assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; +assert stdenv.lib.versionAtLeast libmlt.version "6.20.0"; +assert stdenv.lib.versionAtLeast mlt.version "6.20.0"; mkDerivation rec { pname = "shotcut"; - version = "20.04.12"; + version = "20.07.11"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "05yyv9192f722j8fhfjrphxadgp3crvbq4pi23ln560zh9s1m8r4"; + sha256 = "0ajg0bpdckhvmmsliy1xky9p4mdypnaw3z3cvfsdrm0zcihbgazv"; }; - patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix index d025554835..14ca503f2e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig -, gettext, systemd, perl, lib +, gettext, systemd, perl, lib, fetchpatch , enableSystemd ? true , enableBidi ? true }: stdenv.mkDerivation rec { @@ -12,6 +12,11 @@ sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5"; }; + patches = [ + # Derived from http://git.tvdr.de/?p=vdr.git;a=commit;h=930c2cd2eb8947413e88404fa94c66e4e1db5ad6 + ./glibc2.31-compat.patch + ]; + enableParallelBuilding = true; postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/glibc2.31-compat.patch b/third_party/nixpkgs/pkgs/applications/video/vdr/glibc2.31-compat.patch new file mode 100644 index 0000000000..9a52d4b290 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/glibc2.31-compat.patch @@ -0,0 +1,15 @@ +diff --git a/eit.c b/eit.c +index 50d8229..373dbca 100644 +--- a/eit.c ++++ b/eit.c +@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) + if (abs(diff) > MAX_TIME_DIFF) { + mutex.Lock(); + if (abs(diff) > MAX_ADJ_DIFF) { +- if (stime(&dvbtim) == 0) ++ timespec ts = { 0 }; ++ ts.tv_sec = dvbtim; ++ if (clock_settime(CLOCK_REALTIME, &ts) == 0) + isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); + else + esyslog("ERROR while setting system time: %m"); diff --git a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix index 24c17daa75..ef50dad86b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,14 +1,16 @@ { - alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype, - gdk-pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor, + alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, + gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, - libxcb, nspr, nss, stdenv, udev + libxcb, nspr, nss, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core }: let rpath = stdenv.lib.makeLibraryPath ([ alsaLib atk + at-spi2-core + at-spi2-atk cairo cups dbus @@ -17,9 +19,9 @@ freetype gdk-pixbuf glib - gnome2.GConf - gnome2.gtk - gnome2.pango + gnome3.gtk + pango + libuuid libX11 libXScrnSaver libXcomposite @@ -39,29 +41,33 @@ ]); in stdenv.mkDerivation rec { pname = "webtorrent-desktop"; - version = "0.20.0"; + version = "0.21.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.20.0/webtorrent-desktop_${version}-1_amd64.deb"; - sha256 = "1kkrnbimiip5pn2nwpln35bbdda9gc3cgrjwphq4fqasbjf2781k"; + fetchzip { + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v${version}/WebTorrent-v${version}-linux.zip"; + sha256 = "13gd8isq2l10kibsc1bsc15dbgpnwa7nw4cwcamycgx6pfz9a852"; } else throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}"; + desktopFile = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/applications/webtorrent-desktop.desktop"; + sha256 = "1v16dqbxqds3cqg3xkzxsa5fyd8ssddvjhy9g3i3lz90n47916ca"; + }; + icon256File = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png"; + sha256 = "1dapxvvp7cx52zhyaby4bxm4rll9xc7x3wk8k0il4g3mc7zzn3yk"; + }; + icon48File = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png"; + sha256 = "00y96w9shbbrdbf6xcjlahqd08154kkrxmqraik7qshiwcqpw7p4"; + }; phases = [ "unpackPhase" "installPhase" ]; nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - mkdir -p $out - cp -R opt $out - - mv ./usr/share $out/share - mv $out/opt/webtorrent-desktop $out/libexec - chmod +x $out/libexec/WebTorrent - rmdir $out/opt - - chmod -R g-w $out + mkdir -p $out/share/{applications,icons/hicolor/{48x48,256x256}/apps} + cp -R . $out/libexec # Patch WebTorrent patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -71,9 +77,11 @@ mkdir -p $out/bin ln -s $out/libexec/WebTorrent $out/bin/WebTorrent - # Fix the desktop link - substituteInPlace $out/share/applications/webtorrent-desktop.desktop \ - --replace /opt/webtorrent-desktop $out/bin + cp $icon48File $out/share/icons/hicolor/48x48/apps/webtorrent-desktop.png + cp $icon256File $out/share/icons/hicolor/256x256/apps/webtorrent-desktop.png + ## Fix the desktop link + substitute $desktopFile $out/share/applications/webtorrent-desktop.desktop \ + --replace /opt/webtorrent-desktop $out/libexec ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix index 19ba8ced49..94d0ae94db 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix @@ -41,11 +41,14 @@ edk2.mkDerivation projectDscPath { mkdir -vp $fd/AAVMF mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV - # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec - # FIXME: why is it different from Debian dir layout? https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules - dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=/dev/zero bs=1M count=64 - dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=$fd/FV/QEMU_EFI.fd conv=notrunc - dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M count=64 + # Use Debian dir layout: https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules + dd of=$fd/FV/AAVMF_CODE.fd if=/dev/zero bs=1M count=64 + dd of=$fd/FV/AAVMF_CODE.fd if=$fd/FV/QEMU_EFI.fd conv=notrunc + dd of=$fd/FV/AAVMF_VARS.fd if=/dev/zero bs=1M count=64 + + # Also add symlinks for Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec + ln -s $fd/FV/AAVMF_CODE.fd $fd/AAVMF/QEMU_EFI-pflash.raw + ln -s $fd/FV/AAVMF_VARS.fd $fd/AAVMF/vars-template-pflash.raw '' else '' mkdir -vp $fd/FV mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index d5abb569e7..83261c057a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.18"; + version = "2.0.19"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0f32g048jamfhrds68vzirx8iqizr45wf2d4bfvdsk176amrj4k0"; + sha256 = "005sz8aimbfm12d99q79yvsqczxbvbbgc725pavcbly3k1qva207"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index a11d5d356d..4c5699419e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.13"; + version = "0.14.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0c5acf916yv2zv3xjvxk1sa4h3n2wljc5hw61php7q37pbjc1ppn"; + sha256 = "0r77ksdrpxskf79m898a7ai8wxw9fmmsf2lg8fw3ychnk74l8jvh"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index 71359467c5..cf11b69329 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -4,16 +4,16 @@ , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property -, enum34, functools32, paramiko +, enum34, functools32, paramiko, distro, python-dotenv }: buildPythonApplication rec { - version = "1.25.5"; + version = "1.26.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks"; + sha256 = "0c3v30z7jlbxm9nxs42vv3nbja0zsppkcd6fnd0mjcm1s60hyssp"; }; # lots of networking and other fails @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client - docopt cached-property paramiko + docopt cached-property paramiko distro python-dotenv ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 ++ stdenv.lib.optional (pythonOlder "3.2") functools32; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index da414cd554..e9fc96986a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -184,9 +184,9 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/* - docker_18_09 = makeOverridable dockerGen { + docker_18_09 = makeOverridable dockerGen rec { version = "18.09.9"; - rev = "039a7df9ba8097dd987370782fcdd6ea79b26016"; + rev = "v${version}"; sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; @@ -196,10 +196,10 @@ rec { tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; - docker_19_03 = makeOverridable dockerGen { - version = "19.03.11"; - rev = "42e35e61f352e527082521280d5ea3761f0dee50"; - sha256 = "0q4l4z2bg269hj1dqaq02f84zgp3p8idw1cxczw383cjl0ra8xgq"; + docker_19_03 = makeOverridable dockerGen rec { + version = "19.03.12"; + rev = "v${version}"; + sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix index 74a408952a..576f2d9e6f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "164r8m95g7njh232xfc7zcn1nssaw9bnin9k7ssj9mk6z7z9zy5v"; + sha256 = "0myffqywbvqhax995z55jymwnwyxmp13r27kpbc7wb5fk9s4skvr"; }; buildAttrs = { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index 46d91884fc..df9a89293f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.0.5"; + version = "11.1.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "0idh8dqwb1df2di689090k9x1iap35jk3wg8yb1g70byichmscqb"; + sha256 = "1wyiz8j5b22ajrr1fh9cn55lsgd5g13q0i8wvk2a0yw0vaw1883s"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - ./recognize_nixos.patch + patches = [ + ./recognize_nixos.patch ./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438 ]; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am + sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 3ed029e55f..5c8321a3c9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "1.9.3"; + version = "2.0.2"; src = fetchFromGitHub { owner = "containers"; - repo = "libpod"; + repo = "podman"; rev = "v${version}"; - sha256 = "0gbp12xn1vliyawkw2w2bpn6b5h2cm41g3nj72vk4jyhis0igq1s"; + sha256 = "12iqj71xjszbjbbz5f2dk5chcvfrrq0n737ki7xxkjcw38k2cnqz"; }; vendorSha256 = null; @@ -44,15 +44,18 @@ buildGoModule rec { buildPhase = '' patchShebangs . ${if stdenv.isDarwin - then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" - else "make podman docs"} + then "make podman-remote" + else "make podman"} + make docs ''; - installPhase = '' + installPhase = stdenv.lib.optionalString stdenv.isDarwin '' + mv bin/{podman-remote,podman} + '' + '' install -Dm555 bin/podman $out/bin/podman installShellCompletion --bash completions/bash/podman installShellCompletion --zsh completions/zsh/_podman - MANDIR=$man/share/man make install.man + MANDIR=$man/share/man make install.man-nobuild ''; passthru.tests.podman = nixosTests.podman; @@ -63,6 +66,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 58c3ef4f61..a8d63a0ca4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc90"; + version = "1.0.0-rc91"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; + sha256 = "1hg3hbbjsz76q1piz86q8la6dym86d65xd7h6q12krfmwd2lbhkw"; }; goPackagePath = "github.com/opencontainers/runc"; @@ -30,7 +30,6 @@ buildGoPackage rec { buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; - # these will be the default in the next release makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix index d8a1f36dd5..0b9668b701 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "umoci"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { - owner = "openSUSE"; + owner = "opencontainers"; repo = "umoci"; rev = "v${version}"; - sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3"; + sha256 = "0jaar26l940yh77cs31c3zndiycp85m3fz4zivcibzi68g6n6yzg"; }; vendorSha256 = null; @@ -24,7 +24,7 @@ buildGoModule rec { postInstall = '' sed -i '/SHELL =/d' Makefile - make local-doc + make docs installManPage doc/man/*.[1-9] ''; @@ -33,6 +33,6 @@ buildGoModule rec { homepage = "https://umo.ci"; license = licenses.asl20; maintainers = with maintainers; [ zokrezyl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 7b7929d9f1..f38bafa42d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -14,7 +14,6 @@ , enableHardening ? false , headless ? false , enable32bitGuests ? true -, patchelfUnstable # needed until 0.10 is released }: with stdenv.lib; @@ -46,7 +45,7 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ] + nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4275bc0542..3a9f8eeed4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,6 +19,7 @@ let dlopenLibs = [ { name = "libdbus-1.so"; pkg = dbus; } { name = "libXfixes.so"; pkg = xorg.libXfixes; } + { name = "libXrandr.so"; pkg = xorg.libXrandr; } ]; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix index 0d9e3335f2..372ad1e27f 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix @@ -1,45 +1,45 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, makeWrapper -, wlroots, wayland, wayland-protocols, pixman, libxkbcommon +{ stdenv, fetchFromGitHub +, meson, ninja, pkg-config, wayland, scdoc, makeWrapper +, wlroots, wayland-protocols, pixman, libxkbcommon , systemd, libGL, libX11 , xwayland ? null +, nixosTests }: stdenv.mkDerivation rec { - pname = "cage-unstable"; - version = "2020-01-18"; - # The last stable release (0.1.1) would require at least the following 3 patches: - # - https://github.com/Hjdskes/cage/commit/33bb3c818c5971777b6f09d8821e7f078d38d262.patch - # - https://github.com/Hjdskes/cage/commit/51e6c760da51e2b885737d61a61cdc965bb9269d.patch - # - https://github.com/Hjdskes/cage/commit/84216ca2a417b237ad61c11e2f3ebbcb91681ece.patch - # Which need to be adapted due to other changes. At this point it seems - # better to use the current master version until the next stable release. + pname = "cage"; + version = "0.1.2.1"; src = fetchFromGitHub { owner = "Hjdskes"; repo = "cage"; - rev = "cc1f975c442ebd691b70196d76aa120ead717810"; - sha256 = "1gkqx26pvlw00b3fgx6sh87yyjfzyj51jwxvbf9k117npkrf4b2g"; + rev = "v${version}"; + sha256 = "1i4rm3dpmk7gkl6hfs6a7vwz76ba7yqcdp63nlrdbnq81m9cy2am"; }; - nativeBuildInputs = [ meson ninja pkgconfig makeWrapper wayland ]; + postPatch = '' + substituteInPlace meson.build --replace \ + "0.1.2" "${version}" + ''; + + nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; buildInputs = [ wlroots wayland wayland-protocols pixman libxkbcommon - # TODO: Not specified but required: systemd libGL libX11 ]; - enableParallelBuilding = true; - mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ]; postFixup = stdenv.lib.optionalString (xwayland != null) '' wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" ''; + # Tests Cage using the NixOS module by launching xterm: + passthru.tests.basic-nixos-module-functionality = nixosTests.cage; + meta = with stdenv.lib; { - description = "A Wayland kiosk"; + description = "A Wayland kiosk that runs a single, maximized application"; homepage = "https://www.hjdskes.nl/projects/cage/"; license = licenses.mit; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hikari/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hikari/default.nix index 274c75a3c1..16271864af 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hikari/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hikari/default.nix @@ -12,7 +12,7 @@ let pname = "hikari"; - version = "2.0.2"; + version = "2.0.4"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "1a3i01936pw11hrmjmrhzzwpndl1jqjgx376m5m724wd1j9awm68"; + sha256 = "0arm2zmiqf63a7a3nwcqf88lsk79n0ycdqqgz0c2wafvdxl23v3d"; }; nativeBuildInputs = [ pkgconfig bmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index bacfb9674f..57f4a764c9 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.6.6"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bbidulock"; repo = "icewm"; rev = version; - sha256 = "05jg2gs5cdxn2kfm2y6yrqxpza5s1zsgb52168psmzhb4nakpv42"; + sha256 = "0x6axhwfwxxgnljf3201hvrwa90yacf3ln24lsywrk1bxq9am74b"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix index c18b2129f0..494bb9ff1b 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "notion"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "raboof"; repo = pname; rev = version; - sha256 = "0rqfvwkj0j862hf6i4wsmb6185xibsskfj9kwy896qcpcg8w4kk7"; + sha256 = "1s0fyacygvc9iz7b9v3b2cmzzqc02nh4g1p9bfcxbg254iscd502"; }; nativeBuildInputs = [ pkgconfig makeWrapper groff ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/contrib.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/contrib.nix index e2c27fb470..fd44f4a5be 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/contrib.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/contrib.nix @@ -18,23 +18,11 @@ grimshot = stdenv.mkDerivation rec { pname = "grimshot"; - version = "2020-05-08"; - rev = "b1d08db5f5112ab562f89564825e3e791b0682c4"; + version = sway-unwrapped.version; - # master has new fixes and features, and a man page - # after sway-1.5 these may be switched to sway-unwrapped.src - bsrc = fetchurl { - url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot"; - sha256 = "1awzmzkib8a7q5s78xyh8za03lplqfpbasqp3lidqqmjqs882jq9"; - }; - - msrc = fetchurl { - url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot.1"; - sha256 = "191xxjfhf61gkxl3b0f694h0nrwd7vfnyp5afk8snhhr6q7ia4jz"; - }; + src = sway-unwrapped.src; dontBuild = true; - dontUnpack = true; dontConfigure = true; outputs = [ "out" "man" ]; @@ -42,9 +30,9 @@ grimshot = stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' - installManPage ${msrc} + installManPage contrib/grimshot.1 - install -Dm 0755 ${bsrc} $out/bin/grimshot + install -Dm 0755 contrib/grimshot $out/bin/grimshot wrapProgram $out/bin/grimshot --set PATH \ "${stdenv.lib.makeBinPath [ sway-unwrapped diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix index 66681ef085..da58d844ee 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchFromGitHub, makeWrapper -, meson, ninja -, pkgconfig, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus, libevdev +, meson, ninja, pkg-config, wayland, scdoc +, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols }: stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "11qf89y3q92g696a6f4d23qb44gqixg6qxq740vwv2jw59ms34ja"; + sha256 = "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9"; }; patches = [ @@ -22,8 +21,12 @@ stdenv.mkDerivation rec { ./load-configuration-from-etc.patch ]; + postPatch = '' + substituteInPlace meson.build --replace "v1.5" "1.5" + ''; + nativeBuildInputs = [ - pkgconfig meson ninja scdoc + meson ninja pkg-config wayland scdoc ]; buildInputs = [ @@ -32,16 +35,23 @@ stdenv.mkDerivation rec { wlroots wayland-protocols ]; - enableParallelBuilding = true; - mesonFlags = [ - "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" - "-Dtray=enabled" "-Dman-pages=enabled" + "-Ddefault-wallpaper=false" ]; meta = with stdenv.lib; { - description = "i3-compatible tiling Wayland compositor"; + description = "An i3-compatible tiling Wayland compositor"; + longDescription = '' + Sway is a tiling Wayland compositor and a drop-in replacement for the i3 + window manager for X11. It works with your existing i3 configuration and + supports most of i3's features, plus a few extras. + Sway allows you to arrange your application windows logically, rather + than spatially. Windows are arranged into a grid by default which + maximizes the efficiency of your screen and can be quickly manipulated + using only the keyboard. + ''; homepage = "https://swaywm.org"; + changelog = "https://github.com/swaywm/sway/releases/tag/${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos synthetica ma27 ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix index e07080497f..a6c8d5cd1c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix @@ -6,14 +6,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "v1.6-0"; + version = "v1.6-1"; src = fetchFromGitHub { owner = "mortie"; repo = "swaylock-effects"; rev = version; - sha256 = "15lshqq3qj9m3yfac65hjcciaf9zdfh3ir7hgh0ach7gpi3rbk13"; - + sha256 = "044fc4makjx8v29fkx5xlil6vr1v4r0k6c8741pl67gzvlm4cx3i"; }; postPatch = '' @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Screen locker for Wayland"; longDescription = '' - swaylock-effects is a screen locking utility for Wayland compositors. + Swaylock, with fancy effects ''; inherit (src.meta) homepage; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 9e31ca6a8a..786f0f9c59 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -132,15 +132,15 @@ stdenv.mkDerivation { ldPath="${bintools_bin}/bin" '' + # Solaris needs an additional ld wrapper. + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' - # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" exec="$ldPath/${targetPrefix}ld" wrap ld-solaris ${./ld-solaris-wrapper.sh} '') + # Create a symlink to as (the assembler). + '' - # Create a symlink to as (the assembler). if [ -e $ldPath/${targetPrefix}as ]; then ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as fi @@ -200,26 +200,29 @@ stdenv.mkDerivation { ]; postFixup = + ## + ## General libc support + ## optionalString (libc != null) ('' - ## - ## General libc support - ## - - echo "-L${libc_lib}${libc.libdir or "/lib"}" > $out/nix-support/libc-ldflags + touch "$out/nix-support/libc-ldflags" + echo "-L${libc_lib}${libc.libdir or "/lib"}" >> $out/nix-support/libc-ldflags echo "${libc_lib}" > $out/nix-support/orig-libc echo "${libc_dev}" > $out/nix-support/orig-libc-dev + '' - ## - ## Dynamic linker support - ## - + ## + ## Dynamic linker support + ## + + '' if [[ -z ''${dynamicLinker+x} ]]; then echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 local dynamicLinker="${libc_lib}/lib/ld*.so.?" fi + '' - # Expand globs to fill array of options + # Expand globs to fill array of options + + '' dynamicLinker=($dynamicLinker) case ''${#dynamicLinker[@]} in @@ -228,58 +231,56 @@ stdenv.mkDerivation { *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; esac - if [ -n "''${dynamicLinker:-}" ]; then + if [ -n "''${dynamicLinker-}" ]; then echo $dynamicLinker > $out/nix-support/dynamic-linker '' + (if targetPlatform.isDarwin then '' printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' + '' else '' if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi - - local ldflagsBefore=(-dynamic-linker "$dynamicLinker") - '') + '' - fi - + '' # The dynamic linker is passed in `ldflagsBefore' to allow # explicit overrides of the dynamic linker by callers to ld # (the *last* value counts, so ours should come first). - printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before + + '' + echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before + '') + '' + fi '') + # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. + optionalString stdenv.targetPlatform.isMacOS '' - # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. echo "-macosx_version_min 10.12 -sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before '' - + optionalString (!nativeTools) '' - ## - ## User env support - ## + ## + ## User env support + ## - # Propagate the underling unwrapped bintools so that if you - # install the wrapper, you get tools like objdump (same for any - # binaries of libc). + # Propagate the underling unwrapped bintools so that if you + # install the wrapper, you get tools like objdump (same for any + # binaries of libc). + + optionalString (!nativeTools) '' printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages '' + ## + ## Man page and info support + ## + optionalString propagateDoc ('' - ## - ## Man page and info support - ## - ln -s ${bintools.man} $man '' + optionalString (bintools ? info) '' ln -s ${bintools.info} $info '') - + '' - ## - ## Hardening support - ## + ## + ## Hardening support + ## - # some linkers on some platforms don't support specific -z flags + # some linkers on some platforms don't support specific -z flags + + '' export hardening_unsupported_flags="" if [[ "$($ldPath/${targetPrefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then hardening_unsupported_flags+=" bindnow" @@ -304,15 +305,18 @@ stdenv.mkDerivation { '' + '' + for flags in "$out/nix-support"/*flags*; do + substituteInPlace "$flags" --replace $'\n' ' ' + done + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash - - ## - ## Extra custom steps - ## '' + ## + ## Extra custom steps + ## + extraBuildCommands; inherit dynamicLinker expand-response-params; diff --git a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix index 25a09af6e9..bbcbc4e2e1 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix @@ -35,7 +35,7 @@ args@{ # required for the build as configured, rather than fetching all the dependencies # which may not work in some situations (e.g. Java code which ends up relying on # Debian-specific /usr/share/java paths, but doesn't in the configured build). -, fetchConfigured ? true +, fetchConfigured ? false , ... }: @@ -119,7 +119,8 @@ in stdenv.mkDerivation (fBuildAttrs // { # platforms -> NIX_BUILD_TOP/tmp/install/35282f5123611afa742331368e9ae529/_embedded_binaries/platforms find $bazelOut/external -maxdepth 1 -type l | while read symlink; do name="$(basename "$symlink")" - rm -f "$symlink" "$bazelOut/external/@$name.marker" + rm "$symlink" + test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" done # Patching symlinks to remove build directory reference diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh index 3398f11e8c..04be3f408e 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh @@ -37,6 +37,14 @@ if [ -e @out@/nix-support/libc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi +if [ -e @out@/nix-support/libcxx-cxxflags ]; then + NIX_CXXSTDLIB_COMPILE_@suffixSalt@+=" $(< @out@/nix-support/libcxx-cxxflags)" +fi + +if [ -e @out@/nix-support/libcxx-ldflags ]; then + NIX_CXXSTDLIB_LINK_@suffixSalt@+=" $(< @out@/nix-support/libcxx-ldflags)" +fi + if [ -e @out@/nix-support/cc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh index cf00202221..3f9f099f3b 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -129,7 +129,7 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE_@suffixSalt@+=" ${NIX_CXXSTDLIB_COMPILE_@suffixSalt@:-@default_cxx_stdlib_compile@}" + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" fi NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" fi diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index da16a23f9d..1fef3c4590 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -48,12 +48,6 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then - "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/${targetPlatform.config}" - else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then - "-isystem ${libcxx}/include/c++/v1" - else ""; - # The "suffix salt" is a arbitrary string added in the end of env vars # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used # without interfering. For the moment, it is defined as the target triple, @@ -68,7 +62,7 @@ let # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: - if cc.isGNU or false then + if isGNU then { skylake = versionAtLeast ccVersion "6.0"; skylake-avx512 = versionAtLeast ccVersion "6.0"; cannonlake = versionAtLeast ccVersion "8.0"; @@ -76,7 +70,7 @@ let icelake-server = versionAtLeast ccVersion "8.0"; knm = versionAtLeast ccVersion "8.0"; }.${arch} or true - else if cc.isClang or false then + else if isClang then { cannonlake = versionAtLeast ccVersion "5.0"; icelake-client = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0"; @@ -116,7 +110,7 @@ stdenv.mkDerivation { # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. inherit bintools; - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile; + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; emacsBufferSetup = pkgs: '' ; We should handle propagation here too @@ -160,21 +154,21 @@ stdenv.mkDerivation { ccPath="${cc}/bin" '') + # Create symlinks to everything in the bintools wrapper. + '' - # Create symlinks to everything in the bintools wrapper. for bbin in $bintools/bin/*; do mkdir -p "$out/bin" ln -s "$bbin" "$out/bin/$(basename $bbin)" done + '' - # We export environment variables pointing to the wrapped nonstandard - # cmds, lest some lousy configure script use those to guess compiler - # version. + # We export environment variables pointing to the wrapped nonstandard + # cmds, lest some lousy configure script use those to guess compiler + # version. + + '' export named_cc=${targetPrefix}cc export named_cxx=${targetPrefix}c++ - export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" - if [ -e $ccPath/${targetPrefix}gcc ]; then wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc @@ -226,7 +220,7 @@ stdenv.mkDerivation { strictDeps = true; propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; - depsTargetTargetPropagated = extraPackages; + depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages; wrapperName = "CC_WRAPPER"; @@ -236,12 +230,19 @@ stdenv.mkDerivation { ]; postFixup = + # Ensure flags files exists, as some other programs cat them. (That these + # are considered an exposed interface is a bit dubious, but fine for now.) '' - # Backwards compatability for packages expecting this file, e.g. with - # `$NIX_CC/nix-support/dynamic-linker`. - # - # TODO(@Ericson2314): Remove this after stable release and force - # everyone to refer to bintools-wrapper directly. + touch "$out/nix-support/cc-cflags" + touch "$out/nix-support/cc-ldflags" + '' + + # Backwards compatability for packages expecting this file, e.g. with + # `$NIX_CC/nix-support/dynamic-linker`. + # + # TODO(@Ericson2314): Remove this after stable release and force + # everyone to refer to bintools-wrapper directly. + + '' if [[ -f "$bintools/nix-support/dynamic-linker" ]]; then ln -s "$bintools/nix-support/dynamic-linker" "$out/nix-support" fi @@ -250,22 +251,42 @@ stdenv.mkDerivation { fi '' - + optionalString (libc != null) ('' - ## - ## General libc support - ## + ## + ## General Clang support + ## + + optionalString isClang '' - # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link - # against the crt1.o from our own glibc, rather than the one in - # /usr/lib. (This is only an issue when using an `impure' - # compiler/linker, i.e., one that searches /usr/lib and so on.) - # - # Unfortunately, setting -B appears to override the default search - # path. Thus, the gcc-specific "../includes-fixed" directory is - # now longer searched and glibc's header fails to - # compile, because it uses "#include_next " to find the - # limits.h file in ../includes-fixed. To remedy the problem, - # another -idirafter is necessary to add that directory again. + echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags + '' + + ## + ## GCC libs for non-GCC support + ## + + optionalString (isClang && libcxx == null && cc ? gcc) '' + + echo "-B${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${cc.gcc.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags + '' + + ## + ## General libc support + ## + + # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link + # against the crt1.o from our own glibc, rather than the one in + # /usr/lib. (This is only an issue when using an `impure' + # compiler/linker, i.e., one that searches /usr/lib and so on.) + # + # Unfortunately, setting -B appears to override the default search + # path. Thus, the gcc-specific "../includes-fixed" directory is + # now longer searched and glibc's header fails to + # compile, because it uses "#include_next " to find the + # limits.h file in ../includes-fixed. To remedy the problem, + # another -idirafter is necessary to add that directory again. + + optionalString (libc != null) ('' + touch "$out/nix-support/libc-cflags" + touch "$out/nix-support/libc-ldflags" echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags '' + optionalString (!(cc.langD or false)) '' echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags @@ -279,15 +300,39 @@ stdenv.mkDerivation { echo "${libc_dev}" > $out/nix-support/orig-libc-dev '') - + optionalString (!nativeTools) '' - ## - ## Initial CFLAGS - ## + ## + ## General libc++ support + ## - # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not - # ${cc_solib}/lib64 (even though it does actually search there...).. - # This confuses libtool. So add it to the compiler tool search - # path explicitly. + # We have a libc++ directly, we have one via "smuggled" GCC, or we have one + # bundled with the C compiler because it is GCC + + optionalString (libcxx != null || cc.gcc.langCC or false || (isGNU && cc.langCC or false)) '' + touch "$out/nix-support/libcxx-cxxflags" + touch "$out/nix-support/libcxx-ldflags" + '' + optionalString (libcxx == null && cc ? gcc) '' + for dir in ${cc.gcc}/include/c++/*; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + for dir in ${cc.gcc}/include/c++/*/${targetPlatform.config}; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + '' + + optionalString (libcxx.isLLVM or false) ('' + echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags + echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + echo "-lc++abi" >> $out/nix-support/libcxx-ldflags + '') + + ## + ## Initial CFLAGS + ## + + # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not + # ${cc_solib}/lib64 (even though it does actually search there...).. + # This confuses libtool. So add it to the compiler tool search + # path explicitly. + + optionalString (!nativeTools) '' if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then ccLDFlags+=" -L${cc_solib}/lib64" ccCFlags+=" -B${cc_solib}/lib64" @@ -296,32 +341,34 @@ stdenv.mkDerivation { ccCFlags+=" -B${cc_solib}/lib" '' + optionalString cc.langAda or false '' + touch "$out/nix-support/gnat-cflags" + touch "$out/nix-support/gnat-ldflags" basePath=$(echo $cc/lib/*/*/*) ccCFlags+=" -B$basePath -I$basePath/adainclude" gnatCFlags="-I$basePath/adainclude -I$basePath/adalib" - echo "$gnatCFlags" > $out/nix-support/gnat-cflags + echo "$gnatCFlags" >> $out/nix-support/gnat-cflags '' + '' - echo "$ccLDFlags" > $out/nix-support/cc-ldflags - echo "$ccCFlags" > $out/nix-support/cc-cflags + echo "$ccLDFlags" >> $out/nix-support/cc-ldflags + echo "$ccCFlags" >> $out/nix-support/cc-cflags '' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) '' echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags - '' + optionalString propagateDoc '' - ## - ## Man page and info support - ## + '' + ## + ## Man page and info support + ## + + optionalString propagateDoc '' ln -s ${cc.man} $man ln -s ${cc.info} $info '' + optionalString (cc.langD or false) '' echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags '' + ## + ## Hardening support + ## + '' - ## - ## Hardening support - ## - export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" '' @@ -389,19 +436,18 @@ stdenv.mkDerivation { # There are a few tools (to name one libstdcxx5) which do not work # well with multi line flags, so make the flags single line again + '' - if [ -e "$out/nix-support/libc-cflags" ]; then - substituteInPlace "$out/nix-support/libc-cflags" --replace $'\n' ' ' - fi + for flags in "$out/nix-support"/*flags*; do + substituteInPlace "$flags" --replace $'\n' ' ' + done substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash - - ## - ## Extra custom steps - ## '' + ## + ## Extra custom steps + ## + extraBuildCommands; inherit expand-response-params; diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index 83f4a9e0c0..bf815af6f7 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -11,6 +11,7 @@ jq, jshon, lib, + makeWrapper, moreutils, nix, pigz, @@ -29,6 +30,7 @@ writeReferencesToFile, writeScript, writeText, + writePython3, }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. @@ -204,24 +206,17 @@ rec { mkdir image tar -C image -xpf "$fromImage" - # If the image name isn't set, read it from the image repository json. - if [[ -z "$fromImageName" ]]; then - fromImageName=$(jshon -k < image/repositories | head -n 1) - echo "From-image name wasn't set. Read $fromImageName." + if [[ -n "$fromImageName" ]] && [[ -n "$fromImageTag" ]]; then + parentID="$( + cat "image/manifest.json" | + jq -r '.[] | select(.RepoTags | contains([$desiredTag])) | rtrimstr(".json")' \ + --arg desiredTag "$fromImageName:$fromImageTag" + )" + else + echo "From-image name or tag wasn't set. Reading the first ID." + parentID="$(cat "image/manifest.json" | jq -r '.[0].Config | rtrimstr(".json")')" fi - # If the tag isn't set, use the name as an index into the json - # and read the first key found. - if [[ -z "$fromImageTag" ]]; then - fromImageTag=$(jshon -e $fromImageName -k < image/repositories \ - | head -n1) - echo "From-image tag wasn't set. Read $fromImageTag." - fi - - # Use the name and tag to get the parent ID field. - parentID=$(jshon -e $fromImageName -e $fromImageTag -u \ - < image/repositories) - cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list else touch layer-list @@ -305,106 +300,6 @@ rec { ${text} ''; - # Create $maxLayers worth of Docker Layers, one layer per store path - # unless there are more paths than $maxLayers. In that case, create - # $maxLayers-1 for the most popular layers, and smush the remainaing - # store paths in to one final layer. - # - # NOTE: the `closures` parameter is a list of closures to include. - # The TOP LEVEL store paths themselves will never be present in the - # resulting image. At this time (2019-12-16) none of these layers - # are appropriate to include, as they are all created as - # implementation details of dockerTools. - mkManyPureLayers = { - name, - # Files to add to the layer. - closures, - configJson, - # Docker has a 125-layer maximum, we pick 100 to ensure there is - # plenty of room for extension. - # https://github.com/moby/moby/blob/b3e9f7b13b0f0c414fa6253e1f17a86b2cff68b5/layer/layer_store.go#L23-L26 - maxLayers ? 100 - }: - let - storePathToLayer = substituteAll - { shell = runtimeShell; - isExecutable = true; - src = ./store-path-to-layer.sh; - }; - - overallClosure = writeText "closure" (lib.concatStringsSep " " closures); - in - runCommand "${name}-granular-docker-layers" { - inherit maxLayers; - paths = referencesByPopularity overallClosure; - nativeBuildInputs = [ jshon rsync tarsum moreutils ]; - enableParallelBuilding = true; - } - '' - mkdir layers - - # Delete impurities for store path layers, so they don't get - # shared and taint other projects. - cat ${configJson} \ - | jshon -d config \ - | jshon -s "1970-01-01T00:00:01Z" -i created > generic.json - - # WARNING! - # The following code is fiddly w.r.t. ensuring every layer is - # created, and that no paths are missed. If you change the - # following head and tail call lines, double-check that your - # code behaves properly when the number of layers equals: - # maxLayers-1, maxLayers, and maxLayers+1, 0 - paths() { - cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])} - } - - paths | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer} - if [ $(paths | wc -l) -ge $maxLayers ]; then - paths | tail -n+$maxLayers | xargs ${storePathToLayer} $maxLayers - fi - - echo "Finished building layer '$name'" - - mv ./layers $out - ''; - - # Create a "Customisation" layer which adds symlinks at the root of - # the image to the root paths of the closure. Also add the config - # data like what command to run and the environment to run it in. - mkCustomisationLayer = { - name, - # Files to add to the layer. - contents, - baseJson, - extraCommands, - uid ? 0, gid ? 0, - }: - runCommand "${name}-customisation-layer" { - nativeBuildInputs = [ jshon rsync tarsum ]; - inherit extraCommands; - } - '' - cp -r ${contents}/ ./layer - - if [[ -n $extraCommands ]]; then - chmod ug+w layer - (cd layer; eval "$extraCommands") - fi - - # Tar up the layer and throw it into 'layer.tar', while calculating its checksum. - echo "Packing layer..." - mkdir $out - tarhash=$(tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum) - - # Add a 'checksum' field to the JSON, with the value set to the - # checksum of the tarball. - cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json - - # Indicate to docker that we're using schema version 1.0. - echo -n "1.0" > $out/VERSION - ''; - # Create a "layer" (set of files). mkPureLayer = { # Name of the layer @@ -438,7 +333,7 @@ rec { chmod ug+w layer - if [[ -n $extraCommands ]]; then + if [[ -n "$extraCommands" ]]; then (cd layer; eval "$extraCommands") fi @@ -541,131 +436,15 @@ rec { ''; }; - buildLayeredImage = { - # Image Name - name, - # Image tag, the Nix's output hash will be used if null - tag ? null, - # Files to put on the image (a nix store path or list of paths). - contents ? [], - # Docker config; e.g. what command to run on the container. - config ? {}, - # Time of creation of the image. Passing "now" will make the - # created date be the time of building. - created ? "1970-01-01T00:00:01Z", - # Optional bash script to run on the files prior to fixturizing the layer. - extraCommands ? "", uid ? 0, gid ? 0, - # We pick 100 to ensure there is plenty of room for extension. I - # believe the actual maximum is 128. - maxLayers ? 100 - }: - assert - (lib.assertMsg (maxLayers > 1) - "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); + buildLayeredImage = {name, ...}@args: let - baseName = baseNameOf name; - contentsEnv = symlinkJoin { - name = "bulk-layers"; - paths = if builtins.isList contents - then contents - else [ contents ]; - }; - - configJson = let - pure = writeText "${baseName}-config.json" (builtins.toJSON { - inherit created config; - architecture = buildPackages.go.GOARCH; - os = "linux"; - }); - impure = runCommand "${baseName}-standard-dynamic-date.json" - { nativeBuildInputs = [ jq ]; } - '' - jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out - ''; - in if created == "now" then impure else pure; - - bulkLayers = mkManyPureLayers { - name = baseName; - closures = [ contentsEnv configJson ]; - # One layer will be taken up by the customisationLayer, so - # take up one less. - maxLayers = maxLayers - 1; - inherit configJson; - }; - customisationLayer = mkCustomisationLayer { - name = baseName; - contents = contentsEnv; - baseJson = configJson; - inherit uid gid extraCommands; - }; - result = runCommand "docker-image-${baseName}.tar.gz" { - nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; - # Image name and tag must be lowercase - imageName = lib.toLower name; - baseJson = configJson; - passthru.imageTag = - if tag == null - then lib.head (lib.splitString "-" (lib.last (lib.splitString "/" result))) - else lib.toLower tag; - # Docker can't be made to run darwin binaries - meta.badPlatforms = lib.platforms.darwin; - } '' - ${if (tag == null) then '' - outName="$(basename "$out")" - outHash=$(echo "$outName" | cut -d - -f 1) - - imageTag=$outHash - '' else '' - imageTag="${tag}" - ''} - - find ${bulkLayers} -mindepth 1 -maxdepth 1 | sort -t/ -k5 -n > layer-list - echo ${customisationLayer} >> layer-list - - mkdir image - imageJson=$(cat ${configJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") - manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") - for layer in $(cat layer-list); do - layerChecksum=$(sha256sum $layer/layer.tar | cut -d ' ' -f1) - layerID=$(sha256sum "$layer/json" | cut -d ' ' -f 1) - ln -s "$layer" "./image/$layerID" - - manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerID/layer.tar\"]") - imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${configJson})\"}]") - imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]") - done - imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) - echo "$imageJson" > "image/$imageJsonChecksum.json" - manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"") - echo "$manifestJson" > image/manifest.json - - jshon -n object \ - -n object -s "$layerID" -i "$imageTag" \ - -i "$imageName" > image/repositories - - echo "Cooking the image..." - # tar exits with an exit code of 1 if files changed while it was - # reading them. It considers a change in the number of hard links - # to be a "change", which can cause this to fail if images are being - # built concurrently and the auto-optimise-store nix option is turned on. - # Since the contents of these files will not change, we can reasonably - # ignore this exit code. - set +e - tar -C image --dereference --hard-dereference --sort=name \ - --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 \ - --mode=a-w --xform s:'^./':: --use-compress-program='pigz -nT' \ - --warning=no-file-changed -cf $out . - RET=$? - if [ $RET -ne 0 ] && [ $RET -ne 1 ]; then - exit $RET - fi - set -e - - echo "Finished." - ''; - + stream = streamLayeredImage args; in - result; + runCommand "${name}.tar.gz" { + inherit (stream) imageName; + passthru = { inherit (stream) imageTag; }; + buildInputs = [ pigz ]; + } "${stream} | pigz -nT > $out"; # 1. extract the base image # 2. create the layer @@ -739,6 +518,11 @@ rec { layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; passthru.layer = layer; + passthru.imageTag = + if tag != null + then lib.toLower tag + else + lib.head (lib.strings.splitString "-" (baseNameOf result.outPath)); # Docker can't be made to run darwin binaries meta.badPlatforms = lib.platforms.darwin; } '' @@ -774,20 +558,22 @@ rec { configName="$(cat ./image/manifest.json | jq -r '.[0].Config')" baseEnvs="$(cat "./image/$configName" | jq '.config.Env // []')" + # Extract the parentID from the manifest + if [[ -n "$fromImageName" ]] && [[ -n "$fromImageTag" ]]; then + parentID="$( + cat "image/manifest.json" | + jq -r '.[] | select(.RepoTags | contains([$desiredTag])) | rtrimstr(".json")' \ + --arg desiredTag "$fromImageName:$fromImageTag" + )" + else + echo "From-image name or tag wasn't set. Reading the first ID." + parentID="$(cat "image/manifest.json" | jq -r '.[0].Config | rtrimstr(".json")')" + fi + # Otherwise do not import the base image configuration and manifest chmod a+w image image/*.json rm -f image/*.json - if [[ -z "$fromImageName" ]]; then - fromImageName=$(jshon -k < image/repositories|head -n1) - fi - if [[ -z "$fromImageTag" ]]; then - fromImageTag=$(jshon -e $fromImageName -k \ - < image/repositories|head -n1) - fi - parentID=$(jshon -e $fromImageName -e $fromImageTag -u \ - < image/repositories) - for l in image/*/layer.tar; do ls_tar $l >> baseFiles done @@ -904,4 +690,123 @@ rec { }) ); + streamLayeredImage = { + # Image Name + name, + # Image tag, the Nix's output hash will be used if null + tag ? null, + # Files to put on the image (a nix store path or list of paths). + contents ? [], + # Docker config; e.g. what command to run on the container. + config ? {}, + # Time of creation of the image. Passing "now" will make the + # created date be the time of building. + created ? "1970-01-01T00:00:01Z", + # Optional bash script to run on the files prior to fixturizing the layer. + extraCommands ? "", + # We pick 100 to ensure there is plenty of room for extension. I + # believe the actual maximum is 128. + maxLayers ? 100 + }: + assert + (lib.assertMsg (maxLayers > 1) + "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); + let + streamScript = writePython3 "stream" {} ./stream_layered_image.py; + baseJson = writeText "${name}-base.json" (builtins.toJSON { + inherit config; + architecture = buildPackages.go.GOARCH; + os = "linux"; + }); + customisationLayer = runCommand "${name}-customisation-layer" { inherit extraCommands; } '' + cp -r ${contentsEnv}/ $out + + if [[ -n $extraCommands ]]; then + chmod u+w $out + (cd $out; eval "$extraCommands") + fi + ''; + contentsEnv = symlinkJoin { + name = "${name}-bulk-layers"; + paths = if builtins.isList contents + then contents + else [ contents ]; + }; + + # NOTE: the `closures` parameter is a list of closures to include. + # The TOP LEVEL store paths themselves will never be present in the + # resulting image. At this time (2020-06-18) none of these layers + # are appropriate to include, as they are all created as + # implementation details of dockerTools. + closures = [ baseJson contentsEnv ]; + overallClosure = writeText "closure" (lib.concatStringsSep " " closures); + conf = runCommand "${name}-conf.json" { + inherit maxLayers created; + imageName = lib.toLower name; + passthru.imageTag = + if tag != null + then tag + else + lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath)); + paths = referencesByPopularity overallClosure; + buildInputs = [ jq ]; + } '' + paths() { + cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])} + } + ${if (tag == null) then '' + outName="$(basename "$out")" + outHash=$(echo "$outName" | cut -d - -f 1) + + imageTag=$outHash + '' else '' + imageTag="${tag}" + ''} + + # convert "created" to iso format + if [[ "$created" != "now" ]]; then + created="$(date -Iseconds -d "$created")" + fi + + # Create $maxLayers worth of Docker Layers, one layer per store path + # unless there are more paths than $maxLayers. In that case, create + # $maxLayers-1 for the most popular layers, and smush the remainaing + # store paths in to one final layer. + # + # The following code is fiddly w.r.t. ensuring every layer is + # created, and that no paths are missed. If you change the + # following lines, double-check that your code behaves properly + # when the number of layers equals: + # maxLayers-1, maxLayers, and maxLayers+1, 0 + store_layers="$( + paths | + jq -sR ' + rtrimstr("\n") | split("\n") + | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] + | map(select(length > 0)) + ' \ + --argjson maxLayers "$(( maxLayers - 1 ))" # one layer will be taken up by the customisation layer + )" + + cat ${baseJson} | jq ' + . + { + "store_layers": $store_layers, + "customisation_layer", $customisation_layer, + "repo_tag": $repo_tag, + "created": $created + } + ' --argjson store_layers "$store_layers" \ + --arg customisation_layer ${customisationLayer} \ + --arg repo_tag "$imageName:$imageTag" \ + --arg created "$created" | + tee $out + ''; + result = runCommand "stream-${name}" { + inherit (conf) imageName; + passthru = { inherit (conf) imageTag; }; + buildInputs = [ makeWrapper ]; + } '' + makeWrapper ${streamScript} $out --add-flags ${conf} + ''; + in result; } diff --git a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix index b040d830b3..0d907c2d64 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix @@ -335,4 +335,51 @@ rec { }; }; + # 19. Support files in the store on buildLayeredImage + # See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223 + filesInStore = pkgs.dockerTools.buildLayeredImageWithNixDb { + name = "file-in-store"; + tag = "latest"; + contents = [ + pkgs.coreutils + pkgs.nix + (pkgs.writeScriptBin "myscript" '' + #!${pkgs.runtimeShell} + cat ${pkgs.writeText "somefile" "some data"} + '') + ]; + config = { + Cmd = [ "myscript" ]; + # For some reason 'nix-store --verify' requires this environment variable + Env = [ "USER=root" ]; + }; + }; + + # 20. Ensure that setting created to now results in a date which + # isn't the epoch + 1 for layered images. + unstableDateLayered = pkgs.dockerTools.buildLayeredImage { + name = "unstable-date-layered"; + tag = "latest"; + contents = [ pkgs.coreutils ]; + created = "now"; + }; + + # buildImage without explicit tag + bashNoTag = pkgs.dockerTools.buildImage { + name = "bash-no-tag"; + contents = pkgs.bashInteractive; + }; + + # buildLayeredImage without explicit tag + bashNoTagLayered = pkgs.dockerTools.buildLayeredImage { + name = "bash-no-tag-layered"; + contents = pkgs.bashInteractive; + }; + + # buildImage without explicit tag + bashNoTagStreamLayered = pkgs.dockerTools.streamLayeredImage { + name = "bash-no-tag-stream-layered"; + contents = pkgs.bashInteractive; + }; + } diff --git a/third_party/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh b/third_party/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh deleted file mode 100755 index 3a1fcd0c27..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!@shell@ - -set -eu - -layerNumber=$1 -shift - -layerPath="./layers/$layerNumber" -echo "Creating layer #$layerNumber for $@" - -mkdir -p "$layerPath" - -# Make sure /nix and /nix/store appear first in the archive. -# -# We create the directories here and use them because -# when there are other things being added to the -# nix store, tar could fail, saying, -# "tar: /nix/store: file changed as we read it" -# -# In addition, we use `__Nix__` instead of `nix` to avoid renaming -# relative symlink destinations like -# /nix/store/...-nix-2.3.4/bin/nix-daemon -> nix -mkdir -p __Nix__/store - -# Then we change into the /nix/store in order to -# avoid a similar "file changed as we read it" error -# as above. Namely, if we use the absolute path of -# /nix/store/123-pkg and something new is added to the nix -# store while tar is running, it will detect a change to -# /nix/store and fail. Instead, if we cd into the nix store -# and copy the relative nix store path, tar will ignore -# changes to /nix/store. In order to create the correct -# structure in the tar file, we transform the relative nix -# store path to the absolute store path. -tarhash=$( - basename -a "$@" | - tar --create --preserve-permissions --absolute-names nix \ - --directory /nix/store --verbatim-files-from --files-from - \ - --hard-dereference --sort=name \ - --mtime="@$SOURCE_DATE_EPOCH" \ - --owner=0 --group=0 \ - --transform 's,^__Nix__$,/nix,' \ - --transform 's,^__Nix__/store$,/nix/store,' \ - --transform 's,^[^/],/nix/store/\0,rS' | - tee "$layerPath/layer.tar" | - tarsum -) - -# Add a 'checksum' field to the JSON, with the value set to the -# checksum of the tarball. -cat ./generic.json | jshon -s "$tarhash" -i checksum > $layerPath/json - -# Indicate to docker that we're using schema version 1.0. -echo -n "1.0" > $layerPath/VERSION diff --git a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py new file mode 100644 index 0000000000..8ffd336fce --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py @@ -0,0 +1,309 @@ +""" +This script generates a Docker image from a set of store paths. Uses +Docker Image Specification v1.2 as reference [1]. + +It expects a JSON file with the following properties and writes the +image as an uncompressed tarball to stdout: + +* "architecture", "config", "os", "created", "repo_tag" correspond to + the fields with the same name on the image spec [2]. +* "created" can be "now". +* "created" is also used as mtime for files added to the image. +* "store_layers" is a list of layers in ascending order, where each + layer is the list of store paths to include in that layer. + +The main challenge for this script to create the final image in a +streaming fashion, without dumping any intermediate data to disk +for performance. + +A docker image has each layer contents archived as separate tarballs, +and they later all get enveloped into a single big tarball in a +content addressed fashion. However, because how "tar" format works, +we have to know about the name (which includes the checksum in our +case) and the size of the tarball before we can start adding it to the +outer tarball. We achieve that by creating the layer tarballs twice; +on the first iteration we calculate the file size and the checksum, +and on the second one we actually stream the contents. 'add_layer_dir' +function does all this. + +[1]: https://github.com/moby/moby/blob/master/image/spec/v1.2.md +[2]: https://github.com/moby/moby/blob/4fb59c20a4fb54f944fe170d0ff1d00eb4a24d6f/image/spec/v1.2.md#image-json-field-descriptions +""" # noqa: E501 + + +import io +import os +import re +import sys +import json +import hashlib +import pathlib +import tarfile +import itertools +import threading +from datetime import datetime, timezone +from collections import namedtuple + + +def archive_paths_to(obj, paths, mtime, add_nix, filter=None): + """ + Writes the given store paths as a tar file to the given stream. + + obj: Stream to write to. Should have a 'write' method. + paths: List of store paths. + add_nix: Whether /nix and /nix/store directories should be + prepended to the archive. + filter: An optional transformation to be applied to TarInfo + objects. Should take a single TarInfo object and return + another one. Defaults to identity. + """ + + filter = filter if filter else lambda i: i + + # gettarinfo makes the paths relative, this makes them + # absolute again + def append_root(ti): + ti.name = "/" + ti.name + return ti + + def apply_filters(ti): + ti.mtime = mtime + ti.uid = 0 + ti.gid = 0 + ti.uname = "root" + ti.gname = "root" + return filter(ti) + + def dir(path): + ti = tarfile.TarInfo(path) + ti.type = tarfile.DIRTYPE + return ti + + with tarfile.open(fileobj=obj, mode="w|") as tar: + # To be consistent with the docker utilities, we need to have + # these directories first when building layer tarballs. But + # we don't need them on the customisation layer. + if add_nix: + tar.addfile(apply_filters(dir("/nix"))) + tar.addfile(apply_filters(dir("/nix/store"))) + + for path in paths: + path = pathlib.Path(path) + files = itertools.chain([path], path.rglob("*")) + for filename in sorted(files): + ti = append_root(tar.gettarinfo(filename)) + + # copy hardlinks as regular files + if ti.islnk(): + ti.type = tarfile.REGTYPE + ti.linkname = "" + ti.size = filename.stat().st_size + + ti = apply_filters(ti) + if ti.isfile(): + with open(filename, "rb") as f: + tar.addfile(ti, f) + else: + tar.addfile(ti) + + +class ExtractChecksum: + """ + A writable stream which only calculates the final file size and + sha256sum, while discarding the actual contents. + """ + + def __init__(self): + self._digest = hashlib.sha256() + self._size = 0 + + def write(self, data): + self._digest.update(data) + self._size += len(data) + + def extract(self): + """ + Returns: Hex-encoded sha256sum and size as a tuple. + """ + return (self._digest.hexdigest(), self._size) + + +# Some metadata for a layer +LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) + + +def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): + """ + Appends given store paths to a TarFile object as a new layer. + + tar: 'tarfile.TarFile' object for the new layer to be added to. + paths: List of store paths. + mtime: 'mtime' of the added files and the layer tarball. + Should be an integer representing a POSIX time. + add_nix: Whether /nix and /nix/store directories should be + added to a layer. + filter: An optional transformation to be applied to TarInfo + objects inside the layer. Should take a single TarInfo + object and return another one. Defaults to identity. + + Returns: A 'LayerInfo' object containing some metadata of + the layer added. + """ + + invalid_paths = [i for i in paths if not i.startswith("/nix/store/")] + assert len(invalid_paths) == 0, \ + "Expecting absolute store paths, but got: {invalid_paths}" + + # First, calculate the tarball checksum and the size. + extract_checksum = ExtractChecksum() + archive_paths_to( + extract_checksum, + paths, + mtime=mtime, + add_nix=add_nix, + filter=filter + ) + (checksum, size) = extract_checksum.extract() + + path = f"{checksum}/layer.tar" + layer_tarinfo = tarfile.TarInfo(path) + layer_tarinfo.size = size + layer_tarinfo.mtime = mtime + + # Then actually stream the contents to the outer tarball. + read_fd, write_fd = os.pipe() + with open(read_fd, "rb") as read, open(write_fd, "wb") as write: + def producer(): + archive_paths_to( + write, + paths, + mtime=mtime, + add_nix=add_nix, + filter=filter + ) + write.close() + + # Closing the write end of the fifo also closes the read end, + # so we don't need to wait until this thread is finished. + # + # Any exception from the thread will get printed by the default + # exception handler, and the 'addfile' call will fail since it + # won't be able to read required amount of bytes. + threading.Thread(target=producer).start() + tar.addfile(layer_tarinfo, read) + + return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) + + +def add_customisation_layer(tar, path, mtime): + """ + Adds the contents of the store path as a new layer. This is different + than the 'add_layer_dir' function defaults in the sense that the contents + of a single store path will be added to the root of the layer. eg (without + the /nix/store prefix). + + tar: 'tarfile.TarFile' object for the new layer to be added to. + path: A store path. + mtime: 'mtime' of the added files and the layer tarball. Should be an + integer representing a POSIX time. + """ + + def filter(ti): + ti.name = re.sub("^/nix/store/[^/]*", "", ti.name) + return ti + return add_layer_dir( + tar, + [path], + mtime=mtime, + add_nix=False, + filter=filter + ) + + +def add_bytes(tar, path, content, mtime): + """ + Adds a file to the tarball with given path and contents. + + tar: 'tarfile.TarFile' object. + path: Path of the file as a string. + content: Contents of the file. + mtime: 'mtime' of the file. Should be an integer representing a POSIX time. + """ + assert type(content) is bytes + + ti = tarfile.TarInfo(path) + ti.size = len(content) + ti.mtime = mtime + tar.addfile(ti, io.BytesIO(content)) + + +def main(): + with open(sys.argv[1], "r") as f: + conf = json.load(f) + + created = ( + datetime.now(tz=timezone.utc) + if conf["created"] == "now" + else datetime.fromisoformat(conf["created"]) + ) + mtime = int(created.timestamp()) + + with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: + layers = [] + for num, store_layer in enumerate(conf["store_layers"]): + print( + "Creating layer", num, + "from paths:", store_layer, + file=sys.stderr) + info = add_layer_dir(tar, store_layer, mtime=mtime) + layers.append(info) + + print("Creating the customisation layer...", file=sys.stderr) + layers.append( + add_customisation_layer( + tar, + conf["customisation_layer"], + mtime=mtime + ) + ) + + print("Adding manifests...", file=sys.stderr) + + image_json = { + "created": datetime.isoformat(created), + "architecture": conf["architecture"], + "os": "linux", + "config": conf["config"], + "rootfs": { + "diff_ids": [f"sha256:{layer.checksum}" for layer in layers], + "type": "layers", + }, + "history": [ + { + "created": datetime.isoformat(created), + "comment": f"store paths: {layer.paths}" + } + for layer in layers + ], + } + + image_json = json.dumps(image_json, indent=4).encode("utf-8") + image_json_checksum = hashlib.sha256(image_json).hexdigest() + image_json_path = f"{image_json_checksum}.json" + add_bytes(tar, image_json_path, image_json, mtime=mtime) + + manifest_json = [ + { + "Config": image_json_path, + "RepoTags": [conf["repo_tag"]], + "Layers": [layer.path for layer in layers], + } + ] + manifest_json = json.dumps(manifest_json, indent=4).encode("utf-8") + add_bytes(tar, "manifest.json", manifest_json, mtime=mtime) + + print("Done.", file=sys.stderr) + + +if __name__ == "__main__": + main() diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh index e93c98419a..5b04a702af 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh @@ -15,8 +15,14 @@ curl=( --retry 3 --disable-epsv --cookie-jar cookies - --insecure --user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion" +) + +if ! [ -f "$SSL_CERT_FILE" ]; then + curl+=(--insecure) +fi + +curl+=( $curlOpts $NIX_CURL_FLAGS ) diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix index a0c48468df..c65738aef4 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPackages ? { inherit stdenvNoCC; }, stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC. +{ lib, buildPackages ? { inherit stdenvNoCC; }, stdenvNoCC +, curl # Note that `curl' may be `null', in case of the native stdenvNoCC. +, cacert ? null }: let @@ -112,6 +114,7 @@ let else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; } else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } else if sha1 != "" then { outputHashAlgo = "sha1"; outputHash = sha1; } + else if cacert != null then { outputHashAlgo = "sha256"; outputHash = ""; } else throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}"; in @@ -134,6 +137,10 @@ stdenvNoCC.mkDerivation { # New-style output content requirements. inherit (hash_) outputHashAlgo outputHash; + SSL_CERT_FILE = if hash_.outputHash == "" + then "${cacert}/etc/ssl/certs/ca-bundle.crt" + else "/no-cert-file.crt"; + outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; inherit curlOpts showURLs mirrorsFile postFetch downloadToTemp executable; diff --git a/third_party/nixpkgs/pkgs/build-support/ocaml/oasis.nix b/third_party/nixpkgs/pkgs/build-support/ocaml/oasis.nix index 74977486f2..c1d1d69976 100644 --- a/third_party/nixpkgs/pkgs/build-support/ocaml/oasis.nix +++ b/third_party/nixpkgs/pkgs/build-support/ocaml/oasis.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (args // { buildPhase = '' runHook preBuild oasis setup - ocaml setup.ml -configure + ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out ocaml setup.ml -build runHook postBuild ''; @@ -37,9 +37,7 @@ stdenv.mkDerivation (args // { installPhase = '' runHook preInstall mkdir -p $out - sed -i s+/usr/local+$out+g setup.ml - sed -i s+/usr/local+$out+g setup.data - prefix=$OCAMLFIND_DESTDIR ocaml setup.ml -install + ocaml setup.ml -install runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/default.nix index 8d3a7ba692..9e9f2cb4e3 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/default.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation (args // { -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \)) ''; - checkPhase = args.checkPhase or (let + installCheckPhase = args.checkPhase or (let argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh index 72970623ed..4f7c0c1430 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -141,7 +141,7 @@ autoPatchelfFile() { # This makes sure the builder fails if we didn't find a dependency, because # the stdenv setup script is run with set -e. The actual error is emitted # earlier in the previous loop. - [ $depNotFound -eq 0 ] + [ $depNotFound -eq 0 -o -n "$autoPatchelfIgnoreMissingDeps" ] if [ -n "$rpath" ]; then echo "setting RPATH to: $rpath" >&2 diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh index 2e95495c96..bfa47e3b20 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -61,7 +61,7 @@ _multioutConfig() { local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")" fi # PACKAGE_TARNAME sometimes contains garbage. - if [ -n "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then + if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')" fi fi diff --git a/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix b/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix index 7bfe918030..4551dc2117 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix @@ -1,40 +1,44 @@ { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig -, qtbase, qtimageformats, qtwebkit, qtx11extras, mkDerivation +, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: mkDerivation rec { pname = "zeal"; - version = "0.6.1"; + version = "0.6.999"; src = fetchFromGitHub { - owner = "zealdocs"; - repo = "zeal"; - rev = "v${version}"; - sha256 = "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v"; + owner = "zealdocs"; + repo = "zeal"; + rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67"; + sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr"; }; - # while ads can be disabled from the user settings, by default they are not so - # we patch it out completely instead - patches = [ ./remove_ads.patch ]; + # we only need this if we are using a version that hasn't been released. We + # could also match on the "VERSION x.y.z" bit but then it would have to be + # updated based on whatever is the latest release, so instead just rewrite the + # line. + postPatch = '' + sed -i CMakeLists.txt \ + -e 's@^project.*@project(Zeal VERSION ${version})@' + ''; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + buildInputs = [ - qtbase qtimageformats qtwebkit qtx11extras + qtbase qtimageformats qtwebengine qtx11extras libarchive libXdmcp libpthreadstubs xcbutilkeysyms ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A simple offline API documentation browser"; longDescription = '' Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = "https://zealdocs.org/"; - license = licenses.gpl3; + homepage = "https://zealdocs.org/"; + license = licenses.gpl3; maintainers = with maintainers; [ skeidel peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/data/documentation/zeal/remove_ads.patch b/third_party/nixpkgs/pkgs/data/documentation/zeal/remove_ads.patch deleted file mode 100644 index be0cab305e..0000000000 --- a/third_party/nixpkgs/pkgs/data/documentation/zeal/remove_ads.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 1b61397175b6e60f23224db463301c9057830859 -Author: Peter Hoeg -Date: Mon Feb 19 07:38:03 2018 +0800 - - strip container with ads - -diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html -index bb3f511..67382b2 100644 ---- a/src/app/resources/browser/welcome.html -+++ b/src/app/resources/browser/welcome.html -@@ -20,12 +20,6 @@ - -

-

Docs for everyone

--
--
-- --
--
- -
-

Customize

diff --git a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix b/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix index 585ab6b429..974034be35 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix @@ -2,7 +2,7 @@ let pname = "agave"; - version = "14"; + version = "16"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; @@ -13,7 +13,7 @@ in fetchurl { install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf ''; - sha256 = "14hr6cdn5xbfpszj4qyfqbwmjyrkmi83yl0g9j3y3jw561jwy27j"; + sha256 = "108jvcijnx06v1jzhnb28ql9nvmwqd83309834wcd4aii6bgf9ka"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix new file mode 100644 index 0000000000..4798433416 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "alegreya-sans"; + version = "2.008"; + + src = fetchFromGitHub { + owner = "huertatipografica"; + repo = "Alegreya-Sans"; + rev = "v${version}"; + sha256 = "0xz5lq9fh0pj02ifazhddzh792qkxkz1z6ylj26d93wshc90jl5g"; + }; + + installPhase = '' + install -D -m 444 fonts/otf/* -t $out/share/fonts/otf + install -D -m 444 fonts/ttf/* -t $out/share/fonts/ttf + install -D -m 444 fonts/webfonts/*.woff -t $out/share/fonts/woff + install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 + ''; + + meta = with stdenv.lib; { + description = "Humanist sans serif family with a calligraphic feeling"; + longDescription = '' +Alegreya Sans is a humanist sans serif family with a calligraphic feeling that conveys a dynamic and varied rhythm. This gives a pleasant feeling to readers of long texts. + +The family follows humanist proportions and principles, just like the serif version of the family, Alegreya. It achieves a ludic and harmonious paragraph through elements carefully designed in an atmosphere of diversity. The italics bring a strong emphasis to the roman styles, and each have seven weights to bring you a wide typographic palette. + +Alegreya Sans supports expert latin, greek and cyrillic character sets and provides advanced typography OpenType features such as small caps, dynamic ligatures and fractions, four set of figures, super and subscript characters, ordinals, localized accent forms for spanish, catalan, guaraní, dutch, turkish, romanian, serbian among others. + +The Alegreya type system is a "super family", originally intended for literature, and includes sans and serif sister families. + ''; + homepage = "https://www.huertatipografica.com/en/fonts/alegreya-sans-ht"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ Thra11 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/alegreya/default.nix b/third_party/nixpkgs/pkgs/data/fonts/alegreya/default.nix new file mode 100644 index 0000000000..99a7131dc1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/alegreya/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "alegreya"; + version = "2.008"; + + src = fetchFromGitHub { + owner = "huertatipografica"; + repo = "Alegreya"; + rev = "v${version}"; + sha256 = "1m5xr95y6qxxv2ryvhfck39d6q5hxsr51f530fshg53x48l2mpwr"; + }; + + installPhase = '' + install -D -m 444 fonts/otf/* -t $out/share/fonts/otf + install -D -m 444 fonts/ttf/* -t $out/share/fonts/ttf + install -D -m 444 fonts/webfonts/*.woff -t $out/share/fonts/woff + install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 + ''; + + meta = with stdenv.lib; { + description = "An elegant and versatile font family for comfortable reading"; + longDescription = '' +Alegreya is a typeface originally intended for literature. Among its crowning characteristics, it conveys a dynamic and varied rhythm which facilitates the reading of long texts. Also, it provides freshness to the page while referring to the calligraphic letter, not as a literal interpretation, but rather in a contemporary typographic language. + +The italic has just as much care and attention to detail in the design as the roman. The bold weights are strong, and the Black weights are really experimental for the genre. There is also a Small Caps sister family. + +Not only does Alegreya provide great performance, but also achieves a strong and harmonious text by means of elements designed in an atmosphere of diversity. + +The Alegreya type system is a "super family", originally intended for literature, and includes serif and sans serif sister families. + +It supports expert latin, greek and cyrillic character sets and provides advanced typography OpenType features such as small caps, dynamic ligatures and fractions, four set of figures, super and subscript characters, ordinals, localized accent forms for spanish, catalan, guaraní, dutch, turkish, romanian, serbian among others. + +Alegreya was chosen at the ATypI Letter2 competition in September 2011, and one of the top 14 text type systems. It was also selected in the 2nd Bienal Iberoamericana de Diseño, competition held in Madrid in 2010 and Tipos Latinos. + +Designed by Juan Pablo del Peral for Huerta Tipográfica. + ''; + homepage = "https://www.huertatipografica.com/en/fonts/alegreya-ht-pro"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ Thra11 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix index a5d9f90556..a5bc752c4c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix @@ -1,55 +1,28 @@ -{ stdenv, fetchurl, mkfontscale }: +{ lib, fetchzip }: let - version = "1.5.1"; - releaseUrl = - "https://github.com/slavfox/Cozette/releases/download/v.${version}"; -in stdenv.mkDerivation rec { - pname = "Cozette"; - inherit version; + version = "1.8.3"; +in +fetchzip rec { + name = "Cozette-${version}"; - srcs = map fetchurl [ - { - url = "${releaseUrl}/cozette.otb"; - sha256 = "05k45n7jar11gnng2awpmc7zk9jdlzd6wz87xx49cp75jm4z9xm8"; - } - { - url = "${releaseUrl}/CozetteVector.otf"; - sha256 = "1sqhnjpizn1wi26lc7z2zml7yr7zkcpa72mh1drvd74rlcs1ip30"; - } - { - url = "${releaseUrl}/CozetteVector.ttf"; - sha256 = "1q4ml8shv9lmyc6bwhffwvbvl92s73j7xkb0rkqvci4f0zbz7mcy"; - } - ]; + url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - nativeBuildInputs = [ mkfontscale ]; + sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx"; - sourceRoot = "./"; - - unpackCmd = '' - otName=$(stripHash "$curSrc") - cp $curSrc ./$otName + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.bdf -d $out/share/fonts/misc + unzip -j $downloadedFile \*.otb -d $out/share/fonts/misc ''; - installPhase = '' - - install -D -m 644 *.otf -t "$out/share/fonts/opentype" - install -D -m 644 *.ttf -t "$out/share/fonts/truetype" - install -D -m 644 *.otb -t "$out/share/fonts/misc" - - mkfontdir "$out/share/fonts/misc" - mkfontscale "$out/share/fonts/truetype" - mkfontscale "$out/share/fonts/opentype" - ''; - - outputs = [ "out" ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A bitmap programming font optimized for coziness."; homepage = "https://github.com/slavfox/cozette"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ brettlyons ]; + maintainers = with maintainers; [ brettlyons marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index b801451c7b..dd06ba2044 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "2.3.3"; + version = "3.2.2"; in fetchzip { name = "iosevka-bin-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; - sha256 = "1dfm1888rii5kfmkxp5hnx8ycji57cbs5gazpgkxg1mnmn7i35wl"; + sha256 = "11966fvqamlg88vlgs47fl3ambi48h0mjj4a758i5y8myb2hk6bd"; meta = with stdenv.lib; { homepage = "https://be5invis.github.io/Iosevka/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 4ff0ed5fe4..7696266100 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -30,13 +30,13 @@ assert (privateBuildPlan != null) -> set != null; stdenv.mkDerivation rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "2.3.3"; + version = "3.2.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "Iosevka"; rev = "v${version}"; - sha256 = "0k7xij473g5g0lwhb6qpn70v3n2d025dww3nlb7jwbpnp03zliz0"; + sha256 = "1wbnp6gr3ywvspwk6i0jn68zwjmsd38arn4n2dkh7mdkrmvah81k"; }; nativeBuildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - npm run build --no-update-notifier -- ttf::$pname >/dev/null + npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES ttf::$pname >/dev/null runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/package.json b/third_party/nixpkgs/pkgs/data/fonts/iosevka/package.json index 8faa397576..bc77296088 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/package.json +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/package.json @@ -1,26 +1,28 @@ { "name": "iosevka-build-deps", - "version": "2.3.3", + "version": "3.2.2", "scripts": { "build": "verda -f verdafile.js" }, "dependencies": { - "caryll-shapeops": "^0.3.1", - "colors": "^1.3.3", - "libspiro-js": "^0.3.1", - "megaminx": "^0.9.0", + "@iarna/toml": "^2.2.5", + "cldr": "^5.5.4", + "ejs": "^3.1.3", + "fs-extra": "^9.0.0", "object-assign": "^4.1.1", - "otfcc-ttcize": "^0.8.0", + "otfcc-ttcize": "^0.10.2", "patel": "^0.33.1", - "patrisika-scopes": "^0.11.1", - "primitive-quadify-off-curves": "^0.4.0", - "stylus": "^0.54.5", - "toml": "^3.0.0", - "topsort": "0.0.2", + "prettier": "^2.0.5", + "semver": "^7.1.3", + "spiro": "^2.0.0", + "stylus": "^0.54.7", + "topsort": "^0.0.2", "ttf2woff": "^2.0.1", - "ttf2woff2": "^2.0.3", + "ttf2woff2": "^3.0.0", + "typo-geom": "^0.8.0", + "unicode-13.0.0": "^0.8.0", "unorm": "^1.6.0", - "verda": "^1.0.0-0", - "yargs": "^14.2.0" + "verda": "^1.0.1", + "which": "^2.0.2" } } diff --git a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index 718b6b218d..f81c0ed90f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.0.6"; + version = "2.001"; in -fetchzip rec { +fetchzip { name = "JetBrainsMono-${version}"; - url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; + url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrains.Mono.${version}.zip"; - sha256 = "1198k5zw91g85h6n7rg3y7wcj1nrbby9zlr6zwlmiq0nb37n0d3g"; + sha256 = "06rh8dssq6qzgb9rri3an2ka24j47c0i8yhgq81yyg471spc39h1"; postFetch = '' mkdir -p $out/share/fonts diff --git a/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix index b54fb3fd12..1b107f9cb8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "joypixels"; - version = "5.5.0"; + version = "6.0.0"; src = fetchurl { url = "https://cdn.joypixels.com/arch-linux/font/${version}/joypixels-android.ttf"; - sha256 = "0w3r50l0knrncwv6zihyx01gs995y76xjcwsysx5bmvc1b43yijb"; + sha256 = "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix b/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix index 72dc5fe631..1bf5c6aa48 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "4.7.95"; + version = "5.3.45"; in fetchFromGitHub { name = "material-design-icons-${version}"; owner = "Templarian"; @@ -16,10 +16,10 @@ in fetchFromGitHub { cp fonts/*.woff $out/share/fonts/woff/ cp fonts/*.woff2 $out/share/fonts/woff2/ ''; - sha256 = "0da92kz8ryy60kb5xm52md13w28ih4sfap8g3v9b4ziyww66zjhz"; + sha256 = "1nwha6dbj97ybiwlf69la57l3ibmwgnzs0nr104bfqnqxjs471sx"; meta = with lib; { - description = "3200+ Material Design Icons from the Community"; + description = "4600+ Material Design Icons from the Community"; longDescription = '' Material Design Icons' growing icon collection allows designers and developers targeting various platforms to download icons in the format, diff --git a/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix index 35f43c14df..bf98effb15 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix @@ -5,6 +5,9 @@ # To select only certain fonts, put a list of strings to `fonts`: every key in # ./shas.nix is an optional font , fonts ? [] +# Whether to enable Windows font variants, their internal font name is limited +# to 31 characters +, enableWindowsFonts ? false }: let @@ -50,6 +53,10 @@ stdenv.mkDerivation rec { installPhase = '' find -name \*.otf -exec mkdir -p $out/share/fonts/opentype/NerdFonts \; -exec mv {} $out/share/fonts/opentype/NerdFonts \; find -name \*.ttf -exec mkdir -p $out/share/fonts/truetype/NerdFonts \; -exec mv {} $out/share/fonts/truetype/NerdFonts \; + ${lib.optionalString (! enableWindowsFonts) '' + rm -rfv $out/share/fonts/opentype/NerdFonts/*Windows\ Compatible.* + rm -rfv $out/share/fonts/truetype/NerdFonts/*Windows\ Compatible.* + ''} ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix b/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix index 6994b7d4a7..ace317bf35 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.7.0"; + version = "1.8.0"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -19,7 +19,7 @@ in fetchurl { # create fonts.dir so NixOS xorg module adds to fp ${mkfontscale}/bin/mkfontdir "$d" ''; - sha256 = "17dn6spfr8wv63sy009djb4q12q635m13wsyirzn074qabhr9ggg"; + sha256 = "0vaawnav4k2gpwsgxn5rmkd8wyxnwsrbd0ksp749sb7rwfd3nphc"; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix index 4c7f5d85e8..fb120e5eec 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' + substituteInPlace Makefile --replace 'gzip' 'gzip -n' ''; postBuild = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/xits-math/default.nix b/third_party/nixpkgs/pkgs/data/fonts/xits-math/default.nix index db0ed425de..dfb38973ed 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/xits-math/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/xits-math/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xits-math"; - version = "1.301"; + version = "1.302"; src = fetchFromGitHub { owner = "alif-type"; repo = "xits"; rev = "v${version}"; - sha256 = "043g0gnjc7wn1szvrs0rc1vvrq1qmhqh45b0y2kwrlxsgprpv8ll"; + sha256 = "1x3r505dylz9rz8dj98h5n9d0zixyxmvvhnjnms9qxdrz9bxy9g1"; }; nativeBuildInputs = (with python3Packages; [ python fonttools fontforge ]); diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix index 1bfa8092a3..619fd0205b 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-jade"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1piypv8wdxnfiy6kgh7i3wi52m4fh4x874kh01qjmymssyirn17x"; + sha256 = "1q29ikfssn1vmwws3dry4ssq6b44afd9sb7dwv3rdqg0frabpj1m"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index 3c991cf1fc..885423d9a2 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "19.12.27"; + version = "20.06.07"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0za44h7f4vk37yl30xlaa6w76maiipb6p63gl9hl1rshdn9nxq0y"; + sha256 = "1j1i5w3pfw61axcqh8jdkcv20fkmwq0mslfhq725sp3jwv9wyqy2"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 9cebdc3310..53c8e53998 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "19.12.27"; + version = "20.06.07"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0pjbi2g7wk8gyr4lvp8fvcb8z29kc3l6v19a45axgadnc609hqw7"; + sha256 = "0irib8qywc32cqxchb4z20p0vnyvlgxk8z4vqa5lzx7cd4xmflm1"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix index 56bb2f3808..30e212629e 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme"; - version = "20.03.20"; + version = "20.06.07"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "092f8k38xf9yz898nrangm0ia211d41z8kx0v6njfqfgpiad1s7q"; + sha256 = "1yp9parc8ihmai8pswf4qzrqd88qpls87ipq8ylx38yqns7wsn4h"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 37bde66c3d..fe64325013 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200602"; + version = "20200702"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0cms5dn8qfasi9xpfcq1hsdyvcb39vkh97mjvi7zrng4iyihq06y"; + sha256 = "0p1grfgnmqawayk15qxnl09jai96avx9731qladmcbm2lik4qdpl"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index fa52ad176d..2a9a895b6c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2020-02-21"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0m7f26dzzz5gkxi9dbbc96pl0xcvayr1ibxbjkrlsjcdvfg7p3rr"; + sha256 = "0s5fhwfhn4qgk198jw736byxdrfm42l5m681pllbhg02j8ld4iik"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix index 27aa60ac09..f72431c5a2 100644 --- a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation { description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; + license = licenses.mpl20; }; } diff --git a/third_party/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix b/third_party/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix index d74a9cebce..f2dc4213e0 100644 --- a/third_party/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cldr-emoji-annotation"; - version = "36.12.120200305_0"; + version = "37.0_13.0_0_1"; src = fetchFromGitHub { owner = "fujiwarat"; repo = "cldr-emoji-annotation"; rev = version; - sha256 = "1zg4czaqnfjkd4hx06h8q56z8iiw22crwqr69w94s4hy9zcanfrs"; + sha256 = "19cqxyrap3p7djzzs99pndjbcvzmdv86n2m1sw2zqiwpirw7y1sy"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix index ee08c07f5a..aad1fe61c4 100644 --- a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix @@ -7,7 +7,7 @@ let # occasionally suffers from pointless hash changes, # and having stable sources for older versions has advantages, too. urls = map (prefix: prefix + "cc5e14a264912/etc/root.hints") [ - "https://gitlab.labs.nic.cz/knot/knot-resolver/raw/" + "https://gitlab.nic.cz/knot/knot-resolver/raw/" "https://raw.githubusercontent.com/CZ-NIC/knot-resolver/" ]; sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl"; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index fa4cdf15d9..5027371035 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/65a280e01c4f90470959f0423a5450d2831f845a.tar.gz"; - sha256 = "0m5zg7hswch702gprlfsjmp2xk6hs828c1489d1c85w9kxiyqkdq"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ccbc2765586cc6f71894919f1f096714ca6ae453.tar.gz"; + sha256 = "001crq0myhn0bvyrbl10i8hski6z2a0hg9ij4plbjgvl5cldkzji"; } diff --git a/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix b/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix index 6e6b6e9267..36242db462 100644 --- a/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -46,6 +46,15 @@ in rec { + dracula = mkNixBackground { + name = "dracula-2020-07-02"; + description = "Nix background based on the Dracula color palette"; + src = fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/03c6c20be96c38827037d2238357f2c777ec4aa5/wallpapers/nix-wallpaper-dracula.png"; + sha256 = "07ly21bhs6cgfl7pv4xlqzdqm44h22frwfhdqyd4gkn2jla1waab"; + }; + }; + gnome-dark = simple-dark-gray-bottom; mosaic-blue = mkNixBackground { @@ -57,6 +66,24 @@ rec { }; }; + nineish = mkNixBackground { + name = "nineish-2019-12-04"; + description = "Nix background inspired by simpler times"; + src = fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/da01f68d21ddfdc9f1c6e520c2170871c81f1cf5/wallpapers/nix-wallpaper-nineish.png"; + sha256 = "1mwvnmflp0z1biyyhfz7mjn7i1nna94n7jyns3na2shbfkaq7i0h"; + }; + }; + + nineish-dark-gray = mkNixBackground { + name = "nineish-dark-gray-2020-07-02"; + description = "Dark gray Nix background inspired by simpler times"; + src = fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/f07707cecfd89bc1459d5dad76a3a4c5315efba1/wallpapers/nix-wallpaper-nineish-dark-gray.png"; + sha256 = "07zl1dlxqh9dav9pibnhr2x1llywwnyphmzcdqaby7dz5js184ly"; + }; + }; + simple-blue = mkNixBackground { name = "simple-blue-2016-02-19"; description = "Simple blue background for Nix"; diff --git a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix index dce625de5e..c5c9bbbe37 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "1zfah1ybfgi4dag3lxqap99giwwng9b3lgcick1ciylz6vwf2gwh"; + sha256 = "19s97wm96g3828dp8m85j3lsn1n6h5h2zqk4652hcqcgq6xb6gv5"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/cde-motif-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/data/themes/cde-motif-theme/default.nix rename to third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix index cc83047e3c..ae73860475 100644 --- a/third_party/nixpkgs/pkgs/data/themes/cde-motif-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { - pname = "cde-motif-theme"; + pname = "cdetheme"; version = "1.3"; src = fetchFromGitHub { @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ gnidorah ]; + hydraPlatforms = []; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix new file mode 100644 index 0000000000..8a2300785b --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "marwaita"; + version = "2020-07-01"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = "310a3e596e95005752e14e2b96f55966cbb59d67"; + sha256 = "1r0jqv3hh74965dgc7qwvvhwzf548gb27z69lbpwz060k9di6zwj"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + rm $out/share/themes/*/COPYING + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "GTK theme supporting Budgie, Pantheon, Mate and Xfce4 desktops"; + homepage = "https://www.pling.com/p/1239855/"; + license = licenses.cc0; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix index b63d70b3c6..4e869469db 100644 --- a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "20.04.7"; + version = "20.10.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "05fpr928kgyly7ac3zf6hfw9wqgc7fjn6980ih54iqc2qffcglsk"; + sha256 = "08zws1qwvfr126fgdkqxxmpsqgfk02s31n90555bd5d66cfgdh72"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index ce63099914..a679f15887 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "04rlgcbz02n9kj1w12xa56b7f4x10y6g91hsl70zmag568mdclzz"; + sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch b/third_party/nixpkgs/pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch new file mode 100644 index 0000000000..e0005e430b --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch @@ -0,0 +1,623 @@ + + + + +diff --git a/src/bin/efreet/efreet_icon_cache_create.c b/src/bin/efreet/efreet_icon_cache_create.c +index 6810ca684e..6478df4dbd 100644 +--- a/src/bin/efreet/efreet_icon_cache_create.c ++++ b/src/bin/efreet/efreet_icon_cache_create.c +@@ -38,38 +38,36 @@ static Eina_Hash *icon_themes = NULL; + static Eina_Bool + cache_directory_modified(Eina_Hash *dirs, const char *dir) + { +- Efreet_Cache_Directory *dcache; +- long long time; +- +- if (!dirs) return EINA_TRUE; +- +- time = ecore_file_mod_time(dir); +- if (!time) +- return EINA_FALSE; +- dcache = eina_hash_find(dirs, dir); +- if (!dcache) +- { ++ Efreet_Cache_Directory *dcache; ++ Efreet_Cache_Check check; ++ ++ if (!dirs) return EINA_TRUE; ++ if (!efreet_file_cache_fill(dir, &check)) return EINA_FALSE; ++ dcache = eina_hash_find(dirs, dir); ++ if (!dcache) ++ { + dcache = malloc(sizeof (Efreet_Cache_Directory)); + if (!dcache) return EINA_TRUE; +- +- dcache->modified_time = time; ++ dcache->check = check; + eina_hash_add(dirs, dir, dcache); +- } +- else if (dcache->modified_time == time) return EINA_FALSE; +- dcache->modified_time = time; +- +- return EINA_TRUE; ++ } ++ else if (efreet_file_cache_check(&check, &dcache->check)) ++ return EINA_FALSE; ++ else ++ dcache->check = check; ++ return EINA_TRUE; + } + + static Eina_Bool + cache_extension_lookup(const char *ext) + { +- unsigned int i; ++ unsigned int i; + +- for (i = 0; i < exts->count; ++i) +- if (!strcmp(exts->data[i], ext)) +- return EINA_TRUE; +- return EINA_FALSE; ++ for (i = 0; i < exts->count; ++i) ++ { ++ if (!strcmp(exts->data[i], ext)) return EINA_TRUE; ++ } ++ return EINA_FALSE; + } + + static Eina_Bool +@@ -223,6 +221,37 @@ check_fallback_changed(Efreet_Cache_Icon_Theme *theme) + return EINA_FALSE; + } + ++typedef struct ++{ ++ char *path; ++ int name_start; ++} Scanned_Entry; ++ ++static Eina_Hash *already_scanned_path = NULL; ++ ++static void ++cache_theme_change_verify(Efreet_Cache_Icon_Theme *theme) ++{ ++ Eina_Bool changed = EINA_FALSE; ++ Eina_List *l; ++ Efreet_Icon_Theme_Directory *d; ++ char buf[PATH_MAX], *tdir, *sep; ++ ++ tdir = strdup(theme->path); ++ sep = strrchr(tdir, '/'); ++ if (sep) *sep = 0; ++ EINA_LIST_FOREACH(theme->theme.directories, l, d) ++ { ++ snprintf(buf, sizeof(buf), "%s/%s", tdir, d->name); ++ if (cache_directory_modified(theme->dirs, buf)) ++ { ++ changed = EINA_TRUE; ++ } ++ } ++ free(tdir); ++ if (changed) theme->changed = changed; ++} ++ + static Eina_Bool + cache_scan_path_dir(Efreet_Icon_Theme *theme, + const char *path, +@@ -232,29 +261,63 @@ cache_scan_path_dir(Efreet_Icon_Theme *theme, + Eina_Iterator *it; + char buf[PATH_MAX]; + Eina_File_Direct_Info *entry; ++ Eina_List *dirs = NULL; ++ Eina_List *l; ++ char *ext; ++ Scanned_Entry *scentry; + + snprintf(buf, sizeof(buf), "%s/%s", path, dir->name); ++ // we wont ever free this - no point ++ if (!already_scanned_path) ++ already_scanned_path = eina_hash_string_superfast_new(NULL); ++ dirs = eina_hash_find(already_scanned_path, buf); ++ if ((intptr_t)dirs == (intptr_t)(-1L)) return EINA_TRUE; ++ else if (!dirs) ++ { ++ it = eina_file_stat_ls(buf); ++ if (!it) ++ { ++ eina_hash_add(already_scanned_path, buf, (void *)(intptr_t)(-1L)); ++ return EINA_TRUE; ++ } ++ ++ EINA_ITERATOR_FOREACH(it, entry) ++ { ++ if (entry->type == EINA_FILE_DIR) continue; ++ ext = strrchr(entry->path + entry->name_start, '.'); ++ if (!ext || !cache_extension_lookup(ext)) continue; ++ scentry = malloc(sizeof(Scanned_Entry)); ++ if (!scentry) ++ { ++ ERR("Out of memory"); ++ exit(1); ++ } ++ scentry->name_start = entry->name_start; ++ scentry->path = strdup(entry->path); ++ if (!scentry->path) ++ { ++ ERR("Out of memory"); ++ exit(1); ++ } ++ dirs = eina_list_append(dirs, scentry); ++ } ++ eina_iterator_free(it); ++ if (dirs) ++ eina_hash_add(already_scanned_path, buf, dirs); ++ else ++ eina_hash_add(already_scanned_path, buf, (void *)(intptr_t)(-1L)); ++ } + +- it = eina_file_stat_ls(buf); +- if (!it) return EINA_TRUE; +- +- EINA_ITERATOR_FOREACH(it, entry) ++ EINA_LIST_FOREACH(dirs, l, scentry) + { + Efreet_Cache_Icon *icon; + char *name; +- char *ext; + const char **tmp; + unsigned int i; + +- if (entry->type == EINA_FILE_DIR) +- continue; +- +- ext = strrchr(entry->path + entry->name_start, '.'); +- if (!ext || !cache_extension_lookup(ext)) +- continue; +- ++ ext = strrchr(scentry->path + scentry->name_start, '.'); + /* icon with known extension */ +- name = entry->path + entry->name_start; ++ name = scentry->path + scentry->name_start; + *ext = '\0'; + + icon = eina_hash_find(icons, name); +@@ -284,7 +347,7 @@ cache_scan_path_dir(Efreet_Icon_Theme *theme, + + /* check if the path already exist */ + for (j = 0; j < icon->icons[i]->paths_count; ++j) +- if (!strcmp(icon->icons[i]->paths[j], entry->path)) ++ if (!strcmp(icon->icons[i]->paths[j], scentry->path)) + break; + + if (j != icon->icons[i]->paths_count) +@@ -348,12 +411,9 @@ cache_scan_path_dir(Efreet_Icon_Theme *theme, + exit(1); + } + icon->icons[i]->paths = tmp; +- icon->icons[i]->paths[icon->icons[i]->paths_count] = eina_stringshare_add(entry->path); ++ icon->icons[i]->paths[icon->icons[i]->paths_count] = eina_stringshare_add(scentry->path); + eina_array_push(strs, icon->icons[i]->paths[icon->icons[i]->paths_count++]); + } +- +- eina_iterator_free(it); +- + return EINA_TRUE; + } + +@@ -364,7 +424,9 @@ cache_scan_path(Efreet_Icon_Theme *theme, Eina_Hash *icons, const char *path) + Efreet_Icon_Theme_Directory *dir; + + EINA_LIST_FOREACH(theme->directories, l, dir) ++ { + if (!cache_scan_path_dir(theme, path, dir, icons)) return EINA_FALSE; ++ } + + return EINA_TRUE; + } +@@ -511,13 +573,13 @@ icon_theme_index_read(Efreet_Cache_Icon_Theme *theme, const char *path) + Efreet_Ini *ini; + Efreet_Icon_Theme_Directory *dir; + const char *tmp; +- long long time; ++ Efreet_Cache_Check check; + + if (!theme || !path) return EINA_FALSE; + +- time = ecore_file_mod_time(path); +- if (!time) return EINA_FALSE; +- if (theme->path && !strcmp(theme->path, path) && theme->last_cache_check >= time) ++ if (!efreet_file_cache_fill(path, &check)) return EINA_FALSE; ++ if (theme->path && !strcmp(theme->path, path) && ++ efreet_file_cache_check(&check, &(theme->check))) + { + /* no change */ + theme->valid = 1; +@@ -528,8 +590,7 @@ icon_theme_index_read(Efreet_Cache_Icon_Theme *theme, const char *path) + theme->path = eina_stringshare_add(path); + eina_array_push(strs, theme->path); + } +- if (time > theme->last_cache_check) +- theme->last_cache_check = time; ++ theme->check = check; + theme->changed = 1; + + ini = efreet_ini_new(path); +@@ -644,10 +705,10 @@ cache_theme_scan(const char *dir) + Efreet_Cache_Icon_Theme *theme; + const char *name; + const char *path; +- long long time; ++ Efreet_Cache_Check check; ++ Efreet_Cache_Directory *d; + +- time = ecore_file_mod_time(entry->path); +- if (!time) continue; ++ if (!efreet_file_cache_fill(entry->path, &check)) continue; + + if ((entry->type != EINA_FILE_DIR) && + (entry->type != EINA_FILE_LNK)) +@@ -669,10 +730,26 @@ cache_theme_scan(const char *dir) + (void *)theme->theme.name.internal, theme); + theme->changed = 1; + } +- if (time > theme->last_cache_check) +- { +- theme->last_cache_check = time; ++ ++ d = NULL; ++ if (theme->dirs) ++ d = eina_hash_find(theme->dirs, entry->path); ++ if (!d) ++ { ++ if (!theme->dirs) ++ theme->dirs = eina_hash_string_superfast_new(NULL); + theme->changed = 1; ++ d = NEW(Efreet_Cache_Directory, 1); ++ d->check = check; ++ eina_hash_add(theme->dirs, entry->path, d); ++ } ++ else ++ { ++ if (!efreet_file_cache_check(&check, &(d->check))) ++ { ++ d->check = check; ++ theme->changed = 1; ++ } + } + + /* TODO: We need to handle change in order of included paths */ +@@ -732,8 +809,7 @@ icon_theme_free(Efreet_Cache_Icon_Theme *theme) + + eina_list_free(theme->theme.paths); + eina_list_free(theme->theme.inherits); +- EINA_LIST_FREE(theme->theme.directories, data) +- free(data); ++ EINA_LIST_FREE(theme->theme.directories, data) free(data); + if (theme->dirs) efreet_hash_free(theme->dirs, free); + free(theme); + } +@@ -926,7 +1002,7 @@ main(int argc, char **argv) + if (!theme->theme.name.name) continue; + #endif + INF("scan theme %s", theme->theme.name.name); +- ++ cache_theme_change_verify(theme); + theme->changed = check_changed(theme); + if (flush) + theme->changed = EINA_TRUE; +@@ -981,18 +1057,18 @@ main(int argc, char **argv) + + icons_it = eina_hash_iterator_tuple_new(icons); + EINA_ITERATOR_FOREACH(icons_it, tuple) +- eet_data_write(icon_ef, icon_edd, tuple->key, tuple->data, 1); ++ eet_data_write(icon_ef, icon_edd, tuple->key, tuple->data, EET_COMPRESSION_SUPERFAST); + eina_iterator_free(icons_it); + +- INF("theme change: %s %lld", theme->theme.name.internal, theme->last_cache_check); +- eet_data_write(theme_ef, theme_edd, theme->theme.name.internal, theme, 1); ++ INF("theme change: %s %lld", theme->theme.name.internal, theme->check.mtime); ++ eet_data_write(theme_ef, theme_edd, theme->theme.name.internal, theme, EET_COMPRESSION_SUPERFAST); + } + eina_hash_free(themes); + eina_hash_free(icons); + changed = EINA_TRUE; + } + +- eet_data_write(icon_ef, efreet_version_edd(), EFREET_CACHE_VERSION, icon_version, 1); ++ eet_data_write(icon_ef, efreet_version_edd(), EFREET_CACHE_VERSION, icon_version, EET_COMPRESSION_SUPERFAST); + eet_close(icon_ef); + efreet_setowner(efreet_icon_cache_file(theme->theme.name.internal)); + free(icon_version); +@@ -1064,17 +1140,17 @@ main(int argc, char **argv) + + icons_it = eina_hash_iterator_tuple_new(icons); + EINA_ITERATOR_FOREACH(icons_it, tuple) +- eet_data_write(icon_ef, fallback_edd, tuple->key, tuple->data, 1); ++ eet_data_write(icon_ef, fallback_edd, tuple->key, tuple->data, EET_COMPRESSION_SUPERFAST); + eina_iterator_free(icons_it); + } + eina_hash_free(icons); + +- eet_data_write(theme_ef, theme_edd, EFREET_CACHE_ICON_FALLBACK, theme, 1); ++ eet_data_write(theme_ef, theme_edd, EFREET_CACHE_ICON_FALLBACK, theme, EET_COMPRESSION_SUPERFAST); + } + + icon_theme_free(theme); + +- eet_data_write(icon_ef, efreet_version_edd(), EFREET_CACHE_VERSION, icon_version, 1); ++ eet_data_write(icon_ef, efreet_version_edd(), EFREET_CACHE_VERSION, icon_version, EET_COMPRESSION_SUPERFAST); + eet_close(icon_ef); + efreet_setowner(efreet_icon_cache_file(EFREET_CACHE_ICON_FALLBACK)); + free(icon_version); +@@ -1082,7 +1158,7 @@ main(int argc, char **argv) + eina_hash_free(icon_themes); + + /* save data */ +- eet_data_write(theme_ef, efreet_version_edd(), EFREET_CACHE_VERSION, theme_version, 1); ++ eet_data_write(theme_ef, efreet_version_edd(), EFREET_CACHE_VERSION, theme_version, EET_COMPRESSION_SUPERFAST); + + eet_close(theme_ef); + theme_ef = NULL; +diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c +index f859c630f0..2b5d0c9f5f 100644 +--- a/src/lib/efreet/efreet_cache.c ++++ b/src/lib/efreet/efreet_cache.c +@@ -1,3 +1,4 @@ ++ + #ifdef HAVE_CONFIG_H + # include + #endif +@@ -536,6 +537,137 @@ efreet_desktop_util_cache_file(void) + /* + * Needs EAPI because of helper binaries + */ ++#define SHSH(n, v) ((((v) << (n)) & 0xffffffff) | ((v) >> (32 - (n)))) ++ ++static inline int ++int_to_bigendian(int in) ++{ ++ static const unsigned char test[4] = { 0x11, 0x22, 0x33, 0x44 }; ++ static const unsigned int *test_i = (const unsigned int *)test; ++ if (test_i[0] == 0x44332211) return eina_swap32(in); ++ return in; ++} ++ ++static void ++sha1(unsigned char *data, int size, unsigned char *dst) ++{ ++ unsigned int digest[5], word[80], wa, wb, wc, wd, we, t; ++ unsigned char buf[64], *d; ++ int idx, left, i; ++ const unsigned int magic[4] = ++ { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 }; ++ ++ idx = 0; ++ digest[0] = 0x67452301; digest[1] = 0xefcdab89; digest[2] = 0x98badcfe; ++ digest[3] = 0x10325476; digest[4] = 0xc3d2e1f0; ++ ++ memset(buf, 0, sizeof(buf)); ++ for (left = size, d = data; left > 0; left--, d++) ++ { ++ if ((idx == 0) && (left < 64)) ++ { ++ memset(buf, 0, 60); ++ buf[60] = (size >> 24) & 0xff; ++ buf[61] = (size >> 16) & 0xff; ++ buf[62] = (size >> 8) & 0xff; ++ buf[63] = (size) & 0xff; ++ } ++ buf[idx] = *d; ++ idx++; ++ if ((idx == 64) || (left == 1)) ++ { ++ if ((left == 1) && (idx < 64)) buf[idx] = 0x80; ++ for (i = 0; i < 16; i++) ++ { ++ word[i] = (unsigned int)buf[(i * 4) ] << 24; ++ word[i] |= (unsigned int)buf[(i * 4) + 1] << 16; ++ word[i] |= (unsigned int)buf[(i * 4) + 2] << 8; ++ word[i] |= (unsigned int)buf[(i * 4) + 3]; ++ } ++ for (i = 16; i < 80; i++) ++ word[i] = SHSH(1, ++ word[i - 3 ] ^ word[i - 8 ] ^ ++ word[i - 14] ^ word[i - 16]); ++ wa = digest[0]; wb = digest[1]; wc = digest[2]; ++ wd = digest[3]; we = digest[4]; ++ for (i = 0; i < 80; i++) ++ { ++ if (i < 20) ++ t = SHSH(5, wa) + ((wb & wc) | ((~wb) & wd)) + ++ we + word[i] + magic[0]; ++ else if (i < 40) ++ t = SHSH(5, wa) + (wb ^ wc ^ wd) + ++ we + word[i] + magic[1]; ++ else if (i < 60) ++ t = SHSH(5, wa) + ((wb & wc) | (wb & wd) | (wc & wd)) + ++ we + word[i] + magic[2]; ++ else if (i < 80) ++ t = SHSH(5, wa) + (wb ^ wc ^ wd) + ++ we + word[i] + magic[3]; ++ we = wd; ++ wd = wc; ++ wc = SHSH(30, wb); ++ wb = wa; ++ wa = t; ++ } ++ digest[0] += wa; digest[1] += wb; digest[2] += wc; ++ digest[3] += wd; digest[4] += we; ++ idx = 0; ++ } ++ } ++ t = int_to_bigendian(digest[0]); digest[0] = t; ++ t = int_to_bigendian(digest[1]); digest[1] = t; ++ t = int_to_bigendian(digest[2]); digest[2] = t; ++ t = int_to_bigendian(digest[3]); digest[3] = t; ++ t = int_to_bigendian(digest[4]); digest[4] = t; ++ memcpy(dst, digest, 5 * 4); ++} ++ ++EAPI Eina_Bool ++efreet_file_cache_fill(const char *file, Efreet_Cache_Check *check) ++{ ++ struct stat st; ++ ssize_t size = 0; ++ char link[PATH_MAX]; ++ ++ if (lstat(file, &st) != 0) return EINA_FALSE; ++ if (S_ISLNK(st.st_mode)) ++ { ++ size = readlink(file, link, sizeof(link)); ++ if ((size > 0) && ((size_t)size >= sizeof(link))) return EINA_FALSE; ++ if (stat(file, &st) != 0) return EINA_FALSE; ++ } ++ ++ memset(check, 0, sizeof(Efreet_Cache_Check)); ++ if (size > 0) sha1((unsigned char *)link, size, check->link_sha1); ++ else memset(check->link_sha1, 0, sizeof(check->link_sha1)); ++ check->uid = st.st_uid; ++ check->gid = st.st_gid; ++ check->size = st.st_size; ++ check->blocks = st.st_blocks; ++ check->mtime = st.st_mtime; ++ check->chtime = st.st_ctime; ++ check->mode = st.st_mode; ++ return EINA_TRUE; ++} ++ ++EAPI Eina_Bool // true if matches ++efreet_file_cache_check(const Efreet_Cache_Check *check1, const Efreet_Cache_Check *check2) ++{ ++ if ((check1->mtime != check2->mtime ) || ++ (check1->size != check2->size ) || ++ (check1->chtime != check2->chtime ) || ++ (check1->blocks != check2->blocks) || ++ (check1->mode != check2->mode ) || ++ (check1->uid != check2->uid ) || ++ (check1->gid != check2->gid ) || ++ (memcmp(check1->link_sha1, check2->link_sha1, 20) != 0)) ++ { ++ return EINA_FALSE; ++ } ++ return EINA_TRUE; // matches ++} ++ + EAPI Eet_Data_Descriptor * + efreet_version_edd(void) + { +@@ -691,8 +823,22 @@ efreet_icon_directory_edd(void) + directory_edd = eet_data_descriptor_file_new(&eddc); + if (!directory_edd) return NULL; + +- EET_DATA_DESCRIPTOR_ADD_BASIC(directory_edd, Efreet_Cache_Directory, +- "modified_time", modified_time, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(directory_edd, Efreet_Cache_Directory, ++ "check.uid", check.uid, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(directory_edd, Efreet_Cache_Directory, ++ "check.gid", check.gid, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(directory_edd, Efreet_Cache_Directory, ++ "check.size", check.size, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(directory_edd, Efreet_Cache_Directory, ++ "check.blocks", check.blocks, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(directory_edd, Efreet_Cache_Directory, ++ "check.mtime", check.mtime, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(directory_edd, Efreet_Cache_Directory, ++ "check.chtime", check.chtime, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(directory_edd, Efreet_Cache_Directory, ++ "check.mode", check.mode, EET_T_INT); ++ EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(directory_edd, Efreet_Cache_Directory, ++ "check.link_sha1", check.link_sha1, EET_T_CHAR); + + return directory_edd; + } +@@ -790,7 +936,21 @@ efreet_icon_theme_edd(Eina_Bool cache) + if (cache) + { + EET_DATA_DESCRIPTOR_ADD_BASIC(icon_theme_edd, Efreet_Cache_Icon_Theme, +- "last_cache_check", last_cache_check, EET_T_LONG_LONG); ++ "check.uid", check.uid, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(icon_theme_edd, Efreet_Cache_Icon_Theme, ++ "check.gid", check.gid, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(icon_theme_edd, Efreet_Cache_Icon_Theme, ++ "check.size", check.size, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(icon_theme_edd, Efreet_Cache_Icon_Theme, ++ "check.blocks", check.blocks, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(icon_theme_edd, Efreet_Cache_Icon_Theme, ++ "check.mtime", check.mtime, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(icon_theme_edd, Efreet_Cache_Icon_Theme, ++ "check.chtime", check.chtime, EET_T_LONG_LONG); ++ EET_DATA_DESCRIPTOR_ADD_BASIC(icon_theme_edd, Efreet_Cache_Icon_Theme, ++ "check.mode", check.mode, EET_T_INT); ++ EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(icon_theme_edd, Efreet_Cache_Icon_Theme, ++ "check.link_sha1", check.link_sha1, EET_T_CHAR); + + EET_DATA_DESCRIPTOR_ADD_BASIC(icon_theme_edd, Efreet_Cache_Icon_Theme, + "path", path, EET_T_STRING); +diff --git a/src/lib/efreet/efreet_cache_private.h b/src/lib/efreet/efreet_cache_private.h +index 97dbd45a1e..1edbb3b5ff 100644 +--- a/src/lib/efreet/efreet_cache_private.h ++++ b/src/lib/efreet/efreet_cache_private.h +@@ -38,11 +38,20 @@ + # endif + #endif + ++typedef struct _Efreet_Cache_Check Efreet_Cache_Check; ++ ++typedef struct _Efreet_Cache_Icon_Theme Efreet_Cache_Icon_Theme; ++typedef struct _Efreet_Cache_Directory Efreet_Cache_Directory; ++typedef struct _Efreet_Cache_Desktop Efreet_Cache_Desktop; ++ + EAPI const char *efreet_desktop_util_cache_file(void); + EAPI const char *efreet_desktop_cache_file(void); + EAPI const char *efreet_icon_cache_file(const char *theme); + EAPI const char *efreet_icon_theme_cache_file(void); + ++EAPI Eina_Bool efreet_file_cache_fill(const char *file, Efreet_Cache_Check *check); ++EAPI Eina_Bool efreet_file_cache_check(const Efreet_Cache_Check *check1, const Efreet_Cache_Check *check2); ++ + EAPI Eet_Data_Descriptor *efreet_version_edd(void); + EAPI Eet_Data_Descriptor *efreet_desktop_edd(void); + EAPI Eet_Data_Descriptor *efreet_hash_array_string_edd(void); +@@ -52,15 +61,23 @@ EAPI Eet_Data_Descriptor *efreet_icon_theme_edd(Eina_Bool cache); + EAPI Eet_Data_Descriptor *efreet_icon_edd(void); + EAPI Eet_Data_Descriptor *efreet_icon_fallback_edd(void); + +-typedef struct _Efreet_Cache_Icon_Theme Efreet_Cache_Icon_Theme; +-typedef struct _Efreet_Cache_Directory Efreet_Cache_Directory; +-typedef struct _Efreet_Cache_Desktop Efreet_Cache_Desktop; ++struct _Efreet_Cache_Check ++{ ++ unsigned long long uid; ++ unsigned long long gid; ++ unsigned long long size; ++ unsigned long long blocks; ++ unsigned long long mtime; ++ unsigned long long chtime; ++ unsigned int mode; ++ unsigned char link_sha1[20]; ++}; + + struct _Efreet_Cache_Icon_Theme + { + Efreet_Icon_Theme theme; + +- long long last_cache_check; /**< Last time the cache was checked */ ++ Efreet_Cache_Check check; /**< relevant stat info from last check */ + + Eina_Hash *dirs; /**< All possible icon paths for this theme */ + +@@ -73,13 +90,14 @@ struct _Efreet_Cache_Icon_Theme + + struct _Efreet_Cache_Directory + { +- long long modified_time; ++ Efreet_Cache_Check check; /**< relevant stat info from last check */ + }; + + struct _Efreet_Cache_Desktop + { + Efreet_Desktop desktop; + ++ Efreet_Cache_Check check; /**< relevant stat info from last check */ + double check_time; /**< Last time we check for disk modification */ + }; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch b/third_party/nixpkgs/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch new file mode 100644 index 0000000000..5c32ed9b0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch @@ -0,0 +1,25 @@ +From b7ef2a0d3f31db55a12b2b8c2e1c60ba62b971c8 Mon Sep 17 00:00:00 2001 +From: Matt Bagnara +Date: Wed, 1 Jul 2020 15:30:40 -0500 +Subject: [PATCH] add nixos path + +--- + src/bin/e_util_suid.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/e_util_suid.h b/src/bin/e_util_suid.h +index b01ff792b..88c2a0f17 100644 +--- a/src/bin/e_util_suid.h ++++ b/src/bin/e_util_suid.h +@@ -246,7 +246,7 @@ e_setuid_setup(uid_t *caller_uid, gid_t *caller_gid, char **caller_user, char ** + # endif + #endif + // pass 3 - set path and ifs to minimal defaults +- putenv("PATH=/bin:/usr/bin:/sbin:/usr/sbin"); ++ putenv("PATH=/bin:/usr/bin:/sbin:/usr/sbin:/run/current-system/sw/bin"); + putenv("IFS= \t\n"); + return 0; + } +-- +2.27.0 + diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix index 5ac8194d74..0fa5edc934 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0w3srvigg4kfi7xq76c7y4hnq5yr2gxrrsvlyj1g2wc1igz1vyg1"; + sha256 = "de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a"; }; nativeBuildInputs = [ @@ -149,13 +149,16 @@ stdenv.mkDerivation rec { "-D sdl=true" ]; - patches = [ ./efl-elua.patch ]; + patches = [ + ./efl-elua.patch + ./0002-efreet-more-stat-info-changes.patch + ]; postPatch = '' patchShebangs src/lib/elementary/config_embed # fix destination of systemd unit and dbus service - substituteInPlace systemd-services/meson.build --replace "dep.get_pkgconfig_variable('systemduserunitdir')" "'$out/systemd/user'" + substituteInPlace systemd-services/meson.build --replace "sys_dep.get_pkgconfig_variable('systemduserunitdir')" "'$out/systemd/user'" substituteInPlace dbus-services/meson.build --replace "dep.get_pkgconfig_variable('session_bus_services_dir')" "'$out/share/dbus-1/services'" ''; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix index cbec200602..2d402b3298 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { # wrapped in the enlightenment service module, and the wrapped # executables should be used instead. ./0001-wrapped-setuid-executables.patch + ./0003-setuid-missing-path.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 192c179a93..c3bb4c3629 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.36.1"; + version = "3.36.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ig9zcg8z7yv2c28q0a4q57ckkpmzjsbnancx01rjihrrjbg9ib2"; + sha256 = "1n6glngvybg5im9diq6v5wv1in699nmm34v9yvlbjnsb1k2hb4hg"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix index b9ac719004..e6b2db3330 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00yann3cibbsap7vh6qq08aklvydynmk6gmljkzd80kc52m6rqal"; + sha256 = "0vgd3i5zrs4r0i0700hhl89c66j41bgdzg9j8wdf0w8irlqj5xv2"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 88284c540e..988cb1ed2a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ql3f509bj17riqs0jfpp434s97dzjgkjcd978i4m4y80nq2131v"; + sha256 = "07sc1kn65dzxsxpv0vl5dj1a5awljjsfl9jldrg0hnjmq12m7c6h"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index a722ab9616..57ba6fd076 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.36.2"; + version = "3.36.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "114pia3nd8k7j6ll7za7qzv0ggcdvcw6b3w4lppqqrwqvswik8jv"; + sha256 = "1ila7li9yi4lyjc84a787qr33wr7ayppphxn451jzg410pfcamhz"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index d2d3f83f42..92c40f4a00 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.36.3"; + version = "3.36.4.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ds225fd0zl0zpjc2wmzg4fwivqbqsyiqpnf9pzlqpwrz10d5y2l"; + sha256 = "0zdpjgwf48bqb66wrl6k33pzcmc2g3m1046ma7z8xaj9idpi37jh"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 03edd5c9bf..8b99d309d2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -23,7 +23,7 @@ }: let - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation { pname = "gnome-notes"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "0421g9czdahk2w2kv7zg4gd9b4q8g1hl483jsfrxy5y7saincbr1"; + sha256 = "1d5ynfhwbmrbdk1gcnhddn32d3kakwniq6lwjzsrhq26hq5xncsd"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix index ec6791e323..3668fc171b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.36"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nqn4a6dr4l1fpzj3mv4swhpnvhjcqlwsyhwm59sdzqgdfx4hbwr"; + sha256 = "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix index af39d3a3c0..dce14d6d1d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,13 +4,13 @@ let pname = "baobab"; - version = "3.34.0"; + version = "3.34.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01w6m5ylyqs4wslpjn1hg6n6ynwh3rghksak0qs8r9m6dm3dkss6"; + sha256 = "1i90gc1cpw5507zn54k46hj4mjgdxsq8cvpnlgxq0ksy2d7iv63z"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 860b7b957b..c6b02917ce 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -3,13 +3,13 @@ let pname = "dconf-editor"; - version = "3.36.2"; + version = "3.36.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1iz1ngb26llhqnm2s4p55ysvnav41iv0fx0pbw98k181gy3cikpd"; + sha256 = "0y9yll77wkvr9ly132icfsl12sdz5aba9qc3aqm5rc90r6xhkhry"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix index db15cf2555..9885d0de37 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.36.2"; + version = "3.36.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "135pw7ifr585grz1rbmynyyrmhd8w880pilg7c4nvq58jl16n1aw"; + sha256 = "1p1lrnsgk5iyw7h02qzax4s74dqqsh5lk85b0qsj7hwx91qm61xp"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix index 5cffe4187c..77d00cafe9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ppvzfv98031y884cgy5agr90a0q3m37x2kybsd804g21ym7drn2"; + sha256 = "0vz1j6yrjv0nmf5lk8prkkm10fbcmd35khy9zsd7d4a86wk5c6v2"; }; # Tests need an X display diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix index d9d9f916d4..11a5bcbd0f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.36.5"; + version = "3.36.7"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z79jl0j9xq9wgwkfr0d1w1qrdy4447y8shs407n5srr0vixc3bg"; + sha256 = "0clg9fhgjyj23mmcmw7dp512wzgv5m18fppn05qf1frz7r11mmk5"; }; postPatch = '' @@ -128,6 +128,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.gnome.members ++ [ maintainers.vcunat ]; + maintainers = teams.gnome.members; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 4bb3f4517f..ccda82765c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.36.3"; + version = "3.36.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cix02xl473m0l7h715s68cn7bi1p4y1jkrxswcq4a0g7lblhpqz"; + sha256 = "03sc7r6hpi62kcxpnzm5gv1ky3hmslh4fnf2vy2qghb5xqg3zy1r"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 6e933e7b9a..5372552a72 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qb2kgyk6f6wr129a0gzhvpy5wdjpwjbksxyfs6zxv183jl9s73z"; + sha256 = "048l07biy8xrfidfyzrjd5lrnfzqhb767ih2gl7w6c4mmhj4g2dy"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index d282fec2e8..ea28d651eb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0739qcwfwrimfrpf3gaakkf7ipwy3virs096kkhkxjmy1nbls5xw"; + sha256 = "0m7pxjgymc7aqqz0vcmlq91nxnwzd1v7v1gdhrfam49krxmk80mc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 22b3f17b42..2e89e6b9c2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.36.3.1"; + version = "3.36.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zkbx5inprjpf4abqwn0bxc2d1rwbhv450cjh1wgz82ylagi3vab"; + sha256 = "1ilv49qkppbbag5728iswg1jhhqx9hbj7j8k8wccnbyaq54bsyq0"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index ff7463b940..ff7b1f45e4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11f2yj8q844gks3jkfbi4ap448snz1wjflqbq4y2kk12r3w37afq"; + sha256 = "17szzz2a5wpi7kwjnhimiwf8vg0bfliyk3k0adgv1pw2mcfpxp5s"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 37962d0c69..17f359e7d2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,60 +1,81 @@ -{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, gettext, libsecret -, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core -, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info -, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, wrapGAppsHook, libxslt, gcr -, accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop -, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 -, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon -, gnome-autoar, asciidoc-full +{ fetchurl +, fetchpatch +, substituteAll +, stdenv +, meson +, ninja +, pkg-config +, gnome3 +, json-glib +, gettext +, libsecret +, python3 +, polkit +, networkmanager +, gtk-doc +, docbook-xsl-nons +, at-spi2-core +, libstartup_notification +, telepathy-glib +, telepathy-logger +, unzip +, shared-mime-info +, libgweather +, librsvg +, geoclue2 +, perl +, docbook_xml_dtd_412 +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, desktop-file-utils +, libpulseaudio +, libical +, gobject-introspection +, wrapGAppsHook +, libxslt +, gcr +, accountsservice +, gdk-pixbuf +, gdm +, upower +, ibus +, libnma +, libgnomekbd +, gnome-desktop +, gsettings-desktop-schemas +, gnome-keyring +, glib +, gjs +, mutter +, evolution-data-server +, gtk3 +, sassc +, systemd +, gst_all_1 +, adwaita-icon-theme +, gnome-bluetooth +, gnome-clocks +, gnome-settings-daemon +, gnome-autoar +, asciidoc-full , bash-completion }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup - let - pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); - -in stdenv.mkDerivation rec { + pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); +in +stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.36.3"; + version = "3.36.4"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fs51lcaal4lnx6m5a3j8922yjbjk32khznx77cxb2db1zvspn46"; + sha256 = "1nyibrr98ijn65z9ki0k7xzcwcliwy2jqssz0l0jalpbkhnr751d"; }; - LANG = "en_US.UTF-8"; - - nativeBuildInputs = [ - meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales - sassc desktop-file-utils libxslt.bin python3 asciidoc-full - ]; - buildInputs = [ - systemd - gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice - libsecret libsoup polkit gdk-pixbuf librsvg - networkmanager libstartup_notification telepathy-glib - libXtst gjs mutter libpulseaudio evolution-data-server - libical gtk3 gdm libcanberra-gtk3 geoclue2 - adwaita-icon-theme gnome-bluetooth - gnome-clocks # schemas needed - at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon - gobject-introspection - gnome-autoar - - # recording - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - - # not declared at build time, but typelib is needed at runtime - libgweather libnma - - # for gnome-extension tool - bash-completion - ]; - patches = [ # Hardcode paths to various dependencies so that they can be found at runtime. (substituteAll { @@ -86,6 +107,77 @@ in stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + docbook-xsl-nons + docbook_xml_dtd_412 + docbook_xml_dtd_42 + docbook_xml_dtd_43 + gtk-doc + perl + wrapGAppsHook + sassc + desktop-file-utils + libxslt.bin + python3 + asciidoc-full + ]; + + buildInputs = [ + systemd + gsettings-desktop-schemas + gnome-keyring + glib + gcr + accountsservice + libsecret + polkit + gdk-pixbuf + librsvg + networkmanager + libstartup_notification + telepathy-glib + gjs + mutter + libpulseaudio + evolution-data-server + libical + gtk3 + gdm + geoclue2 + adwaita-icon-theme + gnome-bluetooth + gnome-clocks # schemas needed + at-spi2-core + upower + ibus + gnome-desktop + telepathy-logger + gnome-settings-daemon + gobject-introspection + + # recording + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + + # not declared at build time, but typelib is needed at runtime + libgweather + libnma + + # for gnome-extension tool + bash-completion + gnome-autoar + json-glib + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; + postPatch = '' patchShebangs src/data-to-c.pl chmod +x meson/postinstall.py diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix index 42697911bd..071245ae1e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,19 +1,18 @@ { fetchurl , fetchpatch , substituteAll +, runCommand , stdenv , pkgconfig , gnome3 , gettext , gobject-introspection -, upower , cairo , pango -, cogl , json-glib , libstartup_notification , zenity -, libcanberra-gtk3 +, libcanberra , ninja , xkeyboard_config , libxkbfile @@ -24,7 +23,6 @@ , glib , gtk3 , gnome-desktop -, geocode-glib , pipewire , libgudev , libwacom @@ -42,17 +40,28 @@ , wayland-protocols }: -stdenv.mkDerivation rec { +let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.36.3"; + version = "3.36.4"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1lpf7anlm073npmfqc5n005kyj12j0ym8y9dqg9q7448ilp79kka"; + sha256 = "0p3jglw6f2h67kwk89qz1rz23y25lip8m2mp2xshf2vrg4a930as"; }; + patches = [ + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking + # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 + ./drop-inheritable.patch + + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these @@ -85,16 +94,14 @@ stdenv.mkDerivation rec { buildInputs = [ cairo - cogl egl-wayland - geocode-glib glib gnome-desktop gnome-settings-daemon gobject-introspection gsettings-desktop-schemas gtk3 - libcanberra-gtk3 + libcanberra libgudev libinput libstartup_notification @@ -104,25 +111,11 @@ stdenv.mkDerivation rec { pango pipewire sysprof - upower xkeyboard_config xwayland - zenity - zenity wayland-protocols ]; - patches = [ - # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking - # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - ./drop-inheritable.patch - - (substituteAll { - src = ./fix-paths.patch; - inherit zenity; - }) - ]; - postPatch = '' patchShebangs src/backends/native/gen-default-modes.py ''; @@ -132,6 +125,18 @@ stdenv.mkDerivation rec { ''; passthru = { + libdir = "${self}/lib/mutter-6"; + + tests = { + libdirExists = runCommand "mutter-libdir-exists" {} '' + if [[ ! -d ${self.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." + exit 1 + fi + touch $out + ''; + }; + updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; @@ -145,4 +150,5 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}; +in self diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix index b926f9b627..6145178de1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yknaz8n0l949sr8j3b7kdm0cm5mx2dp4n4k577m492hk6akqrr6"; + sha256 = "1y0fsd7j48v4qkc051cg41mz7jycgw4vd4g37lw682p7n5xgrjmn"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix index 1ace6a5f77..529091e5fd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.38.3"; + version = "0.38.4"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "003xficqb08r1dgid20i7cn889lbfwrglpx78rjd5nkvgxbimhh8"; + sha256 = "0rm1m1z8rcvyj9873wqcz5i3qdg8j6gv6k1p01xifk0y9phg7rzc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 938e89be1e..8a097b74ae 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.2.1"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0aq1pf0wk536b91as54684xgmhl7lps0k2xcwha5wh6h1isyb35v"; + sha256 = "0gsz7jqk0fdj0mama3cnss9i1adw18cpdnlcjcjh4r5qijmvx0vh"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index da0d73364a..5f34d07911 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -18,10 +18,12 @@ stdenv.mkDerivation rec { uuid = "appindicatorsupport@rgcjonas.gmail.com"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/${uuid} cp *.js $out/share/gnome-shell/extensions/${uuid} cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid} cp metadata.json $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix index 44b3f04f79..c6518201da 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -14,8 +14,10 @@ stdenv.mkDerivation rec { uuid = "battery_status@milliburn.github.com"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions/ + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index 608d44a289..770c32f21e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -18,13 +18,17 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + runHook preBuild ${bash}/bin/bash ./update-locale.sh glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index 640903bfe4..3e6903c564 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -14,8 +14,10 @@ stdenv.mkDerivation rec { uuid = "clipboard-indicator@tudmotu.com"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/${uuid} cp -r * $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 4e9c4c025c..a41719f2b9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; - version = "31"; + version = "38"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "0vh36mdncjvfp1jbinifznj5dw3ahsswwm3m9sjw5gydsbx6vh83"; + sha256 = "1kvybb49l1vf0fvh8d0c6xkwnry8m330scamf5x40y63d4i213j1"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix index fb71320159..3c6d181178 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions/ + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix new file mode 100644 index 0000000000..c4db470219 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, glib, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-emoji-selector"; + version = "19"; + + src = fetchFromGitHub { + owner = "maoschanz"; + repo = "emoji-selector-for-gnome"; + rev = version; + sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb"; + }; + + uuid = "emoji-selector@maestroschan.fr"; + + nativeBuildInputs = [ glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas ./${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = + "GNOME Shell extension providing a searchable popup menu displaying most emojis"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ rawkode ]; + homepage = "https://github.com/maoschanz/emoji-selector-for-gnome"; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index efaef03f3b..844c8ad84d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -14,8 +14,10 @@ stdenv.mkDerivation rec { uuid = "icon-hider@kalnitsky.org"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix index 230498f5d7..073a4301cc 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix @@ -16,12 +16,16 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + runHook preBuild make schemas + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r impatience $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; uuid = "impatience@gfxmonk.net"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix index fe3a079c01..0c1d98b2fa 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { uuid = "mprisindicatorbutton@JasonLG1979.github.io"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix index be6c1916ab..71b5309467 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { uuid = "nightthemeswitcher@romainvigier.fr"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/ cp -r src/ $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix index 7a79b691a4..f5ffac9b2f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/${uuid} cp -r . $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index e13941ee04..dfcfd63b59 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall share_dir="$prefix/share" extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad" mkdir -p "$extensions_dir" mv *.js metadata.json dbus.xml schemas locale "$extensions_dir" + runHook postInstall ''; uuid = "pidgin@muffinmad"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index acb0e36242..6d6a04a386 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { uuid = "remove-dropdown-arrows@mpdeimos.com"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/${uuid} cp extension.js $out/share/gnome-shell/extensions/${uuid} cp metadata.json $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index 6273a83dfc..870ac448bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -28,8 +28,10 @@ stdenv.mkDerivation rec { uuid = "sound-output-device-chooser@kgshank.net"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 489a4c5587..1b1da50b7f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,14 +1,14 @@ -{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: +{ stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; - version = "38"; + version = "2020-04-27-unstable"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = "v${version}"; - sha256 = "1sdj2kxb418mgq44a6lf6jic33wlfbnn3ja61igmx0jj1530iknv"; + rev = "7f8f0a7b255473941f14d1dcaa35ebf39d3bccd0"; + sha256 = "tUUvBY0UEUE+T79zVZEAICpKoriFZuuZzi9ArdHdXks="; }; buildInputs = [ @@ -20,18 +20,23 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./paths_and_nonexisting_dirs.patch; + clutter_path = gnome3.mutter.libdir; # this should not be used in settings but 🤷‍♀️ gtop_path = "${libgtop}/lib/girepository-1.0"; glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) ]; buildPhase = '' + runHook preBuild glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall ''; uuid = "system-monitor@paradoxxx.zero.gmail.com"; @@ -41,8 +46,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ tiramiseb ]; homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; - # 3.36 support not yet ready - # https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/564 - broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.34"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch index 82e3d7c541..280af965af 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch @@ -1,5 +1,5 @@ diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js -index b4b7f15..d139135 100644 +index de5e3d7..2d7824d 100644 --- a/system-monitor@paradoxxx.zero.gmail.com/extension.js +++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js @@ -18,6 +18,9 @@ @@ -11,13 +11,23 @@ index b4b7f15..d139135 100644 + /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily * by loading the new libnm.so. Should go away eventually */ - const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0"); -@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({ - connected: false, - _init: function () { + +@@ -407,7 +410,7 @@ const smMountsMonitor = class SystemMonitor_smMountsMonitor { + this.connected = false; + this._volumeMonitor = Gio.VolumeMonitor.get(); - let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; + let sys_mounts = ['/home', '/tmp', '/boot']; this.base_mounts = ['/']; - sys_mounts.forEach(Lang.bind(this, function (sMount) { + sys_mounts.forEach((sMount) => { if (this.is_sys_mount(sMount + '/')) { +diff --git a/system-monitor@paradoxxx.zero.gmail.com/prefs.js b/system-monitor@paradoxxx.zero.gmail.com/prefs.js +index 81d667c..0da4809 100644 +--- a/system-monitor@paradoxxx.zero.gmail.com/prefs.js ++++ b/system-monitor@paradoxxx.zero.gmail.com/prefs.js +@@ -1,3 +1,5 @@ ++imports.gi.GIRepository.Repository.prepend_search_path('@clutter_path@'); ++ + const Gtk = imports.gi.Gtk; + const Gio = imports.gi.Gio; + const Gdk = imports.gi.Gdk; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix index 60ca1dcbef..57f5a9377b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix @@ -14,12 +14,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib ]; buildPhase = '' + runHook preBuild glib-compile-schemas . + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/${uuid} cp -r * $out/share/gnome-shell/extensions/${uuid}/ + runHook postInstall ''; uuid = "tilingnome@rliang.github.com"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix index 6ac9a4a033..f9fc68b548 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { uuid = "timepp@zagortenay333"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/${uuid} cp -r . $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix index 44402fc6e1..9c5d5266ce 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { uuid = "window-corner-preview@fabiomereu.it"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix index 15871e661c..45ac75baf8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix @@ -14,8 +14,10 @@ stdenv.mkDerivation rec { uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/ cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix index 528f4e9f89..5838999fcb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { buildFlags = "schemas"; installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index aaaba71c7e..3960f23300 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qc6s0v8gnzw3wfbfaaindb031cc8akdjdn2sjqqfxhbpx6mhzmr"; + sha256 = "1y1ihh72zk0bgyj197dpwgwj1q91dhvp0rasrib8k18sisrdq31h"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 9dcc8744d2..a9757de639 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-nibbles"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01vzcjys2x95wnanwq25x0a7x6cc4j6g8gk69c5yc9ild48rr9c1"; + sha256 = "17n6ji6yr521kzxfbfm0yxvrlnw4hlzacbwn0jqmw7xf3pdq35z6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index fb609bbb97..99bdffe16a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "149bv8q2a44i9msyshhh57nxwf5a43hankbndbvjqvq95yqlnhv4"; + sha256 = "0awfssqpswsyla4gn80ifj53biwq34hcadxlknnlm7jpz0z38cp0"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 01dc3bab0c..f80012e22b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0y1kc9j740088ffj4rd49w4f2pkn8w6paids5g1dv609sfpzyips"; + sha256 = "0amnmd12mpny3vnf946wnphlsnbvjrvkx29sarplm57m1571qdc5"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix index 3b4fca5f36..0263de1c9b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cid9fag8irlq0cywyqaj402vb60l8f66ld1zj7a023rg0khqnbb"; + sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix index 62df1cd1e3..2fd1d034db 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "3.36.1"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1klnxk49rr1m2lr4zj1wvfl0iaxzdh2k8ngrcmfmcq39vlxnn94y"; + sha256 = "12h6783m4634zzprlk31j0dmvgzrfjklhl0z49fdwcziw5bszr3c"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 2f29d803b2..adaec2498b 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "5.0.5"; + version = "5.0.6"; repoName = "calendar"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1dn2h7riajrn619z69626qnr8w6lp62dnm3d4pjkr0g5l4dp1cdb"; + sha256 = "0lmadk4yzf1kiiqshwqcxzcyia1haq1avv6pyzvsaywxhqwdsini"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index ee9df9955f..1e3db99bab 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "elementary-dock"; - version = "unstable-2020-02-28"; + version = "unstable-2020-06-11"; outputs = [ "out" "dev" ]; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = "ac87d9063dc9c81d90f42f3002ad9c5b49460a82"; - sha256 = "0lhjzd370fza488dav8n155ss486wqv6y7ldkahwg0c3zvlsvha7"; + rev = "0a389ee58939d8c91c340df4e5340fc4b23d0b80"; + sha256 = "01vinik73s0vmk56samgf49zr2bl4wjv44x15sz2cmh744llckja"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index c3da10d1cf..8079d4e788 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.7.1"; + version = "2.7.2"; repoName = "videos"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "00arim4i9bv9mbms1irkp44grkgrfnmqzraswyn1xiz9nvl1bsb9"; + sha256 = "07dwhshdc78wia0fsbzz6iv651znzzasfil91w60v29kgc4s2b1i"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 3215c001a5..91755b5a22 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -83,8 +83,10 @@ stdenv.mkDerivation rec { cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers # Whitelist wingpanel indicators to be used in the greeter - # TODO: is this needed or installed upstream? - install -D ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist + # hhttps://github.com/elementary/greeter/blob/fc19752f147c62767cd2097c0c0c0fcce41e5873/debian/io.elementary.greeter.whitelist + # wingpanel 2.3.2 renamed this to .allowed to .forbidden + # https://github.com/elementary/wingpanel/pull/326 + install -D ${./io.elementary.greeter.allowed} $out/etc/wingpanel.d/io.elementary.greeter.allowed ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist rename to third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 089c9188d6..304009aa9b 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,7 +1,8 @@ { stdenv , fetchFromGitHub -, fetchpatch , substituteAll +, desktop-file-utils +, pkg-config , writeScript , pantheon , gnome-keyring @@ -16,7 +17,6 @@ , writeText , meson , ninja -, pkg-config }: let @@ -69,53 +69,43 @@ let in stdenv.mkDerivation rec { - pname = "elementary-session-settings"; - version = "unstable-2019-11-12"; + pname = "elementary-session-settings-unstable"; + version = "2020-06-11"; repoName = "session-settings"; src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = "f9d5afed16ce447cf6ae3c2d1c1db5eece84daca"; - sha256 = "0n1m41aapr58rb1ffvfkjq6c6w3f0ynjzzhja50s4di98p4m7y0q"; + rev = "130c9ae221913032ed18bcf6d21e3dcdba3c4209"; + sha256 = "0bzg9vbq0ssnxgcb2vxpx6x9zv8ngkm9r3ki5q83m9al9919n0pr"; }; - patches = [ - # Map Pantheon required components by g-s-d versions - # https://github.com/elementary/session-settings/pull/23 - (fetchpatch { - url = "https://github.com/elementary/session-settings/commit/39918f4ec64fa9ed5affa109d6a692b97ae4ff01.patch"; - sha256 = "0v2kqcsibymnslnnw4v67yh098znsrhrcycgxkw8vymvwlinc502"; - }) - ]; - nativeBuildInputs = [ + desktop-file-utils meson ninja pkg-config ]; buildInputs = [ - elementary-settings-daemon + pantheon.elementary-settings-daemon + gnome-keyring + onboard + orca ]; mesonFlags = [ - "-Ddefaults-list=false" - "-Dpatched-gsd-autostarts=false" - "-Dpatched-ubuntu-autostarts=false" + "-Dmimeapps-list=false" "-Dfallback-session=GNOME" + "-Ddetect-program-prefixes=true" + "--sysconfdir=${placeholder "out"}/etc" ]; postInstall = '' mkdir -p $out/share/applications cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list - mkdir -p $out/etc/xdg/autostart - for package in ${gnome-keyring} ${orca} ${onboard} ${at-spi2-core}; do - cp -av $package/etc/xdg/autostart/* $out/etc/xdg/autostart - done - cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop mkdir -p $out/libexec @@ -127,21 +117,16 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/xsessions/pantheon.desktop \ --replace "gnome-session --session=pantheon" "$out/libexec/pantheon" \ --replace "wingpanel" "${wingpanel}/bin/wingpanel" - - for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done - - for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart) - do - echo "Patching OnlyShowIn to Pantheon in: $autostart" - sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart - done ''; passthru = { updateScript = pantheon.updateScript { attrPath = "pantheon.${pname}"; }; - providedSessions = [ "pantheon" ]; + + providedSessions = [ + "pantheon" + ]; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 7de8d3c91d..494af85ecf 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0wrvya9438ncb2rvcz99aa497v95b4yhdw1479iacnb9f94jacns"; + sha256 = "0z5a4jkmg8jw3yjdq89njhqcpms2rbq7rnsh83q9gh8v3qidk75d"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index ff9925c535..99cd7b69c1 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0yvn1crylrdc9gq6gc7v4ynb5ii4n0c3bnswfq72p8cs3vvvvv24"; + sha256 = "0sz3m64s5clirmiamx67iq42spba7sggcb29sny44z9f939vly4r"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix index 823613778f..431c336610 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "5.4.0"; + version = "5.5.0"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0acicv3f9gksb352v88lwap8ailjsxdrfknl2xql7blasbjzl2q0"; + sha256 = "13qfhq8xndikk6kmybibs6a4ddyp6mhvbsp2yy4qr7aiiyxf7mna"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index ca80a2f1df..341d166f68 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1gkispg1wr3fmwhbaaw722hc7cfqvj18gwb1nvv7rz3ghk9ih4jy"; + sha256 = "1kd6spwfwy5r2mrf7xh5l2wrazqia8vr4j3g27s97vn7fcg4pgb0"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix index e53e986060..e6b2c472bc 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, fetchpatch, extra-cmake-modules, kdoctools, bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, @@ -18,4 +18,14 @@ mkDerivation { cmakeFlags = [ "-DHAVE_DDCUTIL=On" ]; + patches = [ + # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to + # 'DDCA_Feature_List'. + # This can be dropped with the next release. + # https://bugs.kde.org/show_bug.cgi?id=423605 + (fetchpatch { + url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; + sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; + }) + ]; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 220e250685..d8f612d1a8 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-eyes-plugin"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx"; + sha256 = "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix index 2a7387c437..1c537edd0b 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix @@ -68,13 +68,14 @@ let xorg.libXxf86vm zlib ]; - teensy_architecture = - lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "linux64" - + lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "linux32" - + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") "linuxaarch64" - + lib.optionalString (builtins.match "armv[67]l-linux" stdenv.hostPlatform.system != null) "linuxarm"; - flavor = ( if withTeensyduino then "teensyduino" else "arduino") - + stdenv.lib.optionalString (!withGui) "-core"; + teensy_architecture = if stdenv.hostPlatform.isx86_32 then "linux32" + else if stdenv.hostPlatform.isx86_64 then "linux64" + else if stdenv.hostPlatform.isAarch64 then "linuxaarch64" + else if stdenv.hostPlatform.isAarch32 then "linuxarm" + else throw "${stdenv.hostPlatform.system} is not supported in teensy"; + + flavor = (if withTeensyduino then "teensyduino" else "arduino") + + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { version = "1.8.12"; @@ -90,28 +91,23 @@ stdenv.mkDerivation rec { teensyduino_version = "151"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; - sha256 = - lib.optionalString (teensy_architecture == "linux64") - "0q8mw9bm2vb5vwa98gwcs6ad164i98hc1qqh2qw029yhwm599pn0" - + lib.optionalString (teensy_architecture == "linux32") - "1rq6sx0048ab200jy0cz5vznwxi99avidngj42rjnh7kcfas5c4m" - + lib.optionalString (teensy_architecture == "linuxaarch64") - "09k78dycn1vcpcx37c1dak8bgjv8gs34l89n9r9s0c3rqmv3pg4x" - + lib.optionalString (teensy_architecture == "linuxarm") - "19j55bq36040rpdpfxcqimda76rkbx137q15bs8nvxj13wrbl4ip"; + sha256 = { + linux64 = "0q8mw9bm2vb5vwa98gwcs6ad164i98hc1qqh2qw029yhwm599pn0"; + linux32 = "1rq6sx0048ab200jy0cz5vznwxi99avidngj42rjnh7kcfas5c4m"; + linuxarm = "19j55bq36040rpdpfxcqimda76rkbx137q15bs8nvxj13wrbl4ip"; + linuxaarch64 = "09k78dycn1vcpcx37c1dak8bgjv8gs34l89n9r9s0c3rqmv3pg4x"; + }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = - lib.optionalString (teensy_architecture == "linux64") - "128f34kkxz7ab6ir5mqyr8d1mgxig8f9jygwxy44pdnq2rk6gmh9" - + lib.optionalString (teensy_architecture == "linux32") - "11n85lwsn1w4ysfacyw08v85s3f3zvl8j8ac7rld19yxgjslvisi" - + lib.optionalString (teensy_architecture == "linuxaarch64") - "04v2nhyjhahml6nmz23bfb63c0an4a7zxgcgxqqq442i8vd304wa" - + lib.optionalString (teensy_architecture == "linuxarm") - "1k8yjivaydm6y16mplrjyblgx7l0wjzm3mjxh5saxrjq7drswmxx"; + { + linux64 = "128f34kkxz7ab6ir5mqyr8d1mgxig8f9jygwxy44pdnq2rk6gmh9"; + linux32 = "11n85lwsn1w4ysfacyw08v85s3f3zvl8j8ac7rld19yxgjslvisi"; + linuxarm = "1k8yjivaydm6y16mplrjyblgx7l0wjzm3mjxh5saxrjq7drswmxx"; + linuxaarch64 = "04v2nhyjhahml6nmz23bfb63c0an4a7zxgcgxqqq442i8vd304wa"; + }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix b/third_party/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix index 01a2fb873a..62a1d190a0 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix +++ b/third_party/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix @@ -1,4 +1,4 @@ -{ lib, buildFHSUserEnv }: +{ lib, buildFHSUserEnv, fetchFromGitHub }: let pio-pkgs = pkgs: @@ -19,6 +19,14 @@ let platformio ]); + src = fetchFromGitHub { + owner = "platformio"; + repo = "platformio-core"; + rev = "v4.3.4"; + sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq"; + }; + + in buildFHSUserEnv { name = "platformio"; @@ -34,7 +42,10 @@ in buildFHSUserEnv { }; extraInstallCommands = '' + mkdir -p $out/lib/udev/rules.d + ln -s $out/bin/platformio $out/bin/pio + ln -s ${src}/scripts/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules ''; runScript = "platformio"; diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix b/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix index d83013dbbd..891d613da5 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix +++ b/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix @@ -82,6 +82,7 @@ in buildPythonApplication rec { patches = [ ./fix-searchpath.patch ./use-local-spdx-license-list.patch + ./missing-udev-rules-nixos.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch b/third_party/nixpkgs/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch new file mode 100644 index 0000000000..f29b93cef4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch @@ -0,0 +1,14 @@ +diff --git a/platformio/exception.py b/platformio/exception.py +index d291ad7f..4761a35b 100644 +--- a/platformio/exception.py ++++ b/platformio/exception.py +@@ -195,7 +195,8 @@ class MissedUdevRules(InvalidUdevRules): + + MESSAGE = ( + "Warning! Please install `99-platformio-udev.rules`. \nMode details: " +- "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules" ++ "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules\n" ++ "On NixOS add the platformio package to services.udev.packages" + ) + + diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 80a16465af..41e7a8eac7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -5,39 +5,45 @@ "hotspot": { "aarch64": { "build": "10", - "sha256": "04b77f6754aed68528f39750c5cfd6a439190206aff216aa081d62a0e1a794fa", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "3b8b8bba6a0472ec7de5271cbf67f11e6ab525de6dd5d4729300375f1d56b7a1", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" }, "armv6l": { "build": "10", - "sha256": "ab5b76203e54fe7a5221535f6f407efa43153de029a746f60af3cffb7cb5080b", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "45c235af67498f87e3dc99642771e57547cf226335eaee8a55d195173e66a2e9", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" }, "armv7l": { "build": "10", - "sha256": "ab5b76203e54fe7a5221535f6f407efa43153de029a746f60af3cffb7cb5080b", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "45c235af67498f87e3dc99642771e57547cf226335eaee8a55d195173e66a2e9", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "10", - "sha256": "330d19a2eaa07ed02757d7a785a77bab49f5ee710ea03b4ee2fa220ddd0feffc", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" } }, "openj9": { + "aarch64": { + "build": "10", + "sha256": "0be01fdcae330e26c489d8d0d0c98c535a2af8cbd0cdcda211776ab9fcd05086", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" + }, "packageType": "jdk", "vmType": "openj9", "x86_64": { "build": "10", - "sha256": "1530172ee98edd129954fcdca1bf725f7b30c8bfc3cdc381c88de96b7d19e690", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz", - "version": "11.0.6" + "sha256": "526e89f3014fec473b24c10c2464c1343e23703114983fd171b68b1599bba561", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" } } }, @@ -45,27 +51,45 @@ "hotspot": { "aarch64": { "build": "10", - "sha256": "7ed04ed9ed7271528e7f03490f1fd7dfbbc2d391414bd6fe4dd80ec3bad76d30", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "cfe504e9e9621b831a5cfd800a2005dafe90a1d11aa14ee35d7b674d68685698", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" + }, + "armv6l": { + "build": "10", + "sha256": "581bae8efcaa40e209a780baa6f96b7c8c9397965bc6d54533f4fd8599d5c742", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" + }, + "armv7l": { + "build": "10", + "sha256": "581bae8efcaa40e209a780baa6f96b7c8c9397965bc6d54533f4fd8599d5c742", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "10", - "sha256": "c5a4e69e2be0e3e5f5bb7c759960b20650967d0f571baad4a7f15b2c03bda352", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "74b493dd8a884dcbee29682ead51b182d9d3e52b40c3d4cbb3167c2fd0063503", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" } }, "openj9": { + "aarch64": { + "build": "10", + "sha256": "37ae26443abb02d2ab041eced9be948f0d20db03183aaf3c159ef682eeeabf9b", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" + }, "packageType": "jre", "vmType": "openj9", "x86_64": { "build": "10", - "sha256": "056e4b5f7166f5daa44f36b06c735913bda52831d2e77fa2ac371505c66d10c1", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jre_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz", - "version": "11.0.6" + "sha256": "08258a767a6953bde21d15ef3c08e776d83257afa4acc52b55c70e1ac02f0489", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jre_x64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" } } } @@ -77,9 +101,9 @@ "vmType": "hotspot", "x86_64": { "build": "10", - "sha256": "b87102274d983bf6bb0aa6c2c623301d0ff5eb7f61043ffd04abb00f962c2dcd", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "0ab1e15e8bd1916423960e91b932d2b17f4c15b02dbdf9fa30e9423280d9e5cc", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" } }, "openj9": { @@ -87,9 +111,9 @@ "vmType": "openj9", "x86_64": { "build": "10", - "sha256": "9a5c5b3bb51a82e666c46b2d1bbafa8c2bbc3aae50194858c8f96c5d43a96f64", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.6_10_openj9-0.18.1.tar.gz", - "version": "11.0.6" + "sha256": "a0de749c37802cc233ac58ffde68191a4dc985c71b626e7c0ff53944f743427f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2_openj9-0.20.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" } } }, @@ -99,9 +123,9 @@ "vmType": "hotspot", "x86_64": { "build": "10", - "sha256": "ab3c2038a32c62843500109d2efb8f5dacdfa1de3cbb713c8226f26dc603cc33", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "931a81f4bed38c48b364db57d4ebdd6e4b4ea1466e9bd0eaf8e0f1e47c4569e9", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" } }, "openj9": { @@ -109,9 +133,9 @@ "vmType": "openj9", "x86_64": { "build": "10", - "sha256": "130850133d9701393352c2ce13ab541b4f900ff1f5ddf8257cda624968aada9f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jre_x64_mac_openj9_11.0.6_10_openj9-0.18.1.tar.gz", - "version": "11.0.6" + "sha256": "0941d739e3230d1d83dc1ee54cff6d17d90331e4f275d00739cb78fba41c5b96", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2_openj9-0.20.0/OpenJDK11U-jre_x64_mac_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" } } } @@ -122,68 +146,68 @@ "jdk": { "hotspot": { "aarch64": { - "build": "33", - "sha256": "74f4110333ac4239564ed864b1d7d69b7af32af39efcfbde9816e1486cb5ae07", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_aarch64_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" }, "armv6l": { - "build": "33", - "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" }, "armv7l": { - "build": "33", - "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "33", - "sha256": "e562caeffa89c834a69a44242d802eae3523875e427f07c05b1902c152638368", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "33", - "sha256": "68ebab0021c719694be8fc868478725a69c5c515cdb62e2933eefe87ba6437df", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" } } }, "jre": { "hotspot": { "aarch64": { - "build": "33", - "sha256": "2365b7fbba8d9125fb091933aad9f38f8cc1fbb0217cdec9ec75d2000f6d451a", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_aarch64_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "33", - "sha256": "73800a0d7c4e81df408a8518d282aa2c001ce4ee15541574c639dfc3564f708f", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "33", - "sha256": "2ee59be5062a81daa7be85be161cab6b245f9a2e2cbd4769ae9edefaac41e31d", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" } } } @@ -194,20 +218,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "33", - "sha256": "f948be96daba250b6695e22cb51372d2ba3060e4d778dd09c89548889783099f", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "33", - "sha256": "583e0defd5c062550896ead7cac383be16f1a81d9b6492dfec26da9af5dcc1c0", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" } } }, @@ -216,20 +240,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "33", - "sha256": "1c23efba7908de9a611a98e755602f45381a8f7c957adb3fc4012ab1369a352c", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_mac_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "33", - "sha256": "33a60b78138d50cb02325156c7d1fcf588697749a4401f6c11a3cbefa3033127", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" } } } @@ -241,51 +265,39 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "35799a2fd4b467115aff1bc3a54853b5131ba9068e53e1ab0fbe5521a3f2ba83", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" + "sha256": "536bf397d98174b376da9ed49d2f659d65c7310318d8211444f4b7ba7c15e453", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "armv6l": { "build": "9", - "sha256": "fdd9f61f1b2df74242da54ee3b3231b0123782a917e9673351276da439c7cab1", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" + "sha256": "5b401ad3c9b246281bd6df34b1abaf75e10e5cad9c6b26b55232b016e90e411a", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "armv7l": { "build": "9", - "sha256": "fdd9f61f1b2df74242da54ee3b3231b0123782a917e9673351276da439c7cab1", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" - }, - "armv6l": { - "build": "10", - "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz", - "version": "8.0.222" - }, - "armv7l": { - "build": "10", - "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz", - "version": "8.0.222" + "sha256": "5b401ad3c9b246281bd6df34b1abaf75e10e5cad9c6b26b55232b016e90e411a", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "f39b523c724d0e0047d238eb2bb17a9565a60574cf651206c867ee5fc000ab43", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "2b59b5282ff32bce7abba8ad6b9fde34c15a98f949ad8ae43e789bbd78fc8862", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "ca785af638b24f9d4df896f5a9f557cc9f1e5fa5e2b1174d6b906e3fd5474c2e", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "910ae847109a6dd1b6cf69baa7615ea2cce8cff787e5a9349a5331ce7604f3a5", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09_openj9-0.20.0/OpenJDK8U-jdk_x64_linux_openj9_8u252b09_openj9-0.20.0.tar.gz", + "version": "8.0.252" } } }, @@ -293,51 +305,39 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "4540db665260fdc84ae2f191e21beec9168a70a4227718bee5edd317707e2fda", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" + "sha256": "30bba4425497f5b4aabcba7b45db69d582d278fb17357d64c22c9dc6b2d29ca1", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "armv6l": { "build": "9", - "sha256": "8ab786fc2fa0a282f5cf57f6040f1976c32c3c5e480e900ce5925de6543f6688", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" + "sha256": "107699a88f611e0c2d57816be25821ef9b17db860b14402c4e9e5bf0b9cf16fd", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_arm_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "armv7l": { "build": "9", - "sha256": "8ab786fc2fa0a282f5cf57f6040f1976c32c3c5e480e900ce5925de6543f6688", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" - }, - "armv6l": { - "build": "10", - "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz", - "version": "8.0.222" - }, - "armv7l": { - "build": "10", - "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz", - "version": "8.0.222" + "sha256": "107699a88f611e0c2d57816be25821ef9b17db860b14402c4e9e5bf0b9cf16fd", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_arm_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "5edfaefdbb0469d8b24d61c8aef80c076611053b1738029c0232b9a632fe2708", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "a93be303ed62398dba9acb0376fb3caf8f488fcde80dc62d0a8e46256b3adfb1", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "985d3134b64c6196d4c9ddbc87af0c62b0e643cef71b29f3d25a8c7811811745", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jre_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "5c0ab4691ff5f8e69bb14462f2afb8d73d751b01048eacf4b426ed6d6646dc63", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09_openj9-0.20.0/OpenJDK8U-jre_x64_linux_openj9_8u252b09_openj9-0.20.0.tar.gz", + "version": "8.0.252" } } } @@ -348,20 +348,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "06675b7d65bce0313ee1f2e888dd44267e8afeced75e0b39b5ad1f5fdff54e0b", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u242b08.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "2caed3ec07d108bda613f9b4614b22a8bdd196ccf2a432a126161cd4077f07a5", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jdk_x64_mac_hotspot_8u252b09.tar.gz", + "version": "8.0.252" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "665dc9c8239b7270b007ab9dd7522570e2686e327d89caf57a6aa6e5c6450078", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_mac_openj9_8u242b08_openj9-0.18.1.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "f522061a23290bce3423e49025a95b6e78d6f30e2741817e83c8fdba4c0c4ae7", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.2_openj9-0.20.0/OpenJDK8U-jdk_x64_mac_openj9_8u252b09_openj9-0.20.0.tar.gz", + "version": "8.0.252" } } }, @@ -370,23 +370,23 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "fae3777e3441dc7384c339a9054aa7efc40cd2c501625a535c2d4648367ccca3", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_mac_hotspot_8u242b08.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "f8206f0fef194c598de6b206a4773b2e517154913ea0e26c5726091562a034c8", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jre_x64_mac_hotspot_8u252b09.tar.gz", + "version": "8.0.252" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "d4a924558ddda0aed671a67f71714b71c25871a7659fd4c505851cf5ee866de5", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jre_x64_mac_openj9_8u242b08_openj9-0.18.1.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "55cce54a39c5748360e2e3fe8edf04469b75a0783514853a5745463979b43c80", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.2_openj9-0.20.0/OpenJDK8U-jre_x64_mac_openj9_8u252b09_openj9-0.20.0.tar.gz", + "version": "8.0.252" } } } } } -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix index b8b02cb9d6..2ee1223a53 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200517"; + version = "20200614"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "05bbsrxw2nxjlcfc22w1ympi66jnmzymivg29cvidh5n28jgwba2"; + sha256 = "0a54y2d9nfg60knfv34kf6sdsh065dzam86l3wprf8gvqffxxcli"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix index dd1510548a..b14c7b40f7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -77,20 +77,20 @@ rec { # v3.1.1 (LTS) aspnetcore_3_1 = buildAspNetCore { - version = "3.1.2"; + version = "3.1.5"; sha512 = { - x86_64-linux = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm"; - aarch64-linux = "2sm5yf376w5dm0za3gbcj251kc909fmlasmlyn70zhqp2jiii075vcqh40racjlwlhsfydx32cw7kgnv238lad5mw5jxy143zql5xl3"; - x86_64-darwin = "311sihjzg0x5inyrz0px29jikxcibd6l56xfdmxkncgwaikf3663x10dfl246qhz8v0f3lvg2vndgp5icbaqrp8awsnrhsl0vi5d7fh"; + x86_64-linux = "3ziyvm6llvhnjg8ayr4cfcabwkc46fqscgj12faavib34r5zx4mnv3qccqm3gg2r8jps60h42lvrwj3fliqmr0qqnhsw04819kqwai6"; + aarch64-linux = "2nbhvh8dpg7dghcs6ysdg7mcc60hbk5d3zab0nnbqkib93fdhbzhzcra9qhh80h8x03zw0jsn3gzqx0d1z2vz5z3lsa14vmb86pzj4a"; + x86_64-darwin = "1sfnp849vmsv8775fjsf9nzx28cmkvfgk8fa81h2l849z31ssaw9fn89kk0n83l0wrhr24ivmprfr11sp42gnjbncqfsnz4883lfchw"; }; }; netcore_3_1 = buildNetCore { - version = "3.1.2"; + version = "3.1.5"; sha512 = { - x86_64-linux = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14"; - aarch64-linux = "3hf61d5adlfffy51627ypp36qc5r55g9xwgfxqd0c7vj9bqmpiph673bvqqpr189df9shxr21p94cwrc5n36z72a37vw4ic8ks2yayx"; - x86_64-darwin = "35flr1p5zpcd77mjsl6qy9ipxc5k9j6pk7ca6mnvqqjf0r3agm3qf8cs5fbraprvkwj8fha3giwbp5xir6050fbb374375idn9x12d8"; + x86_64-linux = "03g6aghbpsxj9csaq9lkc8cad1nk8kvlivkarq6bfqvx992fxw6zryp7kcm5h6a5gkgpimb1nr17vndj1r629hdhpincqj8yw6i33mq"; + aarch64-linux = "25gwicmpzhzs96w3azypbl32bx967f14xkfdgvl7knw234rcmfv7zr0a7lb3vci68dbx4xywpnwlrvgi54mimzp8nagrgwva8zrrxzb"; + x86_64-darwin = "2g28jmv1n7pgxfq4wk9x58y5dp835c7rckz6c88ylk7g9w6z75l94pblfl1rc7mr6g3wddiy5cl87a607j9g283hv28a4vcpvll8s7g"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix index 625d7adab4..133235e5d4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -71,56 +71,60 @@ let }; }; - /* - Node/NPM based dependecies can be upgraded using script - `packages/generate-node-packages.sh`. - Packages which rely on `bin-wrap` will fail by default - and can be patched using `patchBinwrap` function defined in `packages/patch-binwrap.nix`. + /* Node/NPM based dependecies can be upgraded using script `packages/generate-node-packages.sh`. + + * Packages which rely on `bin-wrap` will fail by default + and can be patched using `patchBinwrap` function defined in `packages/lib.nix`. + + * Packages which depend on npm installation of elm can be patched using + `patchNpmElm` function also defined in `packages/lib.nix`. */ - elmNodePackages = + elmLib = import ./packages/lib.nix { + inherit lib writeScriptBin stdenv; + inherit (hsPkgs.elmPkgs) elm; + }; + + elmNodePackages = with elmLib; let nodePkgs = import ./packages/node-composition.nix { inherit nodejs pkgs; inherit (stdenv.hostPlatform) system; }; in with hsPkgs.elmPkgs; { - elm-test = patchBinwrap [elmi-to-json] nodePkgs.elm-test; - elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples; + + elm-test = patchBinwrap [elmi-to-json] + nodePkgs.elm-test; + + elm-verify-examples = patchBinwrap [elmi-to-json] + nodePkgs.elm-verify-examples; + elm-coverage = - let patched = patchBinwrap [elmi-to-json] nodePkgs.elm-coverage; - in patched.override { - preRebuild = '' + let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage); + in patched.override (old: { + # Symlink Elm instrument binary + preRebuild = (old.preRebuild or "") + '' + # Noop custom installation script sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done # in case of just this package + # TODO: investigate sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json - - rm node_modules/elm/install.js - echo "console.log('no-op');" > node_modules/elm/install.js ''; - - # Link Elm instrument binary - postInstall = patched.postInstall + '' + postInstall = (old.postInstall or "") + '' mkdir -p unpacked_bin ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument ''; - }; + }); - create-elm-app = patchBinwrap [elmi-to-json] (nodePkgs.create-elm-app.override { - preRebuild = '' - rm node_modules/elm/install.js - echo "console.log('no-op');" > node_modules/elm/install.js - ''; - }); + create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json] + nodePkgs.create-elm-app); elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; }; - patchBinwrap = import ./packages/patch-binwrap.nix { inherit lib writeScriptBin stdenv; }; - in hsPkgs.elmPkgs // elmNodePackages // { - lib = { inherit patchBinwrap; }; + lib = elmLib; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh index 343721208b..0ffa56eae9 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -6,7 +6,7 @@ set -eu -o pipefail rm -f node-env.nix $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ - --nodejs-10 \ + --nodejs-12 \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lib.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lib.nix new file mode 100644 index 0000000000..12e0600dc2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lib.nix @@ -0,0 +1,43 @@ +{ writeScriptBin, stdenv, lib, elm }: +let + patchBinwrap = + let + # Patching binwrap by NoOp script + binwrap = writeScriptBin "binwrap" '' + #! ${stdenv.shell} + echo "binwrap called: Returning 0" + return 0 + ''; + binwrap-install = writeScriptBin "binwrap-install" '' + #! ${stdenv.shell} + echo "binwrap-install called: Doing nothing" + ''; + in targets: pkg: + pkg.override (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ binwrap binwrap-install ]; + + # Manually install targets + # by symlinking binaries into `node_modules` + postInstall = let + binFile = module: lib.strings.removeSuffix ("-" + module.version) module.name; + in (old.postInstall or "") + '' + ${lib.concatStrings (map (module: '' + echo "linking ${binFile module}" + ln -sf ${module}/bin/${binFile module} \ + node_modules/${binFile module}/bin/${binFile module} + '') targets)} + ''; + }); + + patchNpmElm = pkg: + pkg.override (old: { + preRebuild = (old.preRebuild or "") + '' + rm node_modules/elm/install.js + echo "console.log('Nixpkgs\' version of Elm will be used');" > node_modules/elm/install.js + ''; + postInstall = (old.postInstall or "") + '' + ln -sf ${elm}/bin/elm node_modules/elm/bin/elm + ''; + }); +in +{ inherit patchBinwrap patchNpmElm; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix index 4add754b59..9c6bdb2006 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix index ba11907504..5b30111289 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.2.3" = { + "@babel/cli-7.8.4" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.2.3"; + version = "7.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.2.3.tgz"; - sha512 = "1h5r08pml55n7xvbgqp701sdr9mz4dykd0aj055qgpwk7rmpvq6c6ac24k3x0q6a0iy5szdd66qq73zhkvk8mwq1jkmw9g6p7vxmybd"; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.8.4.tgz"; + sha512 = "XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag=="; }; }; "@babel/code-frame-7.0.0" = { @@ -19,286 +19,340 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz"; - sha512 = "1n9xn1d8d9ai52qv1n1q1a521hrwi2akjlj4lsidm8xr6hbnx1akh3h2lxnl73mwhix4cv2x5iff3m22r4jvpdnygmpb4lsx6wvdw1r"; + sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.8.3" = { + "@babel/code-frame-7.10.3" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "3d85pd9lfbm8yrlpn6wj9g56snbnpr9fx0w1b9x26jbirc2xfrvnifwzprp0f6bhqijshgm0q35axic8d11v4j0kq493dapcyk33n3b"; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz"; + sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg=="; }; }; - "@babel/core-7.3.4" = { + "@babel/compat-data-7.10.3" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.3.tgz"; + sha512 = "BDIfJ9uNZuI0LajPfoYV28lX8kyCPMHY6uY4WH1lJdcicmAfxCK5ASzaeV0D/wsUaRH/cLk+amuxtC37sZ8TUg=="; + }; + }; + "@babel/core-7.9.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.3.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.3.4.tgz"; - sha512 = "2n2a167ki533xdbc8n9n3hqa5m3ykxxc8g5p7wn111bgrr9jj7xw2km0dmbglvi5hf85nkb4v7q39l544y9rjnysx6xm8y1wnqjw6wd"; + url = "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz"; + sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg=="; }; }; - "@babel/generator-7.9.4" = { + "@babel/generator-7.10.3" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.9.4"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; - sha512 = "10dhzfcyh1jfi1436lwl0ic1z15x4rd0y1ih2n9j8fq7jss6vrbi0ka558wp7ag366hpixbsn59lsp68i6s3hmvhqpgmjw32rmgqcxf"; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz"; + sha512 = "drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA=="; }; }; - "@babel/helper-annotate-as-pure-7.8.3" = { + "@babel/helper-annotate-as-pure-7.10.1" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; - sha512 = "19zxjzlr2w22hia04020h7cfgvc14ifv25ra5in7c3yi0l7w8r17xmvg62gqn538hpfm5nxq1bxcvn1fgzwxi5ybw2fmi21nqkad3za"; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz"; + sha512 = "ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; - sha512 = "2bhyq7n603yhsvhh8if76f9hspd8ywwfac3xbr01xhbk3qglspkw54w34vasds8ngn1vbi8gl2fbplc8g231mqx8swg455jcjdlxqg5"; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.3.tgz"; + sha512 = "lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.8.8" = { + "@babel/helper-compilation-targets-7.10.2" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz"; + sha512 = "hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA=="; + }; + }; + "@babel/helper-create-regexp-features-plugin-7.10.1" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.8.8"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; - sha512 = "2mfpciziyvm031vs1rlwyk7861w57k8bl0dxzsq4iqw70klb81lrili086xx973ksc24jdm1fcyn17zvp9dnlgdyyblhh1b15vlz19d"; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz"; + sha512 = "Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA=="; }; }; - "@babel/helper-define-map-7.8.3" = { + "@babel/helper-define-map-7.10.3" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; - sha512 = "3z4d17xj2zhm7zk023hs0w9wydxpw5np319d6rlkllcc2zqnxws3m4wdl9lav0chq3p54rfwcmdqqq99qbfp7brnxf6nr38vii831ry"; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.3.tgz"; + sha512 = "bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.8.3" = { + "@babel/helper-explode-assignable-expression-7.10.3" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; - sha512 = "0iz6s1cb2asrb2iv9kblqv7zdqljaq278iydlnwdrvy4w730nb68c3rzf181w4scfmgmzgc0ykkkj4nkimipgdkxmw3samzrrdixvrp"; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.3.tgz"; + sha512 = "0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw=="; }; }; - "@babel/helper-function-name-7.8.3" = { + "@babel/helper-function-name-7.10.3" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; - sha512 = "0w35m1kq2dmsgdgjxvpmg6gxm1rzl1jqf23h3k7pwh9nmwsmqbgv0rzy7fs6dq31dqq6j17bwyww0091r41aj0rl3zi1nj2a1gn0b04"; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz"; + sha512 = "FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw=="; }; }; - "@babel/helper-get-function-arity-7.8.3" = { + "@babel/helper-get-function-arity-7.10.3" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha512 = "12g2gjipd8svg02d12iqbf0rz4m99g36qccn3f81xij3ac4f7kqzx0407xma49h11j88iz8jil2whj7j96wqpwd67abi23xczwd2l0m"; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz"; + sha512 = "iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg=="; }; }; - "@babel/helper-hoist-variables-7.8.3" = { + "@babel/helper-hoist-variables-7.10.3" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; - sha512 = "110zw1xx11769dn6nmx1nrl4afckadg5rb4kbnyn717kyyfprvhvz9q4483ziwjk7502k0bl9kzpxv1c56bfr7cfd94n3fwx0n4jbck"; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.3.tgz"; + sha512 = "9JyafKoBt5h20Yv1+BXQMdcXXavozI1vt401KBiRc2qzUepbVnd7ogVNymY1xkQN9fekGwfxtotH2Yf5xsGzgg=="; }; }; - "@babel/helper-member-expression-to-functions-7.8.3" = { + "@babel/helper-member-expression-to-functions-7.10.3" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; - sha512 = "123n860dm1xyq93wl0qjc6025awwl14371k9glbv23dvh5vdgnssi0ck7jj75lffxswv1pcdamcaqlqqqhsvkrn2q8dkfiwmy109vkw"; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz"; + sha512 = "q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw=="; }; }; - "@babel/helper-module-imports-7.8.3" = { + "@babel/helper-module-imports-7.10.3" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; - sha512 = "0m3mnvpihbbzmv12qzlpms63wlv1krvd9v6m2r3cga0xyvi6aj40fz8vq9yp6cz3qiw6g8iwp6ax20lzagsbr6w2b0cd9m973g72h27"; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz"; + sha512 = "Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w=="; }; }; - "@babel/helper-module-transforms-7.9.0" = { + "@babel/helper-module-transforms-7.10.1" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; - sha512 = "30gcd0pfjswf9s036nznz9znhb9dwbkzxdb1dyrzvv50vaiyi844s04492jww141ai1k927wx29dly9q1dcc9618g4gg910xp5clnyh"; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz"; + sha512 = "RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg=="; }; }; - "@babel/helper-optimise-call-expression-7.8.3" = { + "@babel/helper-optimise-call-expression-7.10.3" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; - sha512 = "0fs3wpyfm9fmnarclkhbj2c5y1b3hnsjm00myhq6nmmmfap9b12a0vg3ryf0pp9396aawx0rmvq1ymj16hnpp7i0avb6w9sgz93da19"; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz"; + sha512 = "kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg=="; }; }; - "@babel/helper-plugin-utils-7.8.3" = { + "@babel/helper-plugin-utils-7.10.3" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; - sha512 = "1jj9ibj72hqv1qm4hvdnk728fi9mihrwhq0xcs2qlxbs8iz9d2zb4a23sm7ny0s42asrdyy2s98shgnqm0rhn2314k6pcyxspiymrwg"; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz"; + sha512 = "j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g=="; }; }; - "@babel/helper-regex-7.8.3" = { + "@babel/helper-regex-7.10.1" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; - sha512 = "18s59gjlmhr59fb91klimh3l4r3xha8mmddi7iz7ssf3jlz3r4j8fmlqmvjv5c98y1nwgzr7xmg0zvj3n9h23p76lzwiz9gsr178sq5"; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz"; + sha512 = "7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g=="; }; }; - "@babel/helper-remap-async-to-generator-7.8.3" = { + "@babel/helper-remap-async-to-generator-7.10.3" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; - sha512 = "360dpccwg08h484w138qxqzsq6lwhgp90cmmhsa309drgwi1wd9h463b728cfcip3jyagx3kwdfiyj723lhxf04av00w2hz1sdh634j"; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.3.tgz"; + sha512 = "sLB7666ARbJUGDO60ZormmhQOyqMX/shKBXZ7fy937s+3ID8gSrneMvKSSb+8xIM5V7Vn6uNVtOY1vIm26XLtA=="; }; }; - "@babel/helper-replace-supers-7.8.6" = { + "@babel/helper-replace-supers-7.10.1" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.8.6"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; - sha512 = "0acgcd28lns7vqyj6s66c00yghxy6kk70iifxmd0yyb229mj4k3nlz0pjavalakn8x1izq5sngznn59iw9c1mwcgzbgyjiqs2nh1qrx"; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz"; + sha512 = "SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A=="; }; }; - "@babel/helper-simple-access-7.8.3" = { + "@babel/helper-simple-access-7.10.1" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; - sha512 = "05xs5m527nwqh8qq916v0yad41rnwm9px7134xh2v13sc4bpygi5vngly5yw9bih573q1l7kxhhkdj358glvhpvwah2aw3r7h799lal"; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz"; + sha512 = "VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw=="; }; }; - "@babel/helper-split-export-declaration-7.8.3" = { + "@babel/helper-split-export-declaration-7.10.1" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha512 = "1sgm6wd88kmizvig5m0ims97vmlylfii72xcw4k01h2wsw3cpc312s1asnjrq5y472hcqfh2mwn8dwpqkpcvs0ssqwnz1c1xhwz47fz"; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz"; + sha512 = "UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g=="; }; }; - "@babel/helper-validator-identifier-7.9.0" = { + "@babel/helper-validator-identifier-7.10.3" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; - sha512 = "0gx4vkhiijg7fwwjybwryz8ilwr56ziamj68fnzmam13lbgspdjal8s742nmsc7p84nl87y9sanmd7ywq84wzzmw0gym1yfm101nvz8"; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz"; + sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw=="; }; }; - "@babel/helper-wrap-function-7.8.3" = { + "@babel/helper-wrap-function-7.10.1" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; - sha512 = "08jncd536l4pg9svm19ksyfadg2c0sxd06zgb4ssdgz04vkm5ybb8x9fvn41i04a9pr7p02vbnzwgkqqip91yin1w8dfkq4nnnqj01c"; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz"; + sha512 = "C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ=="; }; }; - "@babel/helpers-7.9.2" = { + "@babel/helpers-7.10.1" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.9.2"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; - sha512 = "2j2k8r3s6hwlqg3whjxhsm1cpg030hylh2gimbxvi89f5w4s9j6z525hllf11mrgzcc11zsnlvqhczzgl0zyp2gg6y36gnmap7fy0i7"; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz"; + sha512 = "muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw=="; }; }; - "@babel/highlight-7.9.0" = { + "@babel/highlight-7.10.3" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; - sha512 = "2qmdx9wdiv4yy36dc1ljghwd45kq6bhsddcbps8qznsrwvg3zjir6pb7nsfg4ypqrq6z2zif0ysjmwybpqp5xpz6rvymv2pbj54z5ll"; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz"; + sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw=="; }; }; - "@babel/parser-7.9.4" = { + "@babel/parser-7.10.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.9.4"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; - sha512 = "0fa6q1spz676yd7fadv1k2ki32yskai2zvzg7i3gwqc98n1082zsg6gb2f3d6rrvm53d73i9zlgcww2g343hq48alzxvs6psni3sbkc"; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz"; + sha512 = "oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.8.3" = { + "@babel/plugin-proposal-async-generator-functions-7.10.3" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; - sha512 = "0rwwfjlp32i4bvax3zzcx990wylgr57wr6x9p6cdf2y145q8b5hjmrgr507d3sgpzmg565c8bzv6ipd44hsyg0vvqarpw1qzwp777rm"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.3.tgz"; + sha512 = "WUUWM7YTOudF4jZBAJIW9D7aViYC/Fn0Pln4RIHlQALyno3sXSjqmTA4Zy1TKC2D49RCR8Y/Pn4OIUtEypK3CA=="; }; }; - "@babel/plugin-proposal-json-strings-7.8.3" = { + "@babel/plugin-proposal-dynamic-import-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-dynamic-import"; + packageName = "@babel/plugin-proposal-dynamic-import"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz"; + sha512 = "Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA=="; + }; + }; + "@babel/plugin-proposal-json-strings-7.10.1" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; - sha512 = "3ahyf2462nwk892y4fa4dpzksln13c50zpwkwn0620d98zbs12mwabdx76mmmjrndqxmlka5zivazxq602nrlf8zh328m6kklsm0s18"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz"; + sha512 = "m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.9.0" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; + packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz"; + sha512 = "56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA=="; + }; + }; + "@babel/plugin-proposal-numeric-separator-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-numeric-separator"; + packageName = "@babel/plugin-proposal-numeric-separator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz"; + sha512 = "jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.10.3" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; - sha512 = "2ik5r2xl569yrh5l5qdh8q3vd18n7c3wfb92xfl8jx57dzvlqn0ypbjyhd8rgv3xp9rj9rinqkvbjf1zvbvp96bdz1qgaz3lszq22jj"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.3.tgz"; + sha512 = "ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { + "@babel/plugin-proposal-optional-catch-binding-7.10.1" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; - sha512 = "1vxbchc54810whpqi4s5v4v86r30k8cnplwl8krkwj5f29nh1pf91ldlh1v7yfhyczxi1bamlzmxjlga1aw5p6pqd00py64kvn1f2fj"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz"; + sha512 = "VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.8.8" = { + "@babel/plugin-proposal-optional-chaining-7.10.3" = { + name = "_at_babel_slash_plugin-proposal-optional-chaining"; + packageName = "@babel/plugin-proposal-optional-chaining"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz"; + sha512 = "yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.10.1" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.8.8"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; - sha512 = "3qaz0kiybhl1f774kv904b7c168i2q3ajpw6ygk4h5llxjlbpk0lr5inzfml5f7y4g0yykzqr1pfbcbfqn5kiwpypq14vi9qdb66n0i"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz"; + sha512 = "JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -307,7 +361,16 @@ let version = "7.8.4"; src = fetchurl { url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "0vr768w42hfh5r9hz6rqmx5gh8d6phcx615miv2dyhp68g5w3yy9b24c0i8a340bgv2m9jpd5snjldrsx9mwny4hjqrcz8635kjc9xp"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; + }; + }; + "@babel/plugin-syntax-dynamic-import-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-dynamic-import"; + packageName = "@babel/plugin-syntax-dynamic-import"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; "@babel/plugin-syntax-json-strings-7.8.3" = { @@ -316,7 +379,25 @@ let version = "7.8.3"; src = fetchurl { url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "08g9zcfg8k58q0bki8ar2b26fadfmmcc3v4znspy4bg0f16mxa5hqqldcc1js74jxcwq45x3q2jx4baq1mf3r3bgglgh7jnd9sa93lm"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; + }; + }; + "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; + packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; + }; + }; + "@babel/plugin-syntax-numeric-separator-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-numeric-separator"; + packageName = "@babel/plugin-syntax-numeric-separator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz"; + sha512 = "uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg=="; }; }; "@babel/plugin-syntax-object-rest-spread-7.8.3" = { @@ -325,7 +406,7 @@ let version = "7.8.3"; src = fetchurl { url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "2a9vg6b6p2rfhcflic2w6rbrbiqrdgj4ra2q20g1qv6ncwmvja2jq8snygwfw1ll1k94rqnbj4hc1fpizgr1v35rfvxqvwr6658r2jy"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; }; }; "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { @@ -334,331 +415,367 @@ let version = "7.8.3"; src = fetchurl { url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "3frbi2r4lw5ba5mik8ms5bmzw9kc43s4gs39kfxq1jrcmhi4bjnanxch5jb390g7jw3v8a0d28pw81jagja32j6qgm995imyz8c6lz9"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; }; }; - "@babel/plugin-transform-arrow-functions-7.8.3" = { + "@babel/plugin-syntax-optional-chaining-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-chaining"; + packageName = "@babel/plugin-syntax-optional-chaining"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; + }; + }; + "@babel/plugin-syntax-top-level-await-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-top-level-await"; + packageName = "@babel/plugin-syntax-top-level-await"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz"; + sha512 = "hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ=="; + }; + }; + "@babel/plugin-transform-arrow-functions-7.10.1" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; - sha512 = "338cllyizyzn9jldb8b19zzc0kzkrdw37rapvkr7sqw32my3zad5sm4vcbg0bvxkfjna8f7xp4fqb1xn0jlr25vfpwa24mwl3w4bi6h"; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz"; + sha512 = "6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA=="; }; }; - "@babel/plugin-transform-async-to-generator-7.8.3" = { + "@babel/plugin-transform-async-to-generator-7.10.1" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; - sha512 = "1alfn84kb2xm5fra8p2zwplf243ncwh74ax888krbhm66ffn9xmaa5ndmlcgqia375zfxrh8fx2jy797wif9pd0wwnqixn3aas7sswa"; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz"; + sha512 = "XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.8.3" = { + "@babel/plugin-transform-block-scoped-functions-7.10.1" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; - sha512 = "2d0kvarza8mnbqfkyl1xbq32vrr2140a73ixv3qh9qmb1pgnnw678x6mpc8yhlzw6vix3gp6falg48h6swjg6pcsz0kdamhwzc0b3my"; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz"; + sha512 = "B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q=="; }; }; - "@babel/plugin-transform-block-scoping-7.8.3" = { + "@babel/plugin-transform-block-scoping-7.10.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; - sha512 = "3mp8c45pg6kwvci67fndm7k631ab4799di740limmwb7lrch9c9ma8r743lg6dhw7ail9pas486wybc77dqknrf8qc1hdfidrzdhsd4"; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz"; + sha512 = "8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw=="; }; }; - "@babel/plugin-transform-classes-7.9.2" = { + "@babel/plugin-transform-classes-7.10.3" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.9.2"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; - sha512 = "0qnwdi6360a4j2yifxl76d3plhldndy1p4qnswanbr6ldsc3vllbq22h4majaa5jqg7qfxxhagabrwy154s6nd0nb9gpcgkngfsjbac"; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.3.tgz"; + sha512 = "irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw=="; }; }; - "@babel/plugin-transform-computed-properties-7.8.3" = { + "@babel/plugin-transform-computed-properties-7.10.3" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; - sha512 = "36fk87d811md1xxgp154k5i7389qwlibklymq8p5frx64628jaybqvxjjg49y7z5fp201n1820n8ddm633xjl4l85mnff5jjhi6561v"; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.3.tgz"; + sha512 = "GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA=="; }; }; - "@babel/plugin-transform-destructuring-7.8.8" = { + "@babel/plugin-transform-destructuring-7.10.1" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.8.8"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; - sha512 = "0jl5irg4ra9nwbdqzcbi4kyhwd1sah1f8z3ikw5pmdpj79rn1n7hc3f7xxjizf2x3qd6jagzjiihpbd6x1ksq972innpbinbghnw4kr"; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz"; + sha512 = "V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA=="; }; }; - "@babel/plugin-transform-dotall-regex-7.8.3" = { + "@babel/plugin-transform-dotall-regex-7.10.1" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; - sha512 = "0ihnh0bfa5fb3m5wpd5m2nb837kahwcyrzz70x9rs8968qrqf7x6379kgw95l2rpyzmns2589ncr9brh1z5qlc70llc9q37sf7kbfwh"; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz"; + sha512 = "19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.8.3" = { + "@babel/plugin-transform-duplicate-keys-7.10.1" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; - sha512 = "08ww1bysk4r4s47pp58pw2pdx2f2kxxykdwx1kdsiqgb0z2v0pbfl2d1ni4gcq5g2cmvr8y52zq4sjqdv0lif4liahb8w8v2n44gixk"; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz"; + sha512 = "wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.8.3" = { + "@babel/plugin-transform-exponentiation-operator-7.10.1" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; - sha512 = "26i4rkcf5lgs5ccx03swkk0kb1z9rjvqvjd7jizzch1ldj5m5s60fh3fxwmraj85b5w1l5y5zcpbi1mvb0r5nw9f0170vx6ijw2j0ng"; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz"; + sha512 = "lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA=="; }; }; - "@babel/plugin-transform-for-of-7.9.0" = { + "@babel/plugin-transform-for-of-7.10.1" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; - sha512 = "0aphbh180fndrdkpy3vvncgvjx7s260qvx2n6yyfsxprri5gwsz2yn4kf31k0nycwm92zfsss67fqf2nbgyhx1wr3lybh2cx9c2fc4m"; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz"; + sha512 = "US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w=="; }; }; - "@babel/plugin-transform-function-name-7.8.3" = { + "@babel/plugin-transform-function-name-7.10.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; - sha512 = "04hzrww1ccdhk8gg5g89zxd90paqsfsxxv2d0jld3sr5lxbkhqnwi6hwp27w58cm3hi0qljwr3ilbgkdwpkzy9rdsgliw5v6jfcxvxc"; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz"; + sha512 = "//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw=="; }; }; - "@babel/plugin-transform-literals-7.8.3" = { + "@babel/plugin-transform-literals-7.10.1" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; - sha512 = "38bav1jy57qq8fikvzz2hlmay39i8xg3s12vw1gx3nmm23bxf9dm7h5690700z8mldgc9dxx10sx7z7sgj9fijpgb9ixa3zjbq9yfnx"; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz"; + sha512 = "qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw=="; }; }; - "@babel/plugin-transform-modules-amd-7.9.0" = { + "@babel/plugin-transform-member-expression-literals-7.10.1" = { + name = "_at_babel_slash_plugin-transform-member-expression-literals"; + packageName = "@babel/plugin-transform-member-expression-literals"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz"; + sha512 = "UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA=="; + }; + }; + "@babel/plugin-transform-modules-amd-7.10.1" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; - sha512 = "3wj8qylkfbb2mmi5s3r72yh654s27cqc97lcyi3llr15nw93ynf0sh7grakfihh2ihpxx9yr3icfwrfsx2wpjfc7dw1vp1lbl60765x"; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz"; + sha512 = "31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.9.0" = { + "@babel/plugin-transform-modules-commonjs-7.10.1" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; - sha512 = "3rag3vbizrryxgh63crd9b5j9dan0hwnkxzzh0ag6rq6g1jl61bs4bkirlr0mbx2q1wz2ld4ipvh5rc1i9yh2aq98w2manap6n44fdb"; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz"; + sha512 = "AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.9.0" = { + "@babel/plugin-transform-modules-systemjs-7.10.3" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; - sha512 = "14zkvrxkxqyava1yschic2apfnpgjsxaizwk1aki9say2ksnj2256lfzgrsxi0f94ql35xikfdwx0kjb80y7clmv6fzp8ysz6zq1j0n"; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.3.tgz"; + sha512 = "GWXWQMmE1GH4ALc7YXW56BTh/AlzvDWhUNn9ArFF0+Cz5G8esYlVbXfdyHa1xaD1j+GnBoCeoQNlwtZTVdiG/A=="; }; }; - "@babel/plugin-transform-modules-umd-7.9.0" = { + "@babel/plugin-transform-modules-umd-7.10.1" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; - sha512 = "16ys0wvmbpijqqi3yjfhgbcq0h79wgfbi9d2r2379bw6mmhpaqgps74byy16dj65z9p6h07x8hjijx084bh120l374hzdhm89ga8ddr"; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz"; + sha512 = "EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.10.3" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; - sha512 = "2givr1pfhw82nf5drhqd5is8lyikd8njd0lgj9ixkikxllj8c1hd9nirxigd0yn0af62j6djh71sqixd2id76xh9qx4yg8mqpzlbsvz"; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.3.tgz"; + sha512 = "I3EH+RMFyVi8Iy/LekQm948Z4Lz4yKT7rK+vuCAeRm0kTa6Z5W7xuhRxDNJv0FPya/her6AUgrDITb70YHtTvA=="; }; }; - "@babel/plugin-transform-new-target-7.8.3" = { + "@babel/plugin-transform-new-target-7.10.1" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; - sha512 = "0bnq7wb7y55gsll55gvm7w1cdnplmn47sbdxfik4jvy1jayjlg2q4lig22ws8698pfcd8v3p6cq5bvimwnvlwhlgfqrqhlvr358dr22"; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz"; + sha512 = "MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw=="; }; }; - "@babel/plugin-transform-object-super-7.8.3" = { + "@babel/plugin-transform-object-super-7.10.1" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; - sha512 = "06hyil9pvnm5jg66c563cs62035ymbf52sn705wr4rpzl3wn5vly5sghlahrjl5xhw4b91yrrm964l0r0i267rsgb36zd08x29mgcg7"; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz"; + sha512 = "WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw=="; }; }; - "@babel/plugin-transform-parameters-7.9.3" = { + "@babel/plugin-transform-parameters-7.10.1" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.9.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz"; - sha512 = "09al69prgs8rs1fpkvk4a1grhcs2ggkcw80sq3bch8nybafpwfr9drxn8yhg0fyy98l7mwa0ihw5yvxibwb93ir7chn5vk910ax0fkz"; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz"; + sha512 = "tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg=="; }; }; - "@babel/plugin-transform-regenerator-7.8.7" = { + "@babel/plugin-transform-property-literals-7.10.1" = { + name = "_at_babel_slash_plugin-transform-property-literals"; + packageName = "@babel/plugin-transform-property-literals"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz"; + sha512 = "Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA=="; + }; + }; + "@babel/plugin-transform-regenerator-7.10.3" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.8.7"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; - sha512 = "2n9vklnwvsx5nl6p39n3x6ylby7p2l1ymrn9320ggbl2yp95dqfpzh3wlcjkvdswwfgd7zs85jpvqlk2av9kxv0bavlcrvq1603x22c"; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.3.tgz"; + sha512 = "H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw=="; }; }; - "@babel/plugin-transform-runtime-7.3.4" = { + "@babel/plugin-transform-reserved-words-7.10.1" = { + name = "_at_babel_slash_plugin-transform-reserved-words"; + packageName = "@babel/plugin-transform-reserved-words"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz"; + sha512 = "qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ=="; + }; + }; + "@babel/plugin-transform-runtime-7.9.6" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.3.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz"; - sha512 = "0yb11rhnni08x0l9dhbzz8km2q4g33bpjixvq8hnyp1cghsib2h5xlqrvrl57x7m4h9lakrxd8hhc10cw68r58769wxf0gdxi301aix"; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz"; + sha512 = "qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.8.3" = { + "@babel/plugin-transform-shorthand-properties-7.10.1" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; - sha512 = "3rh55yhh4q4sy77lmf2cqpscb553j904j99jjfih53hxiz32hgil33ndvbsdxqw84p6g8dk4xs0q27jnhsnzwr1qiq95l30wzlcil13"; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz"; + sha512 = "AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g=="; }; }; - "@babel/plugin-transform-spread-7.8.3" = { + "@babel/plugin-transform-spread-7.10.1" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; - sha512 = "3p85332hnhff55y3is8q3hvmq1jgr2dkypaz8ydyawhch6x56a2j28vw2aqxd2w7mbra8c2k9gz71k1ar8r4vcd702hm64vv59r6jqa"; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz"; + sha512 = "8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw=="; }; }; - "@babel/plugin-transform-sticky-regex-7.8.3" = { + "@babel/plugin-transform-sticky-regex-7.10.1" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; - sha512 = "1dmlmw2s1fmy0jllpwqpkdcrlg9rlggm7gxbm0wc5091afpjr1rqmdvb192zqbbfxmcxlq6acndn1p7i9s5vnczw5dr03w2y796lapm"; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz"; + sha512 = "j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA=="; }; }; - "@babel/plugin-transform-template-literals-7.8.3" = { + "@babel/plugin-transform-template-literals-7.10.3" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; - sha512 = "1qsqiwghf845xmas44mbh7vhhhqv08wfm8g9v7fq4yrwj3f14zvxlp0wc5hlhwzwbg4487dxhv597a42gkn839z2n5h68d4vh310vgk"; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.3.tgz"; + sha512 = "yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.8.4" = { + "@babel/plugin-transform-typeof-symbol-7.10.1" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.8.4"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; - sha512 = "2mfnlkk7zxq37znqknq8z9wrk5g9r1zs2v1f21w1xnnqp69y5f0dcwclaw6khxbv13whzh27rn2b9wl85qamyy63rgy7glx65zb40nr"; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz"; + sha512 = "qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g=="; }; }; - "@babel/plugin-transform-unicode-regex-7.8.3" = { + "@babel/plugin-transform-unicode-regex-7.10.1" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; - sha512 = "1kml3kqk32kcwg2snmk38k4xiisyim2nm4g0xji5h9pgzm2bgwad9ad85kddddqmldkc9i3qyrsf7ai8valp3gf8g96g68x6qkf1rzs"; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz"; + sha512 = "Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw=="; }; }; - "@babel/preset-env-7.3.4" = { + "@babel/preset-env-7.9.6" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.3.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.4.tgz"; - sha512 = "203xg6r6imb5gaqxzk06ann6568pgn61398ygl79421ybxkj7xcpijxsvlnzd15zjypr20x9a43flg0mnih8bhdsa00gwqahdyjlv6s"; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz"; + sha512 = "0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ=="; }; }; - "@babel/runtime-7.3.4" = { + "@babel/preset-modules-0.1.3" = { + name = "_at_babel_slash_preset-modules"; + packageName = "@babel/preset-modules"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; + }; + }; + "@babel/runtime-7.9.6" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.3.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz"; - sha512 = "3m5vxl1yg3z98wjmhhxyxdwmk2a10yj2dvh42zqvjfl43cwqw2ir57gimhwr7n820bs2w1n0z2575i233xqvd7bnmdb0s2jqyffzxr2"; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz"; + sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; }; }; - "@babel/runtime-7.9.2" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; - sha512 = "3sh2slrgff4njf77qzi5x2b8l2a2bksb8nfxzcfa0y4vq6g7jcz3vzl1p5kxg96ni206l0z4wvxzm45vr243pzrwv8nwz3fwys86k9l"; - }; - }; - "@babel/template-7.8.6" = { + "@babel/template-7.10.3" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.8.6"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz"; - sha512 = "0z8kzrpis50nr4vsyqr77cpqad0xfsacw45jdhwsl89mdzpvy8wcvc0kdy938kb0ll069plxhgy3a3fpag408ci2pb47gxzrhy2rcyd"; + url = "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz"; + sha512 = "5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA=="; }; }; - "@babel/traverse-7.9.0" = { + "@babel/traverse-7.10.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz"; - sha512 = "3giz5rwk1g73w7f31fpnpf418bk0pkh05npk3vajnybyxhfxj7s5wcs4z1wlj8f055sxv24lspca5ia36cm2pgf3j9qb7x49y7m01lc"; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz"; + sha512 = "qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug=="; }; }; - "@babel/types-7.9.0" = { + "@babel/types-7.10.3" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; - sha512 = "2g85q87d2pq07ggy89zwnd847mlxig5blaapazf7940b8vjbff48l2digxcjfi3dg9vnrkv8n4yjz4j8s15nvhry5jk5kz4yllljbq5"; - }; - }; - "@cnakazawa/watch-1.0.4" = { - name = "_at_cnakazawa_slash_watch"; - packageName = "@cnakazawa/watch"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz"; - sha512 = "2hl7iz90jal2f27hgyb5rbmcp96p182xkmflyj5rsyqqffng8vkzz3fcjvbvcpdykij40ax4yirdc6p68yrmjvai7hr8y93mj20indz"; + url = "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz"; + sha512 = "nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA=="; }; }; "@hapi/address-2.1.4" = { @@ -667,7 +784,7 @@ let version = "2.1.4"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; - sha512 = "1sqi7ls27blq5mlm1r1lbkpyyx347q67x6732qsxw0ms2cqxm814wqpfysa3c64ak47qcfmknk2xsjayi0myv1csr7pvcry162lyga0"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; }; }; "@hapi/bourne-1.3.2" = { @@ -676,7 +793,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; - sha512 = "2jaj0r6ay5qf2ayzcsb02495kaxxdflks99g9k8ff9fi2qq8xns3f6vjiq4949af9gxjrzq6n7vxry55y3lskg2vm6ywlps7qflvmfm"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; "@hapi/hoek-8.5.1" = { @@ -685,7 +802,7 @@ let version = "8.5.1"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; - sha512 = "2ir1zjr8jp78q5v2sm9lh7w5vlb7spdynsy25ndaqgh78d6p9rvmvzc09pzbimbh04p06527jk00jwzadzyffb75jrvbww3r1ny9pn8"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; }; }; "@hapi/joi-15.1.1" = { @@ -694,7 +811,7 @@ let version = "15.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; - sha512 = "00w6lcx6spr7z1xbkfady5yxfxkiw4f3crds9l6qirvnsp30c026jziafi6km0p5146dygrfs1rz47j9klph7y6zcfcnaqfjgqmyyvs"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; }; }; "@hapi/topo-3.1.6" = { @@ -703,7 +820,7 @@ let version = "3.1.6"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; - sha512 = "04mh0ix6qpfggy9if6vjicickw0xydydny3hh2vs1q9gji5fg31jyr25mnagl48pl6mzn2p4dc65fbpm7w53bka7zz033qw679a01ml"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -712,7 +829,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; - sha512 = "3g9wzm6hszqh30x6hmwc9l4vw51c6a224cp2y9qzlj98vzbwbc4s7lfafi67v8401qagjsdxrndnnannzz6i71krmn8svxwk3lfkwbc"; + sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -721,7 +838,7 @@ let version = "2.1.3"; src = fetchurl { url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha512 = "07zn0jp8b7nrrpkxwx715n68ncr51xiyz46j8g1fdvy07cr3s60npwhds1difzwdgz762zwirirppmc5dwl5pdqmww1m0zp15hv0sbq"; + sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -730,7 +847,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; - sha512 = "0zx6w7vq6bz1fxg0dhvd9nwbrbvghcln2xmj89p93dq84bm8pdiiddds49wn45wplh8f8mdnkjv2w0cjn3a1i83v3yq22wh4q7jc45j"; + sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; "@nodelib/fs.stat-2.0.3" = { @@ -739,7 +856,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha512 = "2n8008qx9kqgxsgsd22r2xrkm56nwsnwjfws9s4jjmbrk4gz8vfhdw7vp70kn59mqfihkdks6s0101javrpfi7hg8l0qk3nwjp4a03d"; + sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; }; }; "@nodelib/fs.walk-1.2.4" = { @@ -748,25 +865,34 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha512 = "2nsw6dfpkrkm8pxp2d9jlva5mnwqfzssj9r3xlyvrybb26xvjjkw7c0jvfilz08xvvgaanjxvqz6ycqh35avnqwg8mns39biqwmfpym"; + sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; }; }; - "@sindresorhus/is-0.7.0" = { + "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "0.7.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; - sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; }; - "@sindresorhus/is-2.1.0" = { + "@sindresorhus/is-2.1.1" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.0.tgz"; - sha512 = "0v01lvb36q7cjz2v5spd6h3gcqmw69jmrpa6nsdpdmipxihzn6wv8clkyxibcvxv4b5ajpsz5rg0aiwwhjy7nl0jcwax8sa59zrfwlm"; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz"; + sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; + }; + }; + "@szmarczak/http-timer-1.1.2" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; "@szmarczak/http-timer-4.0.5" = { @@ -775,7 +901,7 @@ let version = "4.0.5"; src = fetchurl { url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz"; - sha512 = "06naxv8ahcw0kc4pzg2fzqqrmb0ah6lsi3qvy3s4a5x2fkil74z97yiagbykqanf1b0zrzq4lhrip8sc6fs124kiypaqqdmr7v4091z"; + sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; "@types/anymatch-1.3.1" = { @@ -784,7 +910,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; - sha512 = "32g2n75z48j6mx4k8iz6hm75q7r6dd24gk40lb02x7bffcjf6zf4ca10g51x8zqd1yr0zq2xny0wrvgfz1ynhmg8hv9l3j1g8yr3q7z"; + sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; }; }; "@types/cacheable-request-6.0.1" = { @@ -793,7 +919,7 @@ let version = "6.0.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz"; - sha512 = "2nx7h47i6xjvrbxlp329m2sx4qa8s7fw3c7xycfd6gr6wwfkjvyv1j5z1pf151w09vzhn721bjrh8p1ydba3vc5ljdy064177dnlhfa"; + sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; }; }; "@types/color-name-1.1.1" = { @@ -802,34 +928,25 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; - sha512 = "0yy21xdbsflgxc7lcl8i2cb4mnw9a518gcj77g39hslrlfanliz7agc4dihnkkhcdpnkas7i2sd5lf9f2i4kaq53axkgir3411qxgxf"; + sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; }; }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi"; - }; - }; - "@types/glob-7.1.1" = { + "@types/glob-7.1.2" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; - sha512 = "3dhbgdkzpgx010hfgkhndrb094kbd3z6s4waicihnl0rp3jk0f0gs8vvzi84xzissrhml1dfgvbdhahzbh75nny1g6429fnqvlp866l"; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz"; + sha512 = "VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA=="; }; }; - "@types/html-minifier-terser-5.0.0" = { + "@types/html-minifier-terser-5.1.0" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.0.0.tgz"; - sha512 = "05y4l2y0vv2pif8awwvi76jy0b19pgwma0d3whwls29q6jzzrwnw1yncza40h1br0zsd980vfwn19hznim1gd031ds634jxh4zm5pmb"; + url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz"; + sha512 = "iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA=="; }; }; "@types/http-cache-semantics-4.0.0" = { @@ -838,7 +955,25 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz"; - sha512 = "3a59p84bj2kf33npin2307frq0xhm47cvw2rw1xijb53yalq3m4bhxkjl045jraj56nz13xnis7amcnr0bd5x1r7785wf54dv9z4xbk"; + sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; + }; + }; + "@types/http-proxy-1.17.4" = { + name = "_at_types_slash_http-proxy"; + packageName = "@types/http-proxy"; + version = "1.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz"; + sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; + }; + }; + "@types/json-schema-7.0.5" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; + sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; }; }; "@types/keyv-3.1.1" = { @@ -847,7 +982,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz"; - sha512 = "1bydwp0jnaxaygfaw3xj8g6drxla6vamlgd2533jq8iplf1hfll274n67kcqj465la3k515krc53v8aqz23vnl2avxhsra0574niyrh"; + sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; "@types/minimatch-3.0.3" = { @@ -856,25 +991,25 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "2ff7lcgph45bp2v5zsaxcy00rbh5n5h4njbicwhqilz66pd1lw7xfrpfl4i4ppfcx78zg9cp582b5fjif0dg7r18m44vxfksslvlyml"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-13.11.0" = { + "@types/node-14.0.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.11.0"; + version = "14.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz"; - sha512 = "32v8pzb6g76fjsp064dr7qqry3f3dbbff56bkzw7qxpzg37kpldx5d61n87183b2s8svx1pid84c225frhy7gp3r6zz4808dfg2dkmq"; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz"; + sha512 = "rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="; }; }; - "@types/q-1.5.2" = { + "@types/q-1.5.4" = { name = "_at_types_slash_q"; packageName = "@types/q"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz"; - sha512 = "17nxpx18sizfrmzc6d7xcc2pr2xn2cq83vh0hm24wpm8ibdlcq5r0m12gbps0sww2jayl9v7lqplss6nsyy6xc4rcn1s4rpmpg5vvki"; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"; + sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; }; }; "@types/responselike-1.0.0" = { @@ -883,7 +1018,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz"; - sha512 = "161bm0d6lm7yvh41bc6yspj5nb36j9v4nx7d3xfqgc3h2cg6z03ik6kfd8cv1q93qwblz5ibp30a7scscxj8vw963d5qz5f7033d5pk"; + sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; "@types/source-list-map-0.1.2" = { @@ -892,43 +1027,43 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; - sha512 = "2q5qxxw2xrn72030yyfpxzl3b498dw1wbfbb86gk9a4i5mhq3adc2711mfdwyg7ixdy79ax1hdfp0vw0aqzwj32dlyklbbwd75bx4ib"; + sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; - "@types/tapable-1.0.5" = { + "@types/tapable-1.0.6" = { name = "_at_types_slash_tapable"; packageName = "@types/tapable"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.5.tgz"; - sha512 = "2sv1nmhp8gvylghvxmxvc02zral5hbrhj45cpl5bz7grf36r8mpaihybdvz1nwkkdn325lap4v1q2jbzzy1l3wz2q8bghr6y8rvc0gy"; + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz"; + sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; - "@types/uglify-js-3.0.5" = { + "@types/uglify-js-3.9.2" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.0.5"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.5.tgz"; - sha512 = "0kqcqx89pacasl4g5azinlm111qla4fn4k5ghsmyc9lsh2a2nhlj74zrm1apzw5zvnaxcl86ysym559000n93szj9ln0saj9151pc9g"; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ=="; }; }; - "@types/webpack-4.41.10" = { + "@types/webpack-4.41.17" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.10"; + version = "4.41.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.10.tgz"; - sha512 = "2f211d97906nnasrwxk3c1f6bd5gc9za6vs3dqp6j5rg928kp975xsj7gfk9sbbvrqcfp0mrb6hjw7fd2m3x1dvcjik60mwmalv935w"; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz"; + sha512 = "6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw=="; }; }; - "@types/webpack-sources-0.1.7" = { + "@types/webpack-sources-1.4.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "0.1.7"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz"; - sha512 = "0px6j424ivmklnnzd5kspgsq0irlhf086gbcd74ycjhrmgz0wy6sv4lkz7l5p4ddz6fghjkl3j4vlxi99cnkf2h3masv30bjan8f9jz"; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz"; + sha512 = "c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ=="; }; }; "@webassemblyjs/ast-1.9.0" = { @@ -937,7 +1072,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz"; - sha512 = "08744px0y61c8svh84df8xg0m3905gkz9wfjlp9pkk8j5dnfs66l43qff6d60y1n0igdzwdpf9bvrdy4jwrkcjs1l98ivlvpzj1db0b"; + sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; }; }; "@webassemblyjs/floating-point-hex-parser-1.9.0" = { @@ -946,7 +1081,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; - sha512 = "10dqii9lv28nj4ls9wv7ys4ckd7v9iz08cb2alpph0xgz44a437yfa6mdzgnkgw5zcgxjy4xqsxv9sfp49ay8c3hdw01w8jbdq6lvjc"; + sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; }; }; "@webassemblyjs/helper-api-error-1.9.0" = { @@ -955,7 +1090,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; - sha512 = "2dmpj9vdgdq3wjfa9a6jlb6xrg4d25l2an1r41sw91a7psdc9lp793ca7z7i9q2712p7gp42095r50xfsc2fwci9409npjch670phrm"; + sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; }; }; "@webassemblyjs/helper-buffer-1.9.0" = { @@ -964,7 +1099,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; - sha512 = "04387f8f3q0kk96h7l1js39xg4xy8ja9bxgqpmfpsj17xma1y3p3risra4yh8j3xbiyn4bxqmcgn6zlwv6n0yzw0jrax1iagbijb6m9"; + sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; }; "@webassemblyjs/helper-code-frame-1.9.0" = { @@ -973,7 +1108,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; - sha512 = "1j2zclfh4a784bb015c39kahlmalikwdx0k1xws46iynf1nskcy6szv1cldldn1zhm8ckj8wddfx6idpj3m2qzvw9pda3v4j1s9h40i"; + sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; }; }; "@webassemblyjs/helper-fsm-1.9.0" = { @@ -982,7 +1117,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; - sha512 = "2bjr61kxvrfhqr7439jkapxcij4cgm9lb32x55qq7hxn07cdkz69aaqvmzqqyir0bn8a1rfblmgvmd53jxg0jgwwjdi1clv2716ix1q"; + sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; }; }; "@webassemblyjs/helper-module-context-1.9.0" = { @@ -991,7 +1126,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; - sha512 = "3r1d7c1zr0b9f85526k03d1p47kq7qgih4q1fzwxv540aid771cjrmw68f6fipmhzlzxwxhj09q2vrxb96p59v7jd6cplw247r9d41h"; + sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; }; }; "@webassemblyjs/helper-wasm-bytecode-1.9.0" = { @@ -1000,7 +1135,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; - sha512 = "19im6kssfy0rjipdvz4jp03rjzkwhnvkp1q8zw7mjfx8yf2w7nlxpy5ambbzvlq5jvh8ks6x35nlh0kcmz68hmcqixwfdgjijs55ca7"; + sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; }; }; "@webassemblyjs/helper-wasm-section-1.9.0" = { @@ -1009,7 +1144,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; - sha512 = "2zs0rl7x9l6adbbiqgw2br1w09b1da351rc69znxakjg9c9wkb227xy374k1zkc7a79rc4q7lgwv9ami3pr4555mipqp4yybpr02wsy"; + sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; }; "@webassemblyjs/ieee754-1.9.0" = { @@ -1018,7 +1153,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; - sha512 = "17f4ncqxsp9b8ssciw5icvf8bxpd732cda6z1jdbddbxl58m3vkjaxpx3ymi4z0y8nnrify698x8g65w38761rjkgr0pzhlwqkgribm"; + sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; }; }; "@webassemblyjs/leb128-1.9.0" = { @@ -1027,7 +1162,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; - sha512 = "2kz1bim131l0y9pjznjv3qmw030gli8yb3hhd38hjrc2py5h551lgzcsjlrx6pnpwnq9rdsyh3ppkyarymrpnnqncimlmvhjlrp7m8h"; + sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; }; }; "@webassemblyjs/utf8-1.9.0" = { @@ -1036,7 +1171,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; - sha512 = "3rlyvh0fy205d045jr17hjj8y641hmhkkzk3gq78865jcqm55ff2n3jbalj5121q8li786hm9jg5ggv66qixp7fsb7i9938dfax15hr"; + sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; }; }; "@webassemblyjs/wasm-edit-1.9.0" = { @@ -1045,7 +1180,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; - sha512 = "33jfv92rsn09qz41blq4a781clr7n5lzpy44zb42fb499mbd1hd4mf0q4l6karmbm8gg552p9ayqgzawz29r2n56gwhrfrldw3g608n"; + sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; "@webassemblyjs/wasm-gen-1.9.0" = { @@ -1054,7 +1189,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; - sha512 = "26a9wb1a8jglkv330fkmcg7l4z9v1b8ygn32lw96z2wiq1m65f7b3rqp1f1rhgg72sxdx0zsirs6am97phy66svps3y7k0qisikgwbh"; + sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; "@webassemblyjs/wasm-opt-1.9.0" = { @@ -1063,7 +1198,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; - sha512 = "3c2a28pzyrsdrichvzc0v1kik18sb0pwfjkwhbm1cc6xakfw5wgialgqkrrv9c7ibskwh1k75m9xf9v4hmd42xj6676z1i7l2dy0j22"; + sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; }; "@webassemblyjs/wasm-parser-1.9.0" = { @@ -1072,7 +1207,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; - sha512 = "0n0927dbd3wsan69ljwzlp9pi15axs3a11sypfl720s8dm8g0q81kxq0w0qybzgm16fwk073y7ffkhm4gqv0cv496fhkn0iihr29v7p"; + sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; }; }; "@webassemblyjs/wast-parser-1.9.0" = { @@ -1081,7 +1216,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; - sha512 = "1pkw353ygc8csplwi4nfx5n296wcj4b8yawrl0kxhizq4fdbbsvrhphzzcvx1p8r8ccj9yq2x5yix17q54gyhikcvr74hyhzl095jma"; + sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; }; }; "@webassemblyjs/wast-printer-1.9.0" = { @@ -1090,7 +1225,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; - sha512 = "2qb0ghchp4dw0yxp9c4h9iw6m7lk58sz7f9j4kmrvp5hj804kwxdskgbjcc96g3r7f3zwvcyw3nlnr718rml73f8gr727bbvq9jg7fq"; + sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -1099,7 +1234,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "1wczr2c331gq4q6w6nsiylqs6q6dp0j2lvc231826gfrdhr3lcimmyhswp4g0b5p7k7k525gq6gh0wpg65sjlp2s4f0n6ww18m2fzqd"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; }; }; "@xtuc/long-4.2.2" = { @@ -1108,7 +1243,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "00n8akj5s578b8r7vcdz817cnmga21vznz895kygvb0j780968szj171f91b0bgvz880ff7zq025q4087cgxb2fqpyg01sgil2ymq9n"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; "abbrev-1.1.1" = { @@ -1117,7 +1252,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; "accepts-1.3.7" = { @@ -1126,7 +1261,7 @@ let version = "1.3.7"; src = fetchurl { url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "acorn-6.4.1" = { @@ -1135,7 +1270,7 @@ let version = "6.4.1"; src = fetchurl { url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"; - sha512 = "1s65pswzbh0155lsrdln08lifgs34zb53vkfl8fvxwnfmrc84vj01m9b31w4n846k7vk8lr5ns6wqf0fxc8xz98vkihldxsgn9ksl35"; + sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; }; }; "address-1.0.3" = { @@ -1144,16 +1279,16 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; - sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; + sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; - "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 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "ajv-errors-1.0.1" = { @@ -1162,16 +1297,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz"; - sha512 = "24kqslzd256yc0dckqcg8n1rngyfzdflfznp55hnhkv3rhyzirjhpj31rgiiryyjlw8a64x9ba7hdqkpiwf6jpllwyyyhr7zqxmy90c"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; }; }; - "ajv-keywords-3.4.1" = { + "ajv-keywords-3.5.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha512 = "1lyjmfg70gijr3gjs63qmawfazm5mz8vb1bknyy1vzdif6a30vi3dpwkrlv4j4i5dg56jd3fliqgfq0rxbm98a42jxbgnyxmdn65va4"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.0.tgz"; + sha512 = "eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw=="; }; }; "alphanum-sort-1.0.2" = { @@ -1189,7 +1324,7 @@ let version = "3.2.4"; src = fetchurl { url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; - sha512 = "2n6gl8300ihln724832pvvzrii5c4qjli9xc16s632ywnyrfbv1kmcqg133v25583hqhflpsfi2yhkjy6nhzj0si5v36zhym0cifxc4"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; }; }; "ansi-escapes-3.2.0" = { @@ -1198,7 +1333,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "12pp3q4c44hrzr2xl9vqjigwjn2wr1j0lhvshl75z5m6a97hqkd047sdcma1inzjvxhpkzk1qkvag7cw3sya32s9wsfasr6xsnnj63h"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; "ansi-html-0.0.7" = { @@ -1234,7 +1369,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; "ansi-regex-5.0.0" = { @@ -1243,7 +1378,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "2bgymyprr0q59vfj2qnmnlcbi60jvry6kzdk94nlw3x6176ar5g0qddm8w01bw7fj2hrb4xlb75x4dqs38198sjachhslcfks7rz3kd"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; }; }; "ansi-styles-2.2.1" = { @@ -1261,7 +1396,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; "ansi-styles-4.2.1" = { @@ -1270,7 +1405,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha512 = "2619xzd910i29pa6v368sk8jdgjk3yqqvjwbg3hyj6byd3ygcrs3xix3fy03smqgiylhdrkrvyrhhnv1l5pkc64qn7zgmh6rfna6lgm"; + sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; }; }; "anymatch-2.0.0" = { @@ -1279,7 +1414,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; - sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; + sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; "anymatch-3.1.1" = { @@ -1288,7 +1423,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "2776jrfn8kh9r6qhz6s43znnwvqmbqrjsch99hdv21j53sj4njyjhrya67drxk8y7hvi28mjvdjj277jy4qd2zfayrjli3cdbdkkkwq"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; }; }; "aproba-1.2.0" = { @@ -1297,7 +1432,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; }; "argparse-1.0.10" = { @@ -1306,7 +1441,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; "arr-diff-4.0.0" = { @@ -1324,7 +1459,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; }; }; "arr-union-3.1.0" = { @@ -1360,7 +1495,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; - sha512 = "2swmvaw9xcvzv29i247057pq4khyss7gnc0p244v1l2g2p2xpsr47m0dfaf54yscd3fc9njh3kvwly99w8shvd9p5fq6nvwwmqg7mw4"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; "array-map-0.0.0" = { @@ -1396,7 +1531,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "35whnhqnw23y121ilf8kl79pyqb9bjsg32gsazzlmww9zgk22c5jycf0vlkpsnp67rqw05hhw97hxw216hpnm6bxa620lyqwjhb2v0w"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; "array-uniq-1.0.3" = { @@ -1432,7 +1567,7 @@ let version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "asn1.js-4.10.1" = { @@ -1441,7 +1576,7 @@ let version = "4.10.1"; src = fetchurl { url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; "assert-1.5.0" = { @@ -1450,7 +1585,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; - sha512 = "1n2xh5m359gm4my50j2206n32q2h044lqrl8h122gjn41fizlrh32j1lj7wqfix1iblyvi7zvdgvzbf97f840lr17vfk8ph1imj0fqh"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; }; "assert-plus-1.0.0" = { @@ -1468,7 +1603,7 @@ let version = "3.9.12"; src = fetchurl { url = "https://registry.npmjs.org/assets-webpack-plugin/-/assets-webpack-plugin-3.9.12.tgz"; - sha512 = "0s21gk3wrzrj44dcpsxj8yffp5iwnjccj9h7yn3l7qls5gcw0cgbd25qqd04b192px7kyjyfx9adwp3vxp286g27g15vlsg5gyd79ca"; + sha512 = "iqXT/CtP013CO+IZJG7f4/KmUnde+nn6FSksAhrGRbT1GODsFU3xocP6A5NkTFoey3XOI9n1ZY0QmX/mY74gNA=="; }; }; "assign-symbols-1.0.0" = { @@ -1486,7 +1621,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "0ga6b0jymkw4jrfvjilhfrddml29l1nrvj7r57d140p7rn31mmbni4j9z343v2zzz2zcnlsr2s17kmlgjkyvs9pxrf88an11pm9y77r"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; }; }; "async-0.9.2" = { @@ -1513,7 +1648,7 @@ let version = "2.6.3"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "1g679kw2qqpqx1yd4s778r8rw3cv9qwmib5x3klk64kcl5ndw71bljcpav5jkk6grizlpvrqszsbs6fkmnlvcq5fnz2q33mrnb6zyfd"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; "async-each-1.0.3" = { @@ -1522,7 +1657,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; - sha512 = "00vbg0zvq40mmvzz9q3klkk5ly5jh75kc8s3bf7j2ff9zivla3wlc8d622gajjq4w66mln5570dc936my6wh08ippfj5jagj51s3xfg"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; "async-limiter-1.0.1" = { @@ -1531,7 +1666,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "asynckit-0.4.0" = { @@ -1549,7 +1684,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; - sha512 = "1rbq2rl2ry0y3nkqs3013vgjrnzf03609rg58092r8zkvzzn6v15grhv2yhzb48sz74zmjcj8ix7f5whrfp4zvsxyzrh64fhs9awvjs"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; "autoprefixer-8.6.5" = { @@ -1558,7 +1693,7 @@ let version = "8.6.5"; src = fetchurl { url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.6.5.tgz"; - sha512 = "25g0ccq9v5sb77q5yhffaxnva8ps64yqp82rzn9jfwl2hpcqbv02175icm0v6c6k4aywnayf6di6cq44agrlzjc6sfbrzp8flvqkd9w"; + sha512 = "PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig=="; }; }; "aws-sign2-0.7.0" = { @@ -1570,13 +1705,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.9.1" = { + "aws4-1.10.0" = { name = "aws4"; packageName = "aws4"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; + sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; }; }; "babel-extract-comments-1.0.0" = { @@ -1585,25 +1720,25 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz"; - sha512 = "1ay21zjvpavyw19hzijli4ax209jw3lxrn2lfzdyd8v29b76r4i35nq4q6iff2zlz88x2py8lkvyczb5l41fnyx0chxlxg5hj5v6rd9"; + sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ=="; }; }; - "babel-loader-8.0.4" = { + "babel-loader-8.1.0" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.0.4"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.4.tgz"; - sha512 = "2pn5lfvi0s3fhz6fllidilfkz4h9v3l4632p55h9pyzccqda3fgpn2ayywyg2shfcw3y3q900xhkc7k63zyly3myqb9g80k8lv6243y"; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; + sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; - "babel-plugin-dynamic-import-node-2.3.0" = { + "babel-plugin-dynamic-import-node-2.3.3" = { name = "babel-plugin-dynamic-import-node"; packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha512 = "2ay3wlyykpjfs9awvl9xigggavibxvbi9hx1mplf87zmqff733aag7hzw89c4f28wf4hxcr404lsp01ndan45yxm9f1q44hjy98bam3"; + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; "babel-plugin-syntax-object-rest-spread-6.13.0" = { @@ -1648,7 +1783,7 @@ let version = "6.18.0"; src = fetchurl { url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; - sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; + sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; }; }; "balanced-match-1.0.0" = { @@ -1666,7 +1801,7 @@ let version = "0.11.2"; src = fetchurl { url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; "base64-js-1.3.1" = { @@ -1675,7 +1810,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; }; }; "batch-0.6.1" = { @@ -1702,7 +1837,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; - sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs"; + sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; }; }; "big.js-5.2.2" = { @@ -1711,7 +1846,7 @@ let version = "5.2.2"; src = fetchurl { url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; - sha512 = "2cin34lhbrlligarblnrqnl6f419mkpqd4abjms0y1fk1mxzb6rqvh1sg0zif7bgskirhh6shxnqa444syk4cf87fmndil954xzc8mz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; "binary-0.3.0" = { @@ -1729,7 +1864,7 @@ let version = "1.13.1"; src = fetchurl { url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; - sha512 = "0drjfs8xmgc4rfi8nbbx7adsinnc5m0nc96dw3r3gars8zvg1kzay5a7a5s3islf13wmw7q9v15i7d2gdghs1lp6rh2wl6x80hcqzjj"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; "binary-extensions-2.0.0" = { @@ -1738,7 +1873,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha512 = "2izzpdg2m0av5pzbv1zyjfi15ddz5yk1d4h9cilzc8z6pzq5abcicnm2xx4b2jdrjk2l4h3zfawsxhnbzlgvlv4700q5930k796s69y"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; }; }; "bindings-1.5.0" = { @@ -1747,7 +1882,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; - sha512 = "24xpa35sym31k1x9hs78jbmsh58yx7ldkn03d4g5qhmvm0bi5cwqvpn2s6r8hkwhks5mhm81gz878gbp5g9b2s7zniy7gm1z6vvysm7"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; "binwrap-0.2.2" = { @@ -1756,7 +1891,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.2.tgz"; - sha512 = "1rh0lsxhj45r639casyzy4jncilkcfygfzz2h7hqm7rjbh0za510z2qmqjbzyrx98618fmcycgraqq115fbwh7n33wi29ipk75azrb3"; + sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw=="; }; }; "bluebird-3.7.2" = { @@ -1765,16 +1900,25 @@ let version = "3.7.2"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "2v12rs2wvv94hrlyv0nadxn9x11796k9mk7a8vg0bqsry8m2pbyy9dribalwikh34qkk3rp6gnis849y5z9x5mxzbbdgkfhc3l674sy"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "bn.js-4.11.8" = { + "bn.js-4.11.9" = { name = "bn.js"; packageName = "bn.js"; - version = "4.11.8"; + version = "4.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; - sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz"; + sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; + }; + }; + "bn.js-5.1.2" = { + name = "bn.js"; + packageName = "bn.js"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz"; + sha512 = "40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="; }; }; "body-parser-1.18.2" = { @@ -1792,7 +1936,7 @@ let version = "1.19.0"; src = fetchurl { url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "2rl5ww96fwgmxdqhqmnknsaafw44vsr2xz7vf7nax8qz9jy8bmmdyawcy6yfny0wm7pi8m2jssakzjc1nin8z8207kv0gclpnrhy4bn"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; "bonjour-3.5.0" = { @@ -1819,7 +1963,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "braces-2.3.2" = { @@ -1828,7 +1972,7 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; - sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; "braces-3.0.2" = { @@ -1837,7 +1981,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; "brorand-1.1.0" = { @@ -1855,7 +1999,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; }; }; "browserify-cipher-1.0.1" = { @@ -1864,7 +2008,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; "browserify-des-1.0.2" = { @@ -1873,7 +2017,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; - sha512 = "3j1gv3firnsbjppm47ldxbav9rmh3plq026zn728wvhgf19i4r7kxzyyj7hpibhjv61lcm9i4b869yy90c8hfj7w8rmr17p2zbhwah6"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; "browserify-rsa-4.0.1" = { @@ -1885,13 +2029,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "browserify-sign-4.0.4" = { + "browserify-sign-4.2.0" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.0.4"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz"; + sha512 = "hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA=="; }; }; "browserify-zlib-0.2.0" = { @@ -1900,7 +2044,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; "browserslist-3.2.8" = { @@ -1909,7 +2053,7 @@ let version = "3.2.8"; src = fetchurl { url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz"; - sha512 = "00i65frm5jkbv8pzc13i02fzd39q0ahh653zzjzhq35pz6p0idajfjqg1b7mnnlvxymihcpmd1cfhwaj51hnqjmh4alrg8sjrq6hxaq"; + sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ=="; }; }; "browserslist-4.1.1" = { @@ -1918,25 +2062,16 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/browserslist/-/browserslist-4.1.1.tgz"; - sha512 = "3clmw7m8rqcpk4qygqml0750q666n48jv76xgw4v7vsff8yyxylgb8lh9hkfx282pg4sj5ggzzysd2gjmaas88nsicyp930xg1jn6jl"; + sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.11.1" = { + "browserslist-4.12.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.11.1"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz"; - sha512 = "3kf0caz4k8wilf978inqj6sgcxbsb9y7rc7m54gv7is132s81fc984wmrh8wl8hglcyvkxwwxm0vd2lf5qz8nx2qc6lca7b83gfn90c"; - }; - }; - "bser-2.1.1" = { - name = "bser"; - packageName = "bser"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"; - sha512 = "30jby01rqjgx78xnzyysjav12c0cj8dcwd40wprcfh1jn3768cdkb834q1zyf3wivhifi47xqa7jai7x16m1jv1mq4g40f69ws56341"; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz"; + sha512 = "UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg=="; }; }; "buffer-4.9.2" = { @@ -1945,7 +2080,7 @@ let version = "4.9.2"; src = fetchurl { url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"; - sha512 = "1d85syv6ashl8f3a6h553d185cg3vq6nhjqnc80vr2z3bak0c9xbm1jawfk9zs43xz34yih6h6j3bhb3njkahdqpji12fsc4kfsmby6"; + sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; }; "buffer-from-1.1.1" = { @@ -1954,7 +2089,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-indexof-1.1.1" = { @@ -1963,7 +2098,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; }; }; "buffer-xor-1.0.3" = { @@ -2008,7 +2143,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "073ccjmvxf726gcgzy0pksvi8x8r51dq6hyv69sc75ynrin7anwk9q3sqhbbbjhqjjrmq42s5f5gdbcgj2jxai6ldpyq6y2ny78payd"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; "cacache-10.0.4" = { @@ -2017,7 +2152,7 @@ let version = "10.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; - sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f"; + sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA=="; }; }; "cacache-12.0.4" = { @@ -2026,7 +2161,7 @@ let version = "12.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz"; - sha512 = "00qxfz1yqkizw00vx1948yfzilxv1c4pzxknh5hbwby5cgiyrzb488qwcdff4qdrbwm13skvhpxpshryw30py3s4bpgny98il3lqjvb"; + sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; "cache-base-1.0.1" = { @@ -2035,7 +2170,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; "cacheable-lookup-2.0.1" = { @@ -2044,16 +2179,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; - sha512 = "2714rgpq0wwdfnahlxn4a3g1fr6mf5dj2f3lkl874x991d7ilqvccrja0j4hk8nbc7g7yivvp9b2pf4rrgq3fpj6ghdjwck4fr1phqh"; + sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; - "cacheable-request-2.1.4" = { + "cacheable-request-6.1.0" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "2.1.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; }; "cacheable-request-7.0.1" = { @@ -2062,7 +2197,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz"; - sha512 = "1kmzafhx567pf4kbwdg03gxjx0d1l6j8lnb05y7f66kn8c1szz41kawa2jkf4zndaihac3i1yv7yjg6mrkk2lxs2b0wm7h0lqkjdpcn"; + sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; }; }; "call-me-maybe-1.0.1" = { @@ -2107,7 +2242,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz"; - sha512 = "3llmv9zy6jv6wn9nyxai15vw5zpjjpax70zzsz10gnd55kp1p86x59swnnylp20gjhgdnq5pj4ycfvd85n14bsjf9j82zdqq5cvdxpd"; + sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q=="; }; }; "camelcase-3.0.0" = { @@ -2125,7 +2260,7 @@ let version = "5.3.1"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; "caniuse-api-3.0.0" = { @@ -2134,25 +2269,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha512 = "2xvajfx062fy4i060qa7p4acawzmcpqs69jmklswq856lyzjq6p8vjgm5zi21ll5gxm7vvyc5xsh9bd30v5bppszr59c19zi2wg1i3f"; + sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001039" = { + "caniuse-lite-1.0.30001087" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001039"; + version = "1.0.30001087"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz"; - sha512 = "3qyz2ijjl61hkbifqpr2k8nrjw9gqlamp914lagh29kf1az6hkslbklljq5ss31n8lblczdvdi3pjjs2hgq71w52sr8gpyk4icdpv29"; - }; - }; - "capture-exit-2.0.0" = { - name = "capture-exit"; - packageName = "capture-exit"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz"; - sha512 = "3m6md2j1rsn26hijf0yfbbfnx6w2jrrqhr2b2xwjc9lyzvypidyz5krczc9wb04z1vq4mgb759ljwn7iggiiigijzhp38lk162zy91y"; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz"; + sha512 = "KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2161,7 +2287,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"; - sha512 = "1fzkc65mi135002lk75zd133f7k3cda42n14yb5lc6inqj10xpd2d3zyhc3bjq1k7zfdrlkxq9c26mdz48dpd30bqbmbjxwjjfj11pz"; + sha512 = "/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ=="; }; }; "caseless-0.12.0" = { @@ -2179,7 +2305,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; - sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; + sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; "chainsaw-0.1.0" = { @@ -2206,7 +2332,7 @@ let version = "2.4.1"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; - sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr"; + sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; }; }; "chalk-2.4.2" = { @@ -2215,7 +2341,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; "chalk-3.0.0" = { @@ -2224,7 +2350,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; - sha512 = "31damxvnvxjdp3hhqfn9nxi6hrw9cmmy5vlf0nqfvns1qhp3ybc0y7viswj1jdxvc0w1f3zapjsl89hx9hcwv2p8jca7m7qczlw2gg0"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; }; "chardet-0.7.0" = { @@ -2233,7 +2359,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; - sha512 = "1qg04aw34n3l68g6s6li7pfdspkj3zmb7qsqf096h19jwc34mv8sbhik4xcx9aazys1ycb5k736f4lql46s0rhl361pmlz1r86j4gwr"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; "charenc-0.0.2" = { @@ -2251,7 +2377,7 @@ let version = "2.1.8"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; - sha512 = "21d2yf3364v025ivy6ak1bh61qvvq9llryh8c1rhvrif1kalx0j996x8m0qs717cgl97q5c40awyv8gi8hbmpgfpl6zvkff6xmm8rk6"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; }; "chokidar-3.0.2" = { @@ -2260,7 +2386,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz"; - sha512 = "0l3pn1afpk9h62fjazidrp2dpgigsqwmpjy92686srm8j8ky8zx8072s00jmvz1mr8g78dj70y0vdg9j1h6m6vfp8sk4di3x3cx30vk"; + sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; "chokidar-3.2.1" = { @@ -2269,7 +2395,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz"; - sha512 = "3mkp71nvz0h69nzh9z15is5l5lpmcs7nf5nypdv5s47fi1z1an9qm29677y5j6sviwky0kr82z4cild7f6qxgnpnflyq5gr8qz4ygpy"; + sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; }; }; "chokidar-3.3.0" = { @@ -2278,7 +2404,16 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "3hbyi14x38mvx936wbajln4g1l8fcyi8fwvcrhf2jqn0yzcyda1d20q67k445j9bvs5kr7jdhd2s07srb2pnm7hxmjngp2k6wn8lsbl"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; + "chokidar-3.4.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; + sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; }; }; "chownr-1.1.4" = { @@ -2287,7 +2422,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "chrome-trace-event-1.0.2" = { @@ -2296,7 +2431,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha512 = "06mh145f12ppkxn7xdzrvh7rrjg9c770rqai08m8r5i31br1ihc96i63dyn0c4arfl1hl0za33kzy5i09x4agz77c11xv7hb33z7vzm"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; }; "cipher-base-1.0.4" = { @@ -2305,7 +2440,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; }; "class-utils-0.3.6" = { @@ -2314,7 +2449,7 @@ let version = "0.3.6"; src = fetchurl { url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; "clean-css-4.2.3" = { @@ -2323,7 +2458,7 @@ let version = "4.2.3"; src = fetchurl { url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; - sha512 = "0ad50l577m99sgpcdd49zspq8h9n9i3hhngapg9y5q76s7zwdz3hmaw2kc2jg30lk4z3wlyp9kgiyg71dvg0fg89g1xyr3qvq61dhsm"; + sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; "cli-cursor-2.1.0" = { @@ -2344,13 +2479,13 @@ let sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; }; }; - "cli-width-2.2.0" = { + "cli-width-2.2.1" = { name = "cli-width"; packageName = "cli-width"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"; + sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; }; "cliui-3.2.0" = { @@ -2362,22 +2497,13 @@ let sha1 = "120601537a916d29940f934da3b48d585a39213d"; }; }; - "cliui-4.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; - sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0"; - }; - }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; "cliui-6.0.0" = { @@ -2386,7 +2512,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; - sha512 = "2nrnc0jqyx39906mqm5rb1svgckj19nfhs2101bm0pmirf4fglfzjzxrfr3si7vfl8bhz84xg9fv8v295y83l6yn8rz0ph2va11pb5p"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; "clone-response-1.0.2" = { @@ -2404,7 +2530,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz"; - sha512 = "1f80c0924lf6b1w99d89a62dbp6sc8mkndhv2gd5lz4l87vca1df8hglf3pd28v1i4x411akwjl3sixwmgf1m8lknw2r78hwqdy77xb"; + sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; }; }; "code-point-at-1.1.0" = { @@ -2431,7 +2557,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz"; - sha512 = "2k8bl73w917gsvrf34vprlahwjr6wj4al3rmhb25388gk1kkjgma55v1a80766b3slgppl1xgkm32f3b0rbqhvrkxcjq1wvfy2cjx5x"; + sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; }; }; "color-convert-1.9.3" = { @@ -2440,7 +2566,7 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; "color-convert-2.0.1" = { @@ -2449,7 +2575,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "0ljb8898z3dy87kw5y4xzfajw793q0bqvkp039sk5k3bps50mgjg6iz6fz2klal75vgx3zcv4a6jahx0p5n22lsdzqyz2pvr0z044a5"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; }; "color-name-1.1.3" = { @@ -2467,7 +2593,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "102q02y0q23lgfnxmqq3arriahq9jsbkx3pyhcyaqrfzq6zqyiw6xirgn8p36zv5y0znlwbdf620dx537ij4ixn6nqavpcn1gfbxv3l"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; "color-string-1.5.3" = { @@ -2476,7 +2602,7 @@ let version = "1.5.3"; src = fetchurl { url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; - sha512 = "11p4cihq5874fmyvwkh0fp4dr2syliqsgg610rw46lsav41l6wcm4bgpkrl34gip3cqncw0ppmqwfknm5v02m1fj8qqk8cnlzk84bbl"; + sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; "colors-1.0.3" = { @@ -2494,7 +2620,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "2saczc8hcdmgns1cp1g1p7g2sq4yksrik0ffvfkhkavmmgx8haqm034a4c9zj8im6kfjh00n2xi360yqfy7vbsi98zri0943r72mrbb"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; }; }; "combined-stream-1.0.8" = { @@ -2503,7 +2629,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-2.14.1" = { @@ -2512,7 +2638,7 @@ let version = "2.14.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; - sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; + sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; }; }; "commander-2.17.1" = { @@ -2521,7 +2647,7 @@ let version = "2.17.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; - sha512 = "21fbnprzkj53pjsp5wd7f5wa50jrirag11gq351jr8hhrib5gw62kylpvcddv3c2a1vcs1p8llq80wdnflh6lny3frnq7v7l6vi9wy0"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; "commander-2.20.3" = { @@ -2530,16 +2656,7 @@ let version = "2.20.3"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s"; - }; - }; - "commander-3.0.2" = { - name = "commander"; - packageName = "commander"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; - sha512 = "2ilf2mvb0dww4ghk17nncvymsankhk01lf7l0vls1dzf25ih2djz36n8xz6xh2rh5iacn1i7azfcfm80wyf0rc81f53q17q400z9ahr"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; "commander-4.1.1" = { @@ -2548,7 +2665,16 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; - sha512 = "1cblg9al7s2w55kglhr3skkiw5m55apxk6idj5j0d0nrxi2djizbz9gv3cap5dd16acshaikaxzwx009vzdl08z2zrhik3433rsdqil"; + sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; + }; + }; + "commander-5.1.0" = { + name = "commander"; + packageName = "commander"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; "common-tags-1.8.0" = { @@ -2557,7 +2683,7 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; - sha512 = "2vvj4chc55svz1wkvkg2r38n3n0qs238fgcjpnn1hrz9w1hd3r23j4dc2vcz61can4c8m0n94bwa9j0j3wcp56wn6zra6mdwz9a1zp8"; + sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; }; }; "commondir-1.0.1" = { @@ -2575,7 +2701,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz"; - sha512 = "029zalmhpzy6rz52kpc6z465asw21dl1jhmsvijp9z3l9hjvp1zq82r0bsm5d4hc8z17f4hs5drv3pbdy456bmfxs0q1krmikc1z82v"; + sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="; }; }; "component-emitter-1.3.0" = { @@ -2584,7 +2710,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; - sha512 = "136ravx3m3gf0ca84sf21hj47wmpqyjzmx6yvhj0b14mga7xcxfcgdc7yj9z8klcbr4yfqzy88fksmf233qx68a9ysw7yh1lixyrpa5"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; "compressible-2.0.18" = { @@ -2593,7 +2719,7 @@ let version = "2.0.18"; src = fetchurl { url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "13341lfj8d36v6gha16xmv92w4875z8irqdbns3jxlkc3a63aswys5sajq97y1sd42l08inw1l0s51r4l9lv20w6gy14nsxzvnfnp80"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; }; }; "compression-1.7.4" = { @@ -2602,7 +2728,7 @@ let version = "1.7.4"; src = fetchurl { url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "24kqcbwm455isy2yiyfrdrsh011qi09pbgylw1jws2yfmiwmwp2j8pmax52c41z3x1n84v1j5va29dnxwygkl4pw599b9gx6c7qi94d"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; }; }; "concat-map-0.0.1" = { @@ -2629,7 +2755,7 @@ let version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; "config-chain-1.1.12" = { @@ -2638,7 +2764,7 @@ let version = "1.1.12"; src = fetchurl { url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; - sha512 = "2hg7rni4gx8l765i8qzkp9dv69c8r06i8rxxkkkrsklbd8iz6ingxnp10r4fqqrm9jxy3gp8yp0lzpybwdf27kq49abkyxwrchqwmvb"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; "connect-history-api-fallback-1.6.0" = { @@ -2647,7 +2773,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; - sha512 = "0p9s5aqb76hamj9z64zd53ndh5r1jv76iw97hwrylmwwjprjn1246hrr5nvp5vs1xwwipq6dv7zj4qwywbn3n4cxc3llfdzvbvh37kv"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; }; }; "console-browserify-1.2.0" = { @@ -2656,7 +2782,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"; - sha512 = "168x7bp4xr522yw92himv9xv14q336ps1kkg79qcmarg3q4yzpd52pa8x8zgq11b6996f8053799k6365437si3pk85w5z4y8xiijb4"; + sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; }; }; "constants-browserify-1.0.0" = { @@ -2683,7 +2809,7 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "3976ggkw1lp21a6m3s19blb9a74kq7a0spw47v0m3vvi1k5wiamrsn20slcr9byx80x2la2sppkwjp7x10gc58142dl7412pvpv84qk"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; }; "content-type-1.0.4" = { @@ -2692,7 +2818,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; "convert-source-map-1.7.0" = { @@ -2701,7 +2827,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "2hgf7brri4yaflx3y24d2cvznsk0km17mq8mp7sb2hhskf45hcamlgf8vzzbimw36lw128bjbf442p2rx96d1bhn9sk044p69gn8lp0"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; }; }; "cookie-0.3.1" = { @@ -2719,7 +2845,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "1g7bscknfpc6zgznz77hvll6cy5m9jv7zg9nkpdqzmgi0vhv75kh8iyqf6rdslkml47l3jihsz7hy0i8x5n6bfx9ba0kvvrp9y7qypq"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; }; "cookie-signature-1.0.6" = { @@ -2737,7 +2863,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; + sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; }; }; "copy-descriptor-0.1.1" = { @@ -2755,7 +2881,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; - sha512 = "1p74sgd6krkddnl160vhab1v634p3n24fy8nzbs7hr9l1snhwxslv3c2xb22599gcc96r3g0m5b9ngx3a17gc3m82ij0xxwj3jlqpiz"; + sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; }; }; "core-js-2.6.11" = { @@ -2764,16 +2890,16 @@ let version = "2.6.11"; src = fetchurl { url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "1db6yjq48a8kkrfrxd0miblcf7nk2b4afgpr8dfgjl3jvz3xclvrqmz590hx2h59jh79lgl35r101lw5jqs46qybizdbpgzljjyf277"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; - "core-js-3.6.4" = { - name = "core-js"; - packageName = "core-js"; - version = "3.6.4"; + "core-js-compat-3.6.5" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz"; - sha512 = "35hfghyllz0wqcz293wdsy4vry8yjx8m9b7f1gr4s8m528d4vqiva2na7b5mwddj0jzrfhimzvzpm9gvykrbqkm47v9708d4wcq75p2"; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; + sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; }; }; "core-util-is-1.0.2" = { @@ -2785,22 +2911,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "cosmiconfig-2.2.2" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz"; - sha512 = "3j2bwqqxpllfpdbnnjl2n380q8mcvz08p2xi5c7kzhqrscl8f3lmpa11jzsn76b5q2rz4604bffg2vxbbx4rrlmvgr82g8500pmf8qs"; - }; - }; "cosmiconfig-5.2.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha512 = "287zy383n43wsxg7y8jwzzf3slyn945k312ilkg7l7c96j458cy25jab60692lb1zvggrcm28hilkr6vsp2garryggshj1mgaqn1bhz"; + sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; }; "create-ecdh-4.0.3" = { @@ -2809,7 +2926,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r"; + sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; }; }; "create-hash-1.2.0" = { @@ -2818,7 +2935,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; - sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; }; }; "create-hmac-1.1.7" = { @@ -2827,7 +2944,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; - sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; "crocks-0.12.1" = { @@ -2836,7 +2953,7 @@ let version = "0.12.1"; src = fetchurl { url = "https://registry.npmjs.org/crocks/-/crocks-0.12.1.tgz"; - sha512 = "0qic3mmpra56jzjnkqhc1pq1wzzlsacpl4r9a7c1qks0dkfw1lvva0iyqhjkp1zjvyf7d55vcidmlxpc17x4y9pbx858gk600kr386s"; + sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ=="; }; }; "cross-spawn-5.0.1" = { @@ -2863,7 +2980,7 @@ let version = "6.0.5"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "1csj16gwq9riz0pm73dlxhbnsl1r3ldc5v0aincwj71ambi6xf3kc1kgsbwaakd8rj16k4mrli2syrjd57g6cr81zdzivdd2jn4ndbr"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; "cross-spawn-7.0.0" = { @@ -2872,7 +2989,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz"; - sha512 = "2vnqmy0kzk78wrwyz8533a4li5x1gx1mxj5qi73v17sxis3fsxhamlhblqdn06nkvj09mphm72ivjinpa7l6s3d0xki655nq94gqkz9"; + sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw=="; }; }; "cross-spawn-7.0.1" = { @@ -2881,16 +2998,16 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz"; - sha512 = "21fi60ixr252k0gn4mwbd6k36fhbw4mjl75jq6h49yzqm47mgfaapnzb2zb8nvlaf8yxq5n4zzgbb371y3j0z36vx1mmh0jrsizifxv"; + sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; }; }; - "cross-spawn-7.0.2" = { + "cross-spawn-7.0.3" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz"; - sha512 = "33hqaimyh16rpn80vgg92ihza7cvx5xwnxadalkzsag2sifp40w1q90wpm9ayz4k6scqcnc17c8wfmc22qib1khzm582jxp07qqcgiw"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; "crypt-0.0.2" = { @@ -2908,7 +3025,7 @@ let version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; "css-color-names-0.0.4" = { @@ -2926,16 +3043,16 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; - sha512 = "02cfxb0d2yngcgfhk64i1sgg22sg0qd0llh8hkd5k7zwm7skwlwdibag8dv0zszdwj1mf2kjg9qb10zxichaafngqa4846jli451k05"; + sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; - "css-loader-3.4.2" = { + "css-loader-3.5.3" = { name = "css-loader"; packageName = "css-loader"; - version = "3.4.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-3.4.2.tgz"; - sha512 = "36dsndmik7z39c4mvjpjdkjw44n2lnvkafsr6gm0xk9p4ys04j5d2j8m1zkwsmhzcd1jnlgx0hx2lndlzxgjb994fs89ljksv6vi2ld"; + url = "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz"; + sha512 = "UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw=="; }; }; "css-select-1.2.0" = { @@ -2953,7 +3070,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"; - sha512 = "16wjx4f410fs6vdg0hgmf0b437d19f9gx73pbb9bj0l2dkrwiin4kg3rk8as74m6lr29kl05csjms6dwjcwsbssvl3vmh5908nkpa8f"; + sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; "css-select-base-adapter-0.1.1" = { @@ -2962,7 +3079,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; - sha512 = "3prww0p33p31w3r3qw6hlmqabd6s1vgjb73pjv4xiy63nfb56yjhby47zpnj4q19abvvchrkbh7n6hzcgyw34zly8s05ldv25wmw1cd"; + sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; }; }; "css-tree-1.0.0-alpha.37" = { @@ -2971,7 +3088,7 @@ let version = "1.0.0-alpha.37"; src = fetchurl { url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; - sha512 = "27dw695h47z8hlav2dn6mcm8fxli9gljif9jiwdxdvg70yn4129lpwwiq53mx4anajcxl28w82zvwjk8w6x34qjhga3x7rb1lk5dk0c"; + sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; "css-tree-1.0.0-alpha.39" = { @@ -2980,7 +3097,7 @@ let version = "1.0.0-alpha.39"; src = fetchurl { url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha512 = "2fay50khaq33f27bwnjc7cxvny8xb7y7fnfdrp8ffcxyika56mmbiw8wk05dw1djdvxw5475jn16fy6b14z6zfvyi378001i08y8jzd"; + sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; }; }; "css-what-2.1.3" = { @@ -2989,16 +3106,16 @@ let version = "2.1.3"; src = fetchurl { url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; - sha512 = "092jz28b0dcfww936mpi3blcr79h3dzl0ksq69ismfks6q03vfm23d7i271jpvymy7fs9d7mqak1m1vlw6wfpzfhxgj6rmf7yh0zqbb"; + sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; }; }; - "css-what-3.2.1" = { + "css-what-3.3.0" = { name = "css-what"; packageName = "css-what"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz"; - sha512 = "0djs0gslzbmmdrlzzd6wqvil6dnjirpdpfb5hxd3gdswxkyj4caxwmak6nabgn6spnm9p0xbb8hlqdwp68fbqp4nfkgqklhr2ian0sv"; + url = "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz"; + sha512 = "pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg=="; }; }; "cssesc-3.0.0" = { @@ -3007,7 +3124,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; - sha512 = "1bgy350qm3f9vcr9yssaj62kkfiqf3fkdfw0z7xqy7b9qy4p8774n3460wzsh9a1ra26s1msfs2gnrn9jza21i76mkmvmyar0jzydpx"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; "cssnano-4.1.10" = { @@ -3016,7 +3133,7 @@ let version = "4.1.10"; src = fetchurl { url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz"; - sha512 = "1lr95m334m2kzy2l8l9arg688wi21ha5wslfm9kh8ks00j546fzy3sw8m83ccmgkansp56v9xxkgmwjz2kajnnrh08zzqw7bvwg42g7"; + sha512 = "5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ=="; }; }; "cssnano-preset-default-4.0.7" = { @@ -3025,7 +3142,7 @@ let version = "4.0.7"; src = fetchurl { url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; - sha512 = "2q4cndyhj7jwz0mjwpavg3vggb703pmxrg1h06aqlm752q71misnkga66j4imxwpc3fidk5g6pgp05fzp966wsx18grvsm13lghfin7"; + sha512 = "x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA=="; }; }; "cssnano-util-get-arguments-4.0.0" = { @@ -3052,7 +3169,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; - sha512 = "105dpashgi6r1x5yxknn3c9ksn3bj04hgzy3q1jv4h6l1j3zjgp1nm6kckmc5j58cw9xirccvlpamnbwiynag4jwzr60vxncasrifx8"; + sha512 = "qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="; }; }; "cssnano-util-same-parent-4.0.1" = { @@ -3061,7 +3178,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; - sha512 = "3apdjffzy480hz1vghhhah8a90d1ah2vz624apbn2gn7847v4mpjfz7phwk959wfs11fqp4md9vbb25850fjmhh0f488aiywvjb3hjr"; + sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; "csso-4.0.3" = { @@ -3070,7 +3187,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; - sha512 = "0fk58wf7qcd30fdfrrwvhh9swyrlzbz63z9kkmhq2557c32627dzjkh8w2ha000ngbsc6w19249lpbn2wzb3s8978mlflii5fkyrg9l"; + sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; }; }; "cycle-1.0.3" = { @@ -3106,7 +3223,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; "debug-3.2.6" = { @@ -3115,16 +3232,16 @@ let version = "3.2.6"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; - "debug-4.1.1" = { + "debug-4.2.0" = { name = "debug"; packageName = "debug"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055"; + url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; + sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; "decamelize-1.2.0" = { @@ -3160,7 +3277,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz"; - sha512 = "0rnf28sjgvk6j7kjw5pw6604hzpvbb6w3j8p1rykk7klpyd4568r0adaaiqylsg2xnhz38lxg66zp5bl3zr5wmjbcl6iigf4rdmddjc"; + sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; }; }; "deep-equal-0.2.2" = { @@ -3178,7 +3295,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "3r4bwyfb492cwv2lz8slgy0ch8gx4wx1smr39qzjscnqvwswnk3r748qdmh8i5867sdm017rwjj2fgl3d2c3p4qz08mgab20zj5rpy9"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; "deep-extend-0.6.0" = { @@ -3187,7 +3304,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; "default-gateway-4.2.0" = { @@ -3196,7 +3313,16 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; - sha512 = "2067xswfnhdrq76l5wqibx50y8r46q0sdbkax2nxq6gq0ljjrrmmq95k99vnkgcz5xc7r1hhv0w7bw978krjxvdmnawam3ma2nhraw7"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; + }; + }; + "defer-to-connect-1.1.3" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; }; "defer-to-connect-2.0.0" = { @@ -3205,7 +3331,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz"; - sha512 = "0i5i9bz9viv04jwx2lnk4485zggbrsnljkfx7dr2n4iaikvgdf8lfmx98wyyq7ba92azw0pr42fxlq2sadwfka64ksjffbg9rvzd0kd"; + sha512 = "bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg=="; }; }; "define-properties-1.1.3" = { @@ -3214,7 +3340,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "define-property-0.2.5" = { @@ -3241,7 +3367,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; - sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; }; "del-4.1.1" = { @@ -3250,7 +3376,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; - sha512 = "1fkk8r4abk9009whl0yqapv13rjzj6mr01ghkxpbjkrvr6a6n6hg492mdr72wf3dc13zp3dmzq6z4bzm31h59q7q4anjgrf988sw0a3"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; "delayed-stream-1.0.0" = { @@ -3286,7 +3412,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; - sha512 = "085ljc5q2yk3jabd61p91n821q4prv13qalbfni9ybcb900b4mmcdnndi5b5prfs9wybp13asd13shlxgrbsgvyfx7nbgvby6jkhhj3"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; }; }; "destroy-1.0.4" = { @@ -3304,7 +3430,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; - sha512 = "0mncqs8asq6722qr5jcv5bwi1653nd4s61s9mb9iyk3jkv83w9iynwjfd6ynp1jwsmr7qaspk6yd1x8c05qi9pxikikwfkbnajd3334"; + sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; }; }; "detect-port-alt-1.1.6" = { @@ -3313,7 +3439,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz"; - sha512 = "3jmpnxszsgf863rw2247kalaihrslvrsp49qvnhymgx1skhhsfs51nkf3galxkn5lk39zw9p53xqbpdy620q6j60i2z5acbvy935m76"; + sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; }; }; "diffie-hellman-5.0.3" = { @@ -3322,7 +3448,7 @@ let version = "5.0.3"; src = fetchurl { url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; "dir-glob-2.2.2" = { @@ -3331,7 +3457,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; - sha512 = "2rlgbmwy8bl5xqrwifdqhggx21ac4c8k6vgq7ia2h6cxmaiprrlm1p99cn4hb4dmax9wwk4vx96bc50b7ngxgx74fvqbk0njj5w3lkz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; }; }; "dir-glob-3.0.1" = { @@ -3340,7 +3466,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "0h761rklv8qk0vhv6ms98gsvdiyk8455iqqh6wh8dfal5xjx87gmmpyg7773zdrxwvhnzw58pan4rdqjfwkhcv653gsbq4is6kxcjjs"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; "dns-equal-1.0.0" = { @@ -3358,7 +3484,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; + sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; }; }; "dns-txt-2.0.2" = { @@ -3376,7 +3502,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; - sha512 = "06bmys00dd8r5s4k2xi892s3xhgwnwj704y2jbpd2bgdm0vvmv0wv81npa6bfb2s7jvk2ny516cxhfy0jpjmj4qhzywlf6zhfjg5pc1"; + sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; }; }; "dom-serializer-0.2.2" = { @@ -3385,7 +3511,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha512 = "3v6s9yk4g6cw8chgrba79rbahiqw782013df898df7k7d81n69x2135qashgf23q59zr3w42qncyf4hszlll8knkhv0xccifdplzz6v"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; "domain-browser-1.2.0" = { @@ -3394,7 +3520,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; - sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; "domelementtype-1.3.1" = { @@ -3403,7 +3529,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; - sha512 = "3gmb8frh13hzm986ggv14h63h5033jp045mvy1wrcj9j56j822a86arwq7x743i6glkv1bw6qwqriivypd0icbkzi492cm96kwq28h5"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; "domelementtype-2.0.1" = { @@ -3412,7 +3538,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; - sha512 = "00vkhxlz4gkgfqzkp7faclfand3fr36zi4lpr50rjwbx54nfpr2fy612p2ixzpysqi28nfyzznngx5gvgcd13b52iy6ar8q7d88fwz4"; + sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; }; }; "domhandler-2.4.2" = { @@ -3421,7 +3547,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "307i53zii3hv9zr3skxhp9pxa09ki0xwx9q1k7mxnq3hanjanlpr1mmavfzz68r2h6cl1bnv2836plrhk02rpa7yfzrpdq73pib88i6"; + sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; }; }; "domutils-1.5.1" = { @@ -3439,7 +3565,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; - sha512 = "076s2v293f9jixaddq6qmjc76y3z0kqddmjb4nclydp23y0jzpg6f7h32j6adilfdjxwwhxkclrhc1vn7rbsidvzcq32dkzq9fpc1rf"; + sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; "dot-case-3.0.3" = { @@ -3448,7 +3574,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz"; - sha512 = "1w5d7iardzdlbrww41km4v8wmhlzbiizk4jvr4n95xdqrwg228v0jfbkvc3vxjvl0vr0d8dfv5wlr8102z3rc7ikcgj92ci1sd0877f"; + sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; }; }; "dot-prop-5.2.0" = { @@ -3457,16 +3583,16 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz"; - sha512 = "3afnifh0aygp94kbnxph4rkg71zmgx2lwv2hhsja42kvryzcy30k767avsjpbvs6qksnbzifi5blka8c679gg7aw160sjd869l34idq"; + sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; }; }; - "dotenv-5.0.1" = { + "dotenv-8.2.0" = { name = "dotenv"; packageName = "dotenv"; - version = "5.0.1"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz"; - sha512 = "2ixnvlqm3fb7javs7yhqb26afyf3wkd3hqpspwrg89mcfwshwyva5473zv7hhh3rrvn0vqywp5vnwkdq9r5mgkhapxhczz3zaw3q2z0"; + url = "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz"; + sha512 = "8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="; }; }; "duplexer-0.1.1" = { @@ -3493,7 +3619,7 @@ let version = "3.7.1"; src = fetchurl { url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; - sha512 = "3k23dn0v8n7r3ds3v137vmw1vg3ngd6fw3bb4hasa6bm40qasvdaidjwx0wb4gakp8xvdrsckjn0wkmmi90z8a2sswj8cxhznxgrg6k"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; "ecc-jsbn-0.1.2" = { @@ -3514,22 +3640,22 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.397" = { + "electron-to-chromium-1.3.481" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.397"; + version = "1.3.481"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz"; - sha512 = "3cfkdvg9vdi3s7f5jh2hk2l0gqnfkqd5sw3v22cfx3za6vpfvdhx6hc8779bzwj8isagxxj0hwc9fdxhsx4w0k9fp939jzvkzb1vifd"; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz"; + sha512 = "q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA=="; }; }; - "elliptic-6.5.2" = { + "elliptic-6.5.3" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz"; - sha512 = "33kzl02iwbq3pl33ihcdq9nm48yzhfj96183zzra06hp3z6bacz3d99pl74jziwygys4npxbxwnvszz12wl8lpkjw8b4r9ki797p33z"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"; + sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw=="; }; }; "elm-0.19.1" = { @@ -3538,7 +3664,7 @@ let version = "0.19.1"; src = fetchurl { url = "https://registry.npmjs.org/elm/-/elm-0.19.1.tgz"; - sha512 = "1y57kz7w9064cmchjigsn0man2vw8b97fx9a88rxjfmxpqn1v7rdqi0kakivh0d0rkmjllbgz81zl742yq7fsyrfl1qdglrjas4xs5d"; + sha512 = "rehOtJKZvoYDddlrd7AX5NAf0H+LUllnBg3AHaeaIOKWzw4W316d7Bkhlbo7aSG+hVUVWP2ihKwyYkDi589TfA=="; }; }; "elm-0.19.1-3" = { @@ -3547,17 +3673,17 @@ let version = "0.19.1-3"; src = fetchurl { url = "https://registry.npmjs.org/elm/-/elm-0.19.1-3.tgz"; - sha512 = "1lmaszcl984nawb51x833i84ywff32l8wm63dkbaglvyc7312kllhqiw79ng3q7i928azlck8iy2xmki71fsqy9qz768mlw01xzlbgb"; + sha512 = "6y36ewCcVmTOx8lj7cKJs3bhI5qMfoVEigePZ9PhEUNKpwjjML/pU2u2YSpHVAznuCcojoF6KIsrS1Ci7GtVaQ=="; }; }; - "elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" = { + "elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf" = { name = "elm-analyse"; packageName = "elm-analyse"; - version = "0.16.5"; + version = "0.16.6-alpha"; src = fetchgit { url = "git://github.com/elm-tooling/elm-analyse"; - rev = "1a665a6e540d7d11b29b3c5e3c52089704325d9c"; - sha256 = "a442bce37ae37a65c1488c66e477c404da1c7f137a6668d89c4b09de845ca374"; + rev = "7f4000cce5ef024fe5e82c7ee1725feef95a9daf"; + sha256 = "270cb1adfdeb368dde2b780938f653e9aa46cc97afbe4de828813fef7c30e556"; }; }; "elm-asset-webpack-loader-1.1.2" = { @@ -3566,7 +3692,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/elm-asset-webpack-loader/-/elm-asset-webpack-loader-1.1.2.tgz"; - sha512 = "0sd764hrl2vzqvidwcpajafn8l24rd25v1bx534y92bvd5da96djd520r1sl0kbbd8n10690r963qs6zrnlz8hhdznvbp1m36vxidcf"; + sha512 = "jrXYtxk13LXtbxCiT23+RuNhUgbJgGBRW2sCqkMGojTZTFKttL1E8mSUvsIuomUiKLJOSXUZb3HjvwXNkJjTNA=="; }; }; "elm-hot-1.1.4" = { @@ -3575,7 +3701,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.4.tgz"; - sha512 = "2grbnfn0995mgsbg3jnzs9b94sk2si3n0fazl66na6lhvfyzj3vzblxn47f1b68hdr2i3l8pvj42wc47dqpynmci7mjg4n5izzczw58"; + sha512 = "qPDP/o/Fkifriaxaf3E7hHFB5L6Ijihyg8is4A6xna6/h/zebUiNssbQrxywI2oxNUkr6W/leEu/WlIC1tmVnw=="; }; }; "elm-hot-webpack-loader-1.1.6" = { @@ -3584,7 +3710,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/elm-hot-webpack-loader/-/elm-hot-webpack-loader-1.1.6.tgz"; - sha512 = "2s6yhby0lmvjl8979zxpzdqhdwvy21m42ml4mlrh02hcq0zn5zirshwjsazy2rs8bz0j2qmv4cambh5jya1vdjkpv7izzmww7mbg3vx"; + sha512 = "fY+36uG8/h/PvlO2HZSXBa6qGNkVCwn+QjoL/5WWHOocf7EfYAYFgJlWQqsgNQi/eYO4/dt/OglRuSsFfkFvtA=="; }; }; "elm-test-0.19.1" = { @@ -3593,7 +3719,7 @@ let version = "0.19.1"; src = fetchurl { url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1.tgz"; - sha512 = "2677ylcn8afd1z2hsk628i7dkc8cp4pb6aassgwv6y6cky0w5393ahkydvy39jlqi95gghiybql8ga26m1r7dylp6dsvaviz1kn09jb"; + sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; }; "elm-test-0.19.1-revision2" = { @@ -3602,16 +3728,16 @@ let version = "0.19.1-revision2"; src = fetchurl { url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; - sha512 = "24qc3z9z059c0dp97lfpsqgigxks6dd8akf14p3wvnvsy5ih3nf4947qc94xfrr0jdql0nnq12727nyyyyz3zrfyy54y85jayckcnyd"; + sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; }; }; - "elm-webpack-loader-6.0.0" = { + "elm-webpack-loader-6.0.1" = { name = "elm-webpack-loader"; packageName = "elm-webpack-loader"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-webpack-loader/-/elm-webpack-loader-6.0.0.tgz"; - sha512 = "0qd4ac4xsbhp76jaqpcr9skahccpj7vva111bxinnbmcl5p7n5y8ryy539hnzvxq3gy3j3x68ikil2fcvzqaf3mnm3jrwn5ix98m5w3"; + url = "https://registry.npmjs.org/elm-webpack-loader/-/elm-webpack-loader-6.0.1.tgz"; + sha512 = "SkltiDAbegaiPxsQq7sxqTyRUXzD4n6UaT9JTZXIYoAjAEi/ogaIbYLQD6Ne5ZaSW3JOo6S/vb+VO5v0qDdirw=="; }; }; "elmi-to-json-1.2.0" = { @@ -3620,7 +3746,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-1.2.0.tgz"; - sha512 = "3yyy4v1cp6bqkriy1dhq77dsliafaxpcmacyxyk5gwk7kflw9lafhh6l0lsrqwlb2nb2qp4l7g0qib7pm80c7kqskswlq5zvv7agn6c"; + sha512 = "zNinzt6/YMr11HgeBlC9Z0UM3qHkYrGsWJTjrCmgBkKnaOLUzTP5K9N3z1RltyunItXtHAxb8DFPvMxlYRPv/Q=="; }; }; "elmi-to-json-1.3.0" = { @@ -3629,7 +3755,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-1.3.0.tgz"; - sha512 = "0m6ryjnwyvjg5nif66bn9vlpwgrkc6vkrbx15aq4f1in806xm7j2ljdjri8z8syczh651k7bwmsckbwnw8q30g390mrbrnvygkl6vga"; + sha512 = "6m1D5/Pb5pUrSOOBgRG3fE2mK19nhmLgZ16jj2KWTVIhT+0GIBuDI1iV0Fee27CZH790J7uMcdGWJ7fnVvpsKg=="; }; }; "emoji-regex-7.0.3" = { @@ -3638,7 +3764,7 @@ let version = "7.0.3"; src = fetchurl { url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; "emoji-regex-8.0.0" = { @@ -3647,7 +3773,7 @@ let version = "8.0.0"; src = fetchurl { url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "3l88qajsl4nn4jy6gfp9fq41z6m68nykklbg1piszmhjgniiw51b3pbnf57lvbw3d6jv3xj1v16z0d5651wzs81q0g0sf4dqp6xha1i"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; "emojis-list-2.1.0" = { @@ -3665,7 +3791,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; - sha512 = "3cib7aw0206bfcb324aqh3fsda46mjxghd08gaasxagv6jfc74r2jvcv78rb8h10m879w42nbrn3q8rjifg9s5rclbpr2hzq7bqqk7y"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; }; }; "encodeurl-1.0.2" = { @@ -3683,16 +3809,16 @@ let version = "1.4.4"; src = fetchurl { url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "3jyw0a0c7m1yxglwk7i5jh8zb3vvx7f9l4frbskxkgf9cyf4i8ww26p8bimnsryrh1dx7lwrxq64vbpjwfcv1svd4lg8m07fa53bv7s"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "enhanced-resolve-4.1.1" = { + "enhanced-resolve-4.2.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; - sha512 = "2w4dww5r1bxbycbb3kq0pdl9v56942678c53j9rwikxf05xd2n5h0b3a6914wxcmzr9wx4m0w56adp3qp21rk1wzkhbybxb9z67djpp"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz"; + sha512 = "S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ=="; }; }; "entities-1.1.2" = { @@ -3701,16 +3827,16 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; - sha512 = "3dv4zcyi5bjn1q5sd46vapv1y0wilalg5bwh5cf62w8bpiwms4q9c3yhfvvj6fh2fkc3bcdwsjabrs4d3j86ji0c6xkn5vmi4qxjqkz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; - "entities-2.0.0" = { + "entities-2.0.3" = { name = "entities"; packageName = "entities"; - version = "2.0.0"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz"; - sha512 = "0pqz0h0aafqad2dm3qs73sqk6nhgr7icrfqwnxbzysbdkh11grcbssa7m1nkyzc22g9zwpi752fpw5r58rrldhjjlqh4isj89bzpmqg"; + url = "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz"; + sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; }; }; "errno-0.1.7" = { @@ -3719,7 +3845,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; - sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; + sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; }; }; "error-ex-1.3.2" = { @@ -3728,16 +3854,16 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.17.5" = { + "es-abstract-1.17.6" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.5"; + version = "1.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; - sha512 = "2kayciqh331d3kp1l8wdsp33kzdc02rv72z6x2327w2i6yks9b7xwxbg1xdrrkhaglr06liqzdjavq9qk9d487sf572rjfv62xml7q5"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; + sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; }; }; "es-to-primitive-1.2.1" = { @@ -3746,16 +3872,16 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "es6-promisify-6.1.0" = { + "es6-promisify-6.1.1" = { name = "es6-promisify"; packageName = "es6-promisify"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz"; - sha512 = "2pr75bj70p2qd7if8kpmm7pqfgkq9317mvb09q8pfrha2kcvn8g0y3b7a63iwm28wh36d0a681j3zaig10hwk7xasn5n42zzbcj8awc"; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz"; + sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; "escape-html-1.0.3" = { @@ -3782,7 +3908,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "3xkdrhqvjj7430kp98pllh0yxbawxp4z1fnvbw5cawjr6mlbgyrd2v3b3kalrx3s515zc731a6ckmb10x9vaizf6sf4b5g84lndr72j"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; + }; + }; + "escape-string-regexp-4.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; "eslint-scope-4.0.3" = { @@ -3791,7 +3926,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz"; - sha512 = "2p4myi99y1nk5dy7fvmbspjdynigw3dzkhcm7zaiwfyw2wp6j61y0i8mba18ksv9qi2s1wp6w6xhn7471qs631bqwmz8fzmvas6xdd7"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; "esprima-4.0.1" = { @@ -3800,7 +3935,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "esrecurse-4.2.1" = { @@ -3809,7 +3944,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; }; }; "estraverse-4.3.0" = { @@ -3818,7 +3953,16 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "2kh3lczc7smb84ryllqrdvrknxl3h47khh7li6n9m76mj9jfh1ahz2jm8ffpcaac7i4k8zkf3sc3nczzp7djgqmsi6wrkynywlygnfz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; }; "etag-1.8.1" = { @@ -3836,16 +3980,16 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz"; - sha512 = "3hv1mm8y1m0ayl0ds213ajdpc0xwalhi1iwvy2zdkg4kys5vdy97s8jz0sfvd91a3xwyy4946wmzk2lc1kpzww94pj307nmw8hm1yxn"; + sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.0" = { + "eventemitter3-4.0.4" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.0"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz"; - sha512 = "05cdww9h7f3kjfmv478p0rcq2ia3lcrvqmsh155hd6wm895i2jn6j68w0ly09c3gjn8hshfdvnh99qchipbclycnb241y993m2d5sm9"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; + sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; }; }; "events-3.1.0" = { @@ -3854,7 +3998,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz"; - sha512 = "1d21craxji58ccc5l8c39mw7pgk0is7gj1sixm8v1va1zc81hrw8426b9rhrv7z2kwqvix5l7cyfc8awwypj19him6ffd67qbqaxzs6"; + sha512 = "Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="; }; }; "eventsource-0.1.6" = { @@ -3872,7 +4016,7 @@ let version = "1.0.7"; src = fetchurl { url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; - sha512 = "02zyvvhbzxhb7q9pzn867l80whipj03h4nkzjw1r8kppkmgaw0fcgvnkkv11fkfnlcdhkr9f55xrap5qpvbggkad4y4jkymxgpzbfg0"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; }; }; "evp_bytestokey-1.0.3" = { @@ -3881,16 +4025,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; - }; - }; - "exec-sh-0.3.4" = { - name = "exec-sh"; - packageName = "exec-sh"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz"; - sha512 = "3a56in0wklcqf6hk0n22z22yg9kzb7y4xj7yfmj2sahbnkjbr5s0sngpzrr60r5rq9b3f0f1m13da5fn9mfz7p3b5nbxgxmrs8lhhdh"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; "execa-1.0.0" = { @@ -3899,16 +4034,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "0nbazkdhh5zqw7l7y4ml860h6pbn72x5kp2iaknqbdk0ygcrp3yh6bnq0brzzsyk3f72ard3ss3kp9a2ffsglib3yiamqwm4mrz3mk9"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-4.0.0" = { + "execa-4.0.2" = { name = "execa"; packageName = "execa"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz"; - sha512 = "06ajp8gz1276n02cd50rh0q2qfhxrj623shfcc7fq6iafmk43kzwifyfm1nfc7jhkdhn8r4fn2rf9h2bcjsvl2mcpwq81kp0p3x9c15"; + url = "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz"; + sha512 = "QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q=="; }; }; "expand-brackets-2.1.4" = { @@ -3944,7 +4079,7 @@ let version = "4.17.1"; src = fetchurl { url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "3i2sxjf2x1r9wbfdyh5ll8ybbnqq6n4xfxdlc4dsqhssljrlih18csqg142lf16lcfcdgsmvf9pff0rzxjw7p0shnlmpajipwxpswlq"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; }; "express-ws-2.0.0" = { @@ -3962,7 +4097,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/express-ws/-/express-ws-4.0.0.tgz"; - sha512 = "1ih0006jpjcg33hwp2whynvvdcnqy87nbhpv636v3d6vzp8yjbzhfy8nxhi284nh9nj46nyy7ywj2i58j6v1iaqi3v48i1hq31r8k18"; + sha512 = "KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw=="; }; }; "extend-3.0.2" = { @@ -3971,7 +4106,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extend-shallow-2.0.1" = { @@ -3998,7 +4133,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "1xm0arqcf7jp9kgq1g67ss2jvj8kblzbb7dd7sj2gm1g8cj4ilcwnn8vwspz3rh83yjphbl1lvqdyivrji6ccmnp3k2rmk9gl4kii44"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; }; }; "extglob-2.0.4" = { @@ -4007,7 +4142,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; "extsprintf-1.3.0" = { @@ -4028,13 +4163,13 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; }; - "fast-deep-equal-3.1.1" = { + "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; "fast-diff-1.2.0" = { @@ -4043,7 +4178,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; - sha512 = "3iz2v3js0dw0ds77cg0v543ba30in2ld6ynakphh1g6nbrdpn4qkydrk6m3qa76ckh1nmqh73ck383zj7b7jw6bczjxbxwbkx7si6y4"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; "fast-glob-2.2.7" = { @@ -4052,16 +4187,16 @@ let version = "2.2.7"; src = fetchurl { url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz"; - sha512 = "2rwrxvdl61rfj9v6hgif4qilfh3g4kqsjk380f2avp0g3m76h6q7n553gdh0nig13hchkwi7pwyxn0ff5vv90fbcj70jr6f051swll3"; + sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.2" = { + "fast-glob-3.2.4" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz"; - sha512 = "3n0a23s3nq6f339d9hw9mw4plbzcdmglhzm09w7azz5fb34xiw60rhhhsvcvqw8c86h3ryfvmk1k624jlf36w3wrrijjhrfivd7qdah"; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; + sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -4070,16 +4205,16 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fastq-1.7.0" = { + "fastq-1.8.0" = { name = "fastq"; packageName = "fastq"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz"; - sha512 = "1yjamwzvgz5f73c2xc5r4pnhprczp52i9za26qi04w144c7hbjp00s0mykg3b0f23ifgnl5vf54cq7by4gh2bw87sx9lxy7350rvrk0"; + url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"; + sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="; }; }; "faye-websocket-0.10.0" = { @@ -4097,16 +4232,7 @@ let version = "0.11.3"; src = fetchurl { url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha512 = "0wgmgai5pj0yjcc4gs5b6r94gr8ycsbv1xyjw055cxfy4vm6yrpqp0mpr89ychmzgr5y0mggqrljf9jhb8n5iq63bi3r9yqidpbhv0g"; - }; - }; - "fb-watchman-2.0.1" = { - name = "fb-watchman"; - packageName = "fb-watchman"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"; - sha512 = "1b67x7n9c1irns63lipsffgi0zm9kfms6k87mznvhak81dijqvfy26nqr3j5mw41mqb3vbbhxbbmcdgc787laz3kaq45slq0wlwjhqf"; + sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; }; }; "figgy-pudding-3.5.2" = { @@ -4115,7 +4241,7 @@ let version = "3.5.2"; src = fetchurl { url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha512 = "1pk6h8pjvxp20pk6y7yagg9vfd4b1y29salqya7mf8kr0rhrk970hyy4d97kh8pk14jbnfayhwqlm4s6h7g63b3pid6lzzwy4ingfyi"; + sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; }; }; "figures-2.0.0" = { @@ -4133,7 +4259,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz"; - sha512 = "0p00kmxlfgsw0mn4y5h5njv0g1y7gakpygdv6wz318wzpll8zd44r7q0fvym4v837054n04d22r2klkqnckr3k0x2hc2ln79qfphr2c"; + sha512 = "TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg=="; }; }; "file-uri-to-path-1.0.0" = { @@ -4142,7 +4268,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; "filesize-3.6.1" = { @@ -4151,7 +4277,7 @@ let version = "3.6.1"; src = fetchurl { url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; - sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c"; + sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; "fill-range-4.0.0" = { @@ -4169,7 +4295,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; "finalhandler-1.1.1" = { @@ -4178,7 +4304,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3"; + sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; "finalhandler-1.1.2" = { @@ -4187,7 +4313,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "1cfqk6g78cb12b1cki4pbcspsy40d0yny513myqji716njyhc5hrj7ll539kz96m6vn27168hhyqvd52cr5x1cs85mm7igfkrdrq1b8"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; "find-0.2.7" = { @@ -4223,7 +4349,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; - sha512 = "0wjlwmvadzac6hwmxv6hsc16z3285i2y0nkwpg4366flza0rx30s3ncx93xn8hkkpxr493zi5b0h94jczinr87h2m6gbhrl265qzbjf"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; }; "find-elm-dependencies-2.0.2" = { @@ -4232,7 +4358,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-2.0.2.tgz"; - sha512 = "32n3i133knsr1q5ld28ljk3s9yq2i124q8rg8cdb5ar0bp7wgc2a87cfkwhvql8vwzd35w0qf9bfhfa7g1imdk212y523qwnw4m9klw"; + sha512 = "nM5UCbccD1G8CGK2GsM7ykG3ksOAl9E+34jiDfl07CAl2OPnLpBVWY2hlxEmIkSBfdJjSopEowWHrO0cI8RhxQ=="; }; }; "find-parent-dir-0.3.0" = { @@ -4268,7 +4394,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; "find-up-4.1.0" = { @@ -4277,7 +4403,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; - sha512 = "2bi4wmj1qymhj4ap1nay5isn0w7x6ymxp30h5y1jv0hx7q0inmirmr09mn621h4alg0gpv2hjwl6ai2giw6pz7qvb85aqizsh0v14ry"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; }; "firstline-1.2.0" = { @@ -4295,7 +4421,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/firstline/-/firstline-2.0.2.tgz"; - sha512 = "317ml53ziaxxnvxxp6fwwxxk2w323334kw64d40asdkir6v10br55qb264xk5i9iqh6q1gpwz0ypfwbnk4vjq9pkw123093imy2d9zh"; + sha512 = "8KcmfI0jgSECnzdhucm0i7vrwef3BWwgjimW2YkRC5eSFwjb5DibVoA0YvgkYwwxuJi9c+7M7X3b3lX8o9B6wg=="; }; }; "flush-write-stream-1.1.1" = { @@ -4304,16 +4430,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; - sha512 = "3pkp1ymgv73zg0d94la628nagxyngq7zm1jmngx6vjc6vi5d4jkmvfygvgac6w6x929hqljwygaidq2znk3l5xd4apdvxvpas21g7nx"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; - "follow-redirects-1.11.0" = { + "follow-redirects-1.12.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz"; - sha512 = "2c9vyshmpm00crjxya51av36d379damv2inkkqmfdy6j5kizkc2a1s151h35lfzcnyqmx5bpgaxnp8g77dcs35cmk0zgw35x5bv9699"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz"; + sha512 = "tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="; }; }; "for-in-1.0.2" = { @@ -4340,7 +4466,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "forwarded-0.1.2" = { @@ -4394,7 +4520,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; - sha512 = "05bphjab1lk12dz3qf87dywgpsjsx0f59kpligxqph53yicigij2gsmvkppgyhpi70h3q3id3ymz30c02v3pphakn06k8vm6xsdpamb"; + sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; }; }; "fs-extra-5.0.0" = { @@ -4403,7 +4529,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; - sha512 = "1ssfaw678600iy330a73gqk65ns22sz4ng7jwndj1fxahj8qddrsy2w4mr4ikx28qhdj8rf49n428qnl657bbpag9r3g3qv2vhyd8zb"; + sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; }; }; "fs-extra-6.0.1" = { @@ -4412,7 +4538,7 @@ let version = "6.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz"; - sha512 = "049jki4y8l719y7754fp6v52jm5r8cw8c4qhag4zgglmc0j19k1dhsbdsahijgv9hzvwz8g76009c8cy8xjg6jhb1a7dkb1m288hz0s"; + sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; }; }; "fs-extra-7.0.1" = { @@ -4421,7 +4547,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; - sha512 = "05qcmykw9czycnn3r2rrlspzd4dznr4796abdqzw150j7rafnlq8n4wp4dai34swb23lfvhw8s31l1k83vpwxqddyf1k724jq4dm430"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; }; }; "fs-extra-8.1.0" = { @@ -4430,7 +4556,7 @@ let version = "8.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "3i4dsx067a564yx62qy0gz15zvsihqybmmx56lqz4cbgh4fiv5ikrj53wa1rfcijlnkywx18az05m1541dm04gb51af57561s0506fa"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; "fs-minipass-1.2.7" = { @@ -4439,7 +4565,7 @@ let version = "1.2.7"; src = fetchurl { url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; "fs-readdir-recursive-1.1.0" = { @@ -4448,7 +4574,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz"; - sha512 = "129732drwnm77iq4y1xr69pl9iqqhgj4w61ckmna6i923rjpp0rphzbg8bn8rmfsb6cndfswgwwdh9p2y6kf3zbvgs9gnkbamgagmhq"; + sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; }; }; "fs-write-stream-atomic-1.0.10" = { @@ -4469,22 +4595,22 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.2.12" = { + "fsevents-1.2.13" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz"; - sha512 = "38n3fx736zykzjypx7imagh6daz9yl98a8v3lw7xy8qs2k0wa2sdsjrdmhwg914mj648j0wzc02mz7f5ii6ql8nlwyb44vvvcm7y1qs"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"; + sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; - "fsevents-2.1.2" = { + "fsevents-2.1.3" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; - sha512 = "1j5ssfzy4xklkj74z7q64dpcld4zicsva1ihfys8dwa9l5apv7q350g4vg65nfp58c7aqkai1qmjlc3xshb97p5h3lsrl0r3j407327"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; "function-bind-1.1.1" = { @@ -4493,7 +4619,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "gensync-1.0.0-beta.1" = { + name = "gensync"; + packageName = "gensync"; + version = "1.0.0-beta.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; + sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; }; }; "get-caller-file-1.0.3" = { @@ -4502,7 +4637,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha512 = "3mw8nv3r73b3lp2pzj116p27flkrv1vq6v0ika46w3xqfinm6gxn38glryibvy834mja8ib4j9cjq27qn164z3793c9g88y79asppny"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; "get-caller-file-2.0.5" = { @@ -4511,7 +4646,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -4520,7 +4655,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha512 = "3m4dzkl08xi19c8aim6hxfy32zxi969r2zfzz9swbvsl5jzcnxn2x9y19kp9ri7k7qw07rz2m7c5g0134rm1i4i43j5bkyfymbh2i93"; + sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; }; }; "get-proxy-2.1.0" = { @@ -4529,16 +4664,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; - sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; }; }; "get-stream-4.1.0" = { @@ -4547,7 +4673,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "3pwlllj9naaqzlc5axbxz4jqg3v533xd9jz945mjd3zmca3hh3pr1dpwc7416kjszw6igk060v6x2dgwpr7m1rd4djavmvr8bhavihq"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; "get-stream-5.1.0" = { @@ -4556,7 +4682,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "21v525x0f3qrc6f343xp3wjwwrjf1l3x0lmp34hivvvmdcz0a681s0b9wx4k5r3r8jyhc5kd6dqrwqjhpbl285xg333gkgbxhagayhi"; + sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; }; }; "get-value-2.0.6" = { @@ -4583,7 +4709,7 @@ let version = "7.1.4"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; - sha512 = "3a8rf655jknn8ccr4p47spa74d8q4j4znjal0arh502m9pg1iq1cln8qjssv7lhc0gvdfm6zfrha6k3xinilm2swfj756m1jxxcyhl6"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; "glob-7.1.6" = { @@ -4592,7 +4718,7 @@ let version = "7.1.6"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "glob-parent-3.1.0" = { @@ -4610,7 +4736,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "1hi3ypyic536qm0jd2aw65wbaian4vxmgsnprw6p1mdfd75ks5x1mrgkgzl41xr6hnav27fqzpm227rj7qq8vcwb63m37m9cda3wwhn"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; "glob-to-regexp-0.3.0" = { @@ -4628,7 +4754,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; }; }; "global-prefix-1.0.2" = { @@ -4646,16 +4772,16 @@ let version = "11.12.0"; src = fetchurl { url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; - sha512 = "1ab6f0n8yjl3zkl6dwhvxpxh63b4acc7nj7i21z3dx1fz1jv1c3673qpkwiavmcbbf8jlkxapx0x8ybzz5w2yra4ln24lh687y6kq2q"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globby-11.0.0" = { + "globby-11.0.1" = { name = "globby"; packageName = "globby"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz"; - sha512 = "094y6k3zjiyzmq9xqilgz3p88c5465cmzsxc31gkm7fxb0vj9i2kdvxv28c4izppgrfgvpwwvcbvivlnhcf6rhv0iqfxikpfhba3rwa"; + url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz"; + sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; }; }; "globby-6.1.0" = { @@ -4682,7 +4808,7 @@ let version = "8.0.1"; src = fetchurl { url = "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz"; - sha512 = "2kvb22azhxv632w6jbgssa2k29c3vwann1f7g3ra974lg41hcw4s7cbc8260y0kycv93nfvkxsc9wyycsl4xmfjbi5s170ij6ndijm0"; + sha512 = "oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw=="; }; }; "got-10.7.0" = { @@ -4691,25 +4817,25 @@ let version = "10.7.0"; src = fetchurl { url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; - sha512 = "0k2vbyaqxs8ikrf2fp7jm1q0147bshpmy94wr1wqlqharvgk1wfachm3yxaf8jn70bdmxl4ph3vnb351hrlwp4k27mfb0rxviwc6r39"; + sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; }; }; - "got-8.3.2" = { + "got-9.6.0" = { name = "got"; packageName = "got"; - version = "8.3.2"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; - sha512 = "05i0zb81f4c0z48y9mjckyajm586ygznh8y8di5g0qrg3vi9hpbw2q3cf548as8zx9b4g1q5zf2cab43yx21wnan1l0qsz19zjhjdda"; + url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "gzip-size-5.0.0" = { @@ -4718,7 +4844,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz"; - sha512 = "007247c436qdpsvrraz3qgssvq0yzi4xinaydxjprr2dslsynhy09lpnlgd52pxkql3880j340fq4qs4rq6s5qfbgksmji5cyi3n8p6"; + sha512 = "5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA=="; }; }; "handle-thing-2.0.1" = { @@ -4727,7 +4853,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; - sha512 = "174zcs1shwmzgb8dxckn95s38pz30irzkrp8zw1rx5drqydb5x6mn1cnc3m6nklbq0jyilpfcrf9br9zrrxlfpcv0him5sy3k4gh2gm"; + sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; }; }; "har-schema-2.0.0" = { @@ -4745,7 +4871,7 @@ let version = "5.1.3"; src = fetchurl { url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -4754,7 +4880,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-ansi-2.0.0" = { @@ -4781,7 +4907,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "0ylry8j6wanggw1786jw36k056caw516fasjfz5jl945p7g0zl2aqxsjd5fxxfah3hlhrbflnsb88vx42080sfsfbb38aimyi7hja8k"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; "has-symbol-support-x-1.4.2" = { @@ -4790,7 +4916,7 @@ let version = "1.4.2"; src = fetchurl { url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; - sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; + sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; "has-symbols-1.0.1" = { @@ -4799,7 +4925,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -4808,7 +4934,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; + sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; "has-value-0.3.1" = { @@ -4847,13 +4973,13 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "hash-base-3.0.4" = { + "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; "hash.js-1.1.7" = { @@ -4862,7 +4988,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; - sha512 = "1f5xc15zpy3b7hssv57xnd92ja5r073zvd2pczvncxmy1jnbjcx716riyr2syvah88qk7328a6fz049mziv2k837093xqxd86r9m8xm"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; "he-1.2.0" = { @@ -4871,7 +4997,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "0dwml2q9r97ga11qbbn5sb46v4g47lx174dz9g1jgxpycknhg1d5dlsij2vja905p8h243jj51hfa5cmzh8n9rdcs8r78lg86fl7z8p"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "hex-color-regex-1.1.0" = { @@ -4880,7 +5006,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; - sha512 = "16nq2pq6pbpjp3xhvxzyr0qv7vn58pp9h29j8abcxkibz0ibgh9lls5ws73qwhz75nl8wsrjkri8ka6rjm7c41v52md7aifbc61znwp"; + sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; }; "hmac-drbg-1.0.1" = { @@ -4898,7 +5024,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; - sha512 = "1qc7ngn9k1w5lcqx2ygqb2x9f03knfbsym25l6qsp6q9qdcxa4fzwwjsh9d9lm5l1569v19rjp7sdnz11087f4b6sv34rav9rcacabr"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "hosted-git-info-2.8.8" = { @@ -4907,7 +5033,7 @@ let version = "2.8.8"; src = fetchurl { url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z"; + sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; }; "hpack.js-2.1.6" = { @@ -4943,34 +5069,34 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha512 = "2cqjc2vwxqb38sr58kl1gj9vv949wmmnb1i2f3gms2pszqqaf9mjci0q13w3086wia9n7nfxwmk73d68gcjjjkgs1c0w99n0vjkmqrz"; + sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; }; }; - "html-entities-1.2.1" = { + "html-entities-1.3.1" = { name = "html-entities"; packageName = "html-entities"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz"; + sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="; }; }; - "html-minifier-terser-5.0.5" = { + "html-minifier-terser-5.1.1" = { name = "html-minifier-terser"; packageName = "html-minifier-terser"; - version = "5.0.5"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz"; - sha512 = "1xh7yad8rlhvqdxf8nzq146y3ay9ifan1yi8whkpgl2nz04d49g325lbkcwaf2fvhz8xmy0bqq124n7ia6jz8plf63zp1sh10b8a53h"; + url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; }; }; - "html-webpack-plugin-4.0.4" = { + "html-webpack-plugin-4.3.0" = { name = "html-webpack-plugin"; packageName = "html-webpack-plugin"; - version = "4.0.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.4.tgz"; - sha512 = "30npn4h34f7ghwsirydj6icfav14sq5slwk3lpd043jgng2gkii00df1cj6hhldj8d2pmmfvg9aslrgyr2cdanjvw988z658v6i0485"; + url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz"; + sha512 = "C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w=="; }; }; "htmlparser2-3.10.1" = { @@ -4979,16 +5105,7 @@ let version = "3.10.1"; src = fetchurl { url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha512 = "04y4izmqmlxvcv7fj67dqaiiwrnq75j6n6yv9a6990y6s23lrj6ipbx0y0i57z8gqzq2ddhb2dj2dflskk2ia7wl81vjcfl50v9w212"; - }; - }; - "http-cache-semantics-3.8.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "3.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; + sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; }; }; "http-cache-semantics-4.1.0" = { @@ -4997,7 +5114,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "1qvqr3inc283iggn9x9wwiv1zb634i5zmlh8dnl2c5n4czaf2yibs4dncrgxfg7zrdfkcali22mvys4pgyhmfqjb57b91qlay9czaki"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; }; "http-deceiver-1.2.7" = { @@ -5033,7 +5150,7 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "13c4825kzqlxdqfjrlrwh15ira0bjm9m3b8qcrfzaysiky1m3gb6dv6gcjgpnap9mbl0fajqiibzp1w5r8qnyn8glaj4wgzf6vh2i5r"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-errors-1.7.3" = { @@ -5042,16 +5159,16 @@ let version = "1.7.3"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "1zx0vws4k6lcw8j8pgc2yrwfw56s6n2z4dvhd9lcj9l1ywnl9ssianilmrlzr6ravkqxv0xbdqg4cn0q3l72d8h0achvcdbqp8dfd35"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; - "http-parser-js-0.4.10" = { + "http-parser-js-0.5.2" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.10"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz"; + sha512 = "opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ=="; }; }; "http-proxy-1.17.0" = { @@ -5060,16 +5177,16 @@ let version = "1.17.0"; src = fetchurl { url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz"; - sha512 = "3z80svhb9hi5fawc8za5qn75lybr53646gfsqm2hkqss4pr186pp7k6f5jnjgw7vrkgjy4yzvb34729q6kvrikn4xgq9gfdg7xsgajd"; + sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g=="; }; }; - "http-proxy-1.18.0" = { + "http-proxy-1.18.1" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz"; - sha512 = "2jhzdgr7gcgj58mf798ak1a638wm4mnp45pk48im1rf03dpw39alpyabd7rqwqgjrilaggnmh6nd3m9pqnyn76q3mw5g7rzjf43d0pk"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; + sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; }; "http-proxy-middleware-0.19.1" = { @@ -5078,16 +5195,16 @@ let version = "0.19.1"; src = fetchurl { url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; - sha512 = "3fl42r9rpdqm0jrrd2wqws6syv02r8cqgy0j6ddrjvn5p3by8shm0mmbych1g5k9i5agc70x6z2904nrgidkdnlq1pwafqhcf0i6xn8"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-0.20.0" = { + "http-proxy-middleware-0.21.0" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.20.0.tgz"; - sha512 = "21l9r4302hy4pdns6p52jw6mb3mcjqia6vydc5r1fmhifd5a5xrkwg0pmwgiqb0kyrwy4k47wqkzw8sc5zl0cq7i17rh437pn9l1lkl"; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.21.0.tgz"; + sha512 = "4Arcl5QQ6pRMRJmtM1WVHKHkFAQn5uvw83XuNeqnMTOikDiCoTxv5/vdudhKQsF+1mtaAawrK2SEB1v2tYecdQ=="; }; }; "http-signature-1.2.0" = { @@ -5114,7 +5231,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; - sha512 = "1kz5n441pr99yhsdpw8sdamc8c44nc6jiipq41iqvsi1djabh15z8vmqkyqy63hjp6da0szqfk2607vfyqh81pav55k6akwz7p2wi28"; + sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; }; }; "i-0.3.6" = { @@ -5132,7 +5249,7 @@ let version = "0.4.19"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; + sha512 = "oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="; }; }; "iconv-lite-0.4.24" = { @@ -5141,7 +5258,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; "icss-utils-4.1.1" = { @@ -5150,7 +5267,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz"; - sha512 = "0yccn3a8gi1sxrbw7ymv239zs4myhrbavs2wvgv8qn3cjbs4r62f01jgsj26jzlq0vy7ycz400xp6qs5l2g21qvhg5c3j6n1gpnm8g1"; + sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; "ieee754-1.1.13" = { @@ -5159,7 +5276,7 @@ let version = "1.1.13"; src = fetchurl { url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "179jm8fhl2advz4j63klrp57sm99wvyb5jcxwfr9rhi730ybcxkyfqrr0pmwvir12zjzpkwwvjjkjclwrss7lpab7dg2myqc8izpxz2"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; "iferr-0.1.5" = { @@ -5177,16 +5294,16 @@ let version = "3.3.10"; src = fetchurl { url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; - sha512 = "2x7za00gs7ipwcq29bslxcdv7j47m28jx14n9ybs5h2icr4024jn5ppmbs6953g2qb3amhs1gg5x0s48ky3mk7ybi36wchsb7kks2ry"; + sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-5.1.4" = { + "ignore-5.1.8" = { name = "ignore"; packageName = "ignore"; - version = "5.1.4"; + version = "5.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; - sha512 = "3q41bskh27g3dd95nqaf3lg1ck1iv1dbb6hhzg1jqlkk6j80q5sxb4i3n4k6rfw5nmnvrflaxvi281c7cv2ljlsxip6skb4m14x8dik"; + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; }; }; "immer-1.7.2" = { @@ -5195,7 +5312,16 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/immer/-/immer-1.7.2.tgz"; - sha512 = "32d76qv6hnprfz8mc75aw3nvwh46ydlni7lf6fvw7sqljhqlr7p6pk101mw04zfpj2p08nb71b0zc438ak764qf4z1p5ydx1dryhjp1"; + sha512 = "4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA=="; + }; + }; + "import-cwd-2.1.0" = { + name = "import-cwd"; + packageName = "import-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"; + sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; }; }; "import-fresh-2.0.0" = { @@ -5207,13 +5333,22 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; + "import-from-2.1.0" = { + name = "import-from"; + packageName = "import-from"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"; + sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + }; + }; "import-local-2.0.0" = { name = "import-local"; packageName = "import-local"; version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"; - sha512 = "04jd526svpmpgya7i580qcb13s9b6bw4s9hng2fsni2gxsz6h8vqxl8gbm5k575yxm5aqhy001rl7p1iy60rsi6371cvynfdpi39avg"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; }; }; "imurmurhash-0.1.4" = { @@ -5240,7 +5375,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; - sha512 = "3s364ysa3q0sxc852a6rlbx0y8spayvg5csradd7s9vn2fr0ky3xpfhy5kkv6afgji3df7kyiswx296kwfakydii9xygqzxgkwn6a90"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; "inflight-1.0.6" = { @@ -5276,7 +5411,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; "ini-1.3.5" = { @@ -5285,7 +5420,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; "inquirer-6.2.0" = { @@ -5294,7 +5429,7 @@ let version = "6.2.0"; src = fetchurl { url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz"; - sha512 = "1x0h1ww7c5dqlkxw4l5y64zw0sknw2z3p2zmkbyajahy74ndsb69ah54x4ya8wlv18mk4wdx4f67c37rk5f5hk0chc6ahrjhqdi10a0"; + sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; }; }; "internal-ip-4.3.0" = { @@ -5303,16 +5438,7 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; - sha512 = "05c6ydjyg8633b07vn5g168r5lxwvl5k1mjm55brfx35c1z18195bh67f7cfk4bjvyapxfhh8q5i7pv75k353rfp0rcpkgsa2iw2p2b"; - }; - }; - "into-stream-3.1.0" = { - name = "into-stream"; - packageName = "into-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; - sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; "invariant-2.2.4" = { @@ -5321,7 +5447,7 @@ let version = "2.2.4"; src = fetchurl { url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; - sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6"; + sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; }; }; "invert-kv-1.0.0" = { @@ -5333,15 +5459,6 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "invert-kv-2.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; - sha512 = "0lamd4l8hybnh42bg1nav09fj3h7k31vnvsqbqk3mhbhml32042k8hpixhiapqfssi1jyhnw31mdv9zx0fvxzxqi8igahyh5zznzxf0"; - }; - }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -5366,7 +5483,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; "is-absolute-url-2.1.0" = { @@ -5384,7 +5501,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; - sha512 = "3ssxj0ds0anzx5qcgn5lcawrsv3br0zbi1qcfpi9sslp4iwzb0hr9aqy3y72rf9c0bwb0h5svy7l341j0arlkyvx2yp85pfgqhqv6d2"; + sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; }; }; "is-accessor-descriptor-0.1.6" = { @@ -5402,7 +5519,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; "is-arguments-1.0.4" = { @@ -5411,7 +5528,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz"; - sha512 = "0n6f8bxyg7bn669kd50zw62x8fjgbckgkfxs9mnka3iw3mklg60ijk5v312y9hd30jvxawag77nv3c0jr4wkvywn2wlwd3wdd379y64"; + sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; }; }; "is-arrayish-0.2.1" = { @@ -5429,7 +5546,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha512 = "1cmy0k81vgz5z55rdyxfnx307053ksyp1lfgyj5jldkqqzmkx1z2k63fvzn7lgj8wdakmsa1mw408rm5xxfpk3avjqbnrb5yl56lm3r"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; "is-binary-path-1.0.1" = { @@ -5447,7 +5564,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "1gldm4swvg3612pg55yjza8dvpv4daf374dijjg8kcmndlq55933pdd7gw4gq4c2aa5fn9vnasz3h9spg3pd8p1rafkr91sxdhi3hb4"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; "is-buffer-1.1.6" = { @@ -5456,16 +5573,16 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.2.0" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; + sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; }; }; "is-color-stop-1.1.0" = { @@ -5492,7 +5609,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; "is-date-object-1.0.2" = { @@ -5501,7 +5618,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; "is-descriptor-0.1.6" = { @@ -5510,7 +5627,7 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; }; }; "is-descriptor-1.0.2" = { @@ -5519,7 +5636,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; "is-directory-0.3.1" = { @@ -5531,6 +5648,15 @@ let sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; }; }; + "is-docker-2.0.0" = { + name = "is-docker"; + packageName = "is-docker"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz"; + sha512 = "pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ=="; + }; + }; "is-extendable-0.1.1" = { name = "is-extendable"; packageName = "is-extendable"; @@ -5546,7 +5672,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; }; }; "is-extglob-2.1.1" = { @@ -5582,7 +5708,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "119fphi7bl53f72b5n0jc61iqlkw6fjmxqhhpbp3ap79vnvp123f3qw5sanin1cfr5cjaa2z0bc6pcdkvbaiz90bc92pc5yxgkscafg"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; "is-glob-3.1.0" = { @@ -5600,7 +5726,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; "is-number-3.0.0" = { @@ -5618,7 +5744,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; "is-obj-1.0.1" = { @@ -5636,7 +5762,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; - sha512 = "3rji48hhgd1433ipvrz0v97fcg39v3wz6awfs6advkwlhb032wadkxks4wnncbx6rk9vjp5kza6kmwf1rvkjs4l21qkqwqvfwdq7fkn"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; "is-object-1.0.1" = { @@ -5654,7 +5780,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha512 = "0aws7clcb9cyvvb4430df9fhfnpg9bl1n07ymzp7jdzia0bvjg25gyd39xp2xhgkgpkqazw8csglblifdql0rpj4kfwg1r26xnkdpn3"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; }; }; "is-path-in-cwd-2.1.0" = { @@ -5663,7 +5789,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; - sha512 = "12yyg4jlg5mmiy2g0r91hz29v3jh5g2wyhdgs1qrfswx2sp7bfsn5g4632yfxmhrpjcy03bxfj12v93yd6pdykkpsmyz912g1f1rnmc"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; }; }; "is-path-inside-2.1.0" = { @@ -5672,16 +5798,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; - sha512 = "0b5h3ls9n24ma1wqpfsv7n034ryz86rfn1vkz5g0sih2abi9wrs0vx6w583s6qhcgqa6rx5w5layfz7hlakhxvf07qcnnn36x7s2b62"; - }; - }; - "is-plain-obj-1.1.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; }; }; "is-plain-object-2.0.4" = { @@ -5690,25 +5807,16 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; - "is-regex-1.0.5" = { + "is-regex-1.1.0" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz"; + sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; }; }; "is-regexp-1.0.0" = { @@ -5726,16 +5834,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha512 = "0r8v3dkj5qbfh2wlj4w1msyqsw6j5myvxi88wkw36isscb97yyc2yc1pwm64djrmh1css6jp9p08cx1zb479fg4gv26prciaifdh05a"; - }; - }; - "is-retry-allowed-1.2.0" = { - name = "is-retry-allowed"; - packageName = "is-retry-allowed"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; - sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5"; + sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; }; }; "is-root-2.0.0" = { @@ -5744,7 +5843,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-root/-/is-root-2.0.0.tgz"; - sha512 = "0z1d0v0af41vz1cwff6262h8zkb0569fwq8yx8gbmrpqp0rc2b3y67b36w2jg4fhv3416m592qqpaarw4g48q9kwjbs63qh9wi4kyhp"; + sha512 = "F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg=="; }; }; "is-stream-1.1.0" = { @@ -5762,7 +5861,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "09j5ybpil7bgiffzq9gw66svm3rrgx634aghkwyslbdx382iqpy991cf3kwfk2jh9bi8fjz5wa996wsjwmq21lzz5svgbsld7wk4ajw"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; "is-svg-3.0.0" = { @@ -5771,7 +5870,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz"; - sha512 = "36jn8w0rn8szd1vpk2pb9b7bnq3bfvwlakxmk1h792hgirxmh5bz8bi5sq6qmz54kx7aq7acbs232gdnwzmdm8jisp1sbbpmqf24bl2"; + sha512 = "gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ=="; }; }; "is-symbol-1.0.3" = { @@ -5780,7 +5879,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; }; "is-typedarray-1.0.0" = { @@ -5807,7 +5906,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; "is-wsl-1.1.0" = { @@ -5819,6 +5918,15 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; + "is-wsl-2.2.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -5870,16 +5978,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; - }; - }; - "js-levenshtein-1.1.6" = { - name = "js-levenshtein"; - packageName = "js-levenshtein"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz"; - sha512 = "3x709s9ph1yxikp636493f7nkd2qbbrv7qrk0xykq9vgmq2sy1gc4h6rhzfqmji1fjqcayvgkppf675sz1429w1cdmb9dhravbl2q2z"; + sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; "js-tokens-4.0.0" = { @@ -5888,16 +5987,16 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "0lwyvximqkf1q5w94x2747nj2v035is66vzalrbl3f2gdh9k1m3m29p8zw6r65ps5784x2lxwz8akmv085l4ai358rwbp84axz59lj5"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.13.1" = { + "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; + sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; }; }; "jsbn-0.1.1" = { @@ -5924,7 +6023,7 @@ let version = "2.5.2"; src = fetchurl { url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "20bfkjw0zjachan7rfv75dn5ky7l12xhyz919mdhh9fjn395ss454ykknjza7fwyx09dj89makcs1xi341dvv4k1cvj94739ifbp2rr"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; "json-buffer-3.0.0" = { @@ -5942,7 +6041,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz"; - sha512 = "14iysr3lrpg8rlrd1q7qv6xwc9abgnfd1yw2wk08lahqhzz6jjrjwxd3k4q6y80p39qp251kdkgxmrx9ydmgglr9k8ag6knyh2pkdg1"; + sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; }; "json-parse-better-errors-1.0.2" = { @@ -5951,7 +6050,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; "json-schema-0.2.3" = { @@ -5969,7 +6068,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stable-stringify-1.0.1" = { @@ -5996,7 +6095,7 @@ let version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; - sha512 = "049m3dzsr3mcgk3g8hw79w9lr296zxs0qmmn45ngfzinyxsvqh6k52i49690bfjlhsv16yrs87vh4nh6lfy80xrdh02haicnnczrgvk"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; }; }; "json5-0.5.1" = { @@ -6014,16 +6113,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "0xzlb8ipv7y4s06gdr1j09fgp9a8xcjrwy5qq739vgadwzfyslk6xph4f9d8zv7rrc0fg3qn6fpwg3y1mrzf0hbi5qp8yng11cvi938"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; - "json5-2.1.2" = { + "json5-2.1.3" = { name = "json5"; packageName = "json5"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz"; - sha512 = "2ln46a38zniy6a7n5kb5mc4vxs81ylfnp08wg7g0swcpjw1fgscnws4jf9x68wv8f5x911r19wf56j8952k9fqrqvrdv24xhm1hx19j"; + url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"; + sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; "jsonfile-2.4.0" = { @@ -6062,22 +6161,22 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "keyv-3.0.0" = { + "keyv-3.1.0" = { name = "keyv"; packageName = "keyv"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; + url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.0" = { + "keyv-4.0.1" = { name = "keyv"; packageName = "keyv"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.0.tgz"; - sha512 = "2i48smwjjjg1l31fm6cflailqiwx8a4f1bcszskxn40zqxg9h2sgi5r04nym2vd9wy630jmdhpn311qybvjsf7w5maz96i2q09sif2k"; + url = "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz"; + sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw=="; }; }; "killable-1.0.1" = { @@ -6086,7 +6185,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; - sha512 = "272kk46rkfh4wq4mispvvy174y6fj8rlnf1m5z8pszpa2igz586k5f8vzz3q3nckxwvkcyqzf48sndd48krwzr9ag22mhjlm4nasfig"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; }; }; "kind-of-3.2.2" = { @@ -6113,7 +6212,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; }; }; "kind-of-6.0.3" = { @@ -6122,7 +6221,7 @@ let version = "6.0.3"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "23pm3j7jjxhl5igjj2mg91b2w2x6j39axjy2y7b1z0dp9jgnhxl885znwwvglzhnb5ssdc4v5vy04ks7xpwgzllyy1ngdmxbyxbbi3m"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; }; "klaw-2.1.1" = { @@ -6140,16 +6239,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz"; - sha512 = "3kqxr8xv0rsarmna01c0nhhvkbi9j76r6f2mwa2515dgskwf5dw7ml5iww9bqwr7s8g8yvy8cm8v305b62kqwyav9lsyrc8c6bkd8pc"; + sha512 = "7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w=="; }; }; - "latest-version-4.0.0" = { + "latest-version-5.1.0" = { name = "latest-version"; packageName = "latest-version"; - version = "4.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-4.0.0.tgz"; - sha512 = "37c4yh5igfqlfkxkd25rgnjrksv9xnkj1zc03n0a8zbpgx7rc1xl0ln562x81cm804pwicav8nw8f116bpxhc6bh9ph52chns9k50vg"; + url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; "lcid-1.0.0" = { @@ -6161,13 +6260,22 @@ let sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; }; - "lcid-2.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "2.0.0"; + "leven-3.1.0" = { + name = "leven"; + packageName = "leven"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; - sha512 = "1wcm03j1xmwayngclsgc7xk3rfsn8d3lcas6yfxszjpjwa37nwiia213cxkagdfc56anijwb679bg42ak1w59d0bkq6j47wqdpw9wva"; + url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; + }; + }; + "levenary-1.1.1" = { + name = "levenary"; + packageName = "levenary"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz"; + sha512 = "mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ=="; }; }; "load-json-file-1.1.0" = { @@ -6185,7 +6293,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz"; - sha512 = "13mmy8rws80fp5mw0b7qwq5zvvlwq8v20hykp1npzsc5i5sw426j6sgi77js3lrqzbc8b7gjxhsrf26bi8xnn7ii8q64p2wskrspj96"; + sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; }; "loader-utils-1.1.0" = { @@ -6203,7 +6311,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "1sdj0mw1y0adq9fpaafpv91yz2ijx06s6fpzjfs0db47cry0q2xjcahr5aksf6vlxp7ripisvjz21hjkkdzrwh8pc3zm7vdq141czd8"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; }; }; "locate-path-2.0.0" = { @@ -6221,7 +6329,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; "locate-path-5.0.0" = { @@ -6230,7 +6338,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "3r6llra9imfvg31342986kfkzm34ficva43avn7cng5inb9f5xrnr64jm4pykjjjbjs9np0mhia370ysnf97w4m6jqgnniyjbv71f5p"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; "lodash-4.17.15" = { @@ -6239,7 +6347,7 @@ let version = "4.17.15"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; "lodash._reinterpolate-3.0.0" = { @@ -6266,7 +6374,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; - sha512 = "3y567dmr1cb5vl7mf23r20iwxr6c3pc9p6wmpal1k61x039xys53b76nddyq8ydyyhnzacw1jjgsccfr87p8qjwi1a2g6i428bxi2zk"; + sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; }; }; "lodash.templatesettings-4.2.0" = { @@ -6275,7 +6383,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; - sha512 = "1jkf1vq05gx9z319z598cdf335qi0jsg1pfxbxg51fsjr9m6nfrqkdabg43knd3xrr7gchgkclyxnmzpvrszqq9crkay0dpx37hpn5j"; + sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; }; }; "lodash.uniq-4.5.0" = { @@ -6287,13 +6395,13 @@ let sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "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 = "3y57kcbhh98x86dpx7apanxgnkqf5chybr4jnwhzljd3k2n9knm5h7fp9aiv6bzpyvq1xg0qssgg3i47ddiz80h7vahfj6hb8n9x3bi"; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "loose-envify-1.4.0" = { @@ -6302,7 +6410,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "3fhlaj5f55z0d4f45a5vsyz1r5k40qy6mfbxphjgnz8x4jx4d1g4pz4v2793viw0hk04a1a6zbiqxbjsjzhidp9jmmzhngzd8yb2awp"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; "lower-case-2.0.1" = { @@ -6311,16 +6419,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz"; - sha512 = "2nvzg5awqkqrrj7g32x95c48sghvbqvnisp439rxgh9fkwwkkq7jzpjivsx6bvmrybsr7a6rgazw6554llb26aldiq5fvyb69ya099f"; - }; - }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ=="; }; }; "lowercase-keys-1.0.1" = { @@ -6329,7 +6428,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; "lowercase-keys-2.0.0" = { @@ -6338,7 +6437,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "2c8fy71cr597nqfq7savid5rdk1msa2pcvxkn504w8bksci9vpm7x3a9yy87zc1lb5chzqnii12rd1h0jpc8k3kxy2c787w5snmg8xn"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; "lru-cache-4.1.5" = { @@ -6347,7 +6446,7 @@ let version = "4.1.5"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "3k64s8pgffvqc84ar3r2jjvxnrll916m1q6s4m2k8pq2gqvlrzy11hdhvx2662fa4x7h1hcpn9wmy4kk28rgk3sj76w2fpn8dn6armi"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; "lru-cache-5.1.1" = { @@ -6356,7 +6455,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "3vjhn04mjkxbkfb4fh7xnlghlgmqffqp5i1w2vg1ndgh5izv7nwvr8lq1n1hypfs5pm3bvbk7wf3fjm2pavld1hipz0n8rp012l14ra"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; "make-dir-1.3.0" = { @@ -6365,7 +6464,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"; - sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv"; + sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; }; }; "make-dir-2.1.0" = { @@ -6374,25 +6473,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; - sha512 = "12asfdw6jlwcqjli9xywj755wznjxadmh7q6abrhldss26wdsik8w39dqww20i3ilr9mjam1r80ickwzlp9w7dz15bvqa1wszwmfbrd"; - }; - }; - "makeerror-1.0.11" = { - name = "makeerror"; - packageName = "makeerror"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz"; - sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; - }; - }; - "map-age-cleaner-0.1.3" = { - name = "map-age-cleaner"; - packageName = "map-age-cleaner"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha512 = "3gk1kdfw4z4pjghrxyn53gyb40gbk71ycv5mi2mbidwxg76mbfgkxcn88zkcrjw38mq6vn5kcarw4n5zq79ligh5k1s6gr8fgmg373c"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; "map-cache-0.2.2" = { @@ -6428,7 +6509,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; - sha512 = "29ds70y468n42xivsz4vrgy8rp2x4nxz52z1vkd1k49556gvn74pq998s510g3jgz9972m9yxs6yk1kw752blq97b9w8gaddkwlyay6"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; }; "mdn-data-2.0.4" = { @@ -6437,7 +6518,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; - sha512 = "1q3dcqzncmynfxw8fbqvgwk8va8mac3lqpd9blz4knhj88fdmdcc863lscf5mm1h0ak34n9zr7bf7bgdzpqgfk8xr83xsilmhsdfpc9"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; }; }; "mdn-data-2.0.6" = { @@ -6446,7 +6527,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; - sha512 = "0w2lssr5jjc55m8zhx3c9n9c6qnq9ivsv2fm25d0dr7hkppcmpbrcsqdwdnc8p7c4q0nni2qws676wh8pv7rnr4h93h75v8pnzy62xd"; + sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; }; }; "media-typer-0.3.0" = { @@ -6458,15 +6539,6 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "mem-4.3.0" = { - name = "mem"; - packageName = "mem"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; - sha512 = "3znrz98ggx92y1crm2y017k8lriwz4m9y4w451wm0h1jzsq7jgpafymdvgpznvx07l3xw8inznd78zzwyxdzhb0aq8scki9iwdrnzd9"; - }; - }; "memory-fs-0.4.1" = { name = "memory-fs"; packageName = "memory-fs"; @@ -6482,7 +6554,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz"; - sha512 = "0cgni6pl3js3s6ylnj3j9sydf6z5sbnpyi42xdh4437rd6c7xgbapzdq84wn8dzxrcf7sva66z7m6mna61sdagfs41078aa9rsjn3cc"; + sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA=="; }; }; "merge-descriptors-1.0.1" = { @@ -6500,16 +6572,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "3gyvijjr3va5jwglqgv7sqxm4a6nhzhj32sl68ffjf8axkzi5z25g0nl2r2mvw1kjs3z49wxjdclljkk4whzpqka4vzjg9fwylgzfv9"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; }; - "merge2-1.3.0" = { + "merge2-1.4.1" = { name = "merge2"; packageName = "merge2"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; - sha512 = "1inz1swib3crzbwlqrpy74dhmn520qgzg5lkfmm3k1334lpb98d0xjpa6ydpdgwnp013j1n5m2yqkac4r75w6lbcj94hfj1v40h6gns"; + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; }; "methods-1.1.2" = { @@ -6527,7 +6599,7 @@ let version = "3.1.10"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; - sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; "micromatch-4.0.2" = { @@ -6536,7 +6608,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "3jiz9pr94hycvjgzxbxi0jfz7n142n3z5w14im7i0088lymjpvj8xrapr8s66xcp13ylh374hbpm9ixp8rln55n7lrcll6c4qfnkcfb"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; }; }; "miller-rabin-4.0.1" = { @@ -6545,7 +6617,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; }; }; "mime-1.4.1" = { @@ -6554,7 +6626,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; + sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; }; }; "mime-1.6.0" = { @@ -6563,7 +6635,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; "mime-2.4.3" = { @@ -6572,34 +6644,34 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz"; - sha512 = "1kxc6r0xfiblss3gn102f4akmmm3jgcsj95n1hm8qgy4k8f5z2qn8bym7v4aa52dk68mjdzl9rvrn9sv70k3n9kwnmbiyn4jx2cy2j2"; + sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; - "mime-2.4.4" = { + "mime-2.4.6" = { name = "mime"; packageName = "mime"; - version = "2.4.4"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; - sha512 = "0c4qs0w88nqz2v7441rw9bbsgrsh50cifwmqm2i7c96yz2ncdy35cb5g42zhr6z0wmqqcwq5la04nnf1n4y3zncvgyg8b721hvnc71d"; + url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"; + sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; }; }; - "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 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv"; + 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 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "mimic-fn-1.2.0" = { @@ -6608,7 +6680,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; "mimic-fn-2.1.0" = { @@ -6617,7 +6689,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "1r8csnc32c6rrvy8d5d1g33gba52m1863wdwl7qbancmzn795726im9mrwp20k3d8pl4x4msp7n6wpldvcwkmk5y4cy0h84ka9wx9is"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; "mimic-response-1.0.1" = { @@ -6626,7 +6698,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "32nwz24nh1f2nbpk8i638ff8hsg1ajmc6746abkssjr951z28362k5a92dd1cfr7bd1l9f507cn0pbam04ixfgsaygskv87g6v1r4cg"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; "mimic-response-2.1.0" = { @@ -6635,7 +6707,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; - sha512 = "080nd6134s2xyc8jb63q7hqszh9a52py287g4zqw1sy06nq0x9ac8bf2pwx7z9ygj4610ij6nk8a42q4ll4hwjgsg8xwblj7x4s6yn1"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; "mini-css-extract-plugin-0.4.5" = { @@ -6644,7 +6716,7 @@ let version = "0.4.5"; src = fetchurl { url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz"; - sha512 = "3dnk581xzzd2njvqxkqy7ihwbk9pr4r4qyc0cqn2nkmrdlflldw01vcmhqy3v0jknxhpvjpy7a7v67ljl5n5xh2hxv7mdp4syf5m83n"; + sha512 = "dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w=="; }; }; "minimalistic-assert-1.0.1" = { @@ -6653,7 +6725,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -6671,7 +6743,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-1.2.0" = { @@ -6689,7 +6761,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "minipass-2.9.0" = { @@ -6698,7 +6770,7 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; "minizlib-1.3.3" = { @@ -6707,7 +6779,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; "mississippi-2.0.0" = { @@ -6716,7 +6788,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; - sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync"; + sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw=="; }; }; "mississippi-3.0.0" = { @@ -6725,7 +6797,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz"; - sha512 = "2895y9fw0xa9bmwbbkv3ziz5gnvr2b9k6kgh1b815ppwhgpcnbzsmn3bjvd2c1852hfakgnxw5hbn8kr8ff1pfbnm8x0lk3qm5gb3n7"; + sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; }; }; "mixin-deep-1.3.2" = { @@ -6734,7 +6806,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha512 = "08fzp03g97vcq1dm4qs3kfjbazfs8h2m99bzdhn9caddpi4xr9bw9n9adlrv24qwfdw2jphwfhjszdwnykawd3ysj4ihp76zygh66jr"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; "mkdirp-0.5.3" = { @@ -6743,7 +6815,7 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "0376f05nckrbra8z0qvw9p5bz1w4vyvalyh8bplzqdlm099dj958xqjckbya4gx36mr8f1fq1iybr0x0z2f9yqdgdhwkivan71a1v9z"; + sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; }; }; "mkdirp-0.5.5" = { @@ -6752,16 +6824,16 @@ let version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "32zxwnp110xb9sm0w7xdr51v2zj4k0b07yq702phnac2l8c91mxw6va27y193m42nvnw5dhby2jzg3b24fzjzkdr8337slz8ja81a9l"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "moment-2.24.0" = { + "moment-2.27.0" = { name = "moment"; packageName = "moment"; - version = "2.24.0"; + version = "2.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "111s7ki890wwh47hr44ps1q5vsh23jpp56dlgvyzz7hg71np9xkrc7k683qvfs7zyijb9fdcwzvinjcnbz36lhn0hg2hhknm7xxypkd"; + url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; + sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; }; }; "move-concurrently-1.0.1" = { @@ -6788,7 +6860,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; "ms-2.1.2" = { @@ -6797,7 +6869,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; "multicast-dns-6.2.3" = { @@ -6806,7 +6878,7 @@ let version = "6.2.3"; src = fetchurl { url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; + sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -6833,7 +6905,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz"; - sha512 = "288avkys1mgcwdv33piblh5i715m64cl4z06ixvr71r4xddk49s4z625i6739hiyakk4j3lqygbjff8ysnpn10j95gs39abawq6yi24"; + sha512 = "RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA=="; }; }; "mute-stream-0.0.7" = { @@ -6851,16 +6923,16 @@ let version = "0.0.8"; src = fetchurl { url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; - sha512 = "001y43826xy43brn2n49xwvg7pjkn95d938fg0sk04jr9x4ak36w247lxnj48xim5c7ljk4czdgdk3myh08darj9qn2anr8x5cdcxly"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.14.0" = { + "nan-2.14.1" = { name = "nan"; packageName = "nan"; - version = "2.14.0"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0"; + url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz"; + sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; }; }; "nanomatch-1.2.13" = { @@ -6869,7 +6941,7 @@ let version = "1.2.13"; src = fetchurl { url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "04al0wvh9hw1p9bblk847c5nbi3lcjz2pg5yzpqdzgllk57firrqinn4yk169iddaagdf9s5l987xh43z87w3hm9h0pqv0i7pcix6ky"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; "ncp-1.0.1" = { @@ -6887,7 +6959,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; "neo-async-2.6.1" = { @@ -6896,7 +6968,7 @@ let version = "2.6.1"; src = fetchurl { url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; - sha512 = "1kvffl97cs76iidch6z424p50m0wdryx6h6b1jdgr71bfg035szlxcdl6dz9jy71aj8msvprdq2ilbs9jisbim3g1b4l2bfy3qsc9lb"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; }; }; "nice-try-1.0.5" = { @@ -6905,7 +6977,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "0swp764n5mcgqfjbm3hsw9iayqy46490y4lvqyk6www0a02bw130mji8lvsvlr34sc29rai5i4vpwwhh76mzplf6ljrlvwyszjphy6n"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; "no-case-3.0.3" = { @@ -6914,7 +6986,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz"; - sha512 = "17pqh35wma9y45ac1apa90fy5l1rl9g0z85mnqhpzgldgz7i09v2j735mkss3q33ns4zzbzapxsg5qldy8b17q2s95x0zq2ajcky5ks"; + sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw=="; }; }; "node-elm-compiler-5.0.4" = { @@ -6923,7 +6995,7 @@ let version = "5.0.4"; src = fetchurl { url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.4.tgz"; - sha512 = "0k6azydldy2w6xamqcm77lm9brm4hn8vxn0na1i7y1s0ikfiblw7f2kd0qg5i793s7ymms50mqxrjg0kggpklbwj03bcym20kqi62sm"; + sha512 = "VQsT8QSierYGkHzRed+b4MnccQVF1+qPHunE8jBoU7jD6YpuRqCDPzEoC2zfyEJS80qVnlMZrqobLnyjzX9lJg=="; }; }; "node-forge-0.9.0" = { @@ -6932,16 +7004,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; - sha512 = "0lhlm8x38i28zwmjycgdcyzcqlb0x3z8scjx7vm3s4ypj99bfj7pmv18yxjsnz532z7g9li2aa1x54hbv61dmvbvm4yj3z9ml6rl17c"; - }; - }; - "node-int64-0.4.0" = { - name = "node-int64"; - packageName = "node-int64"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; - sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; }; }; "node-libs-browser-2.2.1" = { @@ -6950,16 +7013,16 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; - sha512 = "3jhlmpgvcnjkg1bh3qp6rqp4a4plsih4bcfqkg0by0acj58r2m1x1jlsgw1k114920vlsvwl563lfjh844mpm02ykcs14gxq47xrz47"; + sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-releases-1.1.53" = { + "node-releases-1.1.58" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.53"; + version = "1.1.58"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz"; - sha512 = "2ww5b7j2zf3ip1ld49jij1c3h7ba402j2p257w9450qqhj0pbf2q3bh4ihs80rl0kx9r84q7qychakxs9z29pczlnhzsybh0p4k77y2"; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz"; + sha512 = "NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="; }; }; "node-watch-0.5.5" = { @@ -6968,7 +7031,7 @@ let version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/node-watch/-/node-watch-0.5.5.tgz"; - sha512 = "0wamm245lxkvx31zim6cf1hbqwmmy8bvv1jifm1m23fpiwg6jml1bsl9k748wmns914626yhjr0rhiix3g78njir8agvs684vd4vp6g"; + sha512 = "z9xN2ibI6P0UylFadN7oMcIMsoTeCENC0rZyRM5MVK9AqzSPx+uGqKG6KMPeC/laOV4wOGZq/GH0PTstRNSqOA=="; }; }; "nopt-1.0.10" = { @@ -6986,7 +7049,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "normalize-path-2.1.1" = { @@ -7004,7 +7067,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; "normalize-range-0.1.2" = { @@ -7016,22 +7079,13 @@ let sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; }; }; - "normalize-url-2.0.1" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; - }; - }; "normalize-url-3.3.0" = { name = "normalize-url"; packageName = "normalize-url"; version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz"; - sha512 = "1k9wdhamvss3wbk5kf7cxyaz3jrdxa6f4n9gk9sxmvhv7y7qlwqf7s6dmvb01pxs6vh03n0ygdxcw6dfsx9swkapcz5l5vfny5lkqjk"; + sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; }; "normalize-url-4.5.0" = { @@ -7040,7 +7094,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "02k93b4vrh4rvz479dc5rjv43v54pzz5k5kn21cx6gl2b1c45s3sb29cy4cyifvfl9zqghs9m1f5kcv0hp4cwp8sigyqx9i6p5kpkns"; + sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; }; }; "npm-conf-1.1.3" = { @@ -7049,7 +7103,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; }; "npm-run-path-2.0.2" = { @@ -7067,7 +7121,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha512 = "1dw51xws0pd54mna4n5x07w9bh0zn3xdyq1pxf49w79kall1q4625hyi2vpblar83p2yr5xm018v14l9q6fxrwa6khvrvxvjp6id3sb"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; }; "nth-check-1.0.2" = { @@ -7076,7 +7130,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; - sha512 = "0g2sh2g0bndg2df1nsbqm3vw97krfwk37bd4r7sbw2vqxwnbm28xdc33xgjrd4pigwm6sa2g9wlnk3166b51lwv6z7pqjmw7dv4xq2r"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; "num2fraction-1.2.2" = { @@ -7103,7 +7157,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "object-assign-4.1.1" = { @@ -7124,22 +7178,22 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.7.0" = { + "object-inspect-1.8.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb"; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; + sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; }; - "object-is-1.0.2" = { + "object-is-1.1.2" = { name = "object-is"; packageName = "object-is"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz"; - sha512 = "0wsh2mh2v96a9jvknzxad6bxhj8skpsanvcmfldzdj6vlc4y4ffjsjwwpg1awwqwdl0nldilcxpvq00nnd2br7qmlmrqxsrpgws35hj"; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz"; + sha512 = "5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ=="; }; }; "object-keys-1.1.1" = { @@ -7148,7 +7202,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object-visit-1.0.1" = { @@ -7166,16 +7220,16 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; - "object.entries-1.1.1" = { + "object.entries-1.1.2" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz"; - sha512 = "2qp48plcipnz0hpb1bjd7qk60f929qsw5i29jhsa11p2ilxn1d1x1c3gyyaakgmi9v3jqrzmlcxydq8szvhqrpb4snrgj8x33n92nla"; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz"; + sha512 = "BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA=="; }; }; "object.getownpropertydescriptors-2.1.0" = { @@ -7184,7 +7238,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; }; }; "object.pick-1.3.0" = { @@ -7202,7 +7256,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; - sha512 = "1w7lyv8q705mag20f36afs0qcnxjnpdg45xxnkq1ilqfd9rnf21fzbh0ib4vhwz0pzjynmqaszrsjccgk6vmgv4jas2pwla1pibjdjr"; + sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; }; }; "obuf-1.1.2" = { @@ -7211,7 +7265,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; - sha512 = "0vcjqppr8sr1in2haifxl9q8v6kgn8pddc4ffkjbx5n2fasb3kdrx7mybkfxqdaqfch2hqrwa87rrwllqd5lrmx73md609682xp0z9x"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; }; }; "on-finished-2.3.0" = { @@ -7229,7 +7283,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "2n6994y8y4b146a5wpzzgw779yc227cqkmwsifc3fbn2kc9dzypjigqf72bpgsqrk7gs93l6fk4iqdk752jnsnpr89j58sbabw09455"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; }; "once-1.4.0" = { @@ -7256,7 +7310,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; - sha512 = "3lscn8ddi5nifjriym6zgmh0l8cn60g1d97d8ydnw19ssdyi2s0winvrx0j7gbb05lpf795a5v7wbm1jx54szh3452kbhg1y6815mz4"; + sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; }; }; "open-6.4.0" = { @@ -7265,7 +7319,16 @@ let version = "6.4.0"; src = fetchurl { url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz"; - sha512 = "0da91ydfkavxd733v8b3bvcrp681xirng4nyrazinl5bc2y3aacjd2g1bnapmzpp7g85bk42qh064hclbflj7jrkg94gvq5z1aafmr0"; + sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; + }; + }; + "open-7.0.4" = { + name = "open"; + packageName = "open"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.0.4.tgz"; + sha512 = "brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ=="; }; }; "opn-5.4.0" = { @@ -7274,7 +7337,7 @@ let version = "5.4.0"; src = fetchurl { url = "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz"; - sha512 = "15vx11m9g7ljkb0rahxyxkvlbvf81rlgdbw5n7a5ffj2q80msblibdpy5nbrhhlnraplh0fmf4ksp6c1rqbmvgh4splmzvjslslqpv0"; + sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw=="; }; }; "opn-5.5.0" = { @@ -7283,7 +7346,16 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; - sha512 = "2qa90jg1bw4yx1an6vbx2cp7lpk6xwa94yrbr6mkpl2h95wl4iinlmlzzy2z5ihm79d4ypkjkf3w5m7cjl79775amsbav5x021fk89y"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; + }; + }; + "opn-6.0.0" = { + name = "opn"; + packageName = "opn"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz"; + sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; "optimize-css-assets-webpack-plugin-5.0.3" = { @@ -7292,7 +7364,7 @@ let version = "5.0.3"; src = fetchurl { url = "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz"; - sha512 = "0l72h39ll7vgrkls1d7xz21s4bpv54wmpzdxylldnwrf6sx70qacgh5jjrdc5i8fzw9caw9bk38hvda7f7w14m2a0nlds2j4jydpmxb"; + sha512 = "q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA=="; }; }; "options-0.0.6" = { @@ -7310,7 +7382,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; - sha512 = "038qn5613vi5gjik4pmng7zf2ib4w81hjyzy9dhflj7kw1p1ll09nq63x9rnkyyflkv33lq8bx0fbw1gzlpp4asy24l7adam2bma847"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; }; }; "os-browserify-0.3.0" = { @@ -7340,15 +7412,6 @@ let sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; - "os-locale-3.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; - sha512 = "3frcfnhc4914snsnfqyqrz253i5dd31202gbx4dzkp6bvc8f7wnqhfyc89zp662v016gdqa7wb1z2g6p8nzk6cxzwscwn0qii3pgjb7"; - }; - }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -7358,22 +7421,13 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "output-file-sync-2.0.1" = { - name = "output-file-sync"; - packageName = "output-file-sync"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz"; - sha512 = "36zk3d8yzp1i0lxpbv4fk0j853snx2gzaxkfzcx6vgdylnhj3gs6fdr6jf0qw14amcgagbd9r8pcws46n2pky3740bh4nmvm7i6hf4q"; - }; - }; - "p-cancelable-0.4.1" = { + "p-cancelable-1.1.0" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "0.4.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw"; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; "p-cancelable-2.0.0" = { @@ -7382,25 +7436,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; - sha512 = "0va49l2crhr6kr1lgbrjc69hz9scdrarzbrzpvddkfdb9wdr16bv48qajb2m0n6fjammxhvj68d4r35wyfy209rnajfv6nccq7dgwy2"; + sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; }; }; - "p-defer-1.0.0" = { - name = "p-defer"; - packageName = "p-defer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - }; - "p-event-4.1.0" = { + "p-event-4.2.0" = { name = "p-event"; packageName = "p-event"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-event/-/p-event-4.1.0.tgz"; - sha512 = "2059kalwqi0hxv1rnpk504n5piz0cjqw6ifah5mq9vh9y9g26w70x3imkfp2x1smzz8hrqhzy3w3k5cd993f1wcbzjhgcl2l79ivw72"; + url = "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz"; + sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; }; }; "p-finally-1.0.0" = { @@ -7412,40 +7457,22 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-is-promise-1.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; - }; - }; - "p-is-promise-2.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha512 = "0z3jpi001p4scg2h40kyy7mjvscz8l9mpdp79lhk9b19lyiz140gbwi8963dr5nrysmkrl0hy52v6ikg2wzfsmk8m6ccasgak1b8xb3"; - }; - }; "p-limit-1.3.0" = { name = "p-limit"; packageName = "p-limit"; version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "3sh18calqxbww99pxc84hldflmj0i915g8npihlmazw8wjqabihi9475v0ll3fhx44sxn35j014j1k5d2xr73q3mpwkmx09n2q1gxxy"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; }; }; - "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 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-2.0.0" = { @@ -7463,7 +7490,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; "p-locate-4.1.0" = { @@ -7472,7 +7499,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "3n0ljmpk3p2j4aaz345w5gkqr128xkhflcb83k75fgns5ddd4bpx7l0q50w9kwy5792xb8d3dpf8bwgzif3463spf3140rhzmkmkgs7"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; "p-map-2.1.0" = { @@ -7481,7 +7508,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; - sha512 = "0bx813aqd3627xffp035h9nimfd19i0l6may47yd0k7x2bngiyp8z31im58ac1nnxy3gdb3yiilagbyqlb7qwc8wdw06f3wjwmgqxnb"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; "p-retry-3.0.1" = { @@ -7490,16 +7517,16 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; - sha512 = "3gknqxqyn23vmgcqsvnvspzynkbkfn74f3plq72wj54kcyy5f3mbq3lw8pj2gwpmbkqcv7w0wvk3vv54dlny5j5dgv48khkwviqckjw"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; }; }; - "p-timeout-2.0.1" = { + "p-timeout-3.2.0" = { name = "p-timeout"; packageName = "p-timeout"; - version = "2.0.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; "p-try-1.0.0" = { @@ -7517,16 +7544,16 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; - "package-json-5.0.0" = { + "package-json-6.5.0" = { name = "package-json"; packageName = "package-json"; - version = "5.0.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz"; - sha512 = "0p21ljjj6v8r8a8fvl691yyfy7n79anx5940c80byrdfwimpnvqwiznwagrvshhnvlmawz8c40nwhf37nqwaa44j3mn44p5ahad1q8i"; + url = "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; }; "pako-1.0.11" = { @@ -7535,7 +7562,7 @@ let version = "1.0.11"; src = fetchurl { url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; - sha512 = "1imm2ygnj1himskq6lblzdh3ngc6p9gkvhrbzivalqf3nwafzfglpmbh8wkaz0rsiaxh67jzxbb16m2ygapfcnfwqg9gkdqzkqc24p2"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; }; "parallel-transform-1.2.0" = { @@ -7544,7 +7571,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz"; - sha512 = "35gr4098wc5ibbrpckgva8l9v50z6mcii4y3kv6wc1ymz3aj2i444y3m2qm2ngf0k02ylqkg3gn7g6awkqfs56ppljy5wmpifcd4srz"; + sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; }; }; "param-case-3.0.3" = { @@ -7553,7 +7580,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz"; - sha512 = "162w23h2rysv24bd7qhl4qhv1fd2rvb0n6ai8vg1q463b0wl5gfsqdcgxyn3484b2bj250rd9i7dqv9y374csdarlmy9mww5755aq2m"; + sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA=="; }; }; "parse-asn1-5.1.5" = { @@ -7562,7 +7589,7 @@ let version = "5.1.5"; src = fetchurl { url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha512 = "16n59f599pq8832a6c5wyxnqdf4vrqrdnclzs6vp9m2z2h9qmxamjk6xcrl1aal758jyba0pvyz1bkf7npm7achfxxa29jwaygihhwf"; + sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; }; }; "parse-json-2.2.0" = { @@ -7598,7 +7625,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "pascal-case-3.1.1" = { @@ -7607,7 +7634,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz"; - sha512 = "10g214vi3ifgjl3g2ficxdnrxdlgdb3qvr7h0cljj0hbd5kmvcigr9k852m63invlksnbcx359wkmywxaw75xh29naspcibl8m8g1sw"; + sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA=="; }; }; "pascalcase-0.1.1" = { @@ -7625,7 +7652,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; - sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5"; + sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; "path-dirname-1.0.2" = { @@ -7661,7 +7688,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "3zvnv1dp30y10br2qy98z8760jssvps6g9swamdclgxsmhm14dyq0yacrj0d4mk915qhr1z0yh8l3dyd68wn7h7bgv8d39vjk5m0kva"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; }; "path-is-absolute-1.0.1" = { @@ -7697,7 +7724,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "3ll9f60sa4xi9iswmzar1hldsdhg1y8wy94wa0qmrcapf0prj95yng3bw7fkbi3jh44jc3hjymxwhxg7j7a2b9incijvywx98vrwfd2"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; "path-parse-1.0.6" = { @@ -7706,7 +7733,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-to-regexp-0.1.7" = { @@ -7733,7 +7760,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; - sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; }; }; "path-type-4.0.0" = { @@ -7742,16 +7769,16 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "2zw0czk4p8vimrxap6mlnw17lbjrhisby3z1m2j0qdhjcnxlv9lk5d8yxirrqy4ax6ar5qx14rpshmbpvzg9b4mnpzy03aclvqrncl0"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "pbkdf2-3.0.17" = { + "pbkdf2-3.1.1" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.17"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; - sha512 = "2s4nd3yv3kkyywvh5rkrvbr6w2h6a4q786v548w895ralcq9cllqzyxr0jgxf911k3zpmzycimsg3ggww3lkrhd3bk9wribrgjaby2k"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; }; }; "pem-1.14.2" = { @@ -7760,7 +7787,7 @@ let version = "1.14.2"; src = fetchurl { url = "https://registry.npmjs.org/pem/-/pem-1.14.2.tgz"; - sha512 = "0w57ydgr6304raqbf2svkvkxjw6r91kgdk926wljdpybpmr1xr7y94j4sqi63gc4dm6vi5x6wii8kx6p13awzp6i2kp05nrmnvczsac"; + sha512 = "TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA=="; }; }; "performance-now-2.1.0" = { @@ -7778,7 +7805,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "1d2xjd4r28xk5ggmns7n33nvga0ywk30plvs17dr70qwq0jc17p8kmfsm50idvj6xdrj1fikz0yv63x1pychmz90bs6mkj7wvskyhxb"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; }; }; "pify-2.3.0" = { @@ -7805,7 +7832,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; - sha512 = "3d9a1zsv7ca8ffpp7ffl67vp0ahiq78ix1jl21b4nfklinh2ilwh6c45f93syclab0b49p3cfq8d4agpphrbmf6xgfxgzjv268387xq"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; }; }; "pinkie-2.0.4" = { @@ -7832,7 +7859,7 @@ let version = "1.0.9"; src = fetchurl { url = "https://registry.npmjs.org/pjson/-/pjson-1.0.9.tgz"; - sha512 = "1sh37y91m7ii0xy1213jw8ja42309mhxzrv0nvnxl77002lfc0m95fjbnwdn6r0cib8js60v54f2r02n4fcwl98jm74m49kfqglj572"; + sha512 = "4hRJH3YzkUpOlShRzhyxAmThSNnAaIlWZCAb27hd0pVUAXNUAHAO7XZbsPPvsCYwBFEScTmCCL6DGE8NyZ8BdQ=="; }; }; "pkg-dir-2.0.0" = { @@ -7850,7 +7877,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; - sha512 = "2znan90js3xrk8a8cvzv7vrjma5dgr9hkk4kpcgciyawbjz404a4rpdj6gngx1dc7f1xzmfm3q0an1rq69qyk2cmawhsy98i40pnkpw"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; }; }; "pkg-up-2.0.0" = { @@ -7880,13 +7907,13 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; - "portfinder-1.0.25" = { + "portfinder-1.0.26" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.25"; + version = "1.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz"; - sha512 = "0388smj2gw4cwp6pddy75jr5x6sha60s4w055dpxpag7fi9ql9vxrkidnzc1v5h2zp6ra350y8q4n6lqsg0dq12blsm1iavf2f4jjg8"; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz"; + sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ=="; }; }; "posix-character-classes-0.1.1" = { @@ -7904,16 +7931,16 @@ let version = "6.0.23"; src = fetchurl { url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"; - sha512 = "1m7l8kr2bwwm21ki5jvrkfaxfxg5nqjn4zk9xf0b7rzyq1xz4s64cm5wh34qf0c13vva14wbmvfkwg7yndmcpnmcq9m7pc93vba90xj"; + sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.27" = { + "postcss-7.0.32" = { name = "postcss"; packageName = "postcss"; - version = "7.0.27"; + version = "7.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; - sha512 = "1sm64zw7m5fj7ni24kn3xcjnncf9c0jva67x209x5bz33kf1yvr9dwd9bwk2csavbh42a5yh2q61n9z2rjivdpxswgxanqwyd609r2s"; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz"; + sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; "postcss-calc-7.0.2" = { @@ -7922,7 +7949,7 @@ let version = "7.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; - sha512 = "2yialb25zhak51b057lni6kr12p4aicp8w8m13krhsjq24ghz99l3v6mp5qhc6ihymc2bfqn1sqckmz5mcph3qwplmr5s90fladk1xf"; + sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; }; }; "postcss-colormin-4.0.3" = { @@ -7931,7 +7958,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; - sha512 = "0vhqbcpm535dwjglgk0svgxghy7063rwkd7i1rh8ykqmyz9imclbp5blj99i64awgjx6fk68xksqs3r3x6x38vxhx84r96rs00ha92v"; + sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; }; "postcss-convert-values-4.0.1" = { @@ -7940,7 +7967,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; - sha512 = "0jw9v1315cyal4mc0vd8acqy7g8r6hizrx7pldmzin7dnwbb1pj00q6c301cn8dpwkc5wfcphjqw8zwskjx19wrs01abv5vbjiisara"; + sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; }; }; "postcss-discard-comments-4.0.2" = { @@ -7949,7 +7976,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; - sha512 = "29fj6haa98fxl30bgk20jxngsis7r73k0n6zkc0aydqliqj9vddrx3g03zrxhf5k82pyf6kcbhb151kiff1kfw5vigy92kxdqvsv6s4"; + sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; }; "postcss-discard-duplicates-4.0.2" = { @@ -7958,7 +7985,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; - sha512 = "2hkmiwkgz59h7dvgm53nfwv2pc4ymjx82i1mfrfx3lvh3yc2rj8jpvq7in5cpj26aqlbhr2jzg7slc2qibk810qcsbhhd0gb13izm34"; + sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; }; }; "postcss-discard-empty-4.0.1" = { @@ -7967,7 +7994,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; - sha512 = "39k3fi493q6ixpvh0rs3ald21h8mnp0vkls85wfgbhyb5x21dz2xb6knc1xav5ygjzkyckl0wmxd9m2qybqmvzq9pii17pk6r7s5n87"; + sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; }; }; "postcss-discard-overridden-4.0.1" = { @@ -7976,52 +8003,34 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; - sha512 = "179r7sbkc1x3x2mv5g2il2vhx0akmcd61lai2y8ipk8g5vy13pd6nr57xak319ll3wn60mih08y5zz32g2i40sj6dbhvvn381n3d1i1"; + sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; }; }; - "postcss-flexbugs-fixes-3.3.1" = { + "postcss-flexbugs-fixes-4.2.1" = { name = "postcss-flexbugs-fixes"; packageName = "postcss-flexbugs-fixes"; - version = "3.3.1"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.3.1.tgz"; - sha512 = "3xsv14h0z6rs754dhwmmmkcqpbjd9kck8k78ydv7yqcdfyvb370lz2w5mrbvz1igcw7qv8lzd3814bbipkzdcby54ix25zn6w668bzp"; + url = "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz"; + sha512 = "9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ=="; }; }; - "postcss-load-config-1.2.0" = { + "postcss-load-config-2.1.0" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "1.2.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz"; - sha1 = "539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; + sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; }; }; - "postcss-load-options-1.2.0" = { - name = "postcss-load-options"; - packageName = "postcss-load-options"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz"; - sha1 = "b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"; - }; - }; - "postcss-load-plugins-2.3.0" = { - name = "postcss-load-plugins"; - packageName = "postcss-load-plugins"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz"; - sha1 = "745768116599aca2f009fad426b00175049d8d92"; - }; - }; - "postcss-loader-2.1.5" = { + "postcss-loader-3.0.0" = { name = "postcss-loader"; packageName = "postcss-loader"; - version = "2.1.5"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.5.tgz"; - sha512 = "2r4igq1b6l10xxgqwf5mhvn2afwjs63d1f1j1ndgxzikd5ncqlanpgirq5syb4kn440lpc24h2dbm04ivhxc2wznpsly9yyk43y8pm5"; + url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz"; + sha512 = "cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="; }; }; "postcss-merge-longhand-4.0.11" = { @@ -8030,7 +8039,7 @@ let version = "4.0.11"; src = fetchurl { url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; - sha512 = "2zp1rk4fk9lcg6d4x9yfr1n7zp8kzj5vghnjji9229qv8sbb24ij0y33sj6kwv1m5h7s5a3b72ja7wf1h8rpy5jlxiz4phydb77yp3a"; + sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; }; "postcss-merge-rules-4.0.3" = { @@ -8039,7 +8048,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; - sha512 = "08rwihmvnqrz9ia48czncj4i50hrii7xgrvdff49a1yb1v28fd8z41bk21j3invi8d3s0x1iihn0598yczm3xwss378rgcvajpvgdsk"; + sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; }; "postcss-minify-font-values-4.0.2" = { @@ -8048,7 +8057,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; - sha512 = "2vdpqczvay1n44i15jg66gf28pj777img4cps6vx830hhif65w6y92zr555xr5c0f46wnkbx9h0idnldzvghf7x7mrlyid7lcxniklg"; + sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; }; }; "postcss-minify-gradients-4.0.2" = { @@ -8057,7 +8066,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; - sha512 = "3whlz4gqxsd8f0g908qwpqn0bmgm1sz3iscx5i4ys15b1kd4bi8cx01kcvjpa18d567kh38kchb7yr7297xakvp0bzwfxcdag1dz8x8"; + sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; }; }; "postcss-minify-params-4.0.2" = { @@ -8066,7 +8075,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; - sha512 = "1d4037bvr8ws41rvsrnhcmlx57s6czqxr8wwpwdp9wzrz76wxwn1zxpvq9mdalki6vn3ncm0b63qgiv96f09088zzw15lri675rddqv"; + sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; }; "postcss-minify-selectors-4.0.2" = { @@ -8075,7 +8084,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; - sha512 = "3gaxsjc0lh0lwy3jri4bsx18fsmx34qsh07bk43pqw3pxr04bq66vw88rr7jijdn745pw96dhkagmds32745ra7yrip13d5b24vb50g"; + sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; "postcss-modules-extract-imports-2.0.0" = { @@ -8084,7 +8093,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; - sha512 = "1cwpb0nbsgvwyxf6kr3wmpnsc0dgyx0mcapbp1103klr5gq7pmg6d423dah9k4sxzxvpz7b62ncjwvlc21ah5k0wl86yj5qsh60p9id"; + sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; }; }; "postcss-modules-local-by-default-3.0.2" = { @@ -8093,7 +8102,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; - sha512 = "0hxy2fkb9wv78ws2ki52j3rx5j2m1xy9yg8k9mcn5cjlynwbf9kykmysiqlrcpax3yan7y35ccvg7mf4cg87x38vdzq5qlcxbqxbkwc"; + sha512 = "jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ=="; }; }; "postcss-modules-scope-2.2.0" = { @@ -8102,7 +8111,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; - sha512 = "1fnivyay60x7kkg653ks8az8palhp4vprn0n0kj75dvc8f761p8q2bvaq95dbspayxzqyjnw4qvwz47wrzyr0kc3rzdg90i6fqj08b3"; + sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; }; }; "postcss-modules-values-3.0.0" = { @@ -8111,7 +8120,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; - sha512 = "1r2657ijhxmh1dszbwr1k8mdpda7r8w8gj5x4q76bya68pvwyx9vir5y1kg9qqwxhqn5qymldbm5m22cqmwrzhmk51rzbc163kc9zyp"; + sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; }; }; "postcss-normalize-charset-4.0.1" = { @@ -8120,7 +8129,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; - sha512 = "3g41krdk4hzkzly9kw24zwg3dbmxzaiq9wfsin6c8691f9rv94fz8sxinwg7h5v420h7nvcipqg07dxrmxif8adxnva31snp6pc5ic0"; + sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; }; }; "postcss-normalize-display-values-4.0.2" = { @@ -8129,7 +8138,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; - sha512 = "2wi1jy4i45d607gv94743b94ii3q66vm059z6zg7hcdvvayalkcjm6ylkpz4dfvh18l3p632cb0z1wvyzzsj00knnavynwcqrra6pfw"; + sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; }; }; "postcss-normalize-positions-4.0.2" = { @@ -8138,7 +8147,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; - sha512 = "1s6phjg5gbhmhr5ycjw4q6lr5vi8sz542kqhzj41xsbc0nkbas87npz1z3s3rsr30br7pqmdkjj423s0cb2fpsx6hz139ris3zzfmqf"; + sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; }; }; "postcss-normalize-repeat-style-4.0.2" = { @@ -8147,7 +8156,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; - sha512 = "3wkb4bcky7wf9vs92wq6qcwldzxbnbnrww43fyb5i6vi66gzgs5xlhhm8m0na72hqxk08bzjcn52xwwz7vv7j6d2sl2p98chrss1y5a"; + sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; }; }; "postcss-normalize-string-4.0.2" = { @@ -8156,7 +8165,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; - sha512 = "1wg89sywdpnm8pck61g313d9igh8cpmqlgv6x6cdixgc98046irm7yq1nwygk5adz990q9h9frskbm358zkfmlgmcm7q3kvvyhi3ca6"; + sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; }; }; "postcss-normalize-timing-functions-4.0.2" = { @@ -8165,7 +8174,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; - sha512 = "3h7jmkpmrh0yw6w06k28dgfmhn4g4pbkr3p4wc3n7m8psd4z06q4193l59nha3wd3rf6w44j2qzilmb450x7gpgv7xgwx2yvrihkk39"; + sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; }; }; "postcss-normalize-unicode-4.0.1" = { @@ -8174,7 +8183,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; - sha512 = "311iz04wy12nd657s0l1hs8fm9550gzxjkig30cx6wyc7pxlcfraxfjkzdpi30nqplb9rz6k03y7wdnmvkhislzppz8j2dhmm97rpd1"; + sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; }; }; "postcss-normalize-url-4.0.1" = { @@ -8183,7 +8192,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; - sha512 = "1a19pc9bvl37skha2a49r50yvfxhg21idcz965v4ir6adhqvy27m40zvmbd27wnlq3djch92xisk6aas9znlk2sxlp7q81ybrl1b6m7"; + sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; }; }; "postcss-normalize-whitespace-4.0.2" = { @@ -8192,7 +8201,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; - sha512 = "2s0cgihhy92iqlwlsma7llzfnhi0yznf2n0d0bip7hgc3p182l9yywjjzynxah0m04i7xp146awmrzsjnicl7xzwrypl8zc18i11vxl"; + sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; }; "postcss-ordered-values-4.1.2" = { @@ -8201,7 +8210,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; - sha512 = "01rn75rgd2s1jx2q21jc4vhj7zbjzwma81yy5nzay11vs9vb3c9bimnyvab097ff88a77y73f2561cpxp9ax5qp9dppqsjl3rp8xw6r"; + sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; }; }; "postcss-reduce-initial-4.0.3" = { @@ -8210,7 +8219,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; - sha512 = "067nl9p2zm8v4vyxs57iz14gxd5vyjn8vqdf78z197zsp5abrvh65d3lajgj5a06gd544c0gqcc48964p80z7rkdyim9flljr3sd9c0"; + sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; }; "postcss-reduce-transforms-4.0.2" = { @@ -8219,7 +8228,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; - sha512 = "014hrwaf4hyzkglss6k9s77qg6d0ysdh1i71n49ian03j8b0kd1pjm9jzsyx4b436fqz6iz3x1l7pjngja32mwj5q29wh1naj1n4i8h"; + sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; "postcss-safe-parser-4.0.2" = { @@ -8228,7 +8237,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz"; - sha512 = "3b624jkq9r4n23xq425mb6s1wb71m6nvk8h2g9gyq3k7n12z99hb4viy8fnp3wiinxm7mzkpvzxhrkzmb4zvby4ga7v0d4n2j9rw3jk"; + sha512 = "Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g=="; }; }; "postcss-selector-parser-3.1.2" = { @@ -8237,7 +8246,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; - sha512 = "224wav8lxk3x5gjdxig09wdjnnkixl6j941a9z6y8w9dnr0dlgvjrrv36hadqkw12rfg5c483ij2lmpcydf63nr79r1bfcnkgzwkdw7"; + sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; "postcss-selector-parser-6.0.2" = { @@ -8246,7 +8255,7 @@ let version = "6.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha512 = "031v34kpl4kypkmy5bi46kk3n0dcbczavi0zlcy5r0pzaxc5432rmfjb3fjkap0vni5gh7gvahfr43wdd5ah9120b73933x3r0zd8yz"; + sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; "postcss-svgo-4.0.2" = { @@ -8255,7 +8264,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; - sha512 = "27pwrvcvx4w37dz649dsawii4q43znabznk1nqvza2y1lmd4av4mh5ddz68vagghih2k6505680w9l0pddzhwh08as5kh6min735b0b"; + sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw=="; }; }; "postcss-unique-selectors-4.0.1" = { @@ -8264,7 +8273,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; - sha512 = "2k15zwvbnbqb3diyrk5bbb38jdkyzfq2drvs16frm4ix432djb4y1c8r8p2c0blb6x170c1qjghb3lhc1iaxjlqq588ybpjm9asg5pq"; + sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; }; }; "postcss-value-parser-3.3.1" = { @@ -8273,16 +8282,16 @@ let version = "3.3.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; - sha512 = "34qs1g2jb9y7k8ydk013zqgkcmwclfa0n4f98kfpqbhczldnk5sbyyyj3zj7mmrqcahx3w9080g7ma4f1q58frlgiw4lmhvl3mq9154"; + sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "postcss-value-parser-4.0.3" = { + "postcss-value-parser-4.1.0" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; - sha512 = "2p1bcqas3ldbvc3pjzyic1w4kvi5hm5k1apps8vj0dpfw4nl6rca26i6fnjyy8qml78s2spiqn38sv1i2k7kwlc210yx7lddyj7if1p"; + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; "prepend-http-2.0.0" = { @@ -8300,7 +8309,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha512 = "1v427fxhwc53139189yd8i8y9vb41sm5arjs0ib2i0zbbf16f9bjpwdy44x5zi40r8gklq5xns92k3jiqg6i6w58xwamnzxwf3sncc6"; + sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; }; }; "pretty-error-2.1.1" = { @@ -8318,7 +8327,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; + sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; }; }; "process-0.11.10" = { @@ -8345,7 +8354,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "promise-8.1.0" = { @@ -8354,7 +8363,7 @@ let version = "8.1.0"; src = fetchurl { url = "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz"; - sha512 = "3fk4wirp8c5j0drwrlmr69qq3y3ribwfl36dzdaxprq26fd63j7hkmvm4vnnhg5203y40lbpd38sd0akkc8iwqm7pnbyf0bfam00kjv"; + sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; }; }; "promise-inflight-1.0.1" = { @@ -8390,7 +8399,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; "prr-1.0.1" = { @@ -8417,7 +8426,7 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "0hn7s5bxnn3k2hiqh8fmm7bvq4vd6j0a5hwj09jk31r1ylv6q28g5hl3z70m3gycwfb40vdp04fqi59hdjih3jz0fhszg0s5b7lx1s4"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "public-encrypt-4.0.3" = { @@ -8426,7 +8435,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; - sha512 = "3qnsvs746b98ifyv12qj1g6hl6fq25vip5mswhvn3gnl7r32fids6mw3jb0gdcqrrl5x9ik475sf0vx6mbhmif49idkwjwrhbr5lnnd"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; }; "pump-2.0.1" = { @@ -8435,7 +8444,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; - sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; }; "pump-3.0.0" = { @@ -8444,7 +8453,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; "pumpify-1.5.1" = { @@ -8453,7 +8462,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; - sha512 = "1sxm2mh7jmxhjqdrpdqrhc61ipk2cjyyyvsn9hmxlxnlpsasyzjdicl98pm63zv30012qhrxl57vdpdnnq2m2hl4w4ybgn7gqimjad0"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; }; "punycode-1.3.2" = { @@ -8480,7 +8489,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; "q-1.5.1" = { @@ -8498,7 +8507,7 @@ let version = "6.5.1"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + sha512 = "eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="; }; }; "qs-6.5.2" = { @@ -8507,7 +8516,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "qs-6.7.0" = { @@ -8516,16 +8525,7 @@ let version = "6.7.0"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "34x6fm4dnq8m0kps5ann831k8fvx7jzlrcw8vvri0ki2g2ywdrjr8j5y14bvj9c0fd01ndsyx43y6ji51bfhnxk2gr5fpsks52429sl"; - }; - }; - "query-string-5.1.1" = { - name = "query-string"; - packageName = "query-string"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; - sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; "querystring-0.2.0" = { @@ -8552,7 +8552,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; - sha512 = "1yd3j6k7rr39qm5zsh0k86znfksfcz9rbj48vv2dbsicnvvgzvw1vwl17vk2jlxszwqjiqsj9hy88r74wsdxf8by7a3wia2hk2cpdy3"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; }; }; "randombytes-2.1.0" = { @@ -8561,7 +8561,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "2cimbs750ysa2wxsiw9mmc1xqjb8w0c4s22p2mv2n676s8hchvzcl1l5p78jnk62d2jzacpr9zbl9w64kaqnipcbaa25q7ywn47g2dx"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -8570,7 +8570,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; - sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; }; }; "range-parser-1.2.1" = { @@ -8579,7 +8579,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raw-body-2.3.2" = { @@ -8597,7 +8597,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "3flyhj96ayiy8is22lwh9sp1yqq9ksym43x22yri2ikzladqqzxj6z657bc0xb5f2wl7qr2ja4byf57c9f7l2d3wqdglxih886zrv70"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; "rc-1.2.8" = { @@ -8606,7 +8606,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; "react-dev-utils-6.1.1" = { @@ -8615,7 +8615,7 @@ let version = "6.1.1"; src = fetchurl { url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-6.1.1.tgz"; - sha512 = "3gzi6h19w4dkr566jbw277xi1gvrq8r18x2b0wbz5zwjjj25gs0vr1p4kjyyx03351c2nkm09sfyd4l4j7lw8playqdwm98lzrwj5jf"; + sha512 = "ThbJ86coVd6wV/QiTo8klDTvdAJ1WsFCGQN07+UkN+QN9CtCSsl/+YuDJToKGeG8X4j9HMGXNKbk2QhPAZr43w=="; }; }; "react-error-overlay-4.0.1" = { @@ -8624,7 +8624,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.1.tgz"; - sha512 = "2viss03mfyx7xkwyfv6kj5p7j03wpjrq0qjkljc1w715n7q9xb8i0ixhy5vvwfibnsydgr0ib9wifx9bpwm5va808d4ylv40q61nxf5"; + sha512 = "xXUbDAZkU08aAkjtUvldqbvI04ogv+a1XdHxvYuHPYKIVk/42BIOD0zSKTHAWV4+gDy3yGm283z2072rA2gdtw=="; }; }; "react-error-overlay-5.1.6" = { @@ -8633,7 +8633,7 @@ let version = "5.1.6"; src = fetchurl { url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.6.tgz"; - sha512 = "3az1p6ci7r6nf917lkw5lr2plssa9ajmr3l3z77h6vyrsjwbyjbdw3zqzjlil7135bgbvgfg78a9qgmjnz02y5yas1qkv3q6k93wmjz"; + sha512 = "X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q=="; }; }; "read-1.0.7" = { @@ -8678,7 +8678,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; "readable-stream-3.6.0" = { @@ -8687,7 +8687,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; "readdirp-2.2.1" = { @@ -8696,7 +8696,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; - sha512 = "2yzl88bp25ig1xnrzqmqiwpfxyqkmdw27h3p90a4a58q0964xcijcx4i948msnlvin9f6hn5hmpxj1s90jzkj8aqxr5d04mmzr3z5fl"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; "readdirp-3.1.3" = { @@ -8705,7 +8705,7 @@ let version = "3.1.3"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz"; - sha512 = "3snxi021w9pg57mc4wmvpch80fscyqwbrbhwb8541kn7z6xray7ncg6ixykk7vx556lfjnyi4cx6dk0a6zcwk0yg4m6jfr3d561zsv4"; + sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; }; }; "readdirp-3.2.0" = { @@ -8714,7 +8714,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "0chzz12q3inpmwm6b4gi7g9n39jp24ah3mmjgss87hfsbx86vnxf49bx9wk2ng66037x2fh0cjf5rgx00c1m86lqlh7r6g9xm13ifbj"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; "readdirp-3.4.0" = { @@ -8723,7 +8723,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0cs2zxxilvxnj5n2726vpigp95pyc33q9qimcigd349sr2d3rfiqg6hh6qdraqmnw9fhky8zhl8071s58zp52pb5d2741nrbg9v85yk"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; "recursive-readdir-2.2.2" = { @@ -8732,16 +8732,16 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; + sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; }; }; - "regenerate-1.4.0" = { + "regenerate-1.4.1" = { name = "regenerate"; packageName = "regenerate"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz"; - sha512 = "0m5jil0f2yz4js80jxvwilkhq6im5h6h0pa4disk3fsv9lm23lz8ly5219518j47v4fn0h248s9jf5pqhxhcr6z5cmxvbnna0js6vnl"; + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; + sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; }; }; "regenerate-unicode-properties-8.2.0" = { @@ -8750,7 +8750,7 @@ let version = "8.2.0"; src = fetchurl { url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha512 = "225dbzqx56z4pkl71954di1140528vik4pc7q0zxw4k10k6pq5pdqdvhfry1cyj1waqjg4kacgzvnfxhz5wkhz37pnqybnabdiy7l0p"; + sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; "regenerator-runtime-0.11.1" = { @@ -8759,16 +8759,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; - }; - }; - "regenerator-runtime-0.12.1" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz"; - sha512 = "0g2nsc66ha0z9d4p7hxi0lhwqilbbg1ff6pz1mpzn8x4yvrg7zadvk08l4ph8h56156g82df6jjyg8nb2j5w7wpi4w5l3pgbxrlip51"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; "regenerator-runtime-0.13.5" = { @@ -8777,7 +8768,7 @@ let version = "0.13.5"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "2a918h23x10x6v446prj8l20irllscvw554hqk8r9pb9vyi7zk7fzcl0bq2dvc218dbpb3chdg9bxx06z7xs5pcrka2j5ja5bq70bk5"; + sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; }; "regenerator-runtime-0.9.6" = { @@ -8795,7 +8786,7 @@ let version = "0.14.4"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; - sha512 = "1pvch513p14nghc7cnlrrb0isf1sc97asa9nvvk5bq8jkvpilf8j2wqsv8r9qgxyvc15h9gz1c7n73yz1ndlczmlv56px28y0l5m8hi"; + sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw=="; }; }; "regex-not-1.0.2" = { @@ -8804,7 +8795,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; "regexp.prototype.flags-1.3.0" = { @@ -8813,7 +8804,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha512 = "24rfa56w9i13nr9hfwm8rnvnsji46alvzzm0m62ahpw6grjpvd4108vbar6i26cgr5vjj04rchzgkgwp4mynwsjcajm7rrxk05k9r6v"; + sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; }; }; "regexpu-core-4.7.0" = { @@ -8822,34 +8813,34 @@ let version = "4.7.0"; src = fetchurl { url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha512 = "1hpk2aqc7j93nmm07zq652k0cf1yhhwzj7mzxyqygcz5dxcr9kz5qci1izykg1j5gwzh7qa523jryqg4iqsvryqx9rsp7y835fhl3jd"; + sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; }; }; - "registry-auth-token-3.4.0" = { + "registry-auth-token-4.1.1" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.4.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; - sha512 = "3w8zjx5s044i7wr9bqqgjfkjawg0cajc9j9gmzkqs0i420algjvkd5k27j9pvhx1yq7nvdchsl96zcyjf64n14765q0f18y1wbkmcz0"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz"; + sha512 = "9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA=="; }; }; - "registry-url-3.1.0" = { + "registry-url-5.1.0" = { name = "registry-url"; packageName = "registry-url"; - version = "3.1.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; - "regjsgen-0.5.1" = { + "regjsgen-0.5.2" = { name = "regjsgen"; packageName = "regjsgen"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz"; - sha512 = "35ax8xcn4cw0g7c2295pqza2wg3mmym2dxii4rnlsfgb5ppdr5zxg74wr4hg3cxyhr8qbfirl4rv9968bw4rxrlnwwdrcy3k0cp7b76"; + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; + sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; "regjsparser-0.6.4" = { @@ -8858,7 +8849,7 @@ let version = "0.6.4"; src = fetchurl { url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; - sha512 = "0ksbypdbmkzwvi33jcx15lh2h1x3zxl311702paqw4fkjc682zbkqjsh970jd0z9q9la8454p5hd6li40pahl7lygj0f3jgyzpvr0zb"; + sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; }; }; "relateurl-0.2.7" = { @@ -8885,7 +8876,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz"; - sha512 = "0cg3aidnv7kgvxnn1a17s6mzzvvjgr9vsqsdiaim8cz89w8vvjin44668r3xgvbp7zdplcifn5w118bzl3p5rr9q3116r64kr18ph6g"; + sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA=="; }; }; "repeat-element-1.1.3" = { @@ -8894,7 +8885,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "3dbpfrs4yh7dd9572m6dc8cxcgqacnvd24xm9licnw1hygqv51a18a84gm04sjssajbm437rq01raggrzmnzk4jnmbnxrnmk78sl4ba"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; }; }; "repeat-string-1.6.1" = { @@ -8912,7 +8903,7 @@ let version = "2.88.0"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "2339w6v6d7n7pj0085vkfvk0864gs8kfh1kghbl3smj7s21ny3k265in140frsaipc6bvqbi4k696ic4z13d6a56dfvc653p15822il"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; "request-2.88.2" = { @@ -8921,7 +8912,7 @@ let version = "2.88.2"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "request-promise-4.2.5" = { @@ -8930,7 +8921,7 @@ let version = "4.2.5"; src = fetchurl { url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz"; - sha512 = "0748za8mwvj5605cgqxn24sydig74m341wi9x04dar6xid0jmlwdjy0k4haf838p05w1jf79a4r7p4y59n2i7yfmflxj5d45jjdw2b6"; + sha512 = "ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg=="; }; }; "request-promise-core-1.1.3" = { @@ -8939,7 +8930,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "00riv5nw32j70g67b1ll1h599bvdbnkgasnwl1m26pfdgdmgr6zaq500mprx5n77yrnhza27vs3c9icb4z5h6wnwmlha6f81bw3d2s0"; + sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; }; }; "require-directory-2.1.1" = { @@ -8951,15 +8942,6 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; - "require-from-string-1.2.1" = { - name = "require-from-string"; - packageName = "require-from-string"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"; - sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; - }; - }; "require-main-filename-1.0.1" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -8975,7 +8957,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; "requires-port-1.0.0" = { @@ -8987,13 +8969,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "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 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "resolve-cwd-2.0.0" = { @@ -9047,7 +9029,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz"; - sha512 = "05s3yp7f127kahmmajjyy5fbgvpz4b1d2dfhbv0ifp2b7yw6f1xj2f3vvw7ni08dlhfm37s6hmqp9v8w3xzml8fcxnda1skf6xkqzn4"; + sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw=="; }; }; "restore-cursor-2.0.0" = { @@ -9065,7 +9047,7 @@ let version = "0.1.15"; src = fetchurl { url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; "retry-0.12.0" = { @@ -9083,7 +9065,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "37z410bxpvfjlxmd0rfrzmvd4dl33kqqgi51xp8hbbxxwzdddy5q1b20x9msvqhxvhj93w85fr2hlizsi7rfx91j3gcyzdpqvrwgnak"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; }; }; "revalidator-0.1.8" = { @@ -9119,7 +9101,7 @@ let version = "2.6.3"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; - sha512 = "242p51rnhbah4ip4k2bqgnn5kx5v7byi6rd7jphxh7g92y8wh523zmqdr3jzyzr156p98kx7igb3mhh3l3fmf1iga06l0zcjmdrw2lv"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; }; }; "rimraf-2.7.1" = { @@ -9128,7 +9110,7 @@ let version = "2.7.1"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; "ripemd160-2.0.2" = { @@ -9137,25 +9119,16 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; - sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; - "rsvp-4.8.5" = { - name = "rsvp"; - packageName = "rsvp"; - version = "4.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz"; - sha512 = "2wdl1qh3bdrji9q0whkrhj7gzryfipskamagkg5dq54phmg5c7ifp8va0b8saxs4xmi6c5mlvkh6gbk6r4nqrld4v8ykx5f0ja0xwwx"; - }; - }; - "run-async-2.4.0" = { + "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz"; - sha512 = "2k7xr99g0l8qvqzd66mpwp3wylfay2i27dh5ca3bmr92l5yixlk0dh53z9ljvyrm3mi7jz89il8gq55sgdv8d8p0v96wbkvyy3xp564"; + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; "run-parallel-1.1.9" = { @@ -9164,7 +9137,7 @@ let version = "1.1.9"; src = fetchurl { url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc"; + sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; }; }; "run-queue-1.0.3" = { @@ -9182,7 +9155,7 @@ let version = "6.5.5"; src = fetchurl { url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz"; - sha512 = "0csbv2i7lf85kcn3x59ry96c41zx735f8mmaqzid9vp7xz072bxma44arky971djavsjqkdgss4igp4ljwhbgx81psdg198b3xhix2r"; + sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; }; }; "safe-buffer-5.1.1" = { @@ -9191,7 +9164,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="; }; }; "safe-buffer-5.1.2" = { @@ -9200,16 +9173,16 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "safe-buffer-5.2.0" = { + "safe-buffer-5.2.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; "safe-regex-1.1.0" = { @@ -9236,16 +9209,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; - }; - }; - "sane-4.1.0" = { - name = "sane"; - packageName = "sane"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz"; - sha512 = "1jdy0h2kdi5d2lnxafnbxnqssf306v0pffvw10jspi9v899n7rxknzs78k7nnrgy1mgyfragq91y4ci7z7xksbp92xw6py80h1g65l6"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "sax-1.2.4" = { @@ -9254,7 +9218,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; "schema-utils-0.4.7" = { @@ -9263,7 +9227,7 @@ let version = "0.4.7"; src = fetchurl { url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz"; - sha512 = "2fx9w14jysc2biw8niqw9cjrw8y73qnrlx5p4l3ksw1k4j3jsnm4lbkkqlckyij6d8fhjl69hzv64cyzwnwlgdm3ny65h1gmi9v1y5z"; + sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ=="; }; }; "schema-utils-1.0.0" = { @@ -9272,16 +9236,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"; - sha512 = "3kgnvyq6cxrlx9xwba75z4wp364mf4y4d66d92zwhjdw8nqg5jxzp1bfl6n5srl0aircw32nmry28a4476cpb3ijqzz78hars4wqvlb"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; - "schema-utils-2.6.5" = { + "schema-utils-2.7.0" = { name = "schema-utils"; packageName = "schema-utils"; - version = "2.6.5"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz"; - sha512 = "14vmb36crpgskhlwsh3ip0vss6pq08pa5lajyvxa968a61nj2qjva4ww0grfhd3ygzxanwb8v31n1grfd6gs8qz3vav8hp2mk0fx9g4"; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz"; + sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; }; }; "select-hose-2.0.0" = { @@ -9299,7 +9263,7 @@ let version = "1.10.7"; src = fetchurl { url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; - sha512 = "165gijv79k6g333d52fwfnna4z0myalk0cywvf9b6pysjfwlib4cvldycwx6yiiy099v9s0yhgvhq1sn21dqy7r85kq4n6y5h2g1kgh"; + sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; }; }; "semver-5.7.1" = { @@ -9308,7 +9272,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; "semver-6.3.0" = { @@ -9317,16 +9281,25 @@ let version = "6.3.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "17wg4dv63jhss5hwqd135zz67r5c30b7a1xz33kfa7knxr0wfypyb8mj2xmc3l71qkxrz569n89xwp5d77m7adn0sr5wzfjlh2m6zvg"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.1.3" = { + "semver-7.0.0" = { name = "semver"; packageName = "semver"; - version = "7.1.3"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; - sha512 = "32cdpngjcravgf06jc8ny0d3qq8q5a9llmlxvnafjlgqxj6g5l088cx2w27c94rahds21zph8in4b67c5yxk6n2js0j1xc0z36k8hvs"; + url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; + }; + }; + "semver-7.3.2" = { + name = "semver"; + packageName = "semver"; + version = "7.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; "semver-regex-1.0.0" = { @@ -9353,7 +9326,7 @@ let version = "0.16.2"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; }; }; "send-0.17.1" = { @@ -9362,7 +9335,7 @@ let version = "0.17.1"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "016qgvxg1si6vn34p7piyc8mhvmav1zscm294wkcjf221y1l9zk5kwk5z6yn1ixspj12df25bpazb2h3fdclcf59xqc2h4w46r4mi86"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; "serialize-javascript-1.9.1" = { @@ -9371,7 +9344,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; - sha512 = "3a0kvzr1rq0l6v4l587sv58i0xgajs9863srkhxxlzq3dk5mj8r5sag4yyxfidzsbwcbygbg7wdm2nja97kg5n4y9plxsl9hpkzymni"; + sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; }; }; "serialize-javascript-2.1.2" = { @@ -9380,7 +9353,16 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha512 = "26vhlfjji0jk84cvbcpna4h1nfvdwj19g7rjmvz9mzlm277cpgz7xw9q61yrp3x4amas66fxrz0p2rrndv737j4imw4a5ql0614xkxf"; + sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="; + }; + }; + "serialize-javascript-3.1.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz"; + sha512 = "JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg=="; }; }; "serve-index-1.9.1" = { @@ -9398,7 +9380,7 @@ let version = "1.13.2"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; }; }; "serve-static-1.14.1" = { @@ -9407,7 +9389,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "0551vv6s1vgk5krzdn9cwnybsv6g4cyqpkk1dlkyv1pd8n7m8r7pi12r16bw12dzwl6ghj4qwizjsxc8vl26lv9c61fkq9r059yzji4"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; "set-blocking-2.0.0" = { @@ -9425,7 +9407,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; - sha512 = "15idn47lw67wfq0qfva85xnphqxkzz5apix6gwcnylmqw4ch7bqhq4vzdh53f327agpcg6pdzkbj8m72wm887wd8lqaydw20zbxq497"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; }; "setimmediate-1.0.5" = { @@ -9452,7 +9434,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; }; "setprototypeof-1.1.1" = { @@ -9461,7 +9443,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "01qxzb0a6jrcxa6qh776v04ihqrmcy3qfbp9drfsjhfcsmaqd21mppr3ndj970ixfh6bpm8ai45jyqyzjfjw26pcyd82y6pyrcl1xr6"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; "sha.js-2.4.11" = { @@ -9470,7 +9452,7 @@ let version = "2.4.11"; src = fetchurl { url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; - sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; "shebang-command-1.2.0" = { @@ -9488,7 +9470,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "066cirpvgdn5ywf1lpad9wrzkbk19mdwm662mk09mhlsw16rigayybrp18jna89zbqw06v43nnpbxjzxcx0wsnxmikdfqk96vdnnz4h"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; }; "shebang-regex-1.0.0" = { @@ -9506,7 +9488,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "3a1nivszhfclgwknyblqnd1nis1i1g3v571pbrhrf2dhpdbnkliswcw10s9k883cnxk01xd2z26x0s7qg0annp0vvwpvisw3cb9vvzg"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; "shell-quote-1.6.1" = { @@ -9524,7 +9506,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "26893dbicabdw7f4klf18aiw4r88b8ndc9rchbpsaxb3ibvkk37gkffghac7g62clqkhk7szyfwnfxcsfs23wcjq6qm6lxwa3s7hhjm"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; "simple-swizzle-0.2.2" = { @@ -9551,7 +9533,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; - sha512 = "3sbrc1b1qf9m7lhlljmnc51k9bl7jbc9zfmdc4z55iafsck65d9ll77bifknvgvgbc0f0a7cvm1b785ab5d1avm27lm7kvnd3fs30k5"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; }; }; "slash-3.0.0" = { @@ -9560,7 +9542,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "3cj4cvlh36f0h6f3dslbkwa3y9nnny8qmwbf4kw3xy8vfbg5mypknds3j2cdhf7xg82hm8smdl8cq88xn4nyw1b9677xjwvly2kbm43"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; "slice-ansi-2.1.0" = { @@ -9569,7 +9551,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha512 = "2hri697iq2zbwfqga7889i00ry55xb9zj48wf292qn7wk0dyl2ymd1bjph6a79glqyhj4lajd4fyhmxmqdhnpxd55fvjq1hf45rbvs2"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; }; }; "snapdragon-0.8.2" = { @@ -9578,7 +9560,7 @@ let version = "0.8.2"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; }; }; "snapdragon-node-2.1.1" = { @@ -9587,7 +9569,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; }; }; "snapdragon-util-3.0.1" = { @@ -9596,16 +9578,16 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; - "sockjs-0.3.19" = { + "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; - version = "0.3.19"; + version = "0.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz"; - sha512 = "0pn77r3rgi2blxla6ilhf4madx8n0cprzb295mw5knx2hyhiwn60z8n8n8clsb1l0wddcrjj5x4rn24ydf2wnxbrn63xwb5lsa293sp"; + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz"; + sha512 = "SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA=="; }; }; "sockjs-client-1.1.5" = { @@ -9623,16 +9605,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; - sha512 = "3pa683q7x6az2iwmd2bh0d2zwdkgklkfi4vpkwnxw4b49mgfdjkal83i9lzxlz6f6sqybyvb0mlyw0mmg9mdd76fawvi7izxz48ndp7"; - }; - }; - "sort-keys-2.0.0" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; "source-list-map-2.0.1" = { @@ -9641,7 +9614,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; - sha512 = "0izwdwncwz4s14qn5ahkb2mpcdpxq2arn5185dlhljns4nylsw2xfm425zi115ik4kz1vfa97qyix3vf3i149dyi1ndq61iaf0knx5a"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; }; }; "source-map-0.5.7" = { @@ -9659,7 +9632,16 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; "source-map-resolve-0.5.3" = { @@ -9668,16 +9650,16 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha512 = "2gq1flmkac2lzw8rs6vpch0sanmv8r9gv6bggwkgxzj3n7gw33lbqzk7nk9vvsckdjjkm132jzbl3nxc69cf9bb7xz4wnhpgd3gxp0y"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "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 = "1ayqxcigra517ylxbrvri7jlw55cv0m6a8j9j6060c5xsh519ip69jjp4jk6bqcj5ra5y318k6la6lfhpsj0k8hhkyw1szbj128pz3r"; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; "source-map-url-0.4.0" = { @@ -9689,31 +9671,31 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; - "spdx-correct-3.1.0" = { + "spdx-correct-3.1.1" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn"; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; }; }; - "spdx-exceptions-2.2.0" = { + "spdx-exceptions-2.3.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r"; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; }; - "spdx-expression-parse-3.0.0" = { + "spdx-expression-parse-3.0.1" = { name = "spdx-expression-parse"; packageName = "spdx-expression-parse"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; "spdx-license-ids-3.0.5" = { @@ -9722,7 +9704,7 @@ let version = "3.0.5"; src = fetchurl { url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; }; }; "spdy-4.0.2" = { @@ -9731,7 +9713,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; - sha512 = "2h06dvjrd0vv66jpc6cnrkvbvihcfvr325dkpbif6kxnvn8zvgpvgj748whffn0sc0lk87yd8l8k6k595fvwbc2ysjy4msh0rjs13mg"; + sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; }; }; "spdy-transport-3.0.0" = { @@ -9740,7 +9722,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha512 = "1rha3zyhardm434kr4h4y44wxpd49hqzzxqk1d9lqg91bkzfbp6qkh9nahdkkmpgbkc5021x8c8cy1aqnaph5ib1a9hx32j9qadbhl6"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; }; }; "split-1.0.1" = { @@ -9749,7 +9731,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; - sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; + sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; }; }; "split-string-3.1.0" = { @@ -9758,7 +9740,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; "sprintf-js-1.0.3" = { @@ -9776,7 +9758,7 @@ let version = "1.16.1"; src = fetchurl { url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "ssri-5.3.0" = { @@ -9785,7 +9767,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; - sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; + sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; }; }; "ssri-6.0.1" = { @@ -9794,7 +9776,7 @@ let version = "6.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz"; - sha512 = "107yg08ib4232ppannc6fw8ml8p1fssnvcf88cpq3s5ybq3r5ppxnmc32rp40i0ppbgxcw9q04d5rc90if0q3xyp953swad93biws6x"; + sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; }; }; "stable-0.1.8" = { @@ -9803,7 +9785,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; - sha512 = "3mw0cg71gcp6hfg3x0snaxcva4yqnifs11vbs3ba4agmcz8njmz70ndk5d8z97441jdvjhvb8aq8r44ngd8z4iw5hpgfmff372nlbwf"; + sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; }; }; "stack-trace-0.0.10" = { @@ -9830,7 +9812,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; }; }; "statuses-1.5.0" = { @@ -9857,7 +9839,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; - sha512 = "2mfvadpwj9mzxps4arl1frxlkz96hfp0sc5pvq76s0ijf8fgw26mm3a721zq3iz1f8155w3a41wkixbdlwn1cavv0mzics796da2zlx"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; "stream-each-1.2.3" = { @@ -9866,7 +9848,7 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"; - sha512 = "0pxki70s41jg18b738qvcwxlcakp6658ksicxkcgg8wp9q97fwp3mv13c5k38k47vxkyyk951k7gzavs3r7b93ackdyznh8zzch4lxy"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; }; }; "stream-http-2.8.3" = { @@ -9875,7 +9857,7 @@ let version = "2.8.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; - sha512 = "19y2xbs1xzzpjwfdczl21d0d76ahd7013cr3mhfa6a8nbwwv9jpncng8idf0g8hnmnq2mcl3xh912rjlasl06wsz44qw3j7hdya8d7r"; + sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; "stream-shift-1.0.1" = { @@ -9884,25 +9866,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "1ai59bc5x8d6a1c37fp2d2gi6q7x6fhza2jsf1sblrdvbza8j14a4xnp20lg65b8lzm0s95m3pqizblbj6ks44qf73gdllhbahaqa02"; + sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; - "strict-uri-encode-1.1.0" = { - name = "strict-uri-encode"; - packageName = "strict-uri-encode"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; - }; - }; - "string-replace-loader-2.2.0" = { + "string-replace-loader-2.3.0" = { name = "string-replace-loader"; packageName = "string-replace-loader"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-2.2.0.tgz"; - sha512 = "134pqnxfq8nmn7k4q06xwvd01cw8009gzr8nlmh071l1qcnvf1cg2km2r3z3rx5ahdw0mvjpls45wlwn3wdzb8v0nfmbi9y5xj7hjsj"; + url = "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-2.3.0.tgz"; + sha512 = "HYBIHStViMKLZC/Lehxy42OuwsBaPzX/LjcF5mkJlE2SnHXmW6SW6eiHABTXnY8ZCm/REbdJ8qnA0ptmIzN0Ng=="; }; }; "string-width-1.0.2" = { @@ -9920,7 +9893,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; "string-width-3.1.0" = { @@ -9929,7 +9902,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; "string-width-4.2.0" = { @@ -9938,43 +9911,25 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; - sha512 = "1xbbkr5nbg13x7hdllv0fd9a9b15b6ddzi41aswxpil3rd3yvjclpyk12p7wman4s8dqrvavgfmamdq764c089k1rpap0md7wjgjk6d"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trimend-1.0.0" = { + "string.prototype.trimend-1.0.1" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz"; - sha512 = "181zx0q2zkix0hnlhji6z79wdzp5vzp992c1bv2h0gxmcmmyxy19xj184fjvljlncnic3mhv95vn559s8iwcljfhg4dgi5zlqd6fhhh"; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; }; }; - "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 = "15qfz59cpsj9svgvcs24q6h47jfy5zfhg7dy3b8ik3nvf97vhvijy8d51vrprx4z0vfyscg7i2xv9qs960h1pvnmzm1n95m6svk8840"; - }; - }; - "string.prototype.trimright-2.1.2" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha512 = "0b5kvxgqr55r745bccsjz35w9galqf42rm3lf5f4p2i21c4yq5l0fz0s03z4gq1d7yi52i3x6n8fa1n3fhlplc8d49vlaipqvp51m34"; - }; - }; - "string.prototype.trimstart-1.0.0" = { + "string.prototype.trimstart-1.0.1" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz"; - sha512 = "3ir4q4zbjch2mkkxdn1xq5xb939s03n958b47bs6gkkds4dhljw6w4529vml982kdrf0iiyib54nrnxviaipw790ji8h5ad9n1zq8w8"; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string_decoder-0.10.31" = { @@ -9992,7 +9947,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "stringify-object-3.3.0" = { @@ -10001,7 +9956,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; - sha512 = "2pk4j3smpmlm6jkpqqaqwh2jks1hmg5rfk9kqd9msxm5dh5zlf5c2j0m2khy8iajf65f9zr13zy03yi10pj1jv3yn8a15jy3lba4ymc"; + sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; }; }; "strip-ansi-3.0.1" = { @@ -10028,7 +9983,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-ansi-6.0.0" = { @@ -10037,7 +9992,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "3mjvs0jv5m5npyr79f0br9kc7nr52ghv6p8gnkmm25adgr0psxalfzlanvzbnqfn87jf6vspvbx2r30px94fnyb446xch6zni7cmsq2"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; "strip-bom-2.0.0" = { @@ -10055,7 +10010,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz"; - sha512 = "0bln256gbzpmrbc1hg4pwkfh9vwncdzgdr6h3bhkmilz5syb1rlsk9rvc6kjqbh6rfhvqv7jwdnppsfdnpdg58444r1mviqaxm7pgwh"; + sha512 = "kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw=="; }; }; "strip-eof-1.0.0" = { @@ -10073,7 +10028,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha512 = "264panbfx7nxdqgcsb6x1gk226kifd6zpksjmdbjp2xsjirbr91gkcj51ssy2j225n8vd1rjj6wlf4vdqaxyrdrmcpxgp84s1y6zfh6"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; }; "strip-json-comments-2.0.1" = { @@ -10085,13 +10040,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "style-loader-0.21.0" = { + "style-loader-0.23.1" = { name = "style-loader"; packageName = "style-loader"; - version = "0.21.0"; + version = "0.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz"; - sha512 = "33b6cg091mx8mgafvf8d1815mc55w3rqk0527z2l536z5ipprjwkdpm62qyi71snx625y2kqpr6nqfvvmdv7jn30qz8ip950yq0vrag"; + url = "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz"; + sha512 = "XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg=="; }; }; "stylehacks-4.0.3" = { @@ -10100,7 +10055,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz"; - sha512 = "3zfkv97pqkc0k51zsjb6dbyhs1lnf05c4vik7klpyzv7chdqqc49038hlm4rpskfy4nhmpjaib22qqzkfwzx6lfw5c4k53hsa9lnsgc"; + sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; "sums-0.2.4" = { @@ -10127,7 +10082,7 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; "supports-color-6.1.0" = { @@ -10136,7 +10091,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; - sha512 = "30pwyjmww4d54bf2m6lpw20ly4blhb88sy3gn6qcjih2rfq1s5zsl1nszzwgj2j1gqn3c8mw52df0z26rqyk8flzimb70scdmz67vd9"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; }; }; "supports-color-7.1.0" = { @@ -10145,7 +10100,7 @@ let version = "7.1.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "3k12babask2rk5v9n9wdgng00rqac2w5wwvkawlx3brjpqvfpy4j70650ggw5pa7bm5hnn1ppsppsqrcwrvjsk1mxb3vi993yjqh551"; + sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; "svgo-1.3.2" = { @@ -10154,7 +10109,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"; - sha512 = "1biic6k5zbjbibabxnqg6cs0hz8vb69zb4kjgwh6nwxqigx23m7gaggva58cpqp7z2a403q9n1sqlfm6yx660nz1dj90iri0sqvy76a"; + sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; "table-5.4.6" = { @@ -10163,7 +10118,7 @@ let version = "5.4.6"; src = fetchurl { url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; - sha512 = "19b85vbk5rflp8b200akryyzrk92yj7v2pk64mmvy3y00x7ibfcbiqwmba2q14h9rvfsj9bxvmvyfxma4hswy8bw8dpm3hzdvr1qqf2"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; "tapable-1.1.3" = { @@ -10172,7 +10127,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; - sha512 = "283f6rp3hhj0lvi5smcvh4mq56mifjchgv6qlnr4qb1xs2fsyb2vy71b308h1285nngcz8q7cbmjp8qqzh0im71mx5wr3v6hrnvyqp1"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; }; }; "tar-4.4.13" = { @@ -10181,7 +10136,7 @@ let version = "4.4.13"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3"; + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; }; }; "temp-0.9.0" = { @@ -10190,7 +10145,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz"; - sha512 = "36zr3d39z8wdb7v4z9inkii3cd1qsc49bf8z2s4ic671dlf2aab95w9z1lg9fivbvwd9cbpghxvfgiz3l3jb1fzwh2d984900yj3xb1"; + sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; }; }; "temp-0.9.1" = { @@ -10199,25 +10154,25 @@ let version = "0.9.1"; src = fetchurl { url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz"; - sha512 = "1w4xzn45b7a3qd9vvwfc80ah8xnbvdw8ng5jfhkdivs7kxc1wyjvlf6zza2wgkf3s7av5izd1bfjazahx3i79cy8zwidmws5f18xjsq"; + sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; }; }; - "terser-4.6.10" = { + "terser-4.8.0" = { name = "terser"; packageName = "terser"; - version = "4.6.10"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz"; - sha512 = "16fv61l1ffv807q775lmwr3bffdh60399bcz3jgm32n4g607madq6pk3vhv2kfisgz4lvivihpvxbixl5nsmv66hbh53mx88gfpzcd9"; + url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; + sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-webpack-plugin-1.4.3" = { + "terser-webpack-plugin-1.4.4" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha512 = "2n44cgqgz070skn207m3l6zg3q444p1db54g0j87fcjxwyhmlfvgg3kak5v1ffhg765cdxah1l99kjdcy74mc75nlq7907zbiq5xk20"; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz"; + sha512 = "U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA=="; }; }; "text-table-0.2.0" = { @@ -10253,7 +10208,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; - sha512 = "14xi6lbly1f37015ny2pzcnf5kaksjmpnhm61gfhwn686w5ac519qb1icxdda974n84f342g0y15kysj1hci2vl40z91aiivyhx2spy"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; "thunky-1.1.0" = { @@ -10262,16 +10217,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; - sha512 = "2n8ys98dmv1625inb52cdr421ry82ri2sninmss1njzy9hxrlblw3fkvgr3na4d69glygww3g80bj4pgr9ik1zcm10ki0gd2yf3nxkq"; - }; - }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; }; "timers-browserify-2.0.11" = { @@ -10280,7 +10226,7 @@ let version = "2.0.11"; src = fetchurl { url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha512 = "0lrwqck7qvpvxswx5kmydj9nmn2rwckzzfpdf5mf869fqrs9girj45i80hdv99b81m4g8fgwqx2lqk04k7zars7rldq3r89r3m9aipb"; + sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; }; }; "timsort-0.3.0" = { @@ -10307,7 +10253,7 @@ let version = "0.0.33"; src = fetchurl { url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; "tmp-0.1.0" = { @@ -10316,16 +10262,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz"; - sha512 = "0mygbkw1yiz5b0mvdivsmwfaw12w70fjvgd3mn2wny7ggrx69swy5kj11xm3llrv98slhjx9d7pmcd8aa94492r0cfnfv139wmpddi7"; - }; - }; - "tmpl-1.0.4" = { - name = "tmpl"; - packageName = "tmpl"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz"; - sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; "to-arraybuffer-1.0.1" = { @@ -10355,13 +10292,22 @@ let sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; "to-readable-stream-2.1.0" = { name = "to-readable-stream"; packageName = "to-readable-stream"; version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-2.1.0.tgz"; - sha512 = "3pw9wwllhic73ya7g935mwmw4lrjwxf0vxxngs5iqbwlasxbrv506bas7sqqfmmmf7p9lx0g907ihysaxivv78ln8bj3m5067l1lx53"; + sha512 = "o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w=="; }; }; "to-regex-3.0.2" = { @@ -10370,7 +10316,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; }; }; "to-regex-range-2.1.1" = { @@ -10388,7 +10334,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; "toidentifier-1.0.0" = { @@ -10397,7 +10343,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "1bip1yxcfy4c0yl2kwmj9jyzfg1ixyj564wd1aaf46rabdiasx62yznb8bwn9cki886f353axgca42zma7q9rb4b50lhm1zz7y8g8y9"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; "touch-3.1.0" = { @@ -10406,7 +10352,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; + sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; }; }; "tough-cookie-2.4.3" = { @@ -10415,7 +10361,7 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "2akhyixx49dkqadghzwj53xwfa1aikf0iv04ib9zj0kbilkzxxh16j5c6vfkcwm3cy29y46q3d8lzinsy6ql2cvb1wcw31gzs9jp6s3"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; "tough-cookie-2.5.0" = { @@ -10424,7 +10370,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "traverse-0.3.9" = { @@ -10445,13 +10391,13 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; - "tslib-1.11.1" = { + "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; + sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; "tty-browserify-0.0.0" = { @@ -10487,7 +10433,7 @@ let version = "0.10.0"; src = fetchurl { url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz"; - sha512 = "25w8hvjk21iqndawz9h3713dmahzg2w3nf4ipfkgfnlhzk1jdlq2jadyd6lr1sgidbyxbp97mcgci1zw4qd6b0gjvqglz9cis77si8i"; + sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; }; }; "type-is-1.6.18" = { @@ -10496,7 +10442,7 @@ let version = "1.6.18"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; "typedarray-0.0.6" = { @@ -10514,7 +10460,7 @@ let version = "3.3.10"; src = fetchurl { url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz"; - sha512 = "31s7k004qjdb42cavkpgszzvz9zm3aw2iv80k1hrykx202x9wb03451l58fhlba1spjgpdq96w7vm6rvavkcwrxj87aynxkq25czz5c"; + sha512 = "rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww=="; }; }; "uglifyjs-webpack-plugin-1.3.0" = { @@ -10523,7 +10469,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz"; - sha512 = "21rq1kl3wanb1w9jp90w5m1anksk2rffnls8sk324lqwwvhyskh64443jm1ixdl5zjf6717khdp3xm23388yyzz1ximqch03mrciwd2"; + sha512 = "ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw=="; }; }; "ultron-1.0.2" = { @@ -10541,7 +10487,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; - sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; + sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; "unicode-canonical-property-names-ecmascript-1.0.4" = { @@ -10550,7 +10496,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha512 = "2frn6cxiqmhndpdcmrcd2590rx0b4bhn4pvqag2kgif3pqnw52622lpwd0jzz5a9h9jg03yb96m82zf8vvcfrrni43qlxw7fnfwsflc"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; }; }; "unicode-match-property-ecmascript-1.0.4" = { @@ -10559,7 +10505,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha512 = "2p78i127lk184hfbwyzd4xy6hrgg5gz8s3raf83pqx59rqk2dg339m7dnbi4pvysf7390jpnz84ds8ylwxdf3vynbnzjkbgbs3ji11g"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; }; }; "unicode-match-property-value-ecmascript-1.2.0" = { @@ -10568,7 +10514,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha512 = "0hxphkw10m0pz129gv1ngjcj5yaw6qk2zvdbx4yp5410lk15pnb7xs2s0gp469650zk66ydd8xp6kicia258vpx4s9gk88mchf90fy2"; + sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; }; }; "unicode-property-aliases-ecmascript-1.1.0" = { @@ -10577,7 +10523,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha512 = "112w9mql1a57imkl581n0gx21pycfl0cdh5zsfmwxhmv4ipn7g8icjqlvqjsgi2vhahldq2i69qial99fa8ys4qv98fnng93wzai91y"; + sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; }; }; "union-value-1.0.1" = { @@ -10586,7 +10532,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; - sha512 = "1g7i0bs3sa35zpsrr2l3wsz4j6bqpxgm77kg2fdz89irzw6nrk6j93j61wr134mg9rbf039xa4pp1dw0iqfsv15rkf8jn8y2fdxg5xl"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; }; "uniq-1.0.1" = { @@ -10613,7 +10559,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; - sha512 = "0sp2fs9gsv3l6mc9kdk09z835d54gw04x02dlz9q208mda3f6bmqd4vix4634kv9njvvxcz3iswcj6fwcmszvima7wpv5knia678sjn"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; "unique-slug-2.0.2" = { @@ -10622,7 +10568,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; - sha512 = "3dz3f3rqwqssr86c072j9m8m7l98l20b3i75diqrq5l871d647jmdf7pjjml7l83iqvjnb2frz7h6xbs8rpx3rkvk1h5i6swvsap1ff"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; "universalify-0.1.2" = { @@ -10631,7 +10577,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; "unpipe-1.0.0" = { @@ -10667,7 +10613,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.0.tgz"; - sha512 = "3j7r4r1rzgz3kisp8d5jk1sckr8f9jxz4ln29wfkl139a6p1qpr4s6cm9581fscqjwc71fqafd4584myll8z31arz3ps8a6qzy62v9l"; + sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A=="; }; }; "upath-1.2.0" = { @@ -10676,7 +10622,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; - sha512 = "230pbhzxv0jr9n43qhghbsdbsp1rwalc3rclaqscwjaazi35s6vzw9p66s3ypk6yn3jgpmqflda2yh8j2rlypz9vihasfw5m6jhd739"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; "upgrade-1.1.0" = { @@ -10694,7 +10640,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; }; "urix-0.1.0" = { @@ -10721,7 +10667,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz"; - sha512 = "27fp8dsaysmpx7yh2xnc15wngi1qk2n859q75hqjfxaskswh0hl5qxjz7mkk3hrz4v2lf516zfxw5xqd76lvb66pgm165iwdhmf8wbm"; + sha512 = "dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg=="; }; }; "url-parse-1.4.7" = { @@ -10730,7 +10676,7 @@ let version = "1.4.7"; src = fetchurl { url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; - sha512 = "2bdb8rqxq8xd530jx6q8awb1y9idrvd8cfznrlyc1h8j4ra1icxcssfg7qldhssj6dxvibkvx6rnn1ljkjbxi95l58dn1y35ibrlyvp"; + sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; }; }; "url-parse-lax-3.0.0" = { @@ -10757,7 +10703,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; - sha512 = "2hzzynss1cv7kn1lf40hqk16qmbf38g7a28m27pcg05mg6vpf7sj0gy175fdscz534fxdi14622rmq3sdpib9c5ypjympjfg5ai40bk"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; "util-0.10.3" = { @@ -10775,7 +10721,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz"; - sha512 = "0fpzl6qczbzr5jniy99vgfxz1k4gdfl13lwwhlfysj22rm18ikfici89wpgv34v67ckays1d500fgk2dlzw95zncn9jvkdygjr40a0x"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; }; }; "util-deprecate-1.0.2" = { @@ -10793,16 +10739,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; - }; - }; - "util.promisify-1.0.1" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz"; - sha512 = "2n8sxd1qdzc7pn348ayx8jm13kvi9wyjkshzwy1fam3aiy8phv8lbikbli433qvnq3ndnqj8yhcf9dgavm2xv6cvzk7cyy7zl5nkll3"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; }; }; "utila-0.4.0" = { @@ -10838,7 +10775,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; "validate-npm-package-license-3.0.4" = { @@ -10847,7 +10784,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "vary-1.1.2" = { @@ -10865,7 +10802,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz"; - sha512 = "3gn1qs4d8i7gd3qakdk95wn5a5sq2y2nw9zmm6v9fbxi31slyfj9b23m9w5m7qv7j73h936ln9z2i5nwg0kzf6bvar80bqkk7mqcfzy"; + sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; "verror-1.10.0" = { @@ -10883,7 +10820,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"; - sha512 = "00japcjqx1df1bgck837ds0xvg5dr7g4j30a38zhbmanqss2kyxs4p7pgmldlnxpa31js50gydy8x9qi89s4x74iidf6k6nfgqsc5ns"; + sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; "vscode-jsonrpc-5.0.1" = { @@ -10892,7 +10829,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz"; - sha512 = "384pcmr3aa875r6s41lafcgwbkcahimsdw5933mnnzz2x233q8kl7g7k6lj7r3glmp83pwq338g3h8dmmmmfmbr34861p3hkcz8vwr6"; + sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; "vscode-languageserver-6.1.1" = { @@ -10901,7 +10838,7 @@ let version = "6.1.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz"; - sha512 = "06xr3d8zihlfb1rfblzhk4jxy9y8hk4b0yfib0hhnywknif9w3l483wv16msq0a7k44yiq5ynkhid79df1js30y9mbkx4008nk89rqf"; + sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; }; }; "vscode-languageserver-protocol-3.15.3" = { @@ -10910,7 +10847,7 @@ let version = "3.15.3"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz"; - sha512 = "2zyg6f9vc3kac0sl30b3lh5zf92rj7aips62jc261j17214gix4zwa7rgaz20a5m43czchnsg7bdqqv95krbpr91miihhc0fg02xcyf"; + sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; "vscode-languageserver-textdocument-1.0.1" = { @@ -10919,7 +10856,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz"; - sha512 = "1s7rs7mqr3cnpja4fsm58kbni5m6b4qx3ijjavllllhs3gql0nw3pr84kncpmfwn4xzchg95cbzk36cfb9r04mpjcf5j87v6l70k1sh"; + sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="; }; }; "vscode-languageserver-types-3.15.1" = { @@ -10928,34 +10865,34 @@ let version = "3.15.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz"; - sha512 = "1jvind0f20qqmjc1lv1g4dwl0kd07ykb8x9fb6v80bazf3bvr4pn3ppv8rnmcaa1biqn8lfb3bkwm31kghx1dsf35mn8d1b8hylrbzr"; + sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; - "vscode-uri-2.1.1" = { + "vscode-uri-2.1.2" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz"; - sha512 = "3s05w58p3l2hmv5dqj3ll07l9rvy06lcr9s3fnzvm27wa3anvnlk6v10w7zmwsafh11pzsgvm17pa29wyfaycagaky5g784dac673vr"; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz"; + sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "walker-1.0.7" = { - name = "walker"; - packageName = "walker"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz"; - sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; - }; - }; - "watchpack-1.6.1" = { + "watchpack-1.7.2" = { name = "watchpack"; packageName = "watchpack"; - version = "1.6.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz"; - sha512 = "1j6fr0rjlw663ssnc3z7bgv6621zrwj6qsza68h9rbpgy9nl205wp74iyrh62q3l46230qf8awnmdw77fi7vcm2747bcfh5yn2pv0gq"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz"; + sha512 = "ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g=="; + }; + }; + "watchpack-chokidar2-2.0.0" = { + name = "watchpack-chokidar2"; + packageName = "watchpack-chokidar2"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; + sha512 = "9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA=="; }; }; "wbuf-1.7.3" = { @@ -10964,25 +10901,25 @@ let version = "1.7.3"; src = fetchurl { url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; - sha512 = "066j9njgvk6mkjalv1zf1p8w9m2hrl97vz1iw8q6g9zlplhphz54j5j0ma0x9053zhczbyi3k1nr493vgnx1lk22hdwp2glg8x11kiv"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "web-tree-sitter-0.16.2" = { + "web-tree-sitter-0.16.4" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; - version = "0.16.2"; + version = "0.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.2.tgz"; - sha512 = "2ik05lyzg1xzqrizpfbhxb3ix62zmhs505q85828555saxpwlpffgqig00lm67myj4f24p1qsn42cc2sdms0gk18s0d08i7xsm4f5mz"; + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.4.tgz"; + sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "webpack-4.42.1" = { + "webpack-4.43.0" = { name = "webpack"; packageName = "webpack"; - version = "4.42.1"; + version = "4.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; - sha512 = "13b4jgmj0vf8qa13n1cddqaqk28qd1kmfhxqa5gj5sfvhmjjlgkl8rwqjsw4lydilpz39p2m506j91bgm91988if93gf49a50rdhrs8"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; + sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; "webpack-dev-middleware-3.7.2" = { @@ -10991,16 +10928,16 @@ let version = "3.7.2"; src = fetchurl { url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha512 = "27qjisacr2wrfj7r3z5hh2x7nrhadc27vg4kcalrdc7rrn8gnnlk64zf1pqmlkffy8klh8r0dr259v1sf6fjm886j5qlqjvpkcbh46p"; + sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; }; }; - "webpack-dev-server-3.10.3" = { + "webpack-dev-server-3.11.0" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.10.3"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; - sha512 = "1wl6ahwwfvm7620d70by2abmqgvw54mdhr8bxhdnnsvjzincy83rg80vffb1vwm2cvxwdc9qpp7ipq8bqrkf773fi6lbk0qzxxdd2bv"; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; + sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; }; }; "webpack-log-2.0.0" = { @@ -11009,7 +10946,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; - sha512 = "191qr8nb4rszy53q0ydqfxr1pirimc3k3bi7mhgin5f15cd7vd28maxanyb248kdivmajhji580fv3a1i584icz3cc9bwvzykd0czvi"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; "webpack-manifest-plugin-2.2.0" = { @@ -11018,7 +10955,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; - sha512 = "00w35bc3s8hks7621pdrh0396c091yd4kf58y3yw4vldi861kw2m6vwgjfqa4bk4msgaj6d5ndxal1df9a37wpaznrz71walb49hbpm"; + sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; "webpack-sources-1.4.3" = { @@ -11027,34 +10964,43 @@ let version = "1.4.3"; src = fetchurl { url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; - sha512 = "1wn7ixcv4b15kj3jn4c08n3pgrrd2kgzm2llh9viqx6a6k3j6rqzd5iksxdkalzaz6iic1q4fjj6wr9wfa07llf5a751mkgg3fx414n"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "websocket-driver-0.7.3" = { + "websocket-driver-0.6.5" = { name = "websocket-driver"; packageName = "websocket-driver"; - version = "0.7.3"; + version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz"; - sha512 = "0b5m603phj37lw5vb70ijc77g29cz7vn1w1bs7rhkx1ax3gil0wys841m14gnm3p95lc630hs370dngh68p7aaq69yqw1yvysb5d73f"; + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; }; }; - "websocket-extensions-0.1.3" = { + "websocket-driver-0.7.4" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"; + sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; + }; + }; + "websocket-extensions-0.1.4" = { name = "websocket-extensions"; packageName = "websocket-extensions"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy"; + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "whatwg-fetch-2.0.4" = { + "whatwg-fetch-3.0.0" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "2.0.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; - sha512 = "2g4p2ymmww4wm7cf86xwpb0dndwlxk1gg3brsrj892a4z593h25hyhqv0rmv4hzz4zxv3smmaflsnhilakfpr6y8f2gf3sfd8ckbi3m"; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz"; + sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; }; }; "which-1.3.1" = { @@ -11063,7 +11009,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; "which-2.0.1" = { @@ -11072,7 +11018,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-2.0.1.tgz"; - sha512 = "3ph3rnxyan638n4pzf6cvnky97ss1nn321h1q1zxi848b8x2p3d273mmr4csbvhyy0l608n8a6fn1fc7q7680a4jryx1hpcwij83c9p"; + sha512 = "N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w=="; }; }; "which-2.0.2" = { @@ -11081,7 +11027,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "1nf5j1l1b0k8jmah5l6w4d3f5hmlcn70ghr5d0mmvxjiyq3nf1dfxmnii5945hn32n7mh99mkwj5bk3nwmdy9dxjzpp6nskbm73gch4"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; "which-module-1.0.0" = { @@ -11117,7 +11063,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz"; - sha512 = "130y345yhgrh3zfgiccy1s6m3z2crx1w6f9cydmvabb489xxjnrm7qg3i1yaggfj3vvs032zaqdmkcx0h8m91zhxp5jwph99yyn9qfn"; + sha512 = "1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg=="; }; }; "workbox-broadcast-update-4.3.1" = { @@ -11126,7 +11072,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz"; - sha512 = "1n0q0vrpbjhpfwa6ga71qv6pvygbml40kgvkrcnqq4vx8csdy2z9gi9yrnm8vq9cxjz391s7x4c9a541273ml8k9j5r53i56a1ryd1i"; + sha512 = "MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA=="; }; }; "workbox-build-4.3.1" = { @@ -11135,7 +11081,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz"; - sha512 = "33ng87ll8lgd7pwjk7fxky8n3wl2fh2s6wnirm2hyrrwsixiz7alhr89jnnlc0d19yb9sz3lp8dfki7pyaaih6df3i3pb65vnn70xsh"; + sha512 = "UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw=="; }; }; "workbox-cacheable-response-4.3.1" = { @@ -11144,7 +11090,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz"; - sha512 = "2ksgzx6ybrks9h3apmybh68wkb53psjkacnz7v6lxyjmk8jz2w0pk62pv01yd7vl8pdhg387a0c7apn9qkr03blpq7c5kxs76bnm7j6"; + sha512 = "Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw=="; }; }; "workbox-core-4.3.1" = { @@ -11153,7 +11099,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz"; - sha512 = "0m3cfqadsbnzp5viw4d5ym72532mp0w4kx7w01db1vpxxkmvx8rvq49wjg4a85ia03h1g3lqw02ir5b896d0v9d03qs6c76aa7bsw13"; + sha512 = "I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg=="; }; }; "workbox-expiration-4.3.1" = { @@ -11162,7 +11108,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz"; - sha512 = "0zwr054a2rjvmlp73a1d6x2cw7x7rvajb8zbl5pm0xlnrh4fy2z1m7nklzvkd79jblxhhfc931n6gkdxsssaavdyspqnhic0j34phmy"; + sha512 = "vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw=="; }; }; "workbox-google-analytics-4.3.1" = { @@ -11171,7 +11117,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz"; - sha512 = "1v0bql2z41fal9w7zacvclnf5yh2ylnhv2d8ny8l75cl9qznrk3lbagn16raj48yvq5p0vjgsksl4jqyav45c0l11wvwfdfh81a6c67"; + sha512 = "xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg=="; }; }; "workbox-navigation-preload-4.3.1" = { @@ -11180,7 +11126,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz"; - sha512 = "0xhpw0szfaqspkdmw7nzdfqcvijmxi9kz9wmawaq71kgnn8fd0gbjwqic4signyj68hxd52j7dq66mdn301ggphxdsql785gagzlkib"; + sha512 = "K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw=="; }; }; "workbox-precaching-4.3.1" = { @@ -11189,7 +11135,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz"; - sha512 = "2ls1a25idywxi2v60aa2snmi0c07ayqp5n7d1yrafjn5hkhsl4sk1j1gx445hf5h8wni4nci0nlkbnn5n7sgsgkzqi84gicczzs0956"; + sha512 = "piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ=="; }; }; "workbox-range-requests-4.3.1" = { @@ -11198,7 +11144,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz"; - sha512 = "1j267fikkf08y96msxa5vkgaswdhp4jhgirvva3cv8x57yma9dhbbapyivccyryvrfpfvd7jpk5yq67gwll3wlz4nlmqk52vwpy3qab"; + sha512 = "S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA=="; }; }; "workbox-routing-4.3.1" = { @@ -11207,7 +11153,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz"; - sha512 = "3xdf0mryy66n2mk28ljbvw9yfvb647w4j10cpxz2dp5n4hvxd25aa1h9k9f3jk1n4smp9gqjd1yxigldrplsysaifn8kq60w2nfsihn"; + sha512 = "FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g=="; }; }; "workbox-strategies-4.3.1" = { @@ -11216,7 +11162,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz"; - sha512 = "23k6inrsahycsk4ban80q2jw3zy8fydjr6pkp1sjrq28ybcr0pvgpa86038l3yd1sakxkiz32zfyh4n8650lhm7bwfnym36n3kq9zqp"; + sha512 = "F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw=="; }; }; "workbox-streams-4.3.1" = { @@ -11225,7 +11171,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz"; - sha512 = "2wbc90ms21pr4fdwp2mifggynwgy4a18rhzs8lj4spz9xjhv85q1561047dq55776agxqqk88k29lwxzvpxw9gyhli2vzszrn5ara70"; + sha512 = "4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA=="; }; }; "workbox-sw-4.3.1" = { @@ -11234,7 +11180,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz"; - sha512 = "3vypra50sn2adwr7dwb7g4h75ay9fsyzwnmz4nbdgsjh3sd4l7ikhnbg02kqlqfsbj79nbby0lp7h20z9a61wndh2wy1nlbq2xdsdfj"; + sha512 = "0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w=="; }; }; "workbox-webpack-plugin-4.3.1" = { @@ -11243,7 +11189,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.1.tgz"; - sha512 = "08lqpz6fx1gh855d9fqj2ac15fsi07zx0pl79068a78bhzdj6rnm2gzwkr17kc5bgvr12nf96d01cp7ipqndz8wdp5h3wqvqdvn77w0"; + sha512 = "gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ=="; }; }; "workbox-window-4.3.1" = { @@ -11252,7 +11198,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz"; - sha512 = "0g784xkl3xda99q27b8z0n5jvgnqclcpr9l3a6h2psrcj7ijv13dh4kkqwac1klcqk0garwbjlspvrmfq5d777434vwrrw83qm1d60b"; + sha512 = "C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg=="; }; }; "worker-farm-1.7.0" = { @@ -11261,7 +11207,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"; - sha512 = "37m9wq9rvylb71n9kw3qghinwa3x4sggz82k29aall83izni78ijnh8rd6nhas8advw0lbnhby8z74vjlhp3sjsr4qm1wjw6r0kgz5f"; + sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; "wrap-ansi-2.1.0" = { @@ -11279,7 +11225,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; "wrap-ansi-6.2.0" = { @@ -11288,7 +11234,7 @@ let version = "6.2.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha512 = "1f4kz05shsh3xrqa0saaf5hbjp9kzxm7ykg8jmb6l49q8cfyhkrl45kk85p4jw1h95il3qadmsj2cy44yrbp119fd47jrdi25q4zadg"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; "wrappy-1.0.2" = { @@ -11306,7 +11252,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; - sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; + sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; }; }; "ws-3.3.1" = { @@ -11315,7 +11261,7 @@ let version = "3.3.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-3.3.1.tgz"; - sha512 = "3y6jiddhkfn0qgl1bq8whpn8s7l4vh981nnjih1k81wa7mxgbj6c9nnayxk1hz4qdxy34f8wbzv6kq6pdcsg7n98a1c5jyhr52fw3zh"; + sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; "ws-5.2.2" = { @@ -11324,7 +11270,7 @@ let version = "5.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "0f6ay7yn6xslzh3h66d5krqnp48d9g3ikwk0ijiyyxfkwaqxxf3b0qdswy6ych79mj44315qd16snlnk6m6npc5l0habgy5lc7wb8cd"; + sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; "ws-6.2.1" = { @@ -11333,7 +11279,7 @@ let version = "6.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "2l27cfiaw6syjvy6vbpqf5c2swd37bqviizzck6842xlankppm9j1sg79x3m8jpda8v6khcpnm5ssab1b8vf34qpviv41ww5mf8130q"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; "ws-7.1.1" = { @@ -11342,7 +11288,16 @@ let version = "7.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz"; - sha512 = "3f5849ggay87yr83snnkb1p2myb2gk8zswyd5v5m2y0kcvy02bvgi7mn7di8rs7zljpzra5sf1k4d17wyyv48d60ssccyc3d7yl73d3"; + sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; + }; + }; + "ws-7.3.0" = { + name = "ws"; + packageName = "ws"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz"; + sha512 = "iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w=="; }; }; "xmlbuilder-13.0.2" = { @@ -11351,7 +11306,7 @@ let version = "13.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz"; - sha512 = "00nxfgckvb3i20my8mmpc2s3bp59qxkfy926lv9ynbnfyqw7h5hq8cims6q86nr2wqnxq3b6rjvm28kn7700fmhfndq438xcj5p9v0j"; + sha512 = "Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="; }; }; "xtend-4.0.2" = { @@ -11360,7 +11315,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; "y18n-3.2.1" = { @@ -11378,7 +11333,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; "yallist-2.1.2" = { @@ -11396,16 +11351,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb"; - }; - }; - "yargs-12.0.5" = { - name = "yargs"; - packageName = "yargs"; - version = "12.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; - sha512 = "1kjmh68p4rb4c04s0gk4ra20crfr32h6v9zhj4clrz61xanslza9g3drbf6471mmvqq3vmxk04grmgillx1rsp6v2zim7wqnr6gq71f"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; "yargs-13.3.2" = { @@ -11414,7 +11360,7 @@ let version = "13.3.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "19rg5b2rhj2kg44as5vv9jxmpr39lw250885w6nlfwyhvwd5nxnnx7fc35v7h615i65cik7k3wi7ac20c91kcgfi5wy7blgk31xjz81"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; "yargs-15.3.1" = { @@ -11423,7 +11369,7 @@ let version = "15.3.1"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; - sha512 = "10c3d3i284v9l92r3ayx2z43hf4kw4adrlmp6vrjlcrq7mm3xh62c10q79jx73qm4dymnb9222zjr15n4l5w9pq0pn6xhr3c4fvaqzp"; + sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; }; }; "yargs-6.6.0" = { @@ -11435,31 +11381,22 @@ let sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; - "yargs-parser-11.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "11.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; - sha512 = "14iaywclwncdp3p7878q12cqgdc5rbkl0f6ghi9g7k7f4f1bbqi41dc5ki6hnqmy6jbfk0kx88m47vk3igrql5j6i7ar2a3cbyh3a8b"; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; version = "13.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "375nan6m28q81h8q9a8vmcxgiq7s81yn1ql7zdikac0c4j2kmxdjzmbq14fcp9jm4ilcfzkd9ym4x7c80s7r6g488wf13zz2wsyqmny"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; - "yargs-parser-18.1.2" = { + "yargs-parser-18.1.3" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "18.1.2"; + version = "18.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz"; - sha512 = "00h0d3ibv9x6gi9mz2fxg2an5r23vxsvl2svgj8kz6czjgwmw57rrz7fd4dc88cnd2kva21s6a5gahc616djp5xp1c2vk683lshyll6"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; "yargs-parser-4.2.1" = { @@ -11477,7 +11414,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/yn/-/yn-4.0.0.tgz"; - sha512 = "214zjzw9f245al1vhnvhw1ac5xq2sa5d34xa8h0hj3ck2x7nbdkx3j2lgd8zf4cb6bnn0ngffcwkbnl2qy9kq17w6f14kxq4j4a5rc6"; + sha512 = "huWiiCS4TxKc4SfgmTwW1K7JmXPPAmuXWYy4j9qjQo4+27Kni8mGhAAi1cloRWmBe2EqcLgt3IGqQoRL/MtPgg=="; }; }; }; @@ -11489,18 +11426,18 @@ in version = "0.16.5"; src = fetchurl { url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.5.tgz"; - sha512 = "0m37f2yxpjlh0b46n8ijx0zxl51swikdsgj8rm61kfy32c45fz98c2a1zxqlwyk98fblc92jc9zg2bhqxgs7civf01ndylwacc61dr3"; + sha512 = "I7dgGFOc+mYDcDuyo1/HcIn3E5MiMbocStNzivsPSjCUviuEieHdDKZmJJ9uM3IdCu0fdBmRNWQBSOXtXrgzKg=="; }; dependencies = [ sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -11549,7 +11486,7 @@ in }) sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" (sources."finalhandler-1.1.1" // { dependencies = [ @@ -11563,7 +11500,7 @@ in sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-errors-1.7.2" @@ -11587,8 +11524,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - 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."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -11614,7 +11551,7 @@ in (sources."request-2.88.0" // { dependencies = [ sources."qs-6.5.2" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" ]; }) sources."safe-buffer-5.1.1" @@ -11675,12 +11612,12 @@ in version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/elm-coverage/-/elm-coverage-0.3.0.tgz"; - sha512 = "378i24sqwydr323g5n696d0nz12d5ld8496fb3wmznf5fhv7p8ahvgf6a6cjfp78y0i53cr5v5jsa3hmb0xplc3jkrk5s5fn3s4wyaq"; + sha512 = "WHlO9LCu6DLzlIPR28GqcCgtyy6ZjRKBR+c6yYwy7m2o0D0buuLsr3wsZxJBjZYmwregmWRseUOM3DzHmoiIzg=="; }; dependencies = [ sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -11689,7 +11626,7 @@ in sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -11745,7 +11682,7 @@ in sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" sources."find-0.2.9" @@ -11762,12 +11699,12 @@ in sources."fs-extra-4.0.3" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -11796,14 +11733,14 @@ in sources."yallist-2.1.2" ]; }) - 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."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.27.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -11819,7 +11756,7 @@ in sources."once-1.4.0" sources."opn-5.5.0" sources."os-tmpdir-1.0.2" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" @@ -11838,7 +11775,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."rimraf-2.6.3" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" @@ -11900,7 +11837,7 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -11915,293 +11852,130 @@ in elm-doc-preview = nodeEnv.buildNodePackage { name = "elm-doc-preview"; packageName = "elm-doc-preview"; - version = "3.0.4"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-3.0.4.tgz"; - sha512 = "2cg4fjgjxg94lhak20inr9v05bkr2iyh64acg2msc4dr4jwq97542r115mpyzxc7rxsa2pg3jfflmqv74vy22v9zb9pzqdgh83ipfml"; + url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-5.0.3.tgz"; + sha512 = "j9wli2wOHYiSMARDCRgAZGZ8JkcJqG4rh5+6rSgy5nVGqyXDEN6HCBX/8AhqtKMFKcuCp9ejx04heCaROlb/Eg=="; }; dependencies = [ - sources."@cnakazawa/watch-1.0.4" - sources."@sindresorhus/is-0.7.0" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ansi-styles-3.2.1" - sources."anymatch-2.0.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" + sources."ansi-styles-4.2.1" + sources."anymatch-3.1.1" sources."array-flatten-1.1.1" - sources."array-unique-0.3.2" - sources."assign-symbols-1.0.0" sources."async-limiter-1.0.1" - sources."atob-2.1.2" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."batch-0.6.1" + sources."binary-extensions-2.0.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."bser-2.1.1" + sources."braces-3.0.2" sources."bytes-3.1.0" - sources."cache-base-1.0.1" - (sources."cacheable-request-2.1.4" // { + (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."lowercase-keys-1.0.0" - ]; - }) - sources."capture-exit-2.0.0" - sources."chalk-2.4.2" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" ]; }) + sources."chalk-3.0.0" + sources."chokidar-3.4.0" sources."clone-response-1.0.2" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-3.0.2" - sources."component-emitter-1.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-5.1.0" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."copy-descriptor-0.1.1" - sources."core-js-3.6.4" - sources."core-util-is-1.0.2" - sources."cross-spawn-6.0.5" + sources."cross-spawn-7.0.3" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."define-properties-1.1.3" - sources."define-property-2.0.2" + sources."defer-to-connect-1.1.3" sources."depd-1.1.2" sources."destroy-1.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es-abstract-1.17.5" - sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."exec-sh-0.3.4" - (sources."execa-1.0.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."express-4.17.1" (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.2" ]; }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fb-watchman-2.0.1" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."for-in-1.0.2" sources."forwarded-0.1.2" - sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."from2-2.3.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-stream-3.0.0" - sources."get-value-2.0.6" + sources."fsevents-2.1.3" + sources."get-stream-4.1.0" sources."glob-7.1.6" - sources."got-8.3.2" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.1" - sources."has-to-string-tag-x-1.4.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."http-cache-semantics-3.8.1" + sources."glob-parent-5.1.1" + sources."got-9.6.0" + sources."has-flag-4.0.0" + sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" - sources."is-accessor-descriptor-1.0.0" - sources."is-buffer-1.1.6" - sources."is-callable-1.1.5" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-object-1.0.1" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-regex-1.0.5" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" + sources."is-binary-path-2.1.0" + sources."is-docker-2.0.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isurl-1.0.0" sources."json-buffer-3.0.0" - sources."keyv-3.0.0" - sources."kind-of-6.0.3" - sources."latest-version-4.0.0" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" - sources."makeerror-1.0.11" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."micromatch-3.1.10" 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."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."ms-2.0.0" - sources."nanomatch-1.2.13" sources."negotiator-0.6.2" - sources."nice-try-1.0.5" - sources."node-int64-0.4.0" - sources."normalize-path-2.1.1" - sources."normalize-url-2.0.1" - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" - sources."object.pick-1.3.0" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."opn-5.5.0" - sources."p-cancelable-0.4.1" - sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-timeout-2.0.1" - sources."package-json-5.0.0" + sources."open-7.0.4" + sources."p-cancelable-1.1.0" + sources."package-json-6.5.0" sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" - sources."pify-3.0.0" - sources."posix-character-classes-0.1.1" + sources."picomatch-2.2.2" sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.6" sources."pump-3.0.0" sources."qs-6.7.0" - sources."query-string-5.1.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."readable-stream-2.3.7" - sources."regex-not-1.0.2" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."resolve-url-0.2.1" + sources."readdirp-3.4.0" + sources."registry-auth-token-4.1.1" + sources."registry-url-5.1.0" sources."responselike-1.0.2" - sources."ret-0.1.15" sources."rimraf-2.7.1" - sources."rsvp-4.8.5" sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sane-4.1.0" - sources."semver-5.7.1" + sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -12214,111 +11988,24 @@ in ]; }) sources."serve-static-1.14.1" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."setprototypeof-1.1.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."sort-keys-2.0.0" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."statuses-1.5.0" - sources."strict-uri-encode-1.1.0" - sources."string.prototype.trimend-1.0.0" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" - sources."string.prototype.trimstart-1.0.0" - sources."string_decoder-1.1.1" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - sources."timed-out-4.0.1" + sources."supports-color-7.1.0" sources."tmp-0.1.0" - sources."tmpl-1.0.4" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" - sources."union-value-1.0.1" sources."unpipe-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."urix-0.1.0" sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" sources."utils-merge-1.0.1" sources."vary-1.1.2" - sources."walker-1.0.7" - sources."which-1.3.1" + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-7.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -12333,17 +12020,17 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.7.1"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.7.1.tgz"; - sha512 = "25ha586wi38w5bh15dvskvixbw8n1ca5y5x3j2593d0nlrlqr69garz2bd444asgad1yvjkf62dfjdswy3nw1l0nrhpphiryd8hlnzx"; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.9.1.tgz"; + sha512 = "3wqe5OfqVWn0o92vDRuYwK7T6fohG0uSrNRr5EhJYrOUwlZFaSBx50RR79v12j7sNepDrACrsULSENcuyxNzIQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."asn1-0.2.4" @@ -12351,7 +12038,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -12360,13 +12047,13 @@ in sources."caseless-0.12.0" sources."combined-stream-1.0.8" sources."concat-stream-1.5.2" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-2.6.11" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.2" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" @@ -12375,34 +12062,18 @@ in sources."dir-glob-3.0.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" + sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" + sources."escape-string-regexp-4.0.0" sources."etag-1.8.1" - (sources."execa-4.0.0" // { + (sources."execa-4.0.2" // { dependencies = [ sources."is-stream-2.0.0" ]; }) - (sources."express-4.16.3" // { - dependencies = [ - sources."body-parser-1.18.2" - sources."bytes-3.0.0" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" - ]; - }) + sources."express-4.17.1" (sources."express-ws-2.0.0" // { dependencies = [ sources."ws-1.1.5" @@ -12410,17 +12081,13 @@ in }) sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.2" + sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.7.0" + sources."fastq-1.8.0" sources."fill-range-7.0.1" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."finalhandler-1.1.2" sources."find-0.2.7" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -12430,15 +12097,15 @@ in sources."get-stream-5.1.0" sources."getpass-0.1.7" sources."glob-parent-5.1.1" - sources."globby-11.0.0" - sources."graceful-fs-4.2.3" + sources."globby-11.0.1" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."ignore-5.1.4" + sources."ignore-5.1.8" sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-extglob-2.1.1" @@ -12460,14 +12127,14 @@ in sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" - sources."merge2-1.3.0" + sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.2" - sources."mime-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" - sources."minimist-1.2.0" + sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."node-watch-0.5.5" @@ -12476,7 +12143,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.0" - sources."opn-5.4.0" + sources."opn-6.0.0" sources."options-0.0.6" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -12497,25 +12164,21 @@ in sources."raw-body-2.4.0" sources."readable-stream-2.0.6" sources."regenerator-runtime-0.9.6" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" - sources."safe-buffer-5.2.0" ]; }) sources."reusify-1.0.4" sources."run-parallel-1.1.9" - sources."rxjs-6.5.5" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."send-0.16.2" // { + (sources."send-0.17.1" // { dependencies = [ - sources."http-errors-1.6.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" + sources."ms-2.1.1" ]; }) - sources."serve-static-1.13.2" + sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -12530,13 +12193,8 @@ in sources."tmp-0.0.31" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."traverse-chain-0.1.0" - sources."tslib-1.11.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -12554,8 +12212,8 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-uri-2.1.1" - sources."web-tree-sitter-0.16.2" + sources."vscode-uri-2.1.2" + sources."web-tree-sitter-0.16.4" sources."which-2.0.2" sources."wrappy-1.0.2" (sources."ws-3.3.1" // { @@ -12581,7 +12239,7 @@ in version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.2.tgz"; - sha512 = "1ri6f1ij6617nk0nsgrdfnzwac2hgisf7rvgrq4m8vny6a8f18bg5kb3bmal5mb51fsns2s3k678l6pal5v45ay1fdwps25kjyd93g0"; + sha512 = "4I3UvJxF6MubC14VsgtV11B0zBxaaKtdKKsWquoaa5a3UHBIGW83qgTnt/NxOj4omOLfupaftmDaE4yRMTgTcw=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -12605,7 +12263,7 @@ in sources."elm-hot-1.1.4" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es6-promisify-6.1.0" + sources."es6-promisify-6.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" @@ -12617,14 +12275,9 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - (sources."follow-redirects-1.11.0" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" - ]; - }) + sources."follow-redirects-1.12.1" sources."fresh-0.5.2" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."has-ansi-2.0.0" @@ -12703,18 +12356,18 @@ in version = "0.19.1-revision2"; src = fetchurl { url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; - sha512 = "24qc3z9z059c0dp97lfpsqgigxks6dd8akf14p3wvnvsy5ih3nf4947qc94xfrr0jdql0nnq12727nyyyyz3zrfyy54y85jayckcnyd"; + sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12741,7 +12394,7 @@ in sources."elmi-to-json-1.3.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" (sources."find-elm-dependencies-2.0.2" // { @@ -12756,11 +12409,11 @@ in sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-4.0.0" @@ -12781,8 +12434,8 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."lodash-4.17.15" - 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."minipass-2.9.0" @@ -12815,7 +12468,7 @@ in sources."request-promise-4.2.5" sources."request-promise-core-1.1.3" sources."rimraf-2.6.3" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-2.0.0" @@ -12858,15 +12511,15 @@ in version = "0.19.8"; src = fetchurl { url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.8.tgz"; - sha512 = "3rqgj507b7yb9ljc0rbfj7fi18h5lh33wvfr1kfdpqklvx3q84jfrma01fwrraxx1jlllhis9r1cpzcbcgmjlvygc2d5frhimbp60sb"; + sha512 = "SwNzV40wu9IEe35TWR9b7F8WctIRUkpl6F3lzF0AqmYnCcKjbzrxbW6G7DYfA9ICUYjuSLcyYJKm5c86oMiH8w=="; }; dependencies = [ - sources."@sindresorhus/is-2.1.0" + sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.11.0" + sources."@types/node-14.0.13" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" @@ -12885,7 +12538,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-5.1.0" sources."got-10.7.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" @@ -12895,23 +12548,23 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.0.0" + sources."keyv-4.0.1" sources."lowercase-keys-2.0.0" sources."mimic-response-2.1.0" sources."normalize-url-4.5.0" sources."npm-conf-1.1.3" sources."once-1.4.0" sources."p-cancelable-2.0.0" - sources."p-event-4.1.0" + sources."p-event-4.2.0" sources."p-finally-1.0.0" - sources."p-timeout-2.0.1" + sources."p-timeout-3.2.0" sources."pify-3.0.0" sources."proto-list-1.2.4" sources."pump-3.0.0" sources."responselike-2.0.0" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.1.3" + sources."semver-7.3.2" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -12937,10 +12590,10 @@ in version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.0.0.tgz"; - sha512 = "2npciwj93dprxgd9m14wz73q0bq8jqr3wq2027dvphm6jjl6r13yc9v5xl4g72rrjjrb81hnpk5y1q855lzcxbc8h49spb19zwsy0vl"; + sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -12948,7 +12601,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12991,7 +12644,7 @@ in sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" (sources."find-elm-dependencies-2.0.2" // { @@ -13007,12 +12660,12 @@ in sources."fs-extra-5.0.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -13035,8 +12688,8 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."lodash-4.17.15" - 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."minipass-2.9.0" @@ -13055,7 +12708,7 @@ in sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."path-exists-3.0.0" @@ -13073,7 +12726,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."rimraf-2.7.1" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" @@ -13127,14 +12780,14 @@ in version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.1.0.tgz"; - sha512 = "24a79m9qhs2ycldf36p7qyr0dj8jvqja0cycp5gr01nkrdhlin4idh33wbvr7yghh5vbf53j3vbi0r9kjp1crs4cy1jvb80iccxayfv"; + sha512 = "23nVGYsArS2DZ0RnFq6cKYO49pCjuLULhM+fvBcfA7ZIbKSw5WkDyK9c5hlQEm+JZAPZ43PNcI0yLzTEqaajiA=="; }; dependencies = [ sources."bluebird-3.7.2" sources."compare-versions-3.6.0" sources."core-util-is-1.0.2" sources."fs-extra-6.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."jsonfile-4.0.0" @@ -13169,86 +12822,107 @@ in create-elm-app = nodeEnv.buildNodePackage { name = "create-elm-app"; packageName = "create-elm-app"; - version = "4.2.4"; + version = "4.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-4.2.4.tgz"; - sha512 = "007cbn1hd7hb48mwrn7sg132vj9y0bw17jwgc2fi5m4z8zi24992qqgkdqzqz3bwh7khh1f0y35fzn6va384rlahmwyykxrj62hpl06"; + url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-4.2.25.tgz"; + sha512 = "Lasm7xrh8XQR2aqqwRlB2gJ5CWAGNaVoHpjGVft+EkSKMtHn5xtRAEGU3U4IuRDIhL7kvPFZXX4g8VQ7o79UJg=="; }; dependencies = [ - sources."@babel/cli-7.2.3" - sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.3.4" - sources."@babel/generator-7.9.4" - sources."@babel/helper-annotate-as-pure-7.8.3" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-create-regexp-features-plugin-7.8.8" - sources."@babel/helper-define-map-7.8.3" - sources."@babel/helper-explode-assignable-expression-7.8.3" - sources."@babel/helper-function-name-7.8.3" - sources."@babel/helper-get-function-arity-7.8.3" - sources."@babel/helper-hoist-variables-7.8.3" - sources."@babel/helper-member-expression-to-functions-7.8.3" - sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.9.0" - sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-plugin-utils-7.8.3" - sources."@babel/helper-regex-7.8.3" - sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" - sources."@babel/helper-simple-access-7.8.3" - sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" - sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" - sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" - sources."@babel/plugin-proposal-async-generator-functions-7.8.3" - sources."@babel/plugin-proposal-json-strings-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-transform-arrow-functions-7.8.3" - sources."@babel/plugin-transform-async-to-generator-7.8.3" - sources."@babel/plugin-transform-block-scoped-functions-7.8.3" - sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.9.2" - sources."@babel/plugin-transform-computed-properties-7.8.3" - sources."@babel/plugin-transform-destructuring-7.8.8" - sources."@babel/plugin-transform-dotall-regex-7.8.3" - sources."@babel/plugin-transform-duplicate-keys-7.8.3" - sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-for-of-7.9.0" - sources."@babel/plugin-transform-function-name-7.8.3" - sources."@babel/plugin-transform-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" - sources."@babel/plugin-transform-modules-umd-7.9.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" - sources."@babel/plugin-transform-new-target-7.8.3" - sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.9.3" - sources."@babel/plugin-transform-regenerator-7.8.7" - sources."@babel/plugin-transform-runtime-7.3.4" - sources."@babel/plugin-transform-shorthand-properties-7.8.3" - sources."@babel/plugin-transform-spread-7.8.3" - sources."@babel/plugin-transform-sticky-regex-7.8.3" - sources."@babel/plugin-transform-template-literals-7.8.3" - sources."@babel/plugin-transform-typeof-symbol-7.8.4" - sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.3.4" - (sources."@babel/runtime-7.3.4" // { + sources."@babel/cli-7.8.4" + sources."@babel/code-frame-7.10.3" + sources."@babel/compat-data-7.10.3" + (sources."@babel/core-7.9.6" // { dependencies = [ - sources."regenerator-runtime-0.12.1" + sources."debug-4.2.0" + sources."ms-2.1.2" ]; }) - sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.0" - sources."@babel/types-7.9.0" + sources."@babel/generator-7.10.3" + sources."@babel/helper-annotate-as-pure-7.10.1" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" + sources."@babel/helper-compilation-targets-7.10.2" + sources."@babel/helper-create-regexp-features-plugin-7.10.1" + sources."@babel/helper-define-map-7.10.3" + sources."@babel/helper-explode-assignable-expression-7.10.3" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-hoist-variables-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" + sources."@babel/helper-module-transforms-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" + sources."@babel/helper-plugin-utils-7.10.3" + sources."@babel/helper-regex-7.10.1" + sources."@babel/helper-remap-async-to-generator-7.10.3" + sources."@babel/helper-replace-supers-7.10.1" + sources."@babel/helper-simple-access-7.10.1" + sources."@babel/helper-split-export-declaration-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/helper-wrap-function-7.10.1" + sources."@babel/helpers-7.10.1" + sources."@babel/highlight-7.10.3" + sources."@babel/parser-7.10.3" + sources."@babel/plugin-proposal-async-generator-functions-7.10.3" + sources."@babel/plugin-proposal-dynamic-import-7.10.1" + sources."@babel/plugin-proposal-json-strings-7.10.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" + sources."@babel/plugin-proposal-numeric-separator-7.10.1" + sources."@babel/plugin-proposal-object-rest-spread-7.10.3" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.1" + sources."@babel/plugin-proposal-optional-chaining-7.10.3" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.1" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.1" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-top-level-await-7.10.1" + sources."@babel/plugin-transform-arrow-functions-7.10.1" + sources."@babel/plugin-transform-async-to-generator-7.10.1" + sources."@babel/plugin-transform-block-scoped-functions-7.10.1" + sources."@babel/plugin-transform-block-scoping-7.10.1" + sources."@babel/plugin-transform-classes-7.10.3" + sources."@babel/plugin-transform-computed-properties-7.10.3" + sources."@babel/plugin-transform-destructuring-7.10.1" + sources."@babel/plugin-transform-dotall-regex-7.10.1" + sources."@babel/plugin-transform-duplicate-keys-7.10.1" + sources."@babel/plugin-transform-exponentiation-operator-7.10.1" + sources."@babel/plugin-transform-for-of-7.10.1" + sources."@babel/plugin-transform-function-name-7.10.1" + sources."@babel/plugin-transform-literals-7.10.1" + sources."@babel/plugin-transform-member-expression-literals-7.10.1" + sources."@babel/plugin-transform-modules-amd-7.10.1" + sources."@babel/plugin-transform-modules-commonjs-7.10.1" + sources."@babel/plugin-transform-modules-systemjs-7.10.3" + sources."@babel/plugin-transform-modules-umd-7.10.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.3" + sources."@babel/plugin-transform-new-target-7.10.1" + sources."@babel/plugin-transform-object-super-7.10.1" + sources."@babel/plugin-transform-parameters-7.10.1" + sources."@babel/plugin-transform-property-literals-7.10.1" + sources."@babel/plugin-transform-regenerator-7.10.3" + sources."@babel/plugin-transform-reserved-words-7.10.1" + sources."@babel/plugin-transform-runtime-7.9.6" + sources."@babel/plugin-transform-shorthand-properties-7.10.1" + sources."@babel/plugin-transform-spread-7.10.1" + sources."@babel/plugin-transform-sticky-regex-7.10.1" + sources."@babel/plugin-transform-template-literals-7.10.3" + sources."@babel/plugin-transform-typeof-symbol-7.10.1" + sources."@babel/plugin-transform-unicode-regex-7.10.1" + sources."@babel/preset-env-7.9.6" + sources."@babel/preset-modules-0.1.3" + sources."@babel/runtime-7.9.6" + sources."@babel/template-7.10.3" + (sources."@babel/traverse-7.10.3" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + sources."@babel/types-7.10.3" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -13258,27 +12932,28 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" - sources."@types/events-3.0.0" - sources."@types/glob-7.1.1" - sources."@types/html-minifier-terser-5.0.0" + sources."@types/glob-7.1.2" + sources."@types/html-minifier-terser-5.1.0" + sources."@types/http-proxy-1.17.4" + sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.0" - sources."@types/q-1.5.2" + sources."@types/node-14.0.13" + sources."@types/q-1.5.4" sources."@types/source-list-map-0.1.2" - sources."@types/tapable-1.0.5" - (sources."@types/uglify-js-3.0.5" // { + sources."@types/tapable-1.0.6" + (sources."@types/uglify-js-3.9.2" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.10" // { + (sources."@types/webpack-4.41.17" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-0.1.7" // { + (sources."@types/webpack-sources-1.4.0" // { dependencies = [ - sources."source-map-0.6.1" + sources."source-map-0.7.3" ]; }) sources."@webassemblyjs/ast-1.9.0" @@ -13304,16 +12979,20 @@ in sources."accepts-1.3.7" sources."acorn-6.4.1" sources."address-1.0.3" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.4.1" + sources."ajv-keywords-3.5.0" sources."alphanum-sort-1.0.2" sources."ansi-colors-3.2.4" sources."ansi-escapes-3.2.0" sources."ansi-html-0.0.7" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."aproba-1.2.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -13328,7 +13007,11 @@ in sources."array-unique-0.3.2" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."asn1.js-4.10.1" + (sources."asn1.js-4.10.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" @@ -13336,11 +13019,7 @@ in ]; }) sources."assert-plus-1.0.0" - (sources."assets-webpack-plugin-3.9.12" // { - dependencies = [ - sources."mkdirp-0.5.3" - ]; - }) + sources."assets-webpack-plugin-3.9.12" sources."assign-symbols-1.0.0" sources."async-0.9.2" sources."async-each-1.0.3" @@ -13353,10 +13032,10 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."babel-extract-comments-1.0.0" - sources."babel-loader-8.0.4" - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-loader-8.1.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-transform-object-rest-spread-6.26.0" (sources."babel-runtime-6.26.0" // { @@ -13376,16 +13055,14 @@ in sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" sources."binary-0.3.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."binwrap-0.2.2" sources."bluebird-3.7.2" - sources."bn.js-4.11.8" + sources."bn.js-5.1.2" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" - sources."debug-2.6.9" - sources."ms-2.0.0" sources."qs-6.7.0" ]; }) @@ -13396,15 +13073,29 @@ in }) sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" - sources."browserify-rsa-4.0.1" - sources."browserify-sign-4.0.4" + (sources."browserify-rsa-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."browserify-sign-4.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -13421,7 +13112,7 @@ in sources."camel-case-4.1.1" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001039" + sources."caniuse-lite-1.0.30001087" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" sources."chainsaw-0.1.0" @@ -13431,11 +13122,7 @@ in ]; }) sources."chardet-0.7.0" - (sources."chokidar-3.3.0" // { - dependencies = [ - sources."glob-parent-5.1.1" - ]; - }) + sources."chokidar-2.1.8" sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" @@ -13463,7 +13150,7 @@ in }) sources."cli-cursor-2.1.0" sources."cli-table-0.3.1" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" (sources."cliui-3.2.0" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -13478,17 +13165,12 @@ in sources."color-string-1.5.3" sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-4.1.1" sources."common-tags-1.8.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) + sources."compression-1.7.4" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."connect-history-api-fallback-1.6.0" @@ -13503,38 +13185,41 @@ in sources."copy-descriptor-0.1.1" (sources."copy-webpack-plugin-5.1.1" // { dependencies = [ - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."make-dir-2.1.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-limit-2.3.0" sources."p-try-2.2.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" + sources."schema-utils-1.0.0" ]; }) sources."core-js-2.6.11" + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" - sources."create-ecdh-4.0.3" + (sources."create-ecdh-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" + sources."cross-spawn-7.0.3" sources."crypto-browserify-3.12.0" sources."css-color-names-0.0.4" (sources."css-declaration-sorter-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) - (sources."css-loader-3.4.2" // { + (sources."css-loader-3.5.3" // { dependencies = [ - sources."postcss-7.0.27" - sources."postcss-value-parser-4.0.3" - sources."schema-utils-2.6.5" + sources."postcss-7.0.32" + sources."postcss-value-parser-4.1.0" + sources."semver-6.3.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -13550,14 +13235,14 @@ in sources."cssesc-3.0.0" (sources."cssnano-4.1.10" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."cssnano-preset-default-4.0.7" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -13566,7 +13251,7 @@ in sources."cssnano-util-get-match-4.0.0" (sources."cssnano-util-raw-cache-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -13582,7 +13267,7 @@ in sources."cycle-1.0.3" sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."debug-4.1.1" + sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" @@ -13596,7 +13281,6 @@ in sources."pify-2.3.0" ]; }) - sources."pify-4.0.1" ]; }) sources."delayed-stream-1.0.0" @@ -13604,13 +13288,12 @@ in sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detect-node-2.0.4" - (sources."detect-port-alt-1.1.6" // { + sources."detect-port-alt-1.1.6" + (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."bn.js-4.11.9" ]; }) - sources."diffie-hellman-5.0.3" sources."dir-glob-2.2.2" sources."dns-equal-1.0.0" sources."dns-packet-1.3.1" @@ -13627,13 +13310,17 @@ in sources."domutils-1.5.1" sources."dot-case-3.0.3" sources."dot-prop-5.2.0" - sources."dotenv-5.0.1" + sources."dotenv-8.2.0" sources."duplexer-0.1.1" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.397" - sources."elliptic-6.5.2" + sources."electron-to-chromium-1.3.481" + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."elm-0.19.1-3" sources."elm-asset-webpack-loader-1.1.2" sources."elm-hot-1.1.4" @@ -13641,33 +13328,42 @@ in (sources."elm-test-0.19.1-revision2" // { dependencies = [ sources."ansi-styles-4.2.1" + sources."anymatch-3.1.1" + sources."binary-extensions-2.0.0" + sources."braces-3.0.2" sources."chalk-3.0.0" + sources."chokidar-3.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.1" + sources."fill-range-7.0.1" sources."fs-extra-8.1.0" + sources."fsevents-2.1.3" + sources."glob-parent-5.1.1" sources."has-flag-4.0.0" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."is-binary-path-2.1.0" + sources."is-number-7.0.0" + sources."readdirp-3.2.0" sources."supports-color-7.1.0" + sources."to-regex-range-5.0.1" sources."which-2.0.1" ]; }) - sources."elm-webpack-loader-6.0.0" + sources."elm-webpack-loader-6.0.1" sources."elmi-to-json-1.3.0" + sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.1.1" // { + (sources."enhanced-resolve-4.2.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; }) - sources."entities-2.0.0" + sources."entities-2.0.3" sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" @@ -13675,15 +13371,23 @@ in sources."esprima-4.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.0" + sources."eventemitter3-4.0.4" sources."events-3.1.0" sources."eventsource-0.1.6" sources."evp_bytestokey-1.0.3" - sources."execa-1.0.0" + (sources."execa-1.0.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -13697,56 +13401,31 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) sources."expand-tilde-2.0.2" (sources."express-4.17.1" // { dependencies = [ sources."array-flatten-1.1.1" - sources."debug-2.6.9" - sources."ms-2.0.0" sources."qs-6.7.0" ]; }) sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."extend-shallow-3.0.2" sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-3.1.1" - (sources."fast-glob-2.2.7" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) + sources."fast-deep-equal-3.1.3" + sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" sources."faye-websocket-0.11.3" sources."figgy-pudding-3.5.2" @@ -13762,14 +13441,14 @@ in }) sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" - sources."fill-range-7.0.1" - (sources."finalhandler-1.1.2" // { + (sources."fill-range-4.0.0" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."find-cache-dir-1.0.0" + sources."finalhandler-1.1.2" + sources."find-cache-dir-2.1.0" (sources."find-elm-dependencies-2.0.2" // { dependencies = [ sources."firstline-1.2.0" @@ -13779,11 +13458,7 @@ in sources."find-up-2.1.0" sources."firstline-2.0.2" sources."flush-write-stream-1.1.1" - (sources."follow-redirects-1.11.0" // { - dependencies = [ - sources."debug-3.2.6" - ]; - }) + sources."follow-redirects-1.12.1" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -13796,8 +13471,9 @@ in sources."fs-readdir-recursive-1.1.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-1.2.13" sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.1" sources."get-caller-file-1.0.3" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" @@ -13811,15 +13487,24 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-modules-1.0.0" - sources."global-prefix-1.0.2" + (sources."global-prefix-1.0.2" // { + dependencies = [ + sources."which-1.3.1" + ]; + }) sources."globals-11.12.0" (sources."globby-7.1.1" // { dependencies = [ + sources."pify-3.0.0" sources."slash-1.0.0" ]; }) - sources."graceful-fs-4.2.3" - sources."gzip-size-5.0.0" + sources."graceful-fs-4.2.4" + (sources."gzip-size-5.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."handle-thing-2.0.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -13829,15 +13514,15 @@ in sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) sources."hash.js-1.1.7" sources."he-1.2.0" sources."hex-color-regex-1.1.0" @@ -13848,17 +13533,9 @@ in sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" sources."html-comment-regex-1.1.2" - sources."html-entities-1.2.1" - (sources."html-minifier-terser-5.0.5" // { - dependencies = [ - sources."commander-4.1.1" - ]; - }) - (sources."html-webpack-plugin-4.0.4" // { - dependencies = [ - sources."util.promisify-1.0.0" - ]; - }) + sources."html-entities-1.3.1" + sources."html-minifier-terser-5.1.1" + sources."html-webpack-plugin-4.3.0" (sources."htmlparser2-3.10.1" // { dependencies = [ sources."entities-1.1.2" @@ -13871,16 +13548,24 @@ in sources."inherits-2.0.3" ]; }) - sources."http-parser-js-0.4.10" - sources."http-proxy-1.18.0" - sources."http-proxy-middleware-0.20.0" + sources."http-parser-js-0.5.2" + sources."http-proxy-1.18.1" + (sources."http-proxy-middleware-0.21.0" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."i-0.3.6" sources."iconv-lite-0.4.24" (sources."icss-utils-4.1.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -13889,17 +13574,10 @@ in sources."iferr-0.1.5" sources."ignore-3.3.10" sources."immer-1.7.2" + sources."import-cwd-2.1.0" sources."import-fresh-2.0.0" - (sources."import-local-2.0.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."pkg-dir-3.0.0" - ]; - }) + sources."import-from-2.1.0" + sources."import-local-2.0.0" sources."imurmurhash-0.1.4" sources."indexes-of-1.0.1" sources."infer-owner-1.0.4" @@ -13925,27 +13603,29 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-binary-path-2.1.0" + sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.5" + sources."is-callable-1.2.0" sources."is-color-stop-1.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" - sources."is-extendable-0.1.1" + sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" - sources."is-number-7.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" - sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" - sources."is-regex-1.0.5" + sources."is-regex-1.1.0" sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-root-2.0.0" @@ -13960,9 +13640,8 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" @@ -13971,7 +13650,7 @@ in sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsprim-1.4.1" @@ -13979,6 +13658,8 @@ in sources."kind-of-6.0.3" sources."last-call-webpack-plugin-3.0.0" sources."lcid-1.0.0" + sources."leven-3.1.0" + sources."levenary-1.1.1" (sources."load-json-file-1.1.0" // { dependencies = [ sources."parse-json-2.2.0" @@ -13998,33 +13679,35 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."loose-envify-1.4.0" sources."lower-case-2.0.1" sources."lru-cache-5.1.1" - sources."make-dir-1.3.0" - sources."map-age-cleaner-0.1.3" + sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" sources."mdn-data-2.0.4" sources."media-typer-0.3.0" - (sources."mem-4.3.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) sources."memory-fs-0.4.1" sources."merge-descriptors-1.0.1" - sources."merge2-1.3.0" + sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.2" - sources."miller-rabin-4.0.1" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."micromatch-3.1.10" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mime-2.4.6" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" - sources."mini-css-extract-plugin-0.4.5" + (sources."mini-css-extract-plugin-0.4.5" // { + dependencies = [ + sources."schema-utils-1.0.0" + ]; + }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -14032,39 +13715,47 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" + sources."mixin-deep-1.3.2" + sources."mkdirp-0.5.3" sources."move-concurrently-1.0.1" - sources."ms-2.1.2" + sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.2" sources."neo-async-2.6.1" sources."nice-try-1.0.5" sources."no-case-3.0.3" - sources."node-elm-compiler-5.0.4" + (sources."node-elm-compiler-5.0.4" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) sources."node-forge-0.9.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.53" + sources."node-releases-1.1.58" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" sources."normalize-url-3.3.0" - sources."npm-run-path-2.0.2" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) sources."nth-check-1.0.2" sources."num2fraction-1.2.2" sources."number-is-nan-1.0.1" @@ -14083,12 +13774,12 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-inspect-1.8.0" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.entries-1.1.1" + sources."object.entries-1.1.2" sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."object.values-1.1.1" @@ -14101,13 +13792,9 @@ in sources."optimize-css-assets-webpack-plugin-5.0.3" sources."original-1.0.2" sources."os-browserify-0.3.0" - sources."os-homedir-1.0.2" sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" - sources."output-file-sync-2.0.1" - sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-map-2.1.0" @@ -14127,23 +13814,36 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" - sources."path-type-3.0.0" - sources."pbkdf2-3.0.17" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pbkdf2-3.1.1" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pify-3.0.0" + sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pkg-dir-2.0.0" + (sources."pkg-dir-3.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) sources."pkg-up-2.0.0" sources."pkginfo-0.4.1" - (sources."portfinder-1.0.25" // { + (sources."portfinder-1.0.26" // { dependencies = [ sources."async-2.6.3" sources."debug-3.2.6" + sources."ms-2.1.2" ]; }) sources."posix-character-classes-0.1.1" @@ -14154,88 +13854,80 @@ in }) (sources."postcss-calc-7.0.2" // { dependencies = [ - sources."postcss-7.0.27" - sources."postcss-value-parser-4.0.3" + sources."postcss-7.0.32" + sources."postcss-value-parser-4.1.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-colormin-4.0.3" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-convert-values-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-discard-comments-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-discard-duplicates-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-discard-empty-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-discard-overridden-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) - sources."postcss-flexbugs-fixes-3.3.1" - (sources."postcss-load-config-1.2.0" // { + (sources."postcss-flexbugs-fixes-4.2.1" // { dependencies = [ - sources."cosmiconfig-2.2.2" - sources."parse-json-2.2.0" + sources."postcss-7.0.32" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" ]; }) - (sources."postcss-load-options-1.2.0" // { + sources."postcss-load-config-2.1.0" + (sources."postcss-loader-3.0.0" // { dependencies = [ - sources."cosmiconfig-2.2.2" - sources."parse-json-2.2.0" - ]; - }) - (sources."postcss-load-plugins-2.3.0" // { - dependencies = [ - sources."cosmiconfig-2.2.2" - sources."parse-json-2.2.0" - ]; - }) - (sources."postcss-loader-2.1.5" // { - dependencies = [ - sources."schema-utils-0.4.7" + sources."postcss-7.0.32" + sources."schema-utils-1.0.0" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" ]; }) (sources."postcss-merge-longhand-4.0.11" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-merge-rules-4.0.3" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -14243,28 +13935,28 @@ in }) (sources."postcss-minify-font-values-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-minify-gradients-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-minify-params-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-minify-selectors-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -14272,120 +13964,120 @@ in }) (sources."postcss-modules-extract-imports-2.0.0" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-modules-local-by-default-3.0.2" // { dependencies = [ - sources."postcss-7.0.27" - sources."postcss-value-parser-4.0.3" + sources."postcss-7.0.32" + sources."postcss-value-parser-4.1.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-modules-scope-2.2.0" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-modules-values-3.0.0" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-charset-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-display-values-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-positions-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-repeat-style-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-string-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-timing-functions-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-unicode-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-url-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-whitespace-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-ordered-values-4.1.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-reduce-initial-4.0.3" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-reduce-transforms-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-safe-parser-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -14393,14 +14085,14 @@ in sources."postcss-selector-parser-6.0.2" (sources."postcss-svgo-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-unique-selectors-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -14422,7 +14114,11 @@ in sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."psl-1.8.0" - sources."public-encrypt-4.0.3" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -14450,7 +14146,7 @@ in sources."big.js-3.2.0" sources."browserslist-4.1.1" sources."chalk-2.4.1" - sources."debug-2.6.9" + sources."cross-spawn-6.0.5" sources."emojis-list-2.1.0" sources."escape-string-regexp-1.0.5" sources."find-up-3.0.0" @@ -14458,14 +14154,18 @@ in sources."json5-0.5.1" sources."loader-utils-1.1.0" sources."locate-path-3.0.0" - sources."ms-2.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" + sources."path-key-2.0.1" + sources."pify-3.0.0" sources."react-error-overlay-5.1.6" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."slash-1.0.0" sources."sockjs-client-1.1.5" sources."strip-ansi-4.0.0" + sources."which-1.3.1" ]; }) sources."react-error-overlay-4.0.1" @@ -14483,20 +14183,16 @@ in ]; }) sources."readable-stream-2.3.7" - sources."readdirp-3.2.0" + sources."readdirp-2.2.1" sources."recursive-readdir-2.2.2" - sources."regenerate-1.4.0" + sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - (sources."regenerator-transform-0.14.4" // { - dependencies = [ - sources."@babel/runtime-7.9.2" - ]; - }) + sources."regenerator-transform-0.14.4" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.0" sources."regexpu-core-4.7.0" - sources."regjsgen-0.5.1" + sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ sources."jsesc-0.5.0" @@ -14515,10 +14211,9 @@ in sources."request-promise-4.2.5" sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" - sources."require-from-string-1.2.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -14531,24 +14226,19 @@ in sources."rgba-regex-1.0.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-queue-1.0.3" sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."schema-utils-1.0.0" + sources."schema-utils-2.7.0" sources."select-hose-2.0.0" sources."selfsigned-1.10.7" sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) sources."mime-1.6.0" sources."ms-2.1.1" ]; @@ -14556,10 +14246,8 @@ in sources."serialize-javascript-2.1.2" (sources."serve-index-1.9.1" // { dependencies = [ - sources."debug-2.6.9" sources."http-errors-1.6.3" sources."inherits-2.0.3" - sources."ms-2.0.0" sources."setprototypeof-1.1.0" ]; }) @@ -14568,13 +14256,14 @@ in (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { @@ -14585,7 +14274,6 @@ in sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -14599,8 +14287,8 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -14613,33 +14301,42 @@ in sources."kind-of-3.2.2" ]; }) - (sources."sockjs-0.3.19" // { + (sources."sockjs-0.3.20" // { dependencies = [ sources."faye-websocket-0.10.0" + sources."websocket-driver-0.6.5" ]; }) (sources."sockjs-client-1.4.0" // { dependencies = [ sources."debug-3.2.6" sources."eventsource-1.0.7" + sources."ms-2.1.2" ]; }) sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."source-map-url-0.4.0" - sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" - sources."spdx-expression-parse-3.0.0" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.5" - sources."spdy-4.0.2" + (sources."spdy-4.0.2" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) (sources."spdy-transport-3.0.0" // { dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" sources."readable-stream-3.6.0" ]; }) @@ -14673,16 +14370,14 @@ in sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.1" - sources."string-replace-loader-2.2.0" + sources."string-replace-loader-2.3.0" (sources."string-width-1.0.2" // { dependencies = [ sources."strip-ansi-3.0.1" ]; }) - sources."string.prototype.trimend-1.0.0" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" - sources."string.prototype.trimstart-1.0.0" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -14697,14 +14392,14 @@ in sources."strip-bom-2.0.0" sources."strip-comments-1.0.2" sources."strip-eof-1.0.0" - (sources."style-loader-0.21.0" // { + (sources."style-loader-0.23.1" // { dependencies = [ - sources."schema-utils-0.4.7" + sources."schema-utils-1.0.0" ]; }) (sources."stylehacks-4.0.3" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -14714,7 +14409,7 @@ in (sources."svgo-1.3.2" // { dependencies = [ sources."css-select-2.1.0" - sources."css-what-3.2.1" + sources."css-what-3.3.0" sources."domutils-1.7.0" ]; }) @@ -14725,22 +14420,16 @@ in sources."rimraf-2.6.3" ]; }) - (sources."terser-4.6.10" // { + (sources."terser-4.8.0" // { dependencies = [ + sources."commander-2.20.3" sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.3" // { + (sources."terser-webpack-plugin-1.4.4" // { dependencies = [ - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."make-dir-2.1.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" + sources."schema-utils-1.0.0" + sources."serialize-javascript-3.1.0" sources."source-map-0.6.1" ]; }) @@ -14759,11 +14448,11 @@ in ]; }) sources."to-regex-3.0.2" - sources."to-regex-range-5.0.1" + sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" - sources."tslib-1.11.1" + sources."tslib-1.13.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -14778,8 +14467,12 @@ in (sources."uglifyjs-webpack-plugin-1.3.0" // { dependencies = [ sources."cacache-10.0.4" + sources."find-cache-dir-1.0.0" sources."lru-cache-4.1.5" + sources."make-dir-1.3.0" sources."mississippi-2.0.0" + sources."pify-3.0.0" + sources."pkg-dir-2.0.0" sources."pump-2.0.1" sources."schema-utils-0.4.7" sources."serialize-javascript-1.9.1" @@ -14792,7 +14485,11 @@ in sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" - sources."union-value-1.0.1" + (sources."union-value-1.0.1" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) sources."uniq-1.0.1" sources."uniqs-2.0.0" sources."unique-filename-1.1.1" @@ -14819,7 +14516,11 @@ in sources."punycode-1.3.2" ]; }) - sources."url-loader-1.1.2" + (sources."url-loader-1.1.2" // { + dependencies = [ + sources."schema-utils-1.0.0" + ]; + }) sources."url-parse-1.4.7" sources."use-3.1.1" (sources."util-0.11.1" // { @@ -14828,7 +14529,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + sources."util.promisify-1.0.0" sources."utila-0.4.0" sources."utile-0.3.0" sources."utils-merge-1.0.1" @@ -14838,82 +14539,67 @@ in sources."vendors-1.0.4" sources."verror-1.10.0" sources."vm-browserify-1.1.2" - (sources."watchpack-1.6.1" // { + (sources."watchpack-1.7.2" // { dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.12" - sources."is-binary-path-1.0.1" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - sources."to-regex-range-2.1.1" + sources."anymatch-3.1.1" + sources."binary-extensions-2.0.0" + sources."braces-3.0.2" + sources."chokidar-3.4.0" + sources."fill-range-7.0.1" + sources."fsevents-2.1.3" + sources."glob-parent-5.1.1" + sources."is-binary-path-2.1.0" + sources."is-number-7.0.0" + sources."readdirp-3.4.0" + sources."to-regex-range-5.0.1" ]; }) + sources."watchpack-chokidar2-2.0.0" sources."wbuf-1.7.3" - (sources."webpack-4.42.1" // { + (sources."webpack-4.43.0" // { dependencies = [ - sources."braces-2.3.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" + sources."schema-utils-1.0.0" ]; }) sources."webpack-dev-middleware-3.7.2" - (sources."webpack-dev-server-3.10.3" // { + (sources."webpack-dev-server-3.11.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - (sources."cliui-4.1.0" // { + sources."ansi-regex-4.1.0" + (sources."cliui-5.0.0" // { dependencies = [ - sources."strip-ansi-4.0.0" + sources."strip-ansi-5.2.0" ]; }) - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" + sources."debug-4.2.0" sources."find-up-3.0.0" - sources."fsevents-1.2.12" + sources."get-caller-file-2.0.5" sources."http-proxy-middleware-0.19.1" - sources."invert-kv-2.0.0" sources."is-absolute-url-3.0.3" - sources."is-binary-path-1.0.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."lcid-2.0.0" sources."locate-path-3.0.0" - sources."micromatch-3.1.10" - sources."normalize-path-2.1.1" + sources."ms-2.1.2" sources."opn-5.5.0" - sources."os-locale-3.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."readdirp-2.2.1" + sources."require-main-filename-2.0.0" + sources."schema-utils-1.0.0" sources."semver-6.3.0" - (sources."string-width-2.1.1" // { + (sources."string-width-3.1.0" // { dependencies = [ - sources."strip-ansi-4.0.0" + sources."strip-ansi-5.2.0" ]; }) sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" - sources."to-regex-range-2.1.1" sources."which-module-2.0.0" - sources."yargs-12.0.5" - sources."yargs-parser-11.1.1" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" ]; }) sources."webpack-log-2.0.0" @@ -14927,10 +14613,10 @@ in sources."source-map-0.6.1" ]; }) - sources."websocket-driver-0.7.3" - sources."websocket-extensions-0.1.3" - sources."whatwg-fetch-2.0.4" - sources."which-1.3.1" + sources."websocket-driver-0.7.4" + sources."websocket-extensions-0.1.4" + sources."whatwg-fetch-3.0.0" + sources."which-2.0.2" sources."which-module-1.0.0" (sources."winston-2.1.1" // { dependencies = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix deleted file mode 100644 index 30f54e6f5a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/patch-binwrap.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ writeScriptBin, stdenv, lib }: -let - # Patching binwrap by NoOp script - binwrap = writeScriptBin "binwrap" '' - #! ${stdenv.shell} - echo "binwrap called: Returning 0" - return 0 - ''; - binwrap-install = writeScriptBin "binwrap-install" '' - #! ${stdenv.shell} - echo "binwrap-install called: Doing nothing" - ''; -in -targets: -pkg: -pkg.override { - nativeBuildInputs = pkg.nativeBuildInputs ++ [ binwrap binwrap-install ]; - - # Manually install targets - # by symlinking binaries into `node_modules` - postInstall = let - binFile = module: lib.strings.removeSuffix ("-" + module.version) module.name; - in '' - ${lib.concatStrings (map (module: '' - echo "linking ${binFile module}" - ln -sf ${module}/bin/${binFile module} \ - node_modules/${binFile module}/bin/${binFile module} - '') targets)} - ''; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 520a34afe5..b74c5c7e9e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -2,6 +2,7 @@ let rev = emscriptenVersion; + haveGcc = stdenv.cc.isGNU || stdenv.cc.cc ? gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" "-DLLVM_BUILD_TESTS=ON" "-DCLANG_INCLUDE_TESTS=ON" - ] ++ (stdenv.lib.optional stdenv.isLinux + ] ++ (stdenv.lib.optional (stdenv.isLinux && haveGcc) # necessary for clang to find crtend.o "-DGCC_INSTALL_PREFIX=${gcc}" ); @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { passthru = { isClang = true; + } // stdenv.lib.optionalAttrs haveGcc { inherit gcc; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index 0a35ed023c..6f4fd415fc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -63,6 +63,7 @@ let majorVersion = "4"; patches = [ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch + ./libsanitizer.patch (fetchpatch { name = "avoid-ustat-glibc-2.28.patch"; url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/libsanitizer.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/libsanitizer.patch new file mode 100644 index 0000000000..f1a438a4e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/libsanitizer.patch @@ -0,0 +1,24 @@ +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index aec950454..5bda9b3a3 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -156,18 +156,13 @@ namespace __sanitizer { + #elif defined(__sparc__) + # if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; + # endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch new file mode 100644 index 0000000000..0cd04e218c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch @@ -0,0 +1,62 @@ +From 8b55f1047cf3491429c1af607e5dac08a81db6e1 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Thu, 20 Feb 2020 15:08:36 +0100 +Subject: [PATCH] Fix build for glibc 2.31 + +--- + .../sanitizer_platform_limits_posix.cc | 5 +++-- + .../sanitizer_platform_limits_posix.h | 15 +-------------- + 2 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 069d8d557..c49c28c6e 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1130,8 +1130,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 + #endif +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 304d04e39..568081a79 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -200,27 +200,14 @@ namespace __sanitizer { + unsigned __seq; + u64 __unused1; + u64 __unused2; +-#elif defined(__mips__) || defined(__aarch64__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #elif defined(__sparc__) +-# if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-# endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) +-- +2.25.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index f3b15eac55..f1bc490bd7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -65,7 +65,7 @@ let majorVersion = "6"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; patches = - [ ../use-source-date-epoch.patch ] + [ ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch new file mode 100644 index 0000000000..d8aad14942 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch @@ -0,0 +1,62 @@ +From 2d03b6eaf823fc2db6a32b4a95e18f8a7474b47f Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Thu, 20 Feb 2020 01:56:42 +0100 +Subject: [PATCH] Fix build for glibc 2.31 + +--- + .../sanitizer_platform_limits_posix.cc | 5 +++-- + .../sanitizer_platform_limits_posix.h | 15 +-------------- + 2 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 97eae3fc7..4089d4695 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1145,8 +1145,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index c13932283..3456fb2db 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -204,27 +204,14 @@ namespace __sanitizer { + unsigned __seq; + u64 __unused1; + u64 __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #elif defined(__sparc__) +-# if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-# endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) +-- +2.25.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 89933c22ed..dcd129ff25 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -53,6 +53,8 @@ let majorVersion = "7"; ./riscv-pthread-reentrant.patch # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html ./riscv-no-relax.patch + + ./0001-Fix-build-for-glibc-2.31.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optionals targetPlatform.isNetBSD [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/libstdc++-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/gcc/libstdc++-hook.sh deleted file mode 100644 index f5b4123b64..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/@targetConfig@" diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix index 97793d9128..41af279e83 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -78,18 +78,6 @@ stdenv.mkDerivation rec { patchShebangs ghc-${version}/configure '' + - # Strip is harmful, see also below. It's important that this happens - # first. The GHC Cabal build system makes use of strip by default and - # has hardcoded paths to /usr/bin/strip in many places. We replace - # those below, making them point to our dummy script. - '' - mkdir "$TMP/bin" - for i in strip; do - echo '#! ${stdenv.shell}' > "$TMP/bin/$i" - chmod +x "$TMP/bin/$i" - done - PATH="$TMP/bin:$PATH" - '' + # We have to patch the GMP paths for the integer-gmp package. '' find . -name integer-gmp.buildinfo \ @@ -125,17 +113,13 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; - # Stripping combined with patchelf breaks the executables (they die - # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) - dontStrip = true; - # No building is necessary, but calling make without flags ironically # calls install-strip ... dontBuild = true; # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = stdenv.lib.optionalString stdenv.isLinux '' for p in $(find "$out" -type f -executable); do if isELF "$p"; then echo "Patchelfing $p" diff --git a/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix index d85cf1adfe..f528b9f136 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1"; - subPackages = [ "cmd/jsonnet" ]; + subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ]; meta = with lib; { description = "An implementation of Jsonnet in pure Go"; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ nshalman ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix index 48e4d9bdc6..e082628aaa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.12"; + version = "1.13.14"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0d5s5rqyzp6ykj4x1dz8infcsmj3gy8djnf63ji971ypwi6jrfhp"; + sha256 = "01mbqzn1hj8idbyn2f9gghvirfnw348dcf7pjs3ymschfblk6wqr"; }; # perl is used for testing go vet @@ -186,8 +186,11 @@ stdenv.mkDerivation rec { export PATH=$(pwd)/bin:$PATH + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. export CC=${buildPackages.stdenv.cc}/bin/cc + ''} ulimit -a ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix index 95a602025d..6ddd61253a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix @@ -193,8 +193,11 @@ stdenv.mkDerivation rec { export PATH=$(pwd)/bin:$PATH + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. export CC=${buildPackages.stdenv.cc}/bin/cc + ''} ulimit -a ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix new file mode 100644 index 0000000000..cd6d5faaab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -0,0 +1,255 @@ +{ stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, mailcap, runtimeShell +, buildPackages, pkgsTargetTarget +, fetchpatch +}: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.15beta1"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "1h1sg6j9jac5bw2pjrd13bf4nr18prs89147izdhzbhp896sikbq"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.15.patch + ./remove-test-pie-1.15.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests-1.15.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.15.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32-1.14.patch + else ./skip-test-extra-files-on-386-1.14.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + branch = "1.15"; + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie-1.15.patch b/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie-1.15.patch new file mode 100644 index 0000000000..f00685feba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie-1.15.patch @@ -0,0 +1,34 @@ +diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go +index e1cd4965c3..66bf980fc6 100644 +--- a/src/cmd/dist/test.go ++++ b/src/cmd/dist/test.go +@@ -584,29 +584,6 @@ func (t *tester) registerTests() { + }) + } + +- // Test internal linking of PIE binaries where it is supported. +- if t.internalLinkPIE() { +- t.tests = append(t.tests, distTest{ +- name: "pie_internal", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- // Also test a cgo package. +- if t.cgoEnabled && t.internalLink() { +- t.tests = append(t.tests, distTest{ +- name: "pie_internal_cgo", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- } +- } +- + // sync tests + if goos != "js" { // js doesn't support -cpu=10 + t.tests = append(t.tests, distTest{ diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch b/third_party/nixpkgs/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch new file mode 100644 index 0000000000..945d3ef8d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go +index e1cd4965c3..0980d044df 100644 +--- a/src/cmd/dist/test.go ++++ b/src/cmd/dist/test.go +@@ -1136,7 +1136,7 @@ func (t *tester) cgoTest(dt *distTest) error { + t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal") + } + t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie") +- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie") ++ //t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie") + } + } + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch b/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch new file mode 100644 index 0000000000..0ea1050cd8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch @@ -0,0 +1,13 @@ +diff --git a/src/net/dial_test.go b/src/net/dial_test.go +index 01582489de..5b5faa5424 100644 +--- a/src/net/dial_test.go ++++ b/src/net/dial_test.go +@@ -990,6 +990,8 @@ func TestDialerControl(t *testing.T) { + // except that it won't skip testing on non-mobile builders. + func mustHaveExternalNetwork(t *testing.T) { + t.Helper() ++ t.Skipf("Nix sandbox does not have networking") ++ + mobile := runtime.GOOS == "android" || runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" + if testenv.Builder() == "" || mobile { + testenv.MustHaveExternalNetwork(t) diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch new file mode 100644 index 0000000000..cca48eb570 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch @@ -0,0 +1,76 @@ +diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go +index 8ad5a9607d..1d6091cf83 100644 +--- a/src/crypto/x509/root_darwin_amd64.go ++++ b/src/crypto/x509/root_darwin_amd64.go +@@ -8,6 +8,7 @@ import ( + "bytes" + "crypto/x509/internal/macOS" + "fmt" ++ "io/ioutil" + "os" + "strings" + ) +@@ -23,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + var loadSystemRootsWithCgo func() (*CertPool, error) + + func loadSystemRoots() (*CertPool, error) { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + var trustedRoots []*Certificate + untrustedRoots := make(map[string]bool) + +diff --git a/src/crypto/x509/root_darwin_arm64.go b/src/crypto/x509/root_darwin_arm64.go +index 2fb079ba66..6a072f3e78 100644 +--- a/src/crypto/x509/root_darwin_arm64.go ++++ b/src/crypto/x509/root_darwin_arm64.go +@@ -6,6 +6,11 @@ + + package x509 + ++import ( ++ "io/ioutil" ++ "os" ++) ++ + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { + return nil, nil + } +@@ -14,6 +19,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + var loadSystemRootsWithCgo func() (*CertPool, error) + + func loadSystemRoots() (*CertPool, error) { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + p := NewCertPool() + p.AppendCertsFromPEM([]byte(systemRootsPEM)) + return p, nil +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index b48e618a65..195c1ff25a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { diff --git a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix index 6374846f44..8ca85817f9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.4062"; + version = "1.0.4241"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1fr9mb7s5f0kiwxf04lqbyqbxfsvki0kwnpcy41m3p3la22mqz47"; + sha256 = "1jp3c67ppl1x4pazr5nzy52615cpx0kyckaridhc0fsmrkgilyxq"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 1502b243d8..fd3270fa0d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,12 +2,12 @@ openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; - version = "11.0.6-b774"; + version = "11.0.7-b64"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0lx3h74jwa14kr8ybwxbzc4jsjj6xnymvckdsrhqhvrciya7bxzw"; + sha256 = "1gxqi6dkyriv9j29ppan638w1ns2g9m4q1sq7arf9kwqr05zim90"; }; patches = []; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index 4181ab29bd..870d5110d1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -57,23 +57,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ - libstdcxxHook targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -100,14 +94,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -127,7 +119,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -145,7 +136,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -161,7 +151,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix index ed76ce77a8..872865ec47 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -39,12 +39,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix index 624034b522..32d6dd3d47 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ../7/compiler-rt-glibc.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix index e7083a6ed1..5a992f4a35 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -51,25 +51,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix index 88ad3c29c3..f8185fc3ff 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix index 13abf6d956..89f25cad2c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ../7/compiler-rt-glibc.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix index b544a4f6ba..2316fbfc3f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -51,25 +51,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix index 57f1431f47..a922bcfaf0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch new file mode 100644 index 0000000000..2d211795fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch @@ -0,0 +1,48 @@ +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 54da635..c5dc1cd 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1158,8 +1158,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +index f89a113..f6f986f 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -213,26 +213,13 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-#if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-#else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-#endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix index 84ca6af3b3..97a5d73f30 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = [ + # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce + ./compiler-rt-glibc.patch + ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix index 0b71c3a28d..b83c0d2cee 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -87,48 +79,77 @@ let lldb = callPackage ./lldb.nix {}; + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + bintools = callPackage ./bintools.nix {}; lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; bintools = wrapBintoolsWith { inherit (tools) bintools; }; extraPackages = [ - # targetLlvmLibraries.libcxx - # targetLlvmLibraries.libcxxabi + targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; lldClangNoLibc = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; libc = null; }; extraPackages = [ - # targetLlvmLibraries.libcxx - # targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; libc = null; }; extraPackages = [ ]; extraBuildCommands = '' - echo "-nostartfiles -target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-nostartfiles" >> $out/nix-support/cc-cflags ''; }; @@ -148,9 +169,16 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ {}; + libcxx = callPackage ./libc++ ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); - libcxxabi = callPackage ./libc++abi.nix {}; + libcxxabi = callPackage ./libc++abi.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + libunwind = libraries.libunwind; + })); openmp = callPackage ./openmp.nix {}; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix index 96cb671fa4..83c05cf0e6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index 15e55800dc..a907d40865 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = [ + ../7/compiler-rt-glibc.patch ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index d9383d042b..34b1f5e641 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -103,14 +95,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -130,7 +120,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -148,7 +137,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -164,7 +152,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index 24bca6aafc..9c0c7951c7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -43,12 +43,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix index 0183754a2f..394f66ff7f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; patches = [ + ../7/compiler-rt-glibc.patch ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix index 3b6db967b6..5d93ca8709 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -103,14 +95,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -130,7 +120,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -148,7 +137,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -164,7 +152,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix index f3081d1f26..cec6de61ca 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -39,12 +39,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix new file mode 100644 index 0000000000..86853a97c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix @@ -0,0 +1,67 @@ +{ stdenv +, fetchFromGitHub +, cmake +, python +, llvm +, clang-tools-extra_src ? null +, rocm-runtime +, lld + +, version +, src +}: + +stdenv.mkDerivation rec { + inherit version src; + + pname = "clang"; + + nativeBuildInputs = [ cmake python ]; + + buildInputs = [ llvm rocm-runtime ]; + + hardeningDisable = [ "all" ]; + + cmakeFlags = [ + "-DLLVM_CMAKE_PATH=${llvm}/lib/cmake/llvm" + "-DLLVM_MAIN_SRC_DIR=${llvm.src}" + "-DCLANG_SOURCE_DIR=${src}" + "-DLLVM_ENABLE_RTTI=ON" + ]; + + VCSVersion = '' + #undef LLVM_REVISION + #undef LLVM_REPOSITORY + #undef CLANG_REVISION + #undef CLANG_REPOSITORY + ''; + + postUnpack = stdenv.lib.optionalString (!(isNull clang-tools-extra_src)) '' + ln -s ${clang-tools-extra_src} $sourceRoot/tools/extra + ''; + + # Rather than let cmake extract version information from LLVM or + # clang source control repositories, we generate the wanted + # `VCSVersion.inc` file ourselves and remove it from the + # depencencies of the `clangBasic` target. + preConfigure = '' + sed 's/ ''${version_inc}//' -i lib/Basic/CMakeLists.txt + sed 's|sys::path::parent_path(BundlerExecutable)|StringRef("${llvm}/bin")|' -i tools/clang-offload-bundler/ClangOffloadBundler.cpp + sed 's|\([[:space:]]*std::string Linker = \)getToolChain().GetProgramPath(getShortName())|\1"${lld}/bin/ld.lld"|' -i lib/Driver/ToolChains/AMDGPU.cpp + substituteInPlace lib/Driver/ToolChains/AMDGPU.h --replace ld.lld ${lld}/bin/ld.lld + sed 's|configure_file(AST/gen_ast_dump_json_test.py ''${LLVM_TOOLS_BINARY_DIR}/gen_ast_dump_json_test.py COPYONLY)||' -i test/CMakeLists.txt + ''; + + postConfigure = '' + mkdir -p lib/Basic + echo "$VCSVersion" > lib/Basic/VCSVersion.inc + ''; + + meta = with stdenv.lib; { + description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend"; + homepage = "https://llvm.org/"; + license = with licenses; [ ncsa ]; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix new file mode 100644 index 0000000000..e90818d850 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, callPackage, wrapCCWith }: + +let + version = "3.5.1"; + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "llvm-project"; + rev = "rocm-${version}"; + sha256 = "03k2xp8wf4awf1zcjc2hb3kf9bqp567c3s569gp1q3q1zjg6r2ib"; + }; +in rec { + clang = wrapCCWith rec { + cc = clang-unwrapped; + extraBuildCommands = '' + clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags + echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + rm $out/nix-support/add-hardening.sh + touch $out/nix-support/add-hardening.sh + ''; + }; + + clang-unwrapped = callPackage ./clang.nix { + inherit lld llvm version; + src = "${src}/clang"; + }; + + lld = callPackage ./lld.nix { + inherit llvm version; + src = "${src}/lld"; + }; + + llvm = callPackage ./llvm.nix { + inherit version; + src = "${src}/llvm"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix new file mode 100644 index 0000000000..052bfd1c62 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix @@ -0,0 +1,33 @@ +{ stdenv +, cmake +, libxml2 +, llvm + +, version +, src +}: + +stdenv.mkDerivation rec { + inherit version src; + + pname = "lld"; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libxml2 llvm ]; + + outputs = [ "out" "dev" ]; + + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$dev" + ''; + + meta = with stdenv.lib; { + description = "ROCm fork of the LLVM Linker"; + homepage = "https://github.com/RadeonOpenCompute/llvm-project"; + license = licenses.ncsa; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm-outputs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm-outputs.patch new file mode 100644 index 0000000000..40096fa349 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix new file mode 100644 index 0000000000..909284a3e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -0,0 +1,97 @@ +{ stdenv +, fetchFromGitHub +, cmake +, python3 +, libxml2 +, libffi +, libbfd +, ncurses +, zlib +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? true + +, version +, src +}: + +let + llvmNativeTarget = + if stdenv.isx86_64 then "X86" + else if stdenv.isAarch64 then "AArch64" + else throw "Unsupported ROCm LLVM platform"; +in stdenv.mkDerivation rec { + inherit src version; + + pname = "rocm-llvm"; + + outputs = [ "out" "python" ] + ++ stdenv.lib.optional enableSharedLibraries "lib"; + + nativeBuildInputs = [ cmake python3 ]; + + buildInputs = [ libxml2 libffi ]; + + propagatedBuildInputs = [ ncurses zlib ]; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=OFF" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" + ] + ++ + stdenv.lib.optional + enableSharedLibraries + "-DLLVM_LINK_LLVM_DYLIB=ON" + ++ stdenv.lib.optionals enableManpages [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ]; + + postPatch = '' + substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib + patch -p1 < ./llvm-outputs.patch + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + postBuild = '' + rm -fR $out + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + ''; + + postInstall = '' + moveToOutput share/opt-viewer "$python" + '' + + stdenv.lib.optionalString enableSharedLibraries '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + ''; + + passthru.src = src; + + meta = with stdenv.lib; { + description = "ROCm fork of the LLVM compiler infrastructure"; + homepage = "https://github.com/RadeonOpenCompute/llvm-project"; + license = with licenses; [ ncsa ]; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix index d534e2483d..b9225cbd79 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "20.01.2"; + version = "20.06"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "084ml6kswgaqjgmib3gq7zjnqsimz3f35w13ff6z0dv4d9csmq4m"; + sha256 = "1gkr9w8lsdzqykqwd3f1a1phsqv090648i14ilhv8jdg85frdimr"; }; buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix new file mode 100644 index 0000000000..6fa5814525 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, mlton }: + +stdenv.mkDerivation rec { + pname = "mlkit"; + version = "4.5.0"; + + src = fetchFromGitHub { + owner = "melsman"; + repo = "mlkit"; + rev = "v${version}"; + sha256 = "0fc0y40qphn02857fv2dvhwzzsvgixzchx9i6i0x80xfv7z68fbh"; + }; + + nativeBuildInputs = [ autoreconfHook mlton ]; + + buildFlags = ["mlkit" "mlkit_libs"]; + + meta = with stdenv.lib; { + description = "Standard ML Compiler and Toolkit"; + homepage = "https://elsman.com/mlkit/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ athas ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/mono/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/mono/generic.nix index e4d99dcec9..c510f37266 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mono/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which +, gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" , extraPatches ? [] @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}"; }; + nativeBuildInputs = [ gnumake42 ]; buildInputs = [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/mruby/bison-36-compat.patch b/third_party/nixpkgs/pkgs/development/compilers/mruby/bison-36-compat.patch new file mode 100644 index 0000000000..674a88fe4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/mruby/bison-36-compat.patch @@ -0,0 +1,59 @@ +From acab088fd6af0b2ef2df1396aeb93bfc2e020fa5 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Mon, 27 Apr 2020 18:52:43 +0900 +Subject: [PATCH 1/2] Updating `parse.y for recent `bison` (retry). + +--- + mrbgems/mruby-compiler/core/parse.y | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y +index 6a1faf4e..2a4f740e 100644 +--- a/mrbgems/mruby-compiler/core/parse.y ++++ b/mrbgems/mruby-compiler/core/parse.y +@@ -1323,7 +1323,7 @@ heredoc_end(parser_state *p) + + %} + +-%pure-parser ++%define api.pure + %parse-param {parser_state *p} + %lex-param {parser_state *p} + +-- +2.27.0 + +From 3cc682d943b29e84928a847a23f411ddbace74b7 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Fri, 15 May 2020 12:30:13 +0900 +Subject: [PATCH 2/2] Remove `YYERROR_VERBOSE` which no longer supported since + `bison 3.6`. + +Instead we added `%define parse.error verbose`. +--- + mrbgems/mruby-compiler/core/parse.y | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y +index 2a4f740e..eee6a5e5 100644 +--- a/mrbgems/mruby-compiler/core/parse.y ++++ b/mrbgems/mruby-compiler/core/parse.y +@@ -9,7 +9,6 @@ + #ifdef PARSER_DEBUG + # define YYDEBUG 1 + #endif +-#define YYERROR_VERBOSE 1 + #define YYSTACK_USE_ALLOCA 1 + + #include +@@ -1323,6 +1322,7 @@ heredoc_end(parser_state *p) + + %} + ++%define parse.error verbose + %define api.pure + %parse-param {parser_state *p} + %lex-param {parser_state *p} +-- +2.27.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix index f6a7fc2f14..2589c47c3b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix @@ -1,17 +1,19 @@ -{ stdenv, ruby, bison, fetchFromGitHub }: +{ stdenv, ruby, bison, rake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mruby"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "1y072c7dh9jf8xwy7kia6cb4dkpspq4zf24ssn7zm5f46p4waxni"; + sha256 = "gEEb0Vn/G+dNgeY6r0VP8bMSPrEOf5s+0GoOcnIPtEU="; }; - nativeBuildInputs = [ ruby bison ]; + nativeBuildInputs = [ ruby bison rake ]; + + patches = [ ./bison-36-compat.patch ]; # Necessary so it uses `gcc` instead of `ld` for linking. # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 diff --git a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index 16470f1682..dc8f750c56 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.06.12"; + version = "2020.07.08"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "c9e7d1448eaa4644d18073316e30586f2cb1d75a"; - sha256 = "13jyg9d8q9xs1gpb8mz315hcyi3npr4kbfi31x2laz4zmki6ibai"; + rev = "3cafb16aa634d2bc369077d8d36760d23973a35b"; + sha256 = "0z6q8f2f97jr037d51h097vck9jspidjn0pb5irlj0xdnb5si0js"; name = "nextpnr"; }) (fetchFromGitHub { @@ -50,7 +50,7 @@ with stdenv; mkDerivation rec { "-DBUILD_TESTS=ON" "-DICEBOX_ROOT=${icestorm}/share/icebox" "-DTRELLIS_INSTALL_PREFIX=${trellis}" - "-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis" + "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" "-DUSE_OPENMP=ON" # warning: high RAM usage "-DSERIALIZE_CHIPDB=OFF" diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 86518b8db0..9fa2270b1d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nim"; - version = "1.2.0"; + version = "1.2.4"; src = fetchurl { url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; - sha256 = "0xf56xb42hc92h4xnvk72q4n3ysjbyhf0rg60lc84r9r6wx5i52f"; + sha256 = "0dnn60slvp3ynlx3zhv3cjkanv8zglljxws0db8g0rdyz8r8zwgf"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix index 2702a19d31..9efeab499e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "0+alpha2"; - sha256 = "131ixp5kkgk9y42vrprhc2x0gpxhkapmdmb26pwkyl58vrbr8xqg"; + patch_version = "0+beta2"; + sha256 = "1n39qfwvpwlhp9m73zi9hrk9ny9g6spy9apc36n2ydpf5dn7pg75"; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch b/third_party/nixpkgs/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch deleted file mode 100644 index 0b9359221a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 036c87c82793f1da9f98445e8e27462cc19bbe0a Mon Sep 17 00:00:00 2001 -From: John Ericson -Date: Sat, 22 Feb 2020 14:38:38 -0500 -Subject: [PATCH] Allow getting `no_std` from the config file - -Currently, it is only set correctly in the sanity checking implicit -default fallback code. Having a config file at all will for force -`no_std = false`. ---- - src/bootstrap/config.rs | 3 +++ - src/bootstrap/sanity.rs | 4 +--- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs -index 110c8b844d5..83a6934d477 100644 ---- a/src/bootstrap/config.rs -+++ b/src/bootstrap/config.rs -@@ -350,6 +350,7 @@ struct TomlTarget { - musl_root: Option, - wasi_root: Option, - qemu_rootfs: Option, -+ no_std: Option, - } - - impl Config { -@@ -610,6 +611,8 @@ impl Config { - target.musl_root = cfg.musl_root.clone().map(PathBuf::from); - target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from); - target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from); -+ target.no_std -+ = cfg.no_std.unwrap_or(triple.contains("-none-") || triple.contains("nvptx")); - - config.target_config.insert(INTERNER.intern_string(triple.clone()), target); - } -diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs -index 8ff7056e628..76e721ed8e3 100644 ---- a/src/bootstrap/sanity.rs -+++ b/src/bootstrap/sanity.rs -@@ -194,9 +194,7 @@ pub fn check(build: &mut Build) { - - if target.contains("-none-") || target.contains("nvptx") { - if build.no_std(*target).is_none() { -- let target = build.config.target_config.entry(target.clone()).or_default(); -- -- target.no_std = true; -+ build.config.target_config.entry(target.clone()).or_default(); - } - - if build.no_std(*target) == Some(false) { --- -2.24.1 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_42.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_42.nix deleted file mode 100644 index 8717aaf76a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_42.nix +++ /dev/null @@ -1,44 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security -, llvmPackages_5 -, pkgsBuildTarget, pkgsBuildBuild -} @ args: - -import ./default.nix { - rustcVersion = "1.42.0"; - rustcSha256 = "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.41.0"; - - # fetch hashes by running `print-hashes.sh 1.42.0` - bootstrapHashes = { - i686-unknown-linux-gnu = "a93a34f9cf3d35de2496352cb615b42b792eb09db3149b3a278efd2c58fa7897"; - x86_64-unknown-linux-gnu = "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b"; - arm-unknown-linux-gnueabihf = "d0b33fcc97eeb96d716b30573c7e66affdf9077ecdecb30df2498b49f8284047"; - armv7-unknown-linux-gnueabihf = "3c8e787fb4f4f304a065e78c38010f0b5722d809f9dafb0e904084bf0f54f7be"; - aarch64-unknown-linux-gnu = "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27"; - i686-apple-darwin = "628134b3fbaf5c0e7a25bd9a2b8d25f6e68bb256c8b04a3332ec979f5a1cd339"; - x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_42; - - rustcPatches = [ - ./0001-Allow-getting-no_std-from-the-config-file.patch - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_43.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_44.nix similarity index 51% rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_43.nix rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_44.nix index a1a9d17fcd..9fc268d152 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_43.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_44.nix @@ -16,24 +16,24 @@ } @ args: import ./default.nix { - rustcVersion = "1.43.0"; - rustcSha256 = "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm"; + rustcVersion = "1.44.1"; + rustcSha256 = "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"; # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.42.0"; + bootstrapVersion = "1.43.1"; - # fetch hashes by running `print-hashes.sh 1.43.0` + # fetch hashes by running `print-hashes.sh 1.44.1` bootstrapHashes = { - i686-unknown-linux-gnu = "1c89c12c8fc1a45dcbcb9ee2e21cc634b8453f1d4cdd658269263de686aab4e4"; - x86_64-unknown-linux-gnu = "7d1e07ad9c8a33d8d039def7c0a131c5917aa3ea0af3d0cc399c6faf7b789052"; - arm-unknown-linux-gnueabihf = "6cf776b910d08fb0d1f88be94464e7b20a50f9d8b2ec6372c3c385aec0b70e7a"; - armv7-unknown-linux-gnueabihf = "a36e7f2bd148e325a7b8e7131b4226266cf522b1a2b12d585dad9c38ef68f4d9"; - aarch64-unknown-linux-gnu = "fdd39f856a062af265012861949ff6654e2b7103be034d046bec84ebe46e8d2d"; - x86_64-apple-darwin = "db1055c46e0d54b99da05e88c71fea21b3897e74a4f5ff9390e934f3f050c0a8"; + i686-unknown-linux-gnu = "0626fa8a6a2387021413d740543f7496656d81115e2284e4ef73217128398990"; + x86_64-unknown-linux-gnu = "25cd71b95bba0daef56bad8c943a87368c4185b90983f4412f46e3e2418c0505"; + arm-unknown-linux-gnueabihf = "16b9c4861565a195323d144fd0f54c0ae794ee3d2a867682f8aedbdacaad5a6c"; + armv7-unknown-linux-gnueabihf = "0c32a5958a358a031e6ca52074cfd45256688dc334db315199f5dbbf7562e5b1"; + aarch64-unknown-linux-gnu = "fbb612387a64c9da2869725afffc1f66a72d6e7ba6667ba717cd52c33080b7fb"; + x86_64-apple-darwin = "e1c3e1426a9e615079159d6b619319235e3ca7b395e7603330375bfffcbb7003"; }; - selectRustPackage = pkgs: pkgs.rust_1_43; + selectRustPackage = pkgs: pkgs.rust_1_44; rustcPatches = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix index dfea7f6c8e..e820b98262 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix @@ -38,6 +38,11 @@ rustPlatform.buildRustPackage { --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" installManPage src/tools/cargo/src/etc/man/* + + installShellCompletion --bash --name cargo \ + src/tools/cargo/src/etc/cargo.bashcomp.sh + + installShellCompletion --zsh src/tools/cargo/src/etc/_cargo ''; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.13.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.13.nix index 04086321be..75996c382a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.13.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/scala/2.13.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.13.2"; + name = "scala-2.13.3"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1gvdxwlhgjmn8i5a8kcp19700rscjq9ylb35p8vj7nqys94zjkap"; + sha256 = "0zv9w9f6g2cfydsvp8mqcfgv2v3487xp4ca1qndg6v7jrhdp7wy9"; }; propagatedBuildInputs = [ jre ] ; diff --git a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix b/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix index 00d1a2f796..d7fc7b114a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "1.7.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "0px8kh5875q2iyza4ylpa6vxpy6qxg0qvn2idk1j6dcdf5pdryph"; + sha256 = "1azn32x0xbbk8gagipb34qk3y1srm927j5d34w20isgjxir4xsnz"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix index 0cd1f70442..b838aa5917 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -182,6 +182,9 @@ stdenv.mkDerivation { ''; patchPhase = '' + # Glibc 2.31 fix + patch -p1 -i ${./patches/swift-llvm.patch} + # Just patch all the things for now, we can focus this later patchShebangs $SWIFT_SOURCE_ROOT @@ -258,7 +261,7 @@ stdenv.mkDerivation { buildPhase = '' # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found - export NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(< $NIX_CC/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. # This compiler is not using the Nix wrappers, so it needs some help to find things. export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE" diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-llvm.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-llvm.patch new file mode 100644 index 0000000000..fcd9533fd7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-llvm.patch @@ -0,0 +1,48 @@ +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index bc6675bf4..2f3514b64 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1129,8 +1129,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +index de69852d3..652d5cb3b 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -204,26 +204,13 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-#if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-#else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-#endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 1ac34c2431..7d645da8b4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.06.19"; + version = "2020.07.07"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "338ecbe02f8bb3cc4d69de1445c7f398a814b4e4"; - sha256 = "0j5jwyxrq8rmwpyyidid6yp6g5bq7jwnhmn2ycj82kdj787p9vvs"; + rev = "000fd08198487cd1d36e65e4470f4b0269c23a2b"; + sha256 = "01s252vwh4g1f4y99nfrkpf6hgvh9k63nz8hvpmjza5z8x6zf4i1"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix index 7f3c77c75e..96ab512db6 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix @@ -27,15 +27,23 @@ let params = }; "8.10" = rec { - version = "1.2.0"; + version = "1.2.1"; rev = "v${version}"; - sha256 = "1xs4mr3rdb0g44736jb40k370hw3maxdk12jiq1w1dl3q5gfrhah"; + sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46"; + }; + + "8.11" = rec { + version = "1.3.1"; + rev = "v${version}"; + sha256 = "0cajan9w52faqrg42r9rxai4wzsggs86qar88w7lcb928jvcakml"; }; }; param = params.${coq.coq-version}; in -let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in +let inherit (stdenv.lib) maintainers optional optionals versionAtLeast; in + +let recent = versionAtLeast coq.coq-version "8.8"; in stdenv.mkDerivation { @@ -51,12 +59,16 @@ stdenv.mkDerivation { "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]) - ++ stdenv.lib.optionals recent - (with coq.ocamlPackages; [ ocamlbuild num ]) + ++ (with coq.ocamlPackages; [ ocaml findlib ]) + ++ optionals (recent && !versionAtLeast coq.coq-version "8.10") + (with coq.ocamlPackages; [ camlp5 ocamlbuild ]) + ++ optional recent coq.ocamlPackages.num ; propagatedBuildInputs = [ ssreflect ] - ++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ]; + ++ optionals recent [ coq-ext-lib simple-io ] + ++ optional (versionAtLeast coq.coq-version "8.10") + coq.ocamlPackages.ocamlbuild + ; enableParallelBuilding = false; @@ -64,7 +76,7 @@ stdenv.mkDerivation { make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install ''; - meta = with stdenv.lib; { + meta = { homepage = "https://github.com/QuickChick/QuickChick"; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix index 05dcb7898e..9665c5400d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "https://github.com/coq-community/coq-bits"; + homepage = "https://github.com/coq-community/bits"; description = "A formalization of bitset operations in Coq"; license = licenses.asl20; maintainers = with maintainers; [ ptival ]; @@ -33,6 +33,6 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-extensible-records/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-extensible-records/default.nix deleted file mode 100644 index 531c152876..0000000000 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-extensible-records/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchFromGitHub, coq }: - -let - versions = { - pre_8_9 = { - owner = "gmalecha"; - rev = "1.2.0"; - version = "1.2.0"; - sha256 = "0h5m04flqfk0v577syw0v1dw2wf7xrx6jaxv5gpmqzssf5hxafy4"; - }; - post_8_9 = { - owner = "Ptival"; - rev = "bd7082a3571ee3c111096ff6b5eb28c8d3a99ce5"; - version = "1.2.0+8.9-fix"; - sha256 = "0625qd8pyxi0v704fwnawrfw5fk966vnk120il0g6qv42siyck95"; - }; - }; - params = - { - "8.5" = versions.pre_8_9; - "8.6" = versions.pre_8_9; - "8.7" = versions.pre_8_9; - "8.8" = versions.pre_8_9; - "8.9" = versions.post_8_9; - "8.10" = versions.post_8_9; - }; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation rec { - inherit (param) version; - name = "coq${coq.coq-version}-coq-extensible-records-${version}"; - - src = fetchFromGitHub { - inherit (param) owner rev sha256; - repo = "coq-extensible-records"; - }; - - buildInputs = [ coq ]; - - enableParallelBuilding = true; - - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/gmalecha/coq-extensible-records"; - description = "Implementation of extensible records in Coq"; - license = licenses.mit; - maintainers = with maintainers; [ ptival ]; - platforms = coq.meta.platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix index 060fa3b4c8..47ab19048e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix @@ -33,9 +33,15 @@ let }; "8.11" = { - version = "1.2.1"; - rev = "v1.2.1-8.11"; - sha256 = "06k0h7lansxs479is3vj5ikg8s5k4c6svnqcwmxbni4wx8bhmg17"; + version = "1.2.2"; + rev = "v1.2.2-8.11"; + sha256 = "0g2y0s8kb2imbqyrx9hmvjzpwmicid7shv7ma10fnb8dgk2dqkf9"; + }; + + "8.12" = { + version = "1.2.2"; + rev = "v1.2.2-8.12"; + sha256 = "0fkz78i2gn9x9scfa7n8fl2sq7czppsicy7w5mq919qqfp0w1aj0"; }; }; param = params.${coq.coq-version}; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix index 9e78a9f388..d5cfb5a217 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix @@ -3,9 +3,9 @@ let params = if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.4.1"; - uid = "38104"; - sha256 = "1zklv2w34k866fpwmw8q692mid5n6s75d2mmhhigrzpx5l3d4z6y"; + version = "3.4.2"; + uid = "38288"; + sha256 = "00bgzbji0gkazwxhs4q8gz4ccqsa1y1r0m0ravr18ps2h8a8qva5"; } else { version = "3.3.0"; uid = "37077"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; }; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix index 07ce35875d..bc020174da 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, coq, coq-ext-lib }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.3.0"; name = "coq${coq.coq-version}-simple-io-${version}"; src = fetchFromGitHub { owner = "Lysxia"; repo = "coq-simple-io"; rev = version; - sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m"; + sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; }; buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]); @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/tlc/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/tlc/default.nix index 8a10dc388d..816b220502 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/tlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/tlc/default.nix @@ -1,13 +1,27 @@ -{ stdenv, fetchurl, coq }: +{ stdenv, fetchurl, fetchFromGitHub, coq }: -stdenv.mkDerivation rec { - version = "20181116"; - name = "coq${coq.coq-version}-tlc-${version}"; +let params = + if stdenv.lib.versionAtLeast coq.coq-version "8.10" + then rec { + version = "20200328"; + src = fetchFromGitHub { + owner = "charguer"; + repo = "tlc"; + rev = version; + sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; + }; + } else rec { + version = "20181116"; + src = fetchurl { + url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz"; + sha256 = "0iv6f6zmrv2lhq3xq57ipmw856ahsql754776ymv5wjm88ld63nm"; + }; + } +; in - src = fetchurl { - url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz"; - sha256 = "0iv6f6zmrv2lhq3xq57ipmw856ahsql754776ymv5wjm88ld63nm"; - }; +stdenv.mkDerivation { + inherit (params) version src; + pname = "coq${coq.coq-version}-tlc"; buildInputs = [ coq ]; @@ -22,6 +36,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.6" "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix index 7715448511..286037b2cc 100644 --- a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -11,7 +11,7 @@ let deps = import ./deps.nix { inherit fetchurl; }; - version = "2020-04-24"; + version = "2020-06-19"; # Build the nuget source needed for the later build all by itself # since it's a time-consuming step that only depends on ./deps.nix. @@ -49,8 +49,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "d480cd12649dcff78ed271c92c274fab60c00f2f"; - sha256 = "0p2sw6w6fymdlxn8r5ndvija2l7rd77f5rddq9n71dxj1nicljh3"; + rev = "838ba78e00173d639bd90f54d8610ec16b4ba3a2"; + sha256 = "0nj8l1apcb67gqwy5i49v0f01fs4lvdfmmp4w2hvrpss9if62c1m"; }; buildInputs = [dotnet-sdk_3 openssl icu]; diff --git a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix index 803f33f892..c47e29b642 100644 --- a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -28,24 +28,6 @@ in [ sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; }) - (fetchNuGet { - name = "LiteDB"; - version = "4.1.4"; - sha256 = "1g9258mv3jm9ps2s5wcxbmszh9nqiiw3d9nrfqis8x72jqiqi6js"; - }) - - (fetchNuGet { - name = "MSTest.TestAdapter"; - version = "2.1.0"; - sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; - }) - - (fetchNuGet { - name = "MSTest.TestFramework"; - version = "2.1.0"; - sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; - }) - (fetchNuGet { name = "MessagePack"; version = "2.1.90"; @@ -100,60 +82,24 @@ in [ sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.5.0"; sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.2"; sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m"; }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.5.0"; - sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.1"; - sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.0.0"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { name = "Microsoft.NetCore.App.Host.linux-x64"; version = "3.0.2"; @@ -208,6 +154,42 @@ in [ sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9"; }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.5.0"; + sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + }) + (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.5.0"; @@ -269,21 +251,15 @@ in [ }) (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.1"; - sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + name = "MSTest.TestAdapter"; + version = "2.1.0"; + sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; }) (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) - - (fetchNuGet { - name = "NSubstitute"; - version = "4.2.1"; - sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy"; + name = "MSTest.TestFramework"; + version = "2.1.0"; + sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; }) (fetchNuGet { @@ -293,9 +269,15 @@ in [ }) (fetchNuGet { - name = "NewtonSoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { @@ -310,18 +292,342 @@ in [ sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { + name = "NewtonSoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { + name = "NSubstitute"; + version = "4.2.1"; + sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy"; + }) + (fetchNuGet { name = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }) + + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }) + + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) + + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + + (fetchNuGet { + name = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }) + + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + + (fetchNuGet { + name = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; + }) + + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; + }) + + (fetchNuGet { + name = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.3.0"; + sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + + (fetchNuGet { + name = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + (fetchNuGet { name = "StreamJsonRpc"; version = "2.3.103"; @@ -1006,316 +1312,4 @@ in [ sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.3.0"; - sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; - }) - - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; - }) - - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; - }) - - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) - - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; - }) - - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; - }) - - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) - - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; - }) - - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; - }) - - (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; - version = "4.3.0"; - sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; - }) - - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }) - - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; - }) - - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }) - - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; - }) - - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }) - - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; - }) - - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.3.0"; - sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; - }) - - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.3.0"; - sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; - }) - - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }) - - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; - }) - - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }) - - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; - }) - - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }) - - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; - }) - - (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Console"; - version = "4.3.0"; - sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; - }) - - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; - version = "4.3.0"; - sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - ] diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix index 0d8b382167..a478871bd9 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -127,7 +127,7 @@ let export GOSUMDB=off export GOPROXY=off cd "$modRoot" - if [ -n "${go-modules}" ]; then + if [ -n "${go-modules}" ]; then rm -rf vendor ln -s ${go-modules} vendor fi diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 789f1e8fd0..5a5204c3db 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -51,10 +51,6 @@ self: super: { # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; - # Tests are failing - # https://github.com/bos/statistics/issues/123 - statistics = dontCheck super.statistics; - # These packages (and their reverse deps) cannot be built with profiling enabled. ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; ghc-datasize = disableLibraryProfiling super.ghc-datasize; @@ -66,10 +62,6 @@ self: super: { mysql-simple = dontCheck super.mysql-simple; mysql-haskell = dontCheck super.mysql-haskell; - # Tests failing, fixed once 0.8.0 is in stackage - # https://gitlab.com/twittner/zeromq-haskell/issues/63 - zeromq4-haskell = dontCheck super.zeromq4-haskell; - # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ git-annex = (overrideSrc super.git-annex { @@ -77,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0adw72lw3ygls87w6i7hirf26gz991dkm992jb5f0h5nvy6d44pl"; + sha256 = "1b5lb1h7pqfhmp54zzwha17ms20xvxai1dl7s6787m9asli4q406"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -125,19 +117,16 @@ self: super: { }); # The Haddock phase fails for one reason or another. - bytestring-progress = dontHaddock super.bytestring-progress; deepseq-magic = dontHaddock super.deepseq-magic; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; - classy-prelude-yesod = dontHaddock super.classy-prelude-yesod; # https://github.com/haskell/haddock/issues/979 # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; # sse2 flag due to https://github.com/haskell/vector/issues/47. - # dontCheck due to https://github.com/haskell/vector/issues/138 - vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); + vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector; conduit-extra = if pkgs.stdenv.isDarwin then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }) @@ -181,20 +170,14 @@ self: super: { # Test suite depends on source code being available simple-affine-space = dontCheck super.simple-affine-space; - # https://github.com/kazu-yamamoto/simple-sendfile/issues/17 - simple-sendfile = dontCheck super.simple-sendfile; - # Fails no apparent reason. Upstream has been notified by e-mail. assertions = dontCheck super.assertions; # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; - euler = dontCheck super.euler; # https://github.com/decomputed/euler/issues/1 filestore = dontCheck super.filestore; - getopt-generics = dontCheck super.getopt-generics; graceful = dontCheck super.graceful; - Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; ide-backend = dontCheck super.ide-backend; marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69 @@ -219,10 +202,12 @@ self: super: { # base bound digit = doJailbreak super.digit; - # 2020-06-05: HACK: does not passes own build suite - `dontCheck` - hnix = generateOptparseApplicativeCompletion "hnix" ( - dontCheck super.hnix - ); + # 2020-06-05: HACK: does not passes own build suite - `dontCheck` We should + # generate optparse-applicative completions for the hnix executable. Sadly + # building of the executable has been disabled for ghc < 8.10 in hnix. + # Generating the completions should be activated again, once we default to + # ghc 8.10. + hnix = dontCheck super.hnix; # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -249,7 +234,6 @@ self: super: { bloodhound = dontCheck super.bloodhound; buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw - cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw camfort = dontCheck super.camfort; cjk = dontCheck super.cjk; @@ -320,12 +304,17 @@ self: super: { language-slice = dontCheck super.language-slice; ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; - lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; + math-functions = if pkgs.stdenv.isDarwin + then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 + else super.math-functions; matplotlib = dontCheck super.matplotlib; memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; + mockery = if pkgs.stdenv.isDarwin + then overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }) # darwin doesn't have sub-second resolution https://github.com/hspec/mockery/issues/11 + else super.mockery; modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*) nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; @@ -393,9 +382,6 @@ self: super: { # https://github.com/bos/snappy/issues/1 snappy = dontCheck super.snappy; - # https://github.com/kim/snappy-framing/issues/3 - snappy-framing = dontHaddock super.snappy-framing; - # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; @@ -408,9 +394,6 @@ self: super: { # https://github.com/joeyadams/haskell-stm-delay/issues/3 stm-delay = dontCheck super.stm-delay; - # https://github.com/cgaebel/stm-conduit/issues/33 - stm-conduit = dontCheck super.stm-conduit; - # https://github.com/pixbi/duplo/issues/25 duplo = dontCheck super.duplo; @@ -436,9 +419,6 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); - # https://github.com/vincenthz/hs-asn1/issues/12 - asn1-encoding = dontCheck super.asn1-encoding; - # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x. test-framework = dontCheck super.test-framework; @@ -456,13 +436,10 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; - # https://github.com/PaulJohnson/geodetics/issues/1 - geodetics = dontCheck super.geodetics; - # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # https://github.com/tych0/xcffib/issues/37 + # Waiting on language-python 0.5.8 https://github.com/bjpop/language-python/issues/60 xcffib = dontCheck super.xcffib; # https://github.com/afcowie/locators/issues/1 @@ -503,21 +480,12 @@ self: super: { then self.buildHaskellPackages.tasty-discover else dontCheck super.tasty-discover); - # generic-deriving bound is too tight - # aeson 1.4.6.0 needs Diff 0.4.0 to do tests but nixpkgs is still at 0.3.4 - # https://github.com/bos/aeson/issues/740 - aeson = dontCheck (doJailbreak super.aeson); - - # containers >=0.4 && <0.6 is too tight - # https://github.com/RaphaelJ/friday/issues/34 + # Waiting on https://github.com/RaphaelJ/friday/pull/36 friday = doJailbreak super.friday; # Won't compile with recent versions of QuickCheck. inilist = dontCheck super.inilist; - # Doesn't accept recent versions of 'base' or QuickCheck. - MissingH = dontCheck (doJailbreak super.MissingH); - # https://github.com/yaccz/saturnin/issues/3 Saturnin = dontCheck super.Saturnin; @@ -530,12 +498,6 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; - # https://github.com/haskell-hvr/lzma/issues/14 - lzma = dontCheck super.lzma; - - # https://github.com/BNFC/bnfc/issues/140 - BNFC = dontCheck super.BNFC; - # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; @@ -550,21 +512,12 @@ self: super: { inline-c-win32 = dontDistribute super.inline-c-win32; Southpaw = dontDistribute super.Southpaw; - # https://github.com/yesodweb/serversession/issues/1 - serversession = dontCheck super.serversession; - # Hydra no longer allows building texlive packages. lhs2tex = dontDistribute super.lhs2tex; # https://ghc.haskell.org/trac/ghc/ticket/9825 vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }); - # https://github.com/hspec/mockery/issues/6 - mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }); - - # https://github.com/alphaHeavy/lzma-conduit/issues/5 - lzma-conduit = dontCheck super.lzma-conduit; - # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; @@ -595,9 +548,6 @@ self: super: { sha256 = "13g462qmj8c7if797gnyvf8h0cddmm3xy0pjldw48w8f8sr4qsj0"; }); - # https://github.com/athanclark/sets/issues/2 - sets = dontCheck super.sets; - # Install icons, metadata and cli program. bustle = overrideCabal super.bustle (drv: { buildDepends = [ pkgs.libpcap ]; @@ -681,9 +631,6 @@ self: super: { # https://github.com/pxqr/base32-bytestring/issues/4 base32-bytestring = dontCheck super.base32-bytestring; - # https://github.com/goldfirere/singletons/issues/122 - singletons = dontCheck super.singletons; - # Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal # https://github.com/augustss/djinn/pull/8 djinn = appendPatch super.djinn (pkgs.fetchpatch { @@ -694,9 +641,6 @@ self: super: { # We cannot build this package w/o the C library from . phash = markBroken super.phash; - # We get lots of strange compiler errors during the test suite run. - jsaddle = dontCheck super.jsaddle; - # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { @@ -708,9 +652,6 @@ self: super: { # The standard libraries are compiled separately. idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris); - # https://github.com/bos/math-functions/issues/25 - math-functions = dontCheck super.math-functions; - # build servant docs from the repository servant = let @@ -748,10 +689,6 @@ self: super: { # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; - # https://github.com/roelvandijk/terminal-progress-bar/issues/13 - # Still needed because of HUnit < 1.6 - terminal-progress-bar = doJailbreak super.terminal-progress-bar; - # https://hydra.nixos.org/build/42769611/nixlog/1/raw # note: the library is unmaintained, no upstream issue dataenc = doJailbreak super.dataenc; @@ -774,39 +711,17 @@ self: super: { # No upstream issue tracker hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff; - # https://github.com/basvandijk/lifted-base/issues/34 - # Still needed as HUnit < 1.5 - lifted-base = doJailbreak super.lifted-base; - # Don't depend on chell-quickcheck, which doesn't compile due to restricting # QuickCheck to versions ">=2.3 && <2.9". system-filepath = dontCheck super.system-filepath; - # https://github.com/basvandijk/case-insensitive/issues/24 - # Still needed as HUnit < 1.6 - case-insensitive = doJailbreak super.case-insensitive; - # https://github.com/hvr/uuid/issues/28 uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # https://github.com/ekmett/lens/issues/713 - lens = disableCabalFlag super.lens "test-doctests"; - - # https://github.com/haskell/fgl/issues/60 - # Needed for QuickCheck < 2.10 - fgl = dontCheck super.fgl; - fgl-arbitrary = doJailbreak super.fgl-arbitrary; - # The tests spuriously fail libmpd = dontCheck super.libmpd; - # https://github.com/dan-t/cabal-lenses/issues/6 - cabal-lenses = doJailbreak super.cabal-lenses; - - # https://github.com/fizruk/http-api-data/issues/49 - http-api-data = dontCheck super.http-api-data; - # https://github.com/diagrams/diagrams-lib/issues/288 diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); @@ -836,9 +751,6 @@ self: super: { digestive-functors-blaze = doJailbreak super.digestive-functors-blaze; digestive-functors = doJailbreak super.digestive-functors; - # missing dependencies: doctest ==0.12.* - html-entities = doJailbreak super.html-entities; - # https://github.com/takano-akio/filelock/issues/5 filelock = dontCheck super.filelock; @@ -858,8 +770,7 @@ self: super: { grakn = dontCheck (doJailbreak super.grakn); # test suite requires git and does a bunch of git operations - # doJailbreak because of hardcoded time, seems to be fixed upstream - restless-git = dontCheck (doJailbreak super.restless-git); + restless-git = dontCheck super.restless-git; # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; @@ -876,20 +787,18 @@ self: super: { # Needs QuickCheck <2.10, which we don't have. edit-distance = doJailbreak super.edit-distance; - blaze-markup = doJailbreak super.blaze-markup; blaze-html = doJailbreak super.blaze-html; - attoparsec = dontCheck super.attoparsec; # 1 out of 67 tests fails int-cast = doJailbreak super.int-cast; - nix-derivation = doJailbreak super.nix-derivation; # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; + # Depends on tasty < 1.x, which we don't have. + cryptohash-sha256 = doJailbreak super.cryptohash-sha256; + # Needs tasty-quickcheck ==0.8.*, which we don't have. - cryptohash-sha256 = dontCheck super.cryptohash-sha256; cryptohash-sha1 = doJailbreak super.cryptohash-sha1; cryptohash-md5 = doJailbreak super.cryptohash-md5; - text-short = doJailbreak super.text-short; gitHUD = dontCheck super.gitHUD; githud = dontCheck super.githud; @@ -897,7 +806,6 @@ self: super: { config-ini = dontCheck super.config-ini; # doctest >=0.9 && <0.12 - genvalidity-property = doJailbreak super.genvalidity-property; path = dontCheck super.path; # Test suite fails due to trying to create directories @@ -928,12 +836,6 @@ self: super: { in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; - # requires a release including https://github.com/haskell-servant/servant-swagger/commit/249530d9f85fe76dfb18b100542f75a27e6a3079 - servant-swagger = dontCheck super.servant-swagger; - - # Tries to read a file it is not allowed to in the test suite - load-env = dontCheck super.load-env; - # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { @@ -976,18 +878,8 @@ self: super: { ''; }); - # https://github.com/haskell-rewriting/term-rewriting/pull/15 - # remove on next hackage update - term-rewriting = doJailbreak super.term-rewriting; - - # https://github.com/GaloisInc/pure-zlib/pull/11 - pure-zlib = doJailbreak super.pure-zlib; - - # https://github.com/strake/lenz-template.hs/pull/2 - lenz-template = doJailbreak super.lenz-template; # https://github.com/haskell-hvr/resolv/pull/6 - resolv = dontCheck super.resolv; resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2; # spdx 0.2.2.0 needs older tasty @@ -1006,33 +898,24 @@ self: super: { # Compiles some C++ source which requires these headers VulkanMemoryAllocator = addExtraLibrary super.VulkanMemoryAllocator pkgs.vulkan-headers; - # # Builds only with the latest version of indexed-list-literals. - # vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override { - # indexed-list-literals = self.indexed-list-literals_0_2_1_1; - # }; - # https://github.com/dmwit/encoding/pull/3 encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch); # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; - # Test suite depends on old QuickCheck 2.10.x. - cassava = dontCheck super.cassava; - # Test suite depends on cabal-install doctest = dontCheck super.doctest; # https://github.com/haskell-servant/servant-auth/issues/113 servant-auth-client = dontCheck super.servant-auth-client; - # Test has either build errors or fails anyway, depending on the compiler. - vector-algorithms = dontCheck super.vector-algorithms; - # 2020-06-04: HACK: dontCheck - The test suite attempts to use the network. # Should be solved when: https://github.com/dhall-lang/dhall-haskell/issues/1837 - dhall = generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall); + dhall = (generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall)).override { repline = self.repline_0_3_0_0; }; dhall_1_30_0 = dontCheck super.dhall_1_30_0; + repline_0_3_0_0 = super.repline_0_3_0_0.override { haskeline = self.haskeline_0_8_0_0; }; + haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] @@ -1065,13 +948,6 @@ self: super: { sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; }); - # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 - blank-canvas = dontCheck super.blank-canvas; - blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2; - - # needed because of testing-feat >=0.4.0.2 && <1.1 - language-ecmascript = doJailbreak super.language-ecmascript; - # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can. sexpr = appendPatch (overrideCabal super.sexpr (drv: { @@ -1082,9 +958,6 @@ self: super: { # https://github.com/haskell/hoopl/issues/50 hoopl = dontCheck super.hoopl; - # https://github.com/snapframework/xmlhtml/pull/37 - xmlhtml = doJailbreak super.xmlhtml; - purescript = let purescriptWithOverrides = super.purescript.override { @@ -1110,7 +983,7 @@ self: super: { # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; - # https://github.com/DanielG/cabal-helper/issues/59 + # https://github.com/DanielG/cabal-helper/pull/123 cabal-helper = doJailbreak super.cabal-helper; # TODO(Profpatsch): factor out local nix store setup from @@ -1120,19 +993,12 @@ self: super: { # }); libnix = dontCheck super.libnix; - # Jailbreak: https://github.com/jaor/xmobar/issues/463 - # The test suite tries to mess with ALSA, which doesn't work in the build sandbox. - xmobar = appendPatch (dontCheck super.xmobar) (pkgs.fetchpatch { - url = "https://github.com/jaor/xmobar/pull/464.patch"; - sha256 = "0y1dd878yzy1cx0cjj0ijd3dmywr7jdmk68vxdjimxzblrdw1al6"; - }); + # dontCheck: The test suite tries to mess with ALSA, which doesn't work in the build sandbox. + xmobar = dontCheck super.xmobar; # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 - tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 - # Requires pg_ctl command during tests beam-postgres = overrideCabal super.beam-postgres (drv: { testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; @@ -1146,14 +1012,6 @@ self: super: { })]; }); - # Remove unecessary constraint: - # https://github.com/haskell-infra/hackage-trustees/issues/258 - data-accessor-template = overrideCabal super.data-accessor-template (drv: { - postPatch = '' - sed -i 's#template-haskell >=2.11 && <2.15#template-haskell#' data-accessor-template.cabal - ''; - }); - # 2020-06-05: HACK: In Nixpkgs currently this is # old pandoc version 2.7.4 to current 2.9.2.1, # test suite failures: https://github.com/jgm/pandoc/issues/5582 @@ -1163,8 +1021,7 @@ self: super: { xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; # Some tests depend on a postgresql instance - # Haddock failure: https://github.com/haskell/haddock/issues/979 - esqueleto = dontHaddock (dontCheck super.esqueleto); + esqueleto = dontCheck super.esqueleto; # Requires API keys to run tests algolia = dontCheck super.algolia; @@ -1192,9 +1049,6 @@ self: super: { # Test suite won't link for no apparent reason. constraints-deriving = dontCheck super.constraints-deriving; - # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 - graphviz = dontCheck super.graphviz; - # https://github.com/elliottt/hsopenid/issues/15 openid = markBroken super.openid; @@ -1207,16 +1061,9 @@ self: super: { ''; }); - # The doctests in universum-1.5.0 are broken. The doctests in versions of universum after - # 1.5.0 should be fixed, so this should be able to be removed. - universum = dontCheck super.universum; - # https://github.com/erikd/hjsmin/issues/32 hjsmin = dontCheck super.hjsmin; - # https://github.com/blamario/grampa/issues/19 - rank2classes = dontCheck super.rank2classes; - nix-tools = super.nix-tools.overrideScope (self: super: { # Needs https://github.com/peti/hackage-db/pull/9 hackage-db = super.hackage-db.overrideAttrs (old: { @@ -1232,9 +1079,6 @@ self: super: { # upstream issue: https://github.com/vmchale/atspkg/issues/12 language-ats = dontCheck super.language-ats; - # https://github.com/Happstack/web-routes-th/pull/3 - web-routes-th = doJailbreak super.web-routes-th; - # Remove for hail > 0.2.0.0 hail = overrideCabal super.hail (drv: { patches = [ @@ -1253,15 +1097,9 @@ self: super: { ]; }); - # https://github.com/Daniel-Diaz/HaTeX/issues/144 - HaTeX = dontCheck super.HaTeX; - # https://github.com/kazu-yamamoto/dns/issues/150 dns = dontCheck super.dns; - # Support recent versions of fast-logger. - spacecookie = doJailbreak super.spacecookie; - # apply patches from https://github.com/snapframework/snap-server/pull/126 # manually until they are accepted upstream snap-server = overrideCabal super.snap-server (drv: { @@ -1283,9 +1121,6 @@ self: super: { # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; - # krank-0.1.0 does not accept PyF-0.9.0.0. - krank = doJailbreak super.krank; - # the test suite has an overly tight restriction on doctest # See https://github.com/ekmett/perhaps/pull/5 perhaps = doJailbreak super.perhaps; @@ -1297,59 +1132,10 @@ self: super: { ''; }); - # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin - # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that - # patch here. That single patch is for the gtk2hs super-repo, out of which - # we extract the patch for each indvidiual project (glib/gio/pango/gtk/gtk3). - glib = appendPatch super.glib (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "glib.cabal" ]; - stripLen = 1; - sha256 = "1zdss1xgsbijs3kx8dp5a81qryrfc1zm1xrd20whna3dqakf8b7g"; - }); - gio = appendPatch super.gio (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "gio.cabal" ]; - stripLen = 1; - sha256 = "0d72k6gqvgax9jcqi3gz1gqnar7jg8p5065z3mw2fcwvdw46s2zv"; - }); - pango = appendPatch super.pango (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "pango.cabal" ]; - stripLen = 1; - sha256 = "0dc221wlmyhc24h6ybfhbkxmcx4i6bvkbr1zgqidbnj3yp6w0l5w"; - }); - # gtk/gtk3 have an additional complication: independent of the above - # 0.13.8.0-specific fix, they need to be told on Darwin to use the Quartz + # gtk/gtk3 needs to be told on Darwin to use the Quartz # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). - gtk3 = - let - patchedGtk3 = appendPatch super.gtk3 (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "gtk3.cabal" ]; - stripLen = 1; - sha256 = "0zvj0dzfwf9bksfhi0m4v0h5aij236gd0qhyr1adpdcjrkd8zbkd"; - }); - in - # The appendConfigureFlags should remain even after we can drop patchedGtk3. - appendConfigureFlags patchedGtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); - gtk = - let - patchedGtk = appendPatch super.gtk (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "gtk.cabal-renamed" ]; - stripLen = 1; - sha256 = "0wb0scvmhg8b42hxpns9m6zak3r8b25a2z7wg6vl56n17nb635l7"; - # One final complication: the gtk cabal file in the source repo (as seen - # by the patch) is `gtk.cabal-renamed`, but this gets changed to the usual - # `gtk.cabal` before uploading to Hackage by a script. - postFetch = '' - substituteInPlace $out --replace "-renamed" "" - ''; - }); - in - # The appendConfigureFlags should remain even after we can drop patchedGtk. - appendConfigureFlags patchedGtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); + gtk3 = appendConfigureFlags super.gtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); + gtk = appendConfigureFlags super.gtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); # Chart-tests needs and compiles some modules from Chart itself Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: { @@ -1358,46 +1144,16 @@ self: super: { ''; }); - # Unnecessary upper bound on vector <0.12.1 - bitwise-enum = doJailbreak super.bitwise-enum; - # This breaks because of version bounds, but compiles and runs fine. # Last commit is 5 years ago, so we likely won't get upstream fixed soon. # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/ # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; - # https://github.com/bergmark/feed/issues/43 - feed = dontCheck super.feed; - - pantry_0_2_0_0 = appendPatches (dontCheck super.pantry_0_2_0_0) [ - # pantry-0.2.0.0 doesn't build with ghc-8.8, but there is a PR adding support. - # https://github.com/commercialhaskell/pantry/pull/6 - # Currently stack-2.1.3.1 requires pantry-0.2.0.0, but when a newer version of - # stack is released, it will probably use the newer pantry version, so we - # can completely get rid of pantry-0.2.0.0. - (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/pantry/pull/6.diff"; - sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k"; - excludes = [ - ".azure/azure-linux-template.yml" - ".azure/azure-osx-template.yml" - ".azure/azure-windows-template.yml" - "package.yaml" - "pantry.cabal" - "stack-lts-11.yaml" - "stack-lts-12.yaml" - "stack-nightly.yaml" - "stack-windows.yaml" - "stack.yaml" - ]; - }) - ]; - - # https://github.com/serokell/nixfmt/pull/62 + # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; - # https://github.com/phadej/binary-orphans/issues/45 + # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 binary-instances = dontCheck super.binary-instances; # Disabling the test suite lets the build succeed on older CPUs @@ -1414,9 +1170,6 @@ self: super: { # gitit is unbroken in the latest release gitit = markUnbroken super.gitit; - # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. - haskell-ci = doJailbreak super.haskell-ci; - # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; persistent-postgresql = dontCheck super.persistent-postgresql; @@ -1478,7 +1231,7 @@ self: super: { # Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32 constraints-extras = doJailbreak super.constraints-extras; - # Requested version bump on upstream https://github.com/srid/rib/issues/160 + # 2020-06-22: NOTE: > 0.10.0.0 => rm dhall override: https://github.com/srid/rib/issues/161 rib = doJailbreak (super.rib.override { dhall = self.dhall_1_30_0; }); @@ -1496,7 +1249,7 @@ self: super: { # Upstream PR: https://github.com/bgamari/monoidal-containers/pull/62 # Bump these version bound monoidal-containers = appendPatch super.monoidal-containers (pkgs.fetchpatch { - url = "https://github.com/bgamari/monoidal-containers/pull/62/commits/715093b22a015398a1390f636be6f39a0de83254.patch"; + url = "https://github.com/bgamari/monoidal-containers/commit/715093b22a015398a1390f636be6f39a0de83254.patch"; sha256="1lfxvwp8g55ljxvj50acsb0wjhrvp2hvir8y0j5pfjkd1kq628ng"; }); @@ -1504,13 +1257,13 @@ self: super: { # Upstream PR: https://github.com/reflex-frp/patch/pull/20 # Makes tests work with hlint 3 (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/pull/20/commits/3ed23a4e4049ee17e64a1a5bbebf1990cdbe033a.patch"; + url = "https://github.com/reflex-frp/patch/commit/3ed23a4e4049ee17e64a1a5bbebf1990cdbe033a.patch"; sha256 ="1hfa980wln8kzbqw1lr8ddszgcibw25xf12ki2jb9xkl464aynzf"; }) # Upstream PR: https://github.com/reflex-frp/patch/pull/17 # Bumps version dependencies (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/pull/17/commits/a191ed9ded708ed7ff0cf53ad6dafaf54db5b95a.patch"; + url = "https://github.com/reflex-frp/patch/commit/a191ed9ded708ed7ff0cf53ad6dafaf54db5b95a.patch"; sha256 ="1x9w5fimhk3a0l2aa5z91nqaa6s2irz1775iidd0191m6w25vszp"; }) ]; @@ -1519,30 +1272,30 @@ self: super: { # Upstream PR: https://github.com/reflex-frp/reflex/pull/434 # Bump version bounds (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/pull/434/commits/e6104bdfd7f664f524b6765275490722e376df4d.patch"; + url = "https://github.com/reflex-frp/reflex/commit/e6104bdfd7f664f524b6765275490722e376df4d.patch"; sha256 ="1awp5p4640cnhfd50dplsvp0kzy6h8r0hpbw1s40blni74r3dhzr"; }) # Upstream PR: https://github.com/reflex-frp/reflex/pull/436 # Fix build with newest dependent-map version (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/pull/436/commits/dc3bf44d822d70594e3c474fe3869261776c3554.patch"; + url = "https://github.com/reflex-frp/reflex/commit/dc3bf44d822d70594e3c474fe3869261776c3554.patch"; sha256 ="0rbjfj9b8p6zkvd5j4pak5kpgard6cyfvzk750s4xwpc1v84iiqd"; }) # Upstream PR: https://github.com/reflex-frp/reflex/pull/437 # Fix tests with newer dep versions (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/pull/437/commits/87c74a1b9d9098eae8a56148c59ed4963a5232c2.patch"; + url = "https://github.com/reflex-frp/reflex/commit/87c74a1b9d9098eae8a56148c59ed4963a5232c2.patch"; sha256 ="0qhjjgd6n4fms1hpbblny78c95bfh74izhx9dvrdlnhz6q7xlm9q"; }) ]; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393 - reflex-dom-core = unmarkBroken (dontCheck (appendPatches super.reflex-dom-core [ + reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatches super.reflex-dom-core [ # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/388 # Fix upper bounds (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex-dom/pull/388/commits/5ef04d8e478f410d2c63603b84af052c9273a533.patch"; + url = "https://github.com/reflex-frp/reflex-dom/commit/5ef04d8e478f410d2c63603b84af052c9273a533.patch"; sha256 ="0d0b819yh8mqw8ih5asdi9qcca2kmggfsi8gf22akfw1n7xvmavi"; stripLen = 2; extraPrefix = ""; @@ -1550,11 +1303,92 @@ self: super: { # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/394 # Bump dependent-map (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex-dom/pull/394/commits/695bd17d5dcdb1bf321ee8858670731637f651db.patch"; + url = "https://github.com/reflex-frp/reflex-dom/commit/695bd17d5dcdb1bf321ee8858670731637f651db.patch"; sha256 ="0llky3i37rakgsw9vqaqmwryv7s91w8ph8xjkh83nxjs14p5zfyk"; stripLen = 2; extraPrefix = ""; }) - ])); + ]))); + + # add unreleased commit fixing version constraint as a patch + # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved + utc = appendPatch super.utc (pkgs.fetchpatch { + url = "https://github.com/lpeterse/haskell-utc/commit/e4502c08591e80d411129bb7c0414539f6302aaf.diff"; + sha256 = "0v6kv1d4syjzgzc2s7a76c6k4vminlcq62n7jg3nn9xd00gwmmv7"; + }); + + # Picking fixed version constraint from upstream + # Issue: https://github.com/ghcjs/jsaddle/issues/115 + # Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarbal of jsaddle-warp. + jsaddle-warp = dontCheck (appendPatch super.jsaddle-warp (pkgs.fetchpatch { + url = "https://github.com/ghcjs/jsaddle/commit/86b166033186c1724d4d52eeaf0935f0f29fe1ca.patch"; + sha256 = "0j4g3hcqrandlnzr9n9mixygg86accdyk2nyj9hh9g4p7mrcyb7j"; + stripLen = 2; + extraPrefix = ""; + })); + + # 2020-06-24: Jailbreaking because of restrictive test dep bounds + # Upstream issue: https://github.com/kowainik/trial/issues/62 + trial = doJailbreak super.trial; + + # 2020-06-24: Tests are broken in hackage distribution. + # See: https://github.com/kowainik/stan/issues/316 + stan = dontCheck super.stan; + + # 2020-06-24: Tests are broken in hackage distribution. + # See: https://github.com/robstewart57/rdf4h/issues/39 + rdf4h = dontCheck super.rdf4h; + + # hasn't bumped upper bounds + # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)" + # https://github.com/ennocramer/floskell/issues/48 + floskell = dontCheck (doJailbreak super.floskell); + + # hasn't bumped upper bounds + # test fails because of a "Warning: Unused LANGUAGE pragma" + # https://github.com/ennocramer/monad-dijkstra/issues/4 + monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); + + # haskell-language-server uses its own fork of ghcide + # Test disabled: it seems to freeze (is it just that it takes a long time ?) + hls-ghcide = + dontCheck ( + overrideCabal super.hls-ghcide + (old: { + # The integration test run by lsp-test requires the executable to be in the PATH + preCheck = '' + export PATH=$PATH:dist/build/ghcide + ''; + }) + ); + + haskell-language-server = (overrideCabal super.haskell-language-server + (old: { + # The integration test run by lsp-test requires the executable to be in the PATH + preCheck = '' + export PATH=$PATH:dist/build/haskell-language-server + ''; + + # test needs the git tool + testToolDepends = old.testToolDepends + ++ [ pkgs.git ]; + })).override { + # use a fork of ghcide + ghcide = self.hls-ghcide; + # use specific version + ormolu = super.ormolu_0_0_5_0; + }; + + # https://github.com/kowainik/policeman/issues/57 + policeman = doJailbreak super.policeman; + + # 2020-06-29: These three packages have bumped their dependencies for haskell-gi and haskell-gi-base beyond stack-lts. + # Choosing a jailbreak, because a version override would rebuild most of the glibverse and the packages still build with the older version. + gi-javascriptcore = + # Remove these jailbreaks, when assert fails. + assert (pkgs.lib.versionOlder super.haskell-gi-base.version "0.24"); + doJailbreak super.gi-javascriptcore; + gi-soup = doJailbreak super.gi-soup; + gi-webkit2 = doJailbreak super.gi-webkit2; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 7348dd9f22..b0585d1798 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -61,33 +61,15 @@ self: super: { haddock-library = self.haddock-library_1_9_0; # Jailbreak to fix the build. - async = doJailbreak super.async; base-noprelude = doJailbreak super.base-noprelude; - ChasingBottoms = doJailbreak super.ChasingBottoms; - ed25519 = doJailbreak super.ed25519; - email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 - feed = doJailbreak super.feed; # https://github.com/bergmark/feed/issues/48 - hashable = doJailbreak super.hashable; pandoc = doJailbreak super.pandoc; - parallel = doJailbreak super.parallel; - regex-base = doJailbreak super.regex-base; - regex-compat = doJailbreak super.regex-compat; - regex-pcre-builtin = doJailbreak super.regex-pcre-builtin; - regex-posix = doJailbreak super.regex-posix; - regex-tdfa = doJailbreak super.regex-tdfa; - split = doJailbreak super.split; system-fileio = doJailbreak super.system-fileio; - tar = doJailbreak super.tar; - tasty-expected-failure = doJailbreak super.tasty-expected-failure; - tasty-rerun = doJailbreak super.tasty-rerun; # https://github.com/ocharles/tasty-rerun/issues/18 unliftio-core = doJailbreak super.unliftio-core; - vector = doJailbreak super.vector; - zlib = doJailbreak super.zlib; # Use the latest version to fix the build. lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; - repline = self.repline_0_3_0_0; + repline = self.repline_0_4_0_0; singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; @@ -99,14 +81,8 @@ self: super: { ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = null; }; # Jailbreak to fix the build. - aeson-diff = doJailbreak super.aeson-diff; brick = doJailbreak super.brick; - cabal-plan = doJailbreak super.cabal-plan; - cborg = doJailbreak super.cborg; - cborg-json = doJailbreak super.cborg-json; exact-pi = doJailbreak super.exact-pi; - policeman = doJailbreak super.policeman; - relude = dontCheck (doJailbreak super.relude); serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; @@ -132,4 +108,7 @@ self: super: { excludes = ["package.yaml"]; }); + # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. + hnix = generateOptparseApplicativeCompletion "hnix" super.hnix; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index bb2f9294cc..204b5d5a08 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -54,7 +54,6 @@ self: super: { async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; chell = doJailbreak super.chell; - cryptohash-sha256 = doJailbreak super.cryptohash-sha256; Diff = dontCheck super.Diff; doctest = doJailbreak super.doctest; hashable = doJailbreak super.hashable; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9557d25e27..8805958a78 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -67,14 +67,12 @@ core-packages: # comment saying "# LTS Haskell x.y". Any changes after that commend will be # lost the next time `update-stackage.sh` runs. default-package-overrides: - # Newer versions have test suite failures. - - git-annex < 8.20200522 # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag - MissingH ==1.4.2.0 # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.1 + # LTS Haskell 16.3 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -275,13 +273,13 @@ default-package-overrides: - aws-cloudfront-signed-cookies ==0.2.0.6 - bank-holidays-england ==0.2.0.4 - base16 ==0.2.1.0 - - base16-bytestring ==0.1.1.6 + - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.2.0 - base32 ==0.1.1.2 - base32-lens ==0.1.0.0 - base32string ==0.9.1 - base58string ==0.10.0 - - base64 ==0.4.2 + - base64 ==0.4.2.1 - base64-bytestring ==1.0.0.3 - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 @@ -387,7 +385,7 @@ default-package-overrides: - cabal-appimage ==0.3.0.0 - cabal-debian ==5.0.2 - cabal-doctest ==1.0.8 - - cabal-rpm ==2.0.5.1 + - cabal-rpm ==2.0.6 - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 @@ -423,11 +421,11 @@ default-package-overrides: - Chart ==1.9.3 - Chart-diagrams ==1.9.3 - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.8 + - ChasingBottoms ==1.3.1.9 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - - checkers ==0.5.5 + - checkers ==0.5.6 - checksum ==0.0 - chimera ==0.3.1.0 - chiphunk ==0.1.2.1 @@ -449,7 +447,7 @@ default-package-overrides: - classy-prelude-yesod ==1.5.0 - clay ==0.13.3 - clientsession ==0.9.1.2 - - climb ==0.3.1 + - climb ==0.3.3 - Clipboard ==2.3.2.0 - clock ==0.8 - clock-extras ==0.1.0.2 @@ -468,7 +466,7 @@ default-package-overrides: - co-log-core ==0.2.1.1 - co-log-polysemy ==0.0.1.2 - Color ==0.1.4 - - colorful-monoids ==0.2.1.2 + - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - colour ==2.3.5 - colourista ==0.1.0.0 @@ -498,10 +496,10 @@ default-package-overrides: - conduit-extra ==1.3.5 - conduit-parse ==0.2.1.0 - conduit-zstd ==0.0.2.0 - - conferer ==0.4.1.0 - - conferer-hspec ==0.4.0.0 - - conferer-source-json ==0.4.0.0 - - conferer-warp ==0.4.0.0 + - conferer ==0.4.1.1 + - conferer-hspec ==0.4.0.1 + - conferer-source-json ==0.4.0.1 + - conferer-warp ==0.4.0.1 - ConfigFile ==1.1.4 - config-ini ==0.2.4.0 - configurator ==0.3.0.0 @@ -612,7 +610,7 @@ default-package-overrides: - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 - - dbus ==1.2.15.1 + - dbus ==1.2.16 - dbus-hslogger ==0.1.0.1 - debian ==4.0.2 - debian-build ==0.10.2.0 @@ -623,7 +621,7 @@ default-package-overrides: - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - deferred-folds ==0.9.10.1 - - dejafu ==2.3.0.0 + - dejafu ==2.3.0.1 - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 @@ -635,7 +633,7 @@ default-package-overrides: - dhall ==1.32.0 - dhall-bash ==1.0.30 - dhall-json ==1.6.4 - - dhall-lsp-server ==1.0.7 + - dhall-lsp-server ==1.0.8 - dhall-yaml ==1.1.0 - diagrams ==1.4 - diagrams-contrib ==1.4.4 @@ -674,12 +672,12 @@ default-package-overrides: - do-list ==1.0.1 - do-notation ==0.1.0.2 - dotenv ==0.8.0.4 - - dotgen ==0.4.2 + - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.7 - drinkery ==0.4 - - dsp ==0.2.5 + - dsp ==0.2.5.1 - dual ==0.1.1.1 - dual-tree ==0.2.2.1 - dublincore-xml-conduit ==0.1.0.2 @@ -735,7 +733,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 - - esqueleto ==3.3.3.0 + - esqueleto ==3.3.3.2 - essence-of-live-coding ==0.1.0.3 - essence-of-live-coding-gloss ==0.1.0.3 - essence-of-live-coding-pulse ==0.1.0.3 @@ -817,7 +815,7 @@ default-package-overrides: - focuslist ==0.1.0.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - - fold-debounce-conduit ==0.2.0.4 + - fold-debounce-conduit ==0.2.0.5 - foldl ==1.4.6 - folds ==0.7.5 - follow-file ==0.0.3 @@ -841,10 +839,12 @@ default-package-overrides: - frontmatter ==0.1.0.2 - fsnotify ==0.3.0.1 - fsnotify-conduit ==0.1.1.1 + - ftp-client ==0.5.1.4 + - ftp-client-conduit ==0.5.0.5 - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==1 - - fused-effects ==1.0.2.0 + - fused-effects ==1.0.2.2 - fusion-plugin ==0.2.1 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 @@ -914,7 +914,7 @@ default-package-overrides: - ghc-typelits-extra ==0.4 - ghc-typelits-knownnat ==0.7.2 - ghc-typelits-natnormalise ==0.7.2 - - ghc-typelits-presburger ==0.3.0.0 + - ghc-typelits-presburger ==0.3.0.1 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.21 - gi-cairo ==1.0.23 @@ -960,9 +960,9 @@ default-package-overrides: - graphviz ==2999.20.0.4 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.1.0.2 - - greskell-core ==0.1.3.4 - - greskell-websocket ==0.1.2.3 + - greskell ==1.1.0.3 + - greskell-core ==0.1.3.5 + - greskell-websocket ==0.1.2.4 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 - groups ==0.4.1.0 @@ -1023,7 +1023,7 @@ default-package-overrides: - hebrew-time ==0.1.2 - hedgehog ==1.0.2 - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.1 + - hedgehog-fakedata ==0.0.1.3 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.12.13 @@ -1037,7 +1037,7 @@ default-package-overrides: - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hidapi ==0.1.5 - - hie-bios ==0.5.0 + - hie-bios ==0.5.1 - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 @@ -1069,7 +1069,7 @@ default-package-overrides: - hpack ==0.34.2 - hpack-dhall ==0.5.2 - hpc-codecov ==0.2.0.0 - - hpc-lcov ==1.0.0 + - hpc-lcov ==1.0.1 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.3.8 @@ -1108,7 +1108,7 @@ default-package-overrides: - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.1.0 - hspec-meta ==2.6.0 - - hspec-need-env ==0.1.0.4 + - hspec-need-env ==0.1.0.5 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 @@ -1239,7 +1239,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.1 - iproute ==1.7.9 - - IPv6Addr ==1.1.4 + - IPv6Addr ==1.1.5 - ipynb ==0.1.0.1 - ipython-kernel ==0.10.2.0 - irc ==0.6.1.0 @@ -1265,7 +1265,7 @@ default-package-overrides: - json-alt ==1.0.0 - json-feed ==1.0.11 - jsonpath ==0.2.0.0 - - json-rpc ==1.0.2 + - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 @@ -1342,8 +1342,8 @@ default-package-overrides: - lifted-base ==0.2.3.12 - lift-generics ==0.1.3 - line ==4.0.1 - - linear ==1.21 - - linenoise ==0.3.1 + - linear ==1.21.1 + - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 @@ -1388,9 +1388,9 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.5.2.0 + - massiv ==0.5.3.1 - massiv-io ==0.2.1.0 - - massiv-test ==0.1.3 + - massiv-test ==0.1.3.1 - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.0 @@ -1438,7 +1438,7 @@ default-package-overrides: - minimorph ==0.2.2.0 - minio-hs ==1.5.2 - miniutter ==0.5.1.0 - - min-max-pqueue ==0.1.0.1 + - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - miso ==1.6.0.0 - missing-foreign ==0.1.1 @@ -1476,7 +1476,7 @@ default-package-overrides: - monad-peel ==0.2.1.2 - monad-products ==4.0.1 - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.1.2 + - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 @@ -1568,7 +1568,7 @@ default-package-overrides: - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - - numeric-prelude ==0.4.3.1 + - numeric-prelude ==0.4.3.2 - numhask ==0.4.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 @@ -1614,14 +1614,14 @@ default-package-overrides: - optparse-simple ==0.1.1.2 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - - ormolu ==0.1.0.0 + - ormolu ==0.1.2.0 - overhang ==1.0.0 - packcheck ==0.5.1 - pager ==0.1.1.0 - pagination ==0.2.1 - pagure-cli ==0.2 - pandoc ==2.9.2.1 - - pandoc-citeproc ==0.17 + - pandoc-citeproc ==0.17.0.1 - pandoc-csv2table ==1.0.8 - pandoc-plot ==0.6.1.0 - pandoc-pyplot ==2.3.0.1 @@ -1649,7 +1649,7 @@ default-package-overrides: - path-io ==1.6.0 - path-pieces ==0.2.1 - path-text-utf8 ==0.0.1.6 - - pathtype ==0.8.1 + - pathtype ==0.8.1.1 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 - pcg-random ==0.1.3.6 @@ -1730,7 +1730,7 @@ default-package-overrides: - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.1 - - prettyprinter ==1.6.1 + - prettyprinter ==1.6.2 - prettyprinter-ansi-terminal ==1.1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 @@ -1778,7 +1778,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.13 + - pusher-http-haskell ==1.5.1.14 - pvar ==0.2.0.0 - PyF ==0.9.0.1 - qchas ==1.1.0.1 @@ -1797,7 +1797,7 @@ default-package-overrides: - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-text ==0.1.2.1 - - quickcheck-transformer ==0.3.1 + - quickcheck-transformer ==0.3.1.1 - quickcheck-unicode ==1.0.1.0 - quiet ==0.2 - radius ==0.6.1.0 @@ -1857,7 +1857,7 @@ default-package-overrides: - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 - - registry ==0.1.7.1 + - registry ==0.1.9.0 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.3 @@ -1866,15 +1866,15 @@ default-package-overrides: - relational-schemas ==0.1.8.0 - relude ==0.7.0.0 - renderable ==0.2.0.1 - - replace-attoparsec ==1.4.0.0 - - replace-megaparsec ==1.4.1.0 + - replace-attoparsec ==1.4.1.0 + - replace-megaparsec ==1.4.2.0 - repline ==0.2.2.0 - req ==3.2.0 - req-conduit ==1.0.0 - rerebase ==1.6.1 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.4.1 + - resourcet ==1.2.4.2 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.8.1.2 @@ -1920,7 +1920,7 @@ default-package-overrides: - scalpel-core ==0.6.2 - scanf ==0.1.0.0 - scanner ==0.3.1 - - scheduler ==1.4.2.2 + - scheduler ==1.4.2.3 - scientific ==0.3.6.2 - scotty ==0.11.6 - scrypt ==0.5.0 @@ -1993,8 +1993,8 @@ default-package-overrides: - setlocale ==1.0.0.9 - sexp-grammar ==2.1.0 - SHA ==1.6.4.4 - - shake-plus ==0.1.6.0 - - shakespeare ==2.0.24 + - shake-plus ==0.1.7.0 + - shakespeare ==2.0.24.1 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 @@ -2009,7 +2009,7 @@ default-package-overrides: - silently ==1.2.5.1 - simple-affine-space ==0.1.1 - simple-cabal ==0.1.2 - - simple-cmd ==0.2.1 + - simple-cmd ==0.2.2 - simple-cmd-args ==0.1.6 - simple-log ==0.9.12 - simple-reflect ==0.3.3 @@ -2022,7 +2022,7 @@ default-package-overrides: - singleton-bool ==0.1.5 - singleton-nats ==0.4.5 - singletons ==2.6 - - singletons-presburger ==0.3.0.0 + - singletons-presburger ==0.3.0.1 - siphash ==1.0.3 - sitemap-gen ==0.1.0.0 - size-based ==0.1.2.0 @@ -2030,8 +2030,8 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.8.4 - - skylighting-core ==0.8.4 + - skylighting ==0.8.5 + - skylighting-core ==0.8.5 - slack-api ==0.12 - slist ==0.1.1.0 - smallcheck ==1.1.7 @@ -2055,7 +2055,7 @@ default-package-overrides: - sox ==0.2.3.1 - soxlib ==0.0.3.1 - sparse-linear-algebra ==0.3.1 - - sparse-tensor ==0.2.1.3 + - sparse-tensor ==0.2.1.4 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - speculate ==0.4.2 @@ -2072,7 +2072,7 @@ default-package-overrides: - squeather ==0.4.0.0 - srcloc ==0.5.1.2 - stache ==2.1.1 - - stackcollapse-ghc ==0.0.1 + - stackcollapse-ghc ==0.0.1.1 - stack-templatizer ==0.1.0.2 - starter ==0.3.0 - stateref ==0.3 @@ -2092,7 +2092,7 @@ default-package-overrides: - storable-complex ==0.2.3.0 - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - - storablevector ==0.2.13 + - storablevector ==0.2.13.1 - stratosphere ==0.53.0 - streaming ==0.2.3.0 - streaming-bytestring ==0.1.6 @@ -2132,7 +2132,7 @@ default-package-overrides: - svg-tree ==0.6.2.4 - swagger ==0.3.0 - swagger2 ==2.5 - - swish ==0.10.0.3 + - swish ==0.10.0.4 - syb ==0.7.1 - symbol ==0.2.4 - symengine ==0.1.2.0 @@ -2158,7 +2158,7 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - - tasty-dejafu ==2.0.0.4 + - tasty-dejafu ==2.0.0.5 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.3.2 @@ -2371,7 +2371,7 @@ default-package-overrides: - validity ==0.11.0.0 - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 - - validity-containers ==0.5.0.3 + - validity-containers ==0.5.0.4 - validity-path ==0.4.0.1 - validity-primitive ==0.0.0.1 - validity-scientific ==0.2.0.3 @@ -2419,7 +2419,7 @@ default-package-overrides: - wai-session ==0.3.3 - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - - warp ==3.3.12 + - warp ==3.3.13 - warp-tls ==3.2.12 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2434,8 +2434,8 @@ default-package-overrides: - weigh ==0.0.16 - wide-word ==0.1.1.1 - wikicfp-scraper ==0.1.0.11 - - wild-bind ==0.1.2.5 - - wild-bind-x11 ==0.2.0.9 + - wild-bind ==0.1.2.6 + - wild-bind-x11 ==0.2.0.10 - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 @@ -2452,7 +2452,7 @@ default-package-overrides: - word8 ==0.1.3 - word-trie ==0.3.0 - word-wrap ==0.4.1 - - world-peace ==1.0.1.0 + - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.2 - writer-cps-exceptions ==0.1.0.1 @@ -2497,7 +2497,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.4.0 - yamlparse-applicative ==0.1.0.1 - - yesod ==1.6.0.1 + - yesod ==1.6.0.2 - yesod-auth ==1.6.10 - yesod-auth-fb ==1.10.1 - yesod-auth-hashdb ==1.7.1.2 @@ -2512,7 +2512,7 @@ default-package-overrides: - yesod-recaptcha2 ==1.0.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.9.1 + - yesod-test ==1.6.10 - yesod-websockets ==0.3.0.2 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 @@ -2537,16 +2537,15 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier + - aeson-pretty < 0.8 # required by elm compiler - Agda == 2.6.1 # allows the agdaPackage set to be fixed to this version so that it won't break when another agda version is released. - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - apply-refact == 0.6.0.0 # works with GHC 8.6.x https://hackage.haskell.org/package/apply-refact/changelog - apply-refact == 0.7.0.0 # works with GHC 8.8.x https://hackage.haskell.org/package/apply-refact/changelog - apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - colour < 2.3.4 # newer versions don't support GHC 7.10.x @@ -2585,14 +2584,16 @@ extra-packages: - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) + - ormolu == 0.0.5.0 # required by haskell-language-server + - pantry == 0.2.0.0 # required by stack-2.1.3.1 - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x - - pantry == 0.2.0.0 # required by stack-2.1.3.1 - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - prettyprinter == 1.6.1 # required by ghc 8.8.x, and dhall-1.29.0 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - QuickCheck < 2 # required by test-framework-quickcheck and its users + - repline == 0.3.* # required by dhall-0.32.x - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x @@ -2683,11 +2684,12 @@ package-maintainers: sorki: - cayene-lpp - data-stm32 - # - gcodehs + - gcodehs - nix-derivation - nix-narinfo - ttn # - ttn-client + - update-nix-fetchgit - zre unsupported-platforms: @@ -3059,8 +3061,10 @@ broken-packages: - arb-fft - arbb-vm - arbor-datadog + - arbor-monad-counter - arbor-monad-metric - arbor-monad-metric-datadog + - arbor-postgres - arbtt - archive-libarchive - archive-tar-bytestring @@ -3084,6 +3088,7 @@ broken-packages: - arpa - arpack - array-forth + - array-list - array-primops - arrayfire - arraylist @@ -3211,6 +3216,7 @@ broken-packages: - azubi - azure-acs - azure-email + - azure-functions-worker - azure-service-api - azure-servicebus - azurify @@ -3249,6 +3255,8 @@ broken-packages: - base-generics - base-io-access - base32-bytestring + - base62 + - base64-bytes - base64-conduit - baserock-schema - basex-client @@ -3324,6 +3332,7 @@ broken-packages: - binary-protocol-zmq - binary-search - binary-streams + - binary-tagged - binary-typed - bind-marshal - BinderAnn @@ -3395,9 +3404,11 @@ broken-packages: - birch-beer - bird - BirdPP + - birds-of-paradise - bisect-binary - bit-array - bit-stream + - bitcoin-address - bitcoin-api - bitcoin-api-extra - bitcoin-block @@ -3483,6 +3494,7 @@ broken-packages: - bot - botpp - bounded-array + - bowntz - box - braid - brain-bleep @@ -3566,7 +3578,6 @@ broken-packages: - c10k - c2ats - cabal-audit - - cabal-bounds - cabal-bundle-clib - cabal-cache - cabal-cargs @@ -3583,7 +3594,6 @@ broken-packages: - cabal-install-bundle - cabal-install-ghc72 - cabal-install-ghc74 - - cabal-lenses - cabal-meta - cabal-mon - cabal-nirvana @@ -3640,6 +3650,7 @@ broken-packages: - cao - cap - Capabilities + - capability - capnp - capped-list - capri @@ -3975,6 +3986,7 @@ broken-packages: - confcrypt - conferer-hedis - conferer-provider-dhall + - conferer-provider-json - conferer-provider-yaml - conferer-snap - conffmt @@ -4128,6 +4140,7 @@ broken-packages: - crypto-random-effect - crypto-rng - crypto-simple + - crypto-sodium - cryptocipher - cryptocompare - cryptoconditions @@ -4259,6 +4272,7 @@ broken-packages: - datasets - DataTreeView - dataurl + - DataVersion - date-conversions - dates - datetime @@ -4333,6 +4347,7 @@ broken-packages: - delude - demarcate - denominate + - dense - dense-int-set - dependent-hashmap - dependent-monoidal-map @@ -4359,6 +4374,7 @@ broken-packages: - detour-via-uom - deunicode - devil + - devtools - dewdrop - dfinity-radix-tree - Dflow @@ -4432,6 +4448,7 @@ broken-packages: - dirtree - discogs-haskell - discord-gateway + - discord-haskell - discord-hs - discord-rest - discord-types @@ -4733,6 +4750,7 @@ broken-packages: - ethereum-client-haskell - ethereum-merkle-patricia-db - eths-rlp + - euler-tour-tree - euphoria - eurofxref - eve @@ -4795,7 +4813,6 @@ broken-packages: - extensible-data - extensible-effects-concurrent - extensible-skeleton - - extensions - external-sort - Extra - extract-dependencies @@ -4971,7 +4988,6 @@ broken-packages: - flite - float-binstring - floating-bits - - floskell - flow-er - flow2dot - flowdock @@ -5030,6 +5046,7 @@ broken-packages: - foscam-filename - foscam-sort - Foster + - fourmolu - fpco-api - fplll - fpnla-examples @@ -5152,7 +5169,6 @@ broken-packages: - gas - gbu - gc-monitoring-wai - - gcodehs - gconf - gdax - gdiff-ig @@ -5273,10 +5289,9 @@ broken-packages: - gi-gsk - gi-gstpbutils - gi-gsttag - - gi-gtk-declarative - - gi-gtk-declarative-app-simple - gi-gtkosxapplication - gi-handy + - gi-ibus - gi-poppler - gi-secret - gi-wnck @@ -5332,6 +5347,7 @@ broken-packages: - glazier-react - glazier-react-examples - glazier-react-widget + - Gleam - GLFW - GLFW-b-demo - GLFW-OGL @@ -5356,6 +5372,7 @@ broken-packages: - gloss-game - gloss-raster - gloss-sodium + - glpk-headers - glpk-hs - glue - GLUtil @@ -5613,6 +5630,7 @@ broken-packages: - hannahci - hans - hans-pcap + - hanspell - haphviz - hapistrano - happindicator @@ -5788,6 +5806,7 @@ broken-packages: - haskelldb-hsql-sqlite3 - haskelldb-th - haskelldb-wx + - haskellish - HaskellLM - HaskellNet - HaskellNet-SSL @@ -5812,6 +5831,7 @@ broken-packages: - haskoin-protocol - haskoin-script - haskoin-store + - haskoin-store-data - haskoin-util - haskoin-wallet - haskoon @@ -5853,6 +5873,7 @@ broken-packages: - hasql-postgres-options - hasql-queue - hasql-simple + - hasql-th - hastache - hastache-aeson - haste @@ -6192,6 +6213,7 @@ broken-packages: - hol - hold-em - hole + - holmes - Holumbus-Searchengine - holy-project - homeomorphic @@ -6328,6 +6350,7 @@ broken-packages: - hsbencher - hsbencher-codespeed - hsbencher-fusion + - hsc3 - hsc3-auditor - hsc3-cairo - hsc3-data @@ -6377,7 +6400,7 @@ broken-packages: - hsI2C - hsignal - hSimpleDB - - hsimport + - hsinspect-lsp - HsJudy - hskeleton - hslackbuilder @@ -6512,6 +6535,7 @@ broken-packages: - http2-client - http2-client-exe - http2-client-grpc + - http2-grpc-proto-lens - http2-grpc-proto3-wire - https-everywhere-rules - https-everywhere-rules-raw @@ -6549,15 +6573,20 @@ broken-packages: - hvega-theme - hVOIDP - hw-all + - hw-balancedparens - hw-ci-assist - hw-dsv + - hw-eliasfano - hw-json - hw-json-lens - hw-json-simd - hw-json-simple-cursor - hw-json-standard-cursor - hw-kafka-avro + - hw-rankselect - hw-simd + - hw-succinct + - hw-xml - hwall-auth-iitk - hweblib - hwhile @@ -6869,7 +6898,6 @@ broken-packages: - jpeg - js-good-parts - jsaddle-hello - - jsaddle-warp - jsaddle-wkwebview - JsContracts - jsmw @@ -6957,6 +6985,7 @@ broken-packages: - katydid - kawaii - kawhi + - kazura-queue - kd-tree - kdesrc-build-extra - keccak @@ -7211,6 +7240,7 @@ broken-packages: - libraft - librandomorg - librato + - libsodium - libssh2 - libssh2-conduit - libsystemd-daemon @@ -7337,6 +7367,7 @@ broken-packages: - log-postgres - log-utils - log2json + - log4hs - logentries - logger - logging-effect-extra @@ -7502,6 +7533,8 @@ broken-packages: - math-grads - math-interpolate - math-metric + - math-programming-glpk + - math-programming-tests - mathblog - mathflow - mathlink @@ -7664,7 +7697,6 @@ broken-packages: - monad-atom - monad-atom-simple - monad-branch - - monad-dijkstra - monad-exception - monad-finally - monad-fork @@ -7702,6 +7734,7 @@ broken-packages: - MonadCatchIO-transformers - MonadCatchIO-transformers-foreign - MonadCompose + - monadic-recursion-schemes - monadiccp - monadiccp-gecode - Monadius @@ -7741,6 +7774,7 @@ broken-packages: - morfeusz - morley - morpheus-graphql-cli + - morpheus-graphql-client - morphisms-functors - morphisms-functors-inventory - morphisms-objects @@ -7759,6 +7793,7 @@ broken-packages: - mpi-hs-cereal - mpi-hs-store - mpppc + - mprelude - mpretty - mpris - mprover @@ -7877,6 +7912,7 @@ broken-packages: - n-tuple - n2o-protocols - n2o-web + - NaCl - nagios-plugin-ekg - nakadi-client - named-lock @@ -8022,6 +8058,7 @@ broken-packages: - nofib-analyse - nofib-analyze - noise + - nom - Nomyx - Nomyx-Core - Nomyx-Language @@ -8265,6 +8302,7 @@ broken-packages: - parallel-tasks - parallel-tree-search - parameterized + - parameterized-utils - paranoia - parco - parco-attoparsec @@ -8337,6 +8375,7 @@ broken-packages: - pdf-toolbox-viewer - pdfname - pdfsplit + - pdftotext - pdynload - peakachu - PeanoWitnesses @@ -8521,6 +8560,7 @@ broken-packages: - polydata-core - polynomial - polysemy-RandomFu + - polysemy-webserver - polysemy-zoo - polyseq - polytypeable @@ -8534,6 +8574,7 @@ broken-packages: - pool-conduit - pop3-client - popenhs + - popkey - poppler - porcupine-core - porcupine-http @@ -8562,6 +8603,7 @@ broken-packages: - postgresql-simple-queue - postgresql-simple-sop - postgresql-simple-typed + - postgresql-syntax - postgresql-typed - postgresql-typed-lifted - postgrest-ws @@ -8643,6 +8685,7 @@ broken-packages: - process-qq - process-streaming - processing + - processmemory - procrastinating-variable - procstat - producer @@ -8678,6 +8721,7 @@ broken-packages: - proteome - proto-lens-combinators - proto-lens-descriptors + - proto-lens-jsonpb - proto3-suite - protobuf-native - protocol-buffers @@ -8861,7 +8905,6 @@ broken-packages: - rbr - rc - rclient - - rdf4h - rdioh - react-flux - react-flux-servant @@ -9299,6 +9342,7 @@ broken-packages: - Semantique - semdoc - semi-iso + - semialign-extras - semibounded-lattices - Semigroup - semigroupoids-syntax @@ -9333,6 +9377,7 @@ broken-packages: - servant-auth-token-leveldb - servant-auth-token-persistent - servant-auth-token-rocksdb + - servant-avro - servant-client-namedargs - servant-csharp - servant-db @@ -9415,6 +9460,7 @@ broken-packages: - sgrep - sh2md - sha-streams + - sha1 - shade - shadower - shake-bindist @@ -9536,6 +9582,7 @@ broken-packages: - skeletons - skell - skemmtun + - skews - skulk - skylark-client - skylighting-lucid @@ -9548,11 +9595,13 @@ broken-packages: - slidemews - Slides - slim + - slip32 - sloane - slot-lambda - sloth - slug - slynx + - small-bytearray-builder - smallarray - smallcheck-laws - smallcheck-lens @@ -9583,6 +9632,7 @@ broken-packages: - SMTPClient - smtps-gmail - smuggler + - smuggler2 - snake - snake-game - snap-accept @@ -9801,6 +9851,7 @@ broken-packages: - state-record - stateful-mtl - stateWriter + - static - static-canvas - static-closure - static-tensor @@ -9833,6 +9884,7 @@ broken-packages: - stm-hamt - stm-promise - stm-stats + - stm-supply - STM32-Zombie - stmcontrol - stochastic @@ -9867,6 +9919,7 @@ broken-packages: - streamproc - strelka - strict-data + - strict-tuple-lens - StrictBench - StrictCheck - strictly @@ -10027,6 +10080,7 @@ broken-packages: - tapioca - tar-bytestring - target + - tart - task - task-distribution - taskell @@ -10039,6 +10093,8 @@ broken-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens + - tasty-mgolden + - tasty-quickcheck-laws - tasty-stats - tateti-tateti - Taxonomy @@ -10077,6 +10133,11 @@ broken-packages: - tempus - tensor - tensor-safe + - tensorflow + - tensorflow-core-ops + - tensorflow-logging + - tensorflow-opgen + - tensorflow-ops - termbox - termbox-banana - termbox-bindings @@ -10209,6 +10270,7 @@ broken-packages: - timeseries - timespan - timeutils + - timezone-olson-th - timezone-unix - tintin - tiny-scheduler @@ -10228,6 +10290,7 @@ broken-packages: - tldr - tls-extra - tlynx + - tmp-postgres - tn - to-haskell - to-string-class @@ -10370,6 +10433,7 @@ broken-packages: - twilio - twill - twine + - twirp - twitter - twitter-conduit - twitter-enumerator @@ -10496,7 +10560,6 @@ broken-packages: - unused - uom-plugin - up - - update-nix-fetchgit - Updater - uploadcare - upskirt @@ -10530,7 +10593,6 @@ broken-packages: - usb-safe - users-mysql-haskell - users-persistent - - utc - utf8-prelude - utf8-validator - UTFTConverter @@ -10548,6 +10610,7 @@ broken-packages: - uuagc-cabal - uuagc-diagrams - uuid-aeson + - uuid-bytes - uvector - uvector-algorithms - uxadt @@ -10614,6 +10677,7 @@ broken-packages: - verifiable-expressions - verify - verilog + - verismith - versioning - versioning-servant - vflow-types @@ -10833,6 +10897,7 @@ broken-packages: - wsdl - wsedit - wshterm + - wss-client - wstunnel - wtk - wtk-gtk @@ -10913,6 +10978,7 @@ broken-packages: - xmonad-windownames - xmpipe - XMPP + - xor - xorshift-plus - Xorshift128Plus - xournal-builder @@ -10920,6 +10986,7 @@ broken-packages: - xournal-parser - xournal-render - xournal-types + - xrefcheck - xsact - XSaiga - xsd @@ -10967,6 +11034,8 @@ broken-packages: - yarr - yarr-image-io - yavie + - yaya-test + - yaya-unsafe-test - ycextra - yeamer - yeller @@ -11100,6 +11169,7 @@ broken-packages: - zeromq4-conduit - zeromq4-patterns - zeroth + - zettelkast - ZFS - zifter - zifter-cabal diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 342ae157d3..232a99eed2 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -443,6 +443,9 @@ self: super: builtins.intersectAttrs super { [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; }); + # requires an X11 display in test suite + gi-gtk-declarative = dontCheck super.gi-gtk-declarative; + # depends on 'hie' executable lsp-test = dontCheck super.lsp-test; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index ccef54178a..8af74952a0 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -3080,8 +3080,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.8"; - sha256 = "1madbhhxi5awh74q0z2mx1la5jbkvx26zvhl4x8237sjzs0k51wx"; + version = "1.3.1.9"; + sha256 = "1acsmvdwsgry0i0qhmz0img71gq97wikmn9zgbqppl4n8a1d7bvh"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -3322,6 +3322,27 @@ self: { broken = true; }) {}; + "Color_0_2_0" = callPackage + ({ mkDerivation, base, colour, criterion, data-default-class + , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test + , QuickCheck, random, vector + }: + mkDerivation { + pname = "Color"; + version = "0.2.0"; + sha256 = "1w7d1wjssldybbg46s4hc83f96n49v53wyq0sc1q8mkvqdl35vsh"; + libraryHaskellDepends = [ base data-default-class deepseq vector ]; + testHaskellDepends = [ + base colour doctest hspec HUnit JuicyPixels massiv massiv-test + QuickCheck random vector + ]; + benchmarkHaskellDepends = [ base colour criterion deepseq random ]; + description = "Color spaces and conversions between them"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Combinatorrent" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, cereal , containers, deepseq, directory, filepath, hopenssl, hslogger @@ -3735,8 +3756,8 @@ self: { }: mkDerivation { pname = "CouchDB"; - version = "1.2.2"; - sha256 = "0imzpwrynr54as3bzx2222vqcnmmrzx6dis5qa2vmclf6yd8q1z8"; + version = "1.2.3"; + sha256 = "064savpqn5ppj3sg0jsaqq5625zf0ml6wa0k7x058pmsp9i93c4m"; libraryHaskellDepends = [ base bytestring containers HTTP json mtl network network-uri utf8-string @@ -4331,6 +4352,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Type safe data migrations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Deadpan-DDP" = callPackage @@ -6338,8 +6361,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.6.4"; - sha256 = "1z1bv3dqna9gp6k2rjnbl54hxkaxl4khdlfy52r0cv51ah8969ri"; + version = "0.7.0"; + sha256 = "0g4c8s4v3lg7bnsz8n09zrf8cwyywmxpv97wkwx6xvflknb7z0cc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6840,15 +6863,13 @@ self: { }: mkDerivation { pname = "Gamgine"; - version = "0.5.3"; - sha256 = "08awl1f1310ifx9gzjrinsv37n7k2yaxvmjaymjh01pawlp3w4gc"; - revision = "1"; - editedCabalFile = "1i14r4r8814l8cilp24ypcsbac284m6pvib5037sypgqv72wn044"; + version = "0.6.0"; + sha256 = "171mfxq7s719j3h2nfsck2qmwrkmlp3731na6nd81b5x3jvl3ma0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring composition cpphs data-lens directory - filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show - StateVar time unordered-containers utility-ht Vec zlib + array base bytestring composition data-lens directory filepath + GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show StateVar time + unordered-containers utility-ht Vec zlib ]; libraryToolDepends = [ cpphs ]; description = "Some kind of game library or set of utilities"; @@ -7192,6 +7213,8 @@ self: { libraryHaskellDepends = [ base mtl split threepenny-gui ]; description = "HTML Canvas graphics, animations and simulations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Glob" = callPackage @@ -9860,8 +9883,8 @@ self: { }: mkDerivation { pname = "HasCacBDD"; - version = "0.1.0.2"; - sha256 = "1yilx2pl0j4bw3c83kzc1y9wmg67r88gpahbwykff1jjr2xnrsp0"; + version = "0.1.0.3"; + sha256 = "04kczdr702kkqa89pm5lc3glq4xqnjy0rszpq7ms1zlj1gwvgckz"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base process QuickCheck ]; librarySystemDepends = [ CacBDD ]; @@ -11067,8 +11090,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "1.1.4"; - sha256 = "1bkib3mzbc0lzmi4vqkmihgi9vdcsksgss5rp3czhc893wc3hzah"; + version = "1.1.5"; + sha256 = "0fnh77znfkp0d2i6vdvrsnxcdprqjz43in5k36b3yrrzffdrfka7"; libraryHaskellDepends = [ aeson attoparsec base iproute network network-info random text ]; @@ -12201,6 +12224,8 @@ self: { pname = "LambdaHack"; version = "0.9.5.0"; sha256 = "1y5345cmwl40p0risziyqlxfa8jv1rm9x6ivv85xhznrsmr0406h"; + revision = "1"; + editedCabalFile = "0qaqfyg7a50yibshq63718iyi4z1v017fzp7kbwrnwqmkmdqfa5a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -12613,6 +12638,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_7_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.7.1"; + sha256 = "1gccb84fma0plkwjdz8hgqa70a5lr6d9gnw6pfky993555ig29mp"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -13575,8 +13622,8 @@ self: { }: mkDerivation { pname = "MonadRandom"; - version = "0.5.1.2"; - sha256 = "0j1lwg3pp77cf87bk0c1gipzrdvpjcj7bkgi37lcjc7avmlhwvvp"; + version = "0.5.2"; + sha256 = "1rjihspfdg2b9bwvbgj36ql595nbza8ddh1bmgz924xmddshcf30"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -14015,6 +14062,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NameGenerator" = callPackage @@ -18174,6 +18223,17 @@ self: { broken = true; }) {}; + "Shpadoinkle-debug" = callPackage + ({ mkDerivation, aeson, base, jsaddle, lens, text, unliftio }: + mkDerivation { + pname = "Shpadoinkle-debug"; + version = "0.0.0.1"; + sha256 = "1yvr3d40aa6sl3gpyr24a5hij63jm2p0jrx0kac7asjihvd6fk2g"; + libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ]; + description = "Debugging tools for Shpadoinkle applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Shpadoinkle-examples" = callPackage ({ mkDerivation, aeson, base, beam-core, beam-sqlite, bytestring , containers, exceptions, file-embed, lens, mtl @@ -20467,8 +20527,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.2"; - sha256 = "0f94lzb05v4myr1qrpklxhina0iiv7p7zfmjhf2fkd2q1bnffhdw"; + version = "0.3.3"; + sha256 = "0kjyyqwck2b4vv9z2121b3x1bnsc6zswp41idcpmqjxrwhs7whcz"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -24686,15 +24746,15 @@ self: { }) {}; "aeson-with" = callPackage - ({ mkDerivation, aeson, base, hashmap, lens, lens-aeson, scientific - , text, unordered-containers, vector + ({ mkDerivation, aeson, base, hashmap, lens, lens-aeson, mtl + , scientific, text, unordered-containers, vector }: mkDerivation { pname = "aeson-with"; - version = "0.0.1.0"; - sha256 = "05xhbcfym586qb0giwr9rayqgyp25bc026kwbn7x5ln4nmzp2x9n"; + version = "0.1.1.0"; + sha256 = "1w1f3rni01v4scfd2lccx6ijxsy9q54dyad500xm06la1lnw40k6"; libraryHaskellDepends = [ - aeson base hashmap lens lens-aeson scientific text + aeson base hashmap lens lens-aeson mtl scientific text unordered-containers vector ]; description = "withXField combinators for aeson"; @@ -24737,6 +24797,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-yaml_1_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, string-qq, tasty + , tasty-discover, tasty-hunit, text, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "aeson-yaml"; + version = "1.1.0.0"; + sha256 = "1kyrh2w3qpzwm7kpb4rkrzi22kqqz1vcjw1f59wdkl8a5hffkv6y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring string-qq tasty tasty-discover tasty-hunit + unordered-containers yaml + ]; + testToolDepends = [ tasty-discover ]; + description = "Output any Aeson value as YAML (pure Haskell library)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "affection" = callPackage ({ mkDerivation, base, bytestring, clock, containers, glib, linear , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid @@ -28821,6 +28905,24 @@ self: { broken = true; }) {}; + "amqp-streamly" = callPackage + ({ mkDerivation, amqp, base, bytestring, hspec, process, streamly + , testcontainers, text + }: + mkDerivation { + pname = "amqp-streamly"; + version = "0.1.0"; + sha256 = "103srk8i4lpaxbr6sd1c3qq2ag1bv7x0qvzr1a4rqh3ra8wn46qq"; + libraryHaskellDepends = [ amqp base streamly text ]; + testHaskellDepends = [ + amqp base bytestring hspec process streamly testcontainers text + ]; + description = "A simple streamly wrapper for amqp"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {testcontainers = null;}; + "amqp-utils" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers , data-default-class, directory, hinotify, magic, network, process @@ -30976,6 +31078,8 @@ self: { pname = "apply-refact"; version = "0.7.0.0"; sha256 = "1facic5lbc9xih6w1kfr3inwvada6y98n9xgc6iv6r057zr8jfp0"; + revision = "1"; + editedCabalFile = "0ilyhm6nz1mkjdq13pgzgplmmfqrv6b5ailyhvbds362pqjqw72q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30998,7 +31102,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "apply-refact" = callPackage + "apply-refact_0_8_0_0" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact , silently, syb, tasty, tasty-expected-failure, tasty-golden @@ -31027,6 +31131,37 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "apply-refact" = callPackage + ({ mkDerivation, base, containers, directory, extra, filemanip + , filepath, ghc, ghc-boot-th, ghc-exactprint, mtl + , optparse-applicative, process, refact, silently, syb, tasty + , tasty-expected-failure, tasty-golden, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.8.1.0"; + sha256 = "1mnp33c8dghgmn62czyrbmw86czhznbhb75ac1ps1is1p1ik6mih"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-exactprint mtl + process refact syb transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint mtl optparse-applicative process refact syb + transformers unix-compat + ]; + testHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint mtl optparse-applicative process refact silently syb + tasty tasty-expected-failure tasty-golden transformers unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; }) {}; "apportionment" = callPackage @@ -31252,6 +31387,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Counter library for submitting metrics to a backend such as datadog"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbor-monad-logger" = callPackage @@ -31343,6 +31480,8 @@ self: { ]; description = "Convenience types and functions for postgresql-simple"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbtt" = callPackage @@ -31945,7 +32084,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "arithmoi_0_11_0_0" = callPackage + "arithmoi_0_11_0_1" = callPackage ({ mkDerivation, array, base, chimera, constraints, containers , deepseq, exact-pi, gauge, integer-gmp, integer-logarithms , integer-roots, mod, QuickCheck, quickcheck-classes, random @@ -31954,8 +32093,8 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.11.0.0"; - sha256 = "14zhrlml6029n21h0ihspydg2zr7f93k4lji0nyi23c5y67pi9sk"; + version = "0.11.0.1"; + sha256 = "1dz6gpwnyw02lff8xh5vmf1vsknnvnd3vh3iix0r6f1hkf03xi8y"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -32138,6 +32277,22 @@ self: { broken = true; }) {}; + "array-list" = callPackage + ({ mkDerivation, array, base, doctest, doctest-driver-gen, hspec }: + mkDerivation { + pname = "array-list"; + version = "0.2.0.0"; + sha256 = "17xdkn1p7zfg7rw9sfbv6amfab291gz8fafkl26x38al9khjcgy2"; + libraryHaskellDepends = [ array base ]; + testHaskellDepends = [ + array base doctest doctest-driver-gen hspec + ]; + description = "IsList instances of Array for OverloadedLists extension"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "array-memoize" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -34868,8 +35023,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "36"; - editedCabalFile = "12bwnqb8m1z3f84xml7wf8h0lvs5wb67fdhdp5bl1pf42yr94izz"; + revision = "37"; + editedCabalFile = "09z2wlr6g1lm4cdbbf0zjbl1j19xs31y126lcbzcs254f8mx5m13"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -35552,8 +35707,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "3.0.0"; - sha256 = "0gvp65w33pak29min2bym0gnhf9c8ciasv1c15xkvrr7cdgsdwhg"; + version = "3.0.1"; + sha256 = "17f41ppgc4irahp1g3ngrdb24kqhdfld11jdmc6cw6mg2r820l8i"; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -35992,6 +36147,35 @@ self: { broken = true; }) {}; + "azure-functions-worker" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers + , directory, filepath, glabrous, http-types, http2-client + , http2-client-grpc, http2-grpc-proto-lens, http2-grpc-types + , lens-family, lens-family-core, mtl, network-uri + , optparse-applicative, proto-lens-protobuf-types + , proto-lens-protoc, proto-lens-runtime, proto-lens-setup + , raw-strings-qq, stm, text, time + }: + mkDerivation { + pname = "azure-functions-worker"; + version = "0.0.0.0"; + sha256 = "0035kmxfnb121mg38xzbyxphwg2r4x63chlywl67b9nz1pwp828x"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; + libraryHaskellDepends = [ + aeson async base bytestring containers directory filepath glabrous + http-types http2-client http2-client-grpc http2-grpc-proto-lens + http2-grpc-types lens-family lens-family-core mtl network-uri + optparse-applicative proto-lens-protobuf-types proto-lens-runtime + raw-strings-qq stm text time + ]; + libraryToolDepends = [ proto-lens-protoc ]; + testHaskellDepends = [ base ]; + description = "Azure Functions Worker"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "azure-service-api" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , certificate, crypto-pubkey-types, http-conduit, hxt, hxt-xpath @@ -36100,17 +36284,17 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.69.0"; - sha256 = "0r2iwv3ykh04d7qq9nskrj4m3xwlhhlyxzh38vij65gx8jiy2nwa"; + version = "1.0.1"; + sha256 = "1g1172d2bxjhxn5p1jxyxr1bf19fkd8yrrp05hvzv9mdiqynji14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bifunctors binary boxes bytestring conduit conduit-extra ConfigFile directory exceptions extensible-effects filepath free hashable hspec hspec-expectations - lens monad-control mtl parallel parsec pretty pretty-show process - QuickCheck random shake syb tagged template text time transformers - unordered-containers vector yaml + lens monad-control mtl optparse-applicative parallel parsec pretty + pretty-show process QuickCheck random shake syb tagged template + text time transformers unordered-containers vector yaml ]; executableHaskellDepends = [ base bytestring directory extensible-effects hspec @@ -36218,8 +36402,8 @@ self: { }: mkDerivation { pname = "backprop"; - version = "0.2.6.3"; - sha256 = "0zk3k20c100iwqcvg1xw2vdysn01w4h9jypz08xs849n1a3bp7di"; + version = "0.2.6.4"; + sha256 = "0wc71r6l5qgkspl5v76f1d75xwir9jp5kzdl83rq5sviggd458v9"; libraryHaskellDepends = [ base containers deepseq microlens primitive reflection transformers vector vinyl @@ -36257,6 +36441,21 @@ self: { broken = true; }) {}; + "backtracking" = callPackage + ({ mkDerivation, base, primes, tasty, tasty-discover, tasty-hunit + , transformers + }: + mkDerivation { + pname = "backtracking"; + version = "0.1.0"; + sha256 = "0l1isnnld8drsb8jqkf6zd8v61gcy172zk8zdr21yawnkwfr057b"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base primes tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + description = "A backtracking monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -36959,9 +37158,10 @@ self: { ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { pname = "base16-bytestring"; - version = "0.1.1.6"; - sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs"; + version = "0.1.1.7"; + sha256 = "1fk9zvkx005sy4adbyil86svnqhgrvmczmf16ajhzj2wkmkqjmjj"; libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring ]; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -37139,20 +37339,20 @@ self: { ]; description = "Base62 encoding and decoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base64" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, criterion - , deepseq, ghc-byteorder, memory, QuickCheck, quickcheck-instances + , deepseq, ghc-byteorder, QuickCheck, quickcheck-instances , random-bytestring, tasty, tasty-hunit, tasty-quickcheck, text , text-short }: mkDerivation { pname = "base64"; - version = "0.4.2"; - sha256 = "1q3cz1d2zj2bi57g4yrfk1bbfqrcppl6nh0g5fb5dpmf2wdrfv44"; - revision = "3"; - editedCabalFile = "1vjzv8d8yd18nz3pvm8003h3gnj1d45c6g74vd2qqawypwcwhm6b"; + version = "0.4.2.1"; + sha256 = "14ssr4h59bx71fln3igi0nxrn749lqkanj49wahn77z3izm2s2xd"; libraryHaskellDepends = [ base bytestring ghc-byteorder text text-short ]; @@ -37162,10 +37362,10 @@ self: { text-short ]; benchmarkHaskellDepends = [ - base base64-bytestring bytestring criterion deepseq memory + base base64-bytestring bytestring criterion deepseq random-bytestring text ]; - description = "A modern RFC 4648-compliant Base64 library"; + description = "Fast RFC 4648-compliant Base64 encoding"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -37191,6 +37391,8 @@ self: { ]; description = "Base64 encoding of byte sequences"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base64-bytestring" = callPackage @@ -39328,13 +39530,17 @@ self: { }) {}; "binary-io" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, process }: + ({ mkDerivation, async, base, binary, bytestring, deque, hspec + , process, stm + }: mkDerivation { pname = "binary-io"; - version = "0.2.0"; - sha256 = "1m58zjavqcri55diwz6fspbg5qx3qj3b82ch1g740zdr27ly0bwn"; - libraryHaskellDepends = [ base binary bytestring ]; - testHaskellDepends = [ base binary bytestring hspec process ]; + version = "0.3.0"; + sha256 = "1jc362y8ql983fhgcwb8sxgqjnhqd3xis2igcl9dv0zvqmi5jpv6"; + libraryHaskellDepends = [ base binary bytestring deque process ]; + testHaskellDepends = [ + async base binary bytestring hspec process stm + ]; description = "Read and write values of types that implement Binary"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -39594,6 +39800,8 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-tree" = callPackage @@ -40862,20 +41070,19 @@ self: { "bip32" = callPackage ({ mkDerivation, base, base16-bytestring, base58-bytestring, binary - , bitcoin-hash, bytestring, hedgehog, secp256k1-haskell, tasty + , bitcoin-hash, bitcoin-keys, bytestring, hedgehog, tasty , tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "bip32"; - version = "0.1.2"; - sha256 = "10nzbiildpa8k0xp9dh7sc0pr8ipwbidc2y826pmhafpy07qvqdi"; + version = "0.2"; + sha256 = "1ji71m6mdnhqscadrmxs4pwb18cc5j91dhlnqs3d76gk32fyy32q"; libraryHaskellDepends = [ - base base58-bytestring binary bitcoin-hash bytestring - secp256k1-haskell + base base58-bytestring binary bitcoin-hash bitcoin-keys bytestring ]; testHaskellDepends = [ - base base16-bytestring base58-bytestring binary bytestring hedgehog - tasty tasty-hedgehog tasty-hunit + base base16-bytestring base58-bytestring binary bitcoin-keys + bytestring hedgehog tasty tasty-hedgehog tasty-hunit ]; description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies"; license = stdenv.lib.licenses.asl20; @@ -40893,8 +41100,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.2.5.0"; - sha256 = "11ijdd4j9yi3k2blzh8rpzix3w1hfsz188xqharwsk3sxqjbws5c"; + version = "0.3.1.1"; + sha256 = "0v2202zrnli49z4vw4zc6cgxvfqrv51b6p0svp0fdd2f9add4rvm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40949,6 +41156,8 @@ self: { testHaskellDepends = [ base ]; description = "Birds of Paradise"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bisc" = callPackage @@ -40998,8 +41207,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.4"; - sha256 = "0d9mn2jn1iv9x41c1yskfkx9d7papwn863gc1wffcb6aw8wg4mrz"; + version = "0.0.0.5"; + sha256 = "0i05xbld89ws9bzp9ynr9ly2jy0gw3nvikpbj61i669n9yazps90"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -41104,6 +41313,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitcoin-address" = callPackage + ({ mkDerivation, base, base16-bytestring, base58-bytestring, bech32 + , binary, bitcoin-hash, bitcoin-keys, bitcoin-script, bytestring + , hedgehog, tasty, tasty-hedgehog, tasty-hunit, text + }: + mkDerivation { + pname = "bitcoin-address"; + version = "0.1"; + sha256 = "1pxxscq4giqgkk5dy55lmsypqssdddbwp25a7d3n04x3gd23j5ym"; + libraryHaskellDepends = [ + base base58-bytestring bech32 binary bitcoin-hash bitcoin-keys + bitcoin-script bytestring text + ]; + testHaskellDepends = [ + base base16-bytestring bitcoin-keys bitcoin-script bytestring + hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Bitcoin address generation and rendering. Parsing coming soon."; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bitcoin-api" = callPackage ({ mkDerivation, aeson, base, base58string, binary, bitcoin-block , bitcoin-script, bitcoin-tx, bitcoin-types, bytestring, hexstring @@ -41215,6 +41447,23 @@ self: { broken = true; }) {}; + "bitcoin-keys" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, hedgehog + , secp256k1-haskell, tasty, tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "bitcoin-keys"; + version = "0.1"; + sha256 = "18xdwp3p2r1cv5f84mfl5dj2hd6v2dnvqam8ny9jv9kswn4m66c0"; + libraryHaskellDepends = [ base bytestring secp256k1-haskell ]; + testHaskellDepends = [ + base base16-bytestring bytestring hedgehog tasty tasty-hedgehog + tasty-hunit + ]; + description = "Bitcoin keys"; + license = stdenv.lib.licenses.asl20; + }) {}; + "bitcoin-payment-channel" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , blockchain-restful-address-index-api, bytestring, cereal @@ -41995,34 +42244,6 @@ self: { broken = true; }) {}; - "blank-canvas_0_6_2" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, colour, containers, data-default-class, directory - , http-types, kansas-comet, mime-types, process, scotty, semigroups - , shake, stm, text, text-show, time, transformers, unix, vector - , wai, wai-extra, warp - }: - mkDerivation { - pname = "blank-canvas"; - version = "0.6.2"; - sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; - revision = "5"; - editedCabalFile = "1csa2lsr4jv9x3867l1nbd1brnvw10q9qla027r19csscx5pg726"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring colour - containers data-default-class http-types kansas-comet mime-types - scotty semigroups stm text text-show transformers vector wai - wai-extra warp - ]; - testHaskellDepends = [ - base containers directory process shake stm text time unix vector - ]; - description = "HTML5 Canvas Graphics Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blank-canvas" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries , base64-bytestring, bytestring, colour, containers @@ -42413,6 +42634,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_8_2_7" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.2.7"; + sha256 = "1r4fij8qs1z4dfrh6cjzjbnx9f3jyx01zgj15wvy961d8bnqjr4b"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -43863,6 +44102,8 @@ self: { ]; description = "audio-visual pseudo-physical simulation of colliding circles"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "box" = callPackage @@ -44398,6 +44639,8 @@ self: { pname = "broadcast-chan"; version = "0.2.1.1"; sha256 = "01r57v2ghfkv37cwh64zs1lrz1rd7is3pa5k7y8h16ws1ddglirg"; + revision = "1"; + editedCabalFile = "1kmnsnyb4gz70bka30l35lgm5k131d8lc1hm4b23aml2yskx3m54"; libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -45728,8 +45971,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.5.0"; - sha256 = "15ccfbhrvb6pj9py99qpbdrrfla83797ywmxjry2c7raaz3kpr73"; + version = "0.3.6.0"; + sha256 = "15nk9r9mx798kmjl04qf01il1csfjyi3jx44yhi4hmgl66p9fdx3"; libraryHaskellDepends = [ base byteslice bytestring integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted run-st text-short @@ -45896,15 +46139,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_10_0" = callPackage + "bytestring_0_10_10_1" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "bytestring"; - version = "0.10.10.0"; - sha256 = "1h94lyyn4fpklm25dsazj9za08m0vz9irafpza90h9j5wx4qpndq"; + version = "0.10.10.1"; + sha256 = "1imcy8yw5jag91qncvi1s9n0lldmf2pjkja6qq4mfqyh02f7arvq"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; testHaskellDepends = [ base byteorder deepseq directory dlist ghc-prim HUnit mtl @@ -46627,6 +46870,19 @@ self: { broken = true; }) {}; + "c14n" = callPackage + ({ mkDerivation, base, bytestring, libxml2 }: + mkDerivation { + pname = "c14n"; + version = "0.1.0.1"; + sha256 = "0j5g36sxz6bp2z0z10d47lqh7rmclx3296zafc5vzns8d884sm0n"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ libxml2 ]; + libraryPkgconfigDepends = [ libxml2 ]; + description = "Bindings to the c14n implementation in libxml"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) libxml2;}; + "c2ats" = callPackage ({ mkDerivation, base, containers, HUnit, language-c, pretty , regex-posix, test-framework, test-framework-hunit @@ -46814,8 +47070,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "2.2.1"; - sha256 = "13pqdmghs92rwkg8fkky30sqimq54yzw2y1z5czdsmlj46r8i6ij"; + version = "2.3.0"; + sha256 = "106q5imjznbh7x2pvvgfsn8qx1awb00w0mgfrkkzbwnwc3g8jnw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46826,10 +47082,8 @@ self: { testHaskellDepends = [ base directory filepath Glob process tasty tasty-golden ]; - description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; + description = "A command line program for managing the dependency versions in a cabal file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-build-programs" = callPackage @@ -46907,8 +47161,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.2.0"; - sha256 = "10dqy2i2rq4hq81v2gar2bsq3glx5yg5mwp9a0h7drap69407ygs"; + version = "1.3.0"; + sha256 = "08n2n0p3m282yx7cf1nzmlfmw0xikqwrj3l1s8jmx18z2gh0x1h4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46984,6 +47238,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-debian_5_0_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal + , containers, data-default, debian, deepseq, Diff, directory + , exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri + , newtype-generics, optparse-applicative, parsec, pretty, process + , pureMD5, regex-tdfa, syb, text, unix, unliftio, utf8-string + }: + mkDerivation { + pname = "cabal-debian"; + version = "5.0.3"; + sha256 = "11imbizfa65fdqydpxvcdv0a80gsd6szzl33b312myw3il2xr5hi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bifunctors Cabal containers data-default debian + deepseq Diff directory exceptions filepath hsemail HUnit lens mtl + network-uri newtype-generics optparse-applicative parsec pretty + process pureMD5 regex-tdfa syb text unix unliftio utf8-string + ]; + executableHaskellDepends = [ base Cabal debian lens mtl pretty ]; + description = "Create a Debianization for a Cabal package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-dependency-licenses" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { @@ -47202,6 +47481,8 @@ self: { pname = "cabal-helper"; version = "1.1.0.0"; sha256 = "1f4s46l60s1lcdia7nv2r3y71z5c6pg6ljcc0601abl1aklx303p"; + revision = "1"; + editedCabalFile = "08fyxvpqbp0r6hiqxi5wc944phr8zgmkv7hiw71zcavl09c8mvxf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47372,18 +47653,14 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.9.0"; - sha256 = "0rvkwqzz92p85i9xwcxg3ah4imxh46ficg6yk0l6g9687970gfrg"; - revision = "1"; - editedCabalFile = "0snzm6qvalyczmdicff5fsradk3h1bm3cqcax6rmwzr7xa1j43p7"; + version = "0.10.1"; + sha256 = "0pjzz5d2s6b2xaqgb7z3ry5zpba84x3iy2hw3a7xq32ciyl3gnhb"; libraryHaskellDepends = [ base Cabal lens strict system-fileio system-filepath text transformers unordered-containers ]; description = "Lenses and traversals for the Cabal library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-macosx" = callPackage @@ -47536,18 +47813,19 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, optparse-applicative - , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, http-client, http-client-tls, http-conduit + , optparse-applicative, process, simple-cabal, simple-cmd + , simple-cmd-args, time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "2.0.5.1"; - sha256 = "1rpgl7msqr0v3rd11qyp05hv2crgmr59wk4jryx610f6mp7y5rrb"; + version = "2.0.6"; + sha256 = "1f27arazgv65ripbcjirs4hl5ywr7a7s0vcr5s7jd7176h8dr35b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client + base bytestring Cabal directory extra filepath http-client http-client-tls http-conduit optparse-applicative process simple-cabal simple-cmd simple-cmd-args time unix ]; @@ -48268,8 +48546,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.8.0"; - sha256 = "09g93jzackry9yi4xsd5d6h75z0r7mbw2s2w7wd2af4dmp76l2d9"; + version = "0.13.8.1"; + sha256 = "1hpkyhrlg1d24s34kq6d379z8l8fvznm98wpq37haqjma4nl25hk"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -48467,25 +48745,25 @@ self: { , concurrent-extra, containers, data-default-class, data-flags , deepseq, deque, df1, di-polysemy, exceptions, fmt, focus , generic-lens, generic-override, generic-override-aeson, hashable - , http-date, http-types, lens, lens-aeson, megaparsec, mtl - , polysemy, polysemy-plugin, reflection, safe-exceptions + , http-date, http-types, lens, lens-aeson, megaparsec, mime-types + , mtl, polysemy, polysemy-plugin, reflection, safe-exceptions , scientific, stm, stm-chans, stm-containers, text, text-show, time , typerep-map, unagi-chan, unordered-containers, vector, websockets - , wreq-patchable, wuss + , wreq, wuss }: mkDerivation { pname = "calamity"; - version = "0.1.14.6"; - sha256 = "0xz4pc0z9v1x59391jdnc3ragfhip67y784bmgkfifi6gjp9jdl7"; + version = "0.1.17.1"; + sha256 = "1nxv3zm48jpdg4a7plnfqvkn314wl7hr8f86b9ih527m7yldv27w"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy exceptions fmt focus generic-lens generic-override generic-override-aeson hashable http-date http-types lens - lens-aeson megaparsec mtl polysemy polysemy-plugin reflection - safe-exceptions scientific stm stm-chans stm-containers text - text-show time typerep-map unagi-chan unordered-containers vector - websockets wreq-patchable wuss + lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin + reflection safe-exceptions scientific stm stm-chans stm-containers + text text-show time typerep-map unagi-chan unordered-containers + vector websockets wreq wuss ]; description = "A library for writing discord bots in haskell"; license = stdenv.lib.licenses.mit; @@ -49018,6 +49296,8 @@ self: { ]; description = "Extensional capabilities and deriving combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capataz" = callPackage @@ -50479,8 +50759,8 @@ self: { pname = "cborg"; version = "0.2.3.0"; sha256 = "14y7yckj1xzldadyq8g84dgsdaygf9ss0gd38vjfw62smdjq1in8"; - revision = "1"; - editedCabalFile = "0rwliw9xl6y5ypwcywlmr1adqi4c8zi0vghxxarkwh7s5ny34q9f"; + revision = "2"; + editedCabalFile = "1qphglprccmyvjh3v2asikmwgdim4rndin5vls6iwb71hl703h2r"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim half integer-gmp primitive text @@ -50589,8 +50869,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.3.0"; - sha256 = "1c237awhrr1r0qz7jll1d7803j1khhz1qq4my2dddsgwfsy57ga3"; + version = "0.1.3.1"; + sha256 = "0r8q2i29wb47dkkws6cyy2qgwzgyhcsmx7sixv8n44rxiiv0dhcw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51831,19 +52111,6 @@ self: { }) {}; "checkers" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; - version = "0.5.5"; - sha256 = "1g16603803xzz73md1azlcpd6xz7gkwjpy66l638v6lvipdl9hr9"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_5_6" = callPackage ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; @@ -51854,7 +52121,6 @@ self: { ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -52735,6 +53001,8 @@ self: { pname = "cipher-aes128"; version = "0.7.0.5"; sha256 = "1bafr5aa9mjfzdgc6gwapvb9g04pyh4lwhv2x2m1v3ljjglg9d1w"; + revision = "1"; + editedCabalFile = "0miqp8jvgsqkgj5rxb2vjwa24ac5kdyy3b2cwxb9z0wk1ixk5ilm"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -52948,6 +53216,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "circular" = callPackage + ({ mkDerivation, aeson, base, criterion, hspec, hspec-discover + , QuickCheck, quickcheck-instances, vector + }: + mkDerivation { + pname = "circular"; + version = "0.1.1"; + sha256 = "0kj9sfal78k0ba5djq10xddy2h8lq0grf5cknwcr96j555nlwhk9"; + libraryHaskellDepends = [ aeson base vector ]; + testHaskellDepends = [ + aeson base hspec hspec-discover QuickCheck quickcheck-instances + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ aeson base criterion vector ]; + description = "Circular fixed-sized mutable vectors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cirru-parser" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { @@ -54258,8 +54545,8 @@ self: { }: mkDerivation { pname = "climb"; - version = "0.3.1"; - sha256 = "0d9f0h0zk9ga349bvdaq6ch9xi3hynadi6r4mcmy7hcigckk2j7r"; + version = "0.3.3"; + sha256 = "0d6jscwbjlm21jcdl29c3ix6vd5ly9mjr0ljchzkr6yk7gqk4z24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56257,18 +56544,6 @@ self: { }) {}; "colorful-monoids" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "colorful-monoids"; - version = "0.2.1.2"; - sha256 = "0y35f21n8xh1xq8i0anbfx034m5wnwhp2ka47vvi3w0iw13zyhhb"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Styled console text output using ANSI escape sequences"; - license = stdenv.lib.licenses.mit; - }) {}; - - "colorful-monoids_0_2_1_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "colorful-monoids"; @@ -56278,7 +56553,6 @@ self: { testHaskellDepends = [ base ]; description = "Styled console text output using ANSI escape sequences"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colorize-haskell" = callPackage @@ -56863,8 +57137,8 @@ self: { }: mkDerivation { pname = "commander-cli"; - version = "0.5.0.0"; - sha256 = "0brs8irdshp1mhrp5xmj608c7n80nlkxz2kp3dc7b69wzs0k40k7"; + version = "0.7.0.0"; + sha256 = "1xrlgfyq59g7x7msrwl58bzg108jkxk0k5sra8la7zwpx46ach4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59165,8 +59439,8 @@ self: { }: mkDerivation { pname = "conferer"; - version = "0.4.1.0"; - sha256 = "10wkzd7418jk6lvjn21h0qyk2lmsx12pvhn5j23b8vim89nb3p1c"; + version = "0.4.1.1"; + sha256 = "1fi3sflfkzgxzjv5s0w6ja9dqrlc72lli382j6phqdw3h4qja10d"; libraryHaskellDepends = [ base bytestring containers directory text ]; @@ -59174,19 +59448,19 @@ self: { base bytestring containers deepseq directory hspec text ]; description = "Configuration management library"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; }) {}; "conferer-hedis" = callPackage ({ mkDerivation, base, conferer, hedis, hspec, text }: mkDerivation { pname = "conferer-hedis"; - version = "0.4.0.0"; - sha256 = "0w6ndawqcc25kq3jzlr907pga69php06sfnmkm2dnw5sw4ws5766"; + version = "0.4.0.1"; + sha256 = "0drsyagkdzlkrrq0x43j72804x1i3p4b9pjyqff5jdrr8h9jrv37"; libraryHaskellDepends = [ base conferer hedis text ]; testHaskellDepends = [ base conferer hedis hspec text ]; description = "conferer's FromConfig instances for hedis settings"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -59195,12 +59469,12 @@ self: { ({ mkDerivation, base, conferer, hspec, hspec-core, text }: mkDerivation { pname = "conferer-hspec"; - version = "0.4.0.0"; - sha256 = "1zj132a0m043lyk8bi9scvpcyhskivn2hrkcyrbms73i800dd59v"; + version = "0.4.0.1"; + sha256 = "1g2dglsvj7caqrvbg1yc08j98ljf71l885kxmmk469ab07j1c5sz"; libraryHaskellDepends = [ base conferer hspec-core text ]; testHaskellDepends = [ base conferer hspec hspec-core text ]; description = "conferer's FromConfig instances for hspec Config"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; }) {}; "conferer-provider-dhall" = callPackage @@ -59243,6 +59517,8 @@ self: { ]; description = "conferer's provider for reading json files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-provider-yaml" = callPackage @@ -59271,8 +59547,8 @@ self: { }: mkDerivation { pname = "conferer-snap"; - version = "0.4.0.0"; - sha256 = "1k7pnk3jlrrgky7fb3bf397w5ad9qkh2k42bw5777s35ni3v7955"; + version = "0.4.0.1"; + sha256 = "1z5p8zchykp8fc7lag3mi32z4wzb0bxcw5p4j3ya57bqs2xhhsdd"; libraryHaskellDepends = [ base conferer snap-core snap-server text ]; @@ -59280,7 +59556,7 @@ self: { base conferer hspec snap-core snap-server text ]; description = "conferer's FromConfig instances for snap Config"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -59291,8 +59567,8 @@ self: { }: mkDerivation { pname = "conferer-source-dhall"; - version = "0.4.0.0"; - sha256 = "0s3f0r9q16b08g6kv7vbk7hy48a6bgf5xqalw7n9zkmn4i6qb2cf"; + version = "0.4.0.1"; + sha256 = "00i3sk948bg6brf97m41n9s4da4m25n220l5gkddb589li0lq0rk"; libraryHaskellDepends = [ base bytestring conferer conferer-source-json dhall dhall-json directory text @@ -59302,7 +59578,7 @@ self: { directory hspec text ]; description = "Configuration for reading dhall files"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; }) {}; "conferer-source-json" = callPackage @@ -59311,8 +59587,8 @@ self: { }: mkDerivation { pname = "conferer-source-json"; - version = "0.4.0.0"; - sha256 = "0dml6xcs3bx3ay1f415k58xdr5xwy2201ibbi2v5lcs9dcb5vnhb"; + version = "0.4.0.1"; + sha256 = "01kfm771qks7b66z0nlv2b108r002xv8bzacr9p6ih7nsbcbiqdn"; libraryHaskellDepends = [ aeson base bytestring conferer directory text unordered-containers vector @@ -59322,7 +59598,7 @@ self: { unordered-containers vector ]; description = "conferer's source for reading json files"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; }) {}; "conferer-source-yaml" = callPackage @@ -59330,8 +59606,8 @@ self: { }: mkDerivation { pname = "conferer-source-yaml"; - version = "0.4.0.0"; - sha256 = "1cpq88z525fw0zabvn4m14shp0pvbchzbmhiby4cyp7qzb5cjiyn"; + version = "0.4.0.1"; + sha256 = "0ydciicxd7lxz2b6jmcc8ipyp99rp9gr9s2s2fnhmnhjv0xw6d7a"; libraryHaskellDepends = [ base conferer conferer-source-json yaml ]; @@ -59339,7 +59615,7 @@ self: { base conferer conferer-source-json hspec yaml ]; description = "Configuration for reading yaml files"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; }) {}; "conferer-warp" = callPackage @@ -59347,14 +59623,14 @@ self: { }: mkDerivation { pname = "conferer-warp"; - version = "0.4.0.0"; - sha256 = "1xwvk22diwfww82v7q7paq0aqnp5lqqayq4z76lq41zmp1l6nkzc"; + version = "0.4.0.1"; + sha256 = "1swvrkfqvpnpw2nihqzgn8rxv0pfbc9cl8wlyfshrqirjm0lhbj3"; libraryHaskellDepends = [ base conferer http-types text wai warp ]; testHaskellDepends = [ base conferer hspec http-types text wai warp ]; description = "conferer's FromConfig instances for warp settings"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; }) {}; "confetti" = callPackage @@ -60542,8 +60818,8 @@ self: { }: mkDerivation { pname = "contiguous"; - version = "0.5"; - sha256 = "0nz3ssh0zc8rs67mk8fmc8plvbjac6mlxdmzk9fw8sj2vx2ssisq"; + version = "0.5.1"; + sha256 = "1y02gqgd012zggs7kqxkky0prmbl0k9ji5ynb74i5mym88xrj67h"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted ]; @@ -61937,8 +62213,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.4"; - sha256 = "1269zgvcvd18zdmg4rf73mh89a3gcph91fqm46p5h05wz500179w"; + version = "0.2.5.6"; + sha256 = "1fvwvaqd9nn4pnblyi874kwb450h85gg2afa6khp4vsz1bybc8ch"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63510,6 +63786,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level cryptography based on Sodium"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypto-token" = callPackage @@ -63842,6 +64120,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_27" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.27"; + sha256 = "1c68wvn2b49gijq9day2bzi0axcbdz41ip3j0wdahdhcjfl4a9y8"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -65004,8 +65305,8 @@ self: { }: mkDerivation { pname = "curve25519"; - version = "0.2.3"; - sha256 = "0kwn7g479vpmir0vklvj7pw9xav3l463i1apzrqd45paiz88px6k"; + version = "0.2.4"; + sha256 = "1ckwdd9x03y6008ikl757sp7hkqscad144l9djmcm6pq5isjn7jh"; libraryHaskellDepends = [ base bytestring crypto-api ]; testHaskellDepends = [ base bytestring crypto-api DRBG HUnit QuickCheck tagged @@ -67812,8 +68113,8 @@ self: { }: mkDerivation { pname = "dataflower"; - version = "0.2.0.0"; - sha256 = "19b265w70dcaw5xw9y0bhvfng0yyywm8my3c0rp0jqdwacp7c126"; + version = "0.2.1.0"; + sha256 = "14pypk9lv5fri55waigl5526nq9rrbk4q3i5nxn4cyxra4gk3946"; libraryHaskellDepends = [ base hashable mtl pretty-show stm time transformers vector ]; @@ -68276,8 +68577,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.15.1"; - sha256 = "1fq1ds5lkgysi5cpbwh97233vil6w9djxn6dcp5sjj7r5gb76vj7"; + version = "1.2.16"; + sha256 = "103zxllh7nwbbckjblidr45xa13lrpqh9bwhvirrx24g7hsj1y9c"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -69551,8 +69852,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "2.3.0.0"; - sha256 = "09lqniw3gacyykmk23vl4icyhiixdyjps50cwvcmlwd8k4941gwa"; + version = "2.3.0.1"; + sha256 = "0klw2knnhqanmfjz2hjrj5sag6bqkh1g6vhgbvyk3d532m748wx1"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -69561,6 +69862,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_2_4_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.4.0.0"; + sha256 = "1kj4ygdbbkr54bqknxk3jqif74jxgpid7cz9vzcm2m15h8q2z9k2"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -69791,6 +70109,8 @@ self: { ]; description = "Mutable and immutable dense multidimensional arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dense-int-set" = callPackage @@ -70201,6 +70521,19 @@ self: { broken = true; }) {}; + "derive-lifted-instances" = callPackage + ({ mkDerivation, base, bifunctors, reflection, template-haskell }: + mkDerivation { + pname = "derive-lifted-instances"; + version = "0.2"; + sha256 = "1bms5m5hfrq4qg1gxxc045qms9jqrqgbd0695cxqnx9vyr86fpxf"; + libraryHaskellDepends = [ + base bifunctors reflection template-haskell + ]; + description = "Derive class instances though various kinds of lifting"; + license = stdenv.lib.licenses.asl20; + }) {}; + "derive-monoid" = callPackage ({ mkDerivation, base, semigroups, template-haskell }: mkDerivation { @@ -70633,6 +70966,8 @@ self: { ]; description = "Haskell development tool agregate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dewdrop" = callPackage @@ -70942,7 +71277,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_33_0" = callPackage + "dhall_1_33_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -70960,8 +71295,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.33.0"; - sha256 = "0njkn3kkzj14aa3qixcqpj0gdzkidlx6z92pkam84scs4ghs98k1"; + version = "1.33.1"; + sha256 = "17l6qh5zhy0gnxw0x5v4c6n00dmgk279lfyi65n2hsbpaspw7h2k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71134,6 +71469,8 @@ self: { pname = "dhall-json"; version = "1.7.0"; sha256 = "1nk2dibdnzm5wmvlsf82n8hc0zab1chqw339pp9q5n2gavj8kvsi"; + revision = "1"; + editedCabalFile = "1xbr4cphc98frf458vsggx5lh3my7ahlz5fl19hnyy876iwb04hm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71173,37 +71510,6 @@ self: { }) {}; "dhall-lsp-server" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , data-default, dhall, dhall-json, directory, doctest, filepath - , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core - , lsp-test, megaparsec, mtl, network-uri, optparse-applicative - , prettyprinter, QuickCheck, rope-utf16-splay, tasty, tasty-hspec - , text, transformers, unordered-containers, uri-encode - }: - mkDerivation { - pname = "dhall-lsp-server"; - version = "1.0.7"; - sha256 = "08nyai9y7s8facdjyfxc1z8dp8qd150y5554vxpvfr98xxj5kf41"; - revision = "3"; - editedCabalFile = "1iyad38szy9c6zpfkx37r7d9gl3zzjmiqvnkwfldp48cyr5x2hj9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers data-default dhall - dhall-json directory filepath haskell-lsp hslogger lens - lens-family-core megaparsec mtl network-uri prettyprinter - rope-utf16-splay text transformers unordered-containers uri-encode - ]; - executableHaskellDepends = [ base optparse-applicative ]; - testHaskellDepends = [ - base directory doctest filepath haskell-lsp-types lsp-test - QuickCheck tasty tasty-hspec text - ]; - description = "Language Server Protocol (LSP) server for Dhall"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dhall-lsp-server_1_0_8" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , data-default, dhall, dhall-json, directory, doctest, filepath , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core @@ -71230,7 +71536,6 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-nix" = callPackage @@ -71507,8 +71812,8 @@ self: { ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { pname = "di-polysemy"; - version = "0.1.3.1"; - sha256 = "0gxcpn3x2rwykimzhv473f9sjphja7bzsjxn2r9i9yjl89mjb7y8"; + version = "0.1.4.0"; + sha256 = "0p9wyli73skjbdbb0dgqb3p37rbijpadywsi0dwjdwdzpddjarcm"; libraryHaskellDepends = [ base df1 di-core di-df1 di-handle polysemy ]; @@ -72819,6 +73124,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "dijkstra-simple" = callPackage + ({ mkDerivation, base, containers, fingertree, hspec }: + mkDerivation { + pname = "dijkstra-simple"; + version = "0.1.0"; + sha256 = "068jfmkk14fmyd8ars13zi8z716d7ak0mxj3zm5f1zyj31901wz8"; + libraryHaskellDepends = [ base containers fingertree ]; + testHaskellDepends = [ base containers fingertree hspec ]; + description = "A simpler Dijkstra shortest paths implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dimensional" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob , hspec, hspec-discover, ieee754, numtype-dk, QuickCheck @@ -73404,6 +73721,8 @@ self: { executableHaskellDepends = [ base text ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-hs" = callPackage @@ -74913,6 +75232,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dobutokO-effects" = callPackage + ({ mkDerivation, base, dobutokO-frequency }: + mkDerivation { + pname = "dobutokO-effects"; + version = "0.4.0.0"; + sha256 = "1w4n4sag05qggj79ygdkxjgnyy4c7azl29gvhkqpf38gd4jqdysy"; + libraryHaskellDepends = [ base dobutokO-frequency ]; + description = "A library to deal with SoX effects and possibilities"; + license = stdenv.lib.licenses.mit; + }) {}; + + "dobutokO-frequency" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dobutokO-frequency"; + version = "0.1.1.0"; + sha256 = "11ngz39dqdcv6xkff9b590cbhd94gx1q71v6cz3birmhvbf8qwrm"; + libraryHaskellDepends = [ base ]; + description = "Helps to create experimental music. Working with frequencies and types."; + license = stdenv.lib.licenses.mit; + }) {}; + "dobutokO-poetry" = callPackage ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: mkDerivation { @@ -74935,8 +75276,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.41.0.0"; - sha256 = "1qnlmyxg5qsh63gh7vnjmvshrflfz8ybxcnwdcjr8qwflyfj5kq9"; + version = "0.42.0.0"; + sha256 = "12bjaa9kw1ks9f64zl0lg4447hs1bjjy5g3q3yhmabwzp5yyy014"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74957,8 +75298,8 @@ self: { }: mkDerivation { pname = "dobutokO3"; - version = "0.1.0.0"; - sha256 = "09nd465327fz7li2g9gc50lhsqi2a2sbaznmwxld7jsnzm5i9fbm"; + version = "0.2.1.0"; + sha256 = "0xh6685v01j1r9fg8r7ldd8vqxlir2fylryb0z71ndpdi4ajvkih"; libraryHaskellDepends = [ base bytestring directory dobutokO2 mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s mmsyn7ukr process vector @@ -74973,8 +75314,8 @@ self: { }: mkDerivation { pname = "dobutokO4"; - version = "0.5.0.0"; - sha256 = "1l11ym6y7gx58cbirr5lanzzin0pybc2gswwwbhnhiqfrj2ybsr9"; + version = "0.7.0.0"; + sha256 = "16im8ki3jbc7jgvr8nwnr4mb19is1vf3pz6pdfrj4q9jfmrv82d2"; libraryHaskellDepends = [ base directory dobutokO2 mmsyn3 mmsyn7l process vector vector-doublezip @@ -75838,19 +76179,6 @@ self: { }) {}; "dotgen" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "dotgen"; - version = "0.4.2"; - sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers ]; - description = "A simple interface for building .dot graph files."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dotgen_0_4_3" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "dotgen"; @@ -75861,7 +76189,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "A simple interface for building .dot graph files."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotnet-timespan" = callPackage @@ -76546,6 +76873,21 @@ self: { broken = true; }) {}; + "drunken-bishop" = callPackage + ({ mkDerivation, array, base, bytestring, pureMD5 }: + mkDerivation { + pname = "drunken-bishop"; + version = "0.1.0.0"; + sha256 = "114728h8zznmjygp1ddjnkklk0pcs8w7in7698k9xi54j6v467gy"; + revision = "1"; + editedCabalFile = "1iaq53nvyzh84g91a6p7y4m38v0mcqpw1c18s2fxlzb5zg342zqi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base bytestring pureMD5 ]; + description = "An implementation of the Drunken Bishop visual fingerprinting algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ds-kanren" = callPackage ({ mkDerivation, base, containers, logict, QuickCheck, tasty , tasty-quickcheck @@ -76680,14 +77022,14 @@ self: { ({ mkDerivation, array, base, containers, QuickCheck, random }: mkDerivation { pname = "dsp"; - version = "0.2.5"; - sha256 = "1lka6l0xf3p7cb9ikzvszwgr7pl3gjm0s5v312p6k4w1fqqsycl5"; + version = "0.2.5.1"; + sha256 = "03mhqqnjqjhklmlim6cljq5ik0l4h6lgqffw2i2clqgwj64ky5nf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers random ]; testHaskellDepends = [ array base containers QuickCheck ]; description = "Haskell Digital Signal Processing"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; }) {}; "dstring" = callPackage @@ -80929,8 +81271,8 @@ self: { ({ mkDerivation, base, containers, deepseq }: mkDerivation { pname = "enummaps"; - version = "0.6.2.1.3"; - sha256 = "0ki60a2lg1hdbcrd10ldfja0ayrwlxg2hvbip9llqaj0lkw01r6r"; + version = "0.6.2.1.7"; + sha256 = "0p4klnhwr10yiv3w209vl1j09280257z0pz626ynbxbff4mh9wg4"; libraryHaskellDepends = [ base containers deepseq ]; description = "Enum wrappers for IntMap and IntSet"; license = stdenv.lib.licenses.bsd3; @@ -81938,8 +82280,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.3.0"; - sha256 = "19zzqmaciski4ara41djkh1df17nzqw2nfwzc81zv6d3pylaznq1"; + version = "3.3.3.2"; + sha256 = "0488vrv85gzv190j4npyjll5v1fchqlxlg5346j4p90zb9vl2pzl"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -82467,6 +82809,8 @@ self: { ]; description = "Euler tour trees"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "euphoria" = callPackage @@ -83264,6 +83608,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exception-transformers_0_4_0_9" = callPackage + ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit + , transformers, transformers-compat + }: + mkDerivation { + pname = "exception-transformers"; + version = "0.4.0.9"; + sha256 = "033z8mhczwf59lh59q3z546gkcsy0bzg98r1qhm3fiq7j11hgd95"; + libraryHaskellDepends = [ base transformers transformers-compat ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit transformers + transformers-compat + ]; + description = "Type classes and monads for unchecked extensible exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exceptional" = callPackage ({ mkDerivation, base, exceptions }: mkDerivation { @@ -83498,17 +83860,26 @@ self: { }) {inherit (pkgs) exif;}; "exigo-schema" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, persistent - , persistent-template, template-haskell, text, th-lift-instances + ({ mkDerivation, aeson, base, binary, bytestring, directory + , esqueleto, exceptions, hint, hspec, hspec-core, interpolate + , monad-logger, mtl, persistent, persistent-sqlite + , persistent-template, QuickCheck, quickcheck-text, resourcet + , template-haskell, temporary, text, th-lift-instances }: mkDerivation { pname = "exigo-schema"; - version = "0.1.0.0"; - sha256 = "1ivpms6vm022jbc859l2vjibvzl6sa8kindkz165c0fk1ii433ph"; + version = "0.2.0.2"; + sha256 = "0kaja735bsgzywhfa16wg5kvjc1c89gvm503gxxyhkakacmp2002"; libraryHaskellDepends = [ aeson base binary bytestring persistent persistent-template template-haskell text th-lift-instances ]; + testHaskellDepends = [ + aeson base bytestring directory esqueleto exceptions hint hspec + hspec-core interpolate monad-logger mtl persistent + persistent-sqlite persistent-template QuickCheck quickcheck-text + resourcet template-haskell temporary text + ]; description = "database schema for exigo marking/assessment tools"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -84414,8 +84785,6 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "external-sort" = callPackage @@ -84641,8 +85010,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.2.1"; - sha256 = "1vz273vni9335py69nlc2g92gkvy13rkfa238116g83qjjcx8w1f"; + version = "0.3.2.2"; + sha256 = "00nxadfipy92rpg7d3ypgigr51n4sn9jjh6n1gzxfjl6p7vq6myn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87194,6 +87563,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "filelock_0_1_1_5" = callPackage + ({ mkDerivation, async, base, process, unix }: + mkDerivation { + pname = "filelock"; + version = "0.1.1.5"; + sha256 = "06a44i7a956d7xkk2na4090xj2a7b7a228pk4spmccs4x20ymssh"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ async base process ]; + description = "Portable interface to file locking (flock / LockFileEx)"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filemanip" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , unix-compat @@ -87928,8 +88310,8 @@ self: { }: mkDerivation { pname = "fishfood"; - version = "0.0.1.9"; - sha256 = "128m9zhn57jzz5ijkz54mlw70g0d1byp2gisw7wyrgddi0j3x3i5"; + version = "0.0.1.10"; + sha256 = "075hqpp4jmhl57a6y5vgnmxc3264mby2xpcmskxpcrqf6isbljah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89041,8 +89423,6 @@ self: { ]; description = "A flexible Haskell source code pretty printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "flow" = callPackage @@ -89731,8 +90111,8 @@ self: { }: mkDerivation { pname = "fold-debounce-conduit"; - version = "0.2.0.4"; - sha256 = "0mhnc5j8jnmf4rnb5cj75jlyj9xc4gj3dawywcw26zz189j540fj"; + version = "0.2.0.5"; + sha256 = "1qvr3wqqv2lvs22ddmalavggp8a4a50d056a50dsz6lcml1k6hdg"; libraryHaskellDepends = [ base conduit fold-debounce resourcet stm transformers transformers-base @@ -90740,20 +91120,21 @@ self: { }) {}; "fourmolu" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, syb, text + ({ mkDerivation, aeson, base, bytestring, containers, directory + , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec + , hspec-discover, mtl, optparse-applicative, path, path-io, syb + , text, yaml }: mkDerivation { pname = "fourmolu"; - version = "0.0.6.0"; - sha256 = "16i5wlwbvk9868nscj1xg5n8j3z56jbv9q4nipcwmzm76i19iqwf"; + version = "0.1.0.0"; + sha256 = "1kc7hhaqn7sghbcfj9xg8r1pvrmhawy9y2rhizfxzm7z034bgjyk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc-lib-parser mtl syb - text + aeson base bytestring containers directory dlist exceptions + filepath ghc-lib-parser mtl syb text yaml ]; executableHaskellDepends = [ base ghc-lib-parser gitrev optparse-applicative text @@ -90764,6 +91145,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fpco-api" = callPackage @@ -91199,16 +91582,17 @@ self: { }) {}; "free-functors" = callPackage - ({ mkDerivation, algebraic-classes, base, bifunctors, comonad - , contravariant, profunctors, template-haskell, transformers + ({ mkDerivation, base, bifunctors, comonad, contravariant + , derive-lifted-instances, profunctors, template-haskell + , transformers }: mkDerivation { pname = "free-functors"; - version = "1.0.1"; - sha256 = "1y1cmm4z5s5a1ivs30vwb2rbgc9q24y6z2a9in3azwpgfb1x4fw0"; + version = "1.1.2"; + sha256 = "1qkn7irp1zids0dvi7xn17kk8wmwkqnys78qy5n27dhsgi2l1avs"; libraryHaskellDepends = [ - algebraic-classes base bifunctors comonad contravariant profunctors - template-haskell transformers + base bifunctors comonad contravariant derive-lifted-instances + profunctors template-haskell transformers ]; description = "Free functors, adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; @@ -91805,8 +92189,8 @@ self: { pname = "friday"; version = "0.2.3.1"; sha256 = "04wn36249b7mddhp6r8zycdxixm0ryj3jrc6qjjvl5k138n4j9q8"; - revision = "1"; - editedCabalFile = "0n1f4plvrmad6gm8dbsi6g5ghahdwwy2fhgippmnp1ixb65x7d58"; + revision = "2"; + editedCabalFile = "1iy2ywz42mwwr2iy7fzfdif8f0vbyl3w9hgy4rkynsmmqc8mmxba"; libraryHaskellDepends = [ base containers convertible deepseq primitive ratio-int transformers vector @@ -93102,26 +93486,6 @@ self: { }) {}; "fused-effects" = callPackage - ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn - , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog - , tasty-hunit, transformers - }: - mkDerivation { - pname = "fused-effects"; - version = "1.0.2.0"; - sha256 = "0dy8m54fm3gndj0bda0savl80w7drj8h113bhbi2439wl3x02y6x"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ - base containers hedgehog hedgehog-fn inspection-testing mtl tasty - tasty-hedgehog tasty-hunit transformers - ]; - testToolDepends = [ markdown-unlit ]; - benchmarkHaskellDepends = [ base gauge ]; - description = "A fast, flexible, fused effect system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fused-effects_1_0_2_2" = callPackage ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn , inspection-testing, markdown-unlit, tasty, tasty-hedgehog , tasty-hunit, transformers @@ -93139,7 +93503,6 @@ self: { benchmarkHaskellDepends = [ base gauge ]; description = "A fast, flexible, fused effect system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -94104,8 +94467,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "GCode processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "gconf" = callPackage @@ -94778,15 +95140,17 @@ self: { }) {}; "generic-data-surgery" = callPackage - ({ mkDerivation, base, first-class-families, generic-data, tasty - , tasty-hunit + ({ mkDerivation, base, first-class-families, generic-data + , show-combinators, tasty, tasty-hunit }: mkDerivation { pname = "generic-data-surgery"; - version = "0.2.1.0"; - sha256 = "0mjx8yi4f1wvf5w2wp5vzzrh3z5n6900qsp2lbhd2xzzq4zlvzy7"; + version = "0.3.0.0"; + sha256 = "1dg9mg10g0abs21wksplnaqgig42jb6zvk7xqwj2mkl5yln3h9is"; libraryHaskellDepends = [ base first-class-families generic-data ]; - testHaskellDepends = [ base generic-data tasty tasty-hunit ]; + testHaskellDepends = [ + base generic-data show-combinators tasty tasty-hunit + ]; description = "Surgery for generic data types"; license = stdenv.lib.licenses.mit; }) {}; @@ -97551,10 +97915,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.3.0.0"; - sha256 = "1jahwmy2cywnnlvrjizak1wqih7pki9r35qazcz7mih68pd9gnhz"; - revision = "1"; - editedCabalFile = "0kh04p9n9q74n84vrzrybkd45alwzhll8m6xwn8nzi1bxpilrhm4"; + version = "0.3.0.1"; + sha256 = "0h403zi5lqbpygpqw5469fafz1cgh5mcx96sp0iw4scnmh7z3cj9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98225,6 +98587,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_22" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.22"; + sha256 = "1jx0wy3a0vzclqpysks3nllvm2163svll1iakh3ar7njba7ihq2x"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + description = "Atk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) atk;}; + "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -98248,6 +98630,30 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.24"; + sha256 = "1g8dvfhsncigi4xrdydp8bxjrcajk1794xb24wpvqpnnbmmykpwk"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Cairo bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage ({ mkDerivation, base, cairo-core, haskell-gi-base , template-haskell @@ -98318,6 +98724,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenu_0_4_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenu"; + version = "0.4.8"; + sha256 = "15nvfap39ayw34282br4rch1aias0m1sbapc0nkla8h5ip2naqi6"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libdbusmenu ]; + description = "Dbusmenu bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenugtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk @@ -98342,6 +98768,31 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-dbusmenugtk3_0_4_9" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk + , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu-gtk3, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenugtk3"; + version = "0.4.9"; + sha256 = "1cni5368ldyblwh0jr6wva8fhi3574d258xzw49prwbjxngmjiv0"; + setupHaskellDepends = [ + base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib + gi-gobject gi-gtk haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf + gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; + description = "DbusmenuGtk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -98366,7 +98817,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gdk_4_0_1" = callPackage + "gi-gdk_4_0_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -98374,8 +98825,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "4.0.1"; - sha256 = "1b2azv7c3c9ni9f258ag2cxy97sh8ax78v0hym0gpvrky741vqwq"; + version = "4.0.2"; + sha256 = "0271n81jqwcl7g0li4yv6x42jkcmx4cjs2b6b60g1mz0qq8klhbn"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -98412,6 +98863,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkpixbuf_2_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.24"; + sha256 = "00hgfyln0pqx4fmffc24mx818y1lladfc288qq0f03345p5dnbna"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk-pixbuf ]; + description = "GdkPixbuf bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkx11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi @@ -98434,15 +98907,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gdkx11_4_0_1" = callPackage + "gi-gdkx11_4_0_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "4.0.1"; - sha256 = "1z7d8vs4l1gzm0nbi0ir2q76jcc9s685s2nhbfflyjsvclr91spm"; + version = "4.0.2"; + sha256 = "1z510v5p515i2fyd5kjxcfnyf5lsd0kzgzsnnqw4km186b241fc5"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -98464,8 +98937,8 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.8"; - sha256 = "151qgcwp2spa957nr3jdb9ac35f1r1gyi2d5vzgxy8xzc3993wmq"; + version = "1.0.9"; + sha256 = "0qvmppdby40ncd9alnnk8ang90qcaj00c0g0nrq0s0m1ynar8ccd"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -98497,6 +98970,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_27" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.27"; + sha256 = "08qc0ahj0qmmibf92m48hv8q2x47q83c6j9a49h11dyc8l4nclx6"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "Gio bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base @@ -98504,8 +98997,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.22"; - sha256 = "1m7gnam8a46zbbnxgcszv1wn8zgzdrpki6k3fgy5xjnb4gp5pvpj"; + version = "1.0.23"; + sha256 = "0a8sis3zayiywi7mgs1g4p7nr9szv392j7bimq5nvva04lj6sdzc"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -98535,6 +99028,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.24"; + sha256 = "0zrajclbjbq6d6pyvz3s0kjq997w7j8nghi3i89l8fjw16gbmjxn"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GLib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -98554,6 +99067,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_23" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.23"; + sha256 = "15wkma8akcy50c2xiiwlc4zm5k1v4vnrk3mhn3bbz1rdfbdhvr9v"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base @@ -98575,6 +99108,27 @@ self: { broken = true; }) {graphene-gobject = null;}; + "gi-graphene_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-graphene"; + version = "1.0.2"; + sha256 = "1mszvx58mdazy8202s0c05hp800b92n21g4rxwvp5k0ms7qz95nq"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ graphene-gobject ]; + description = "Graphene bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {graphene-gobject = null;}; + "gi-gsk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-glib, gi-gobject, gi-graphene, gi-pango, gtk4 @@ -98583,8 +99137,8 @@ self: { }: mkDerivation { pname = "gi-gsk"; - version = "4.0.1"; - sha256 = "0645dyifg6d3x03zrzf2andfah32s878rcyqzw891prn2dvga3nx"; + version = "4.0.2"; + sha256 = "1jc5jxni87zg475rgjrxv85rpyr20bwxdyfjw060dx4gvnyhxnfs"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-glib gi-gobject gi-graphene gi-pango haskell-gi @@ -98608,8 +99162,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.22"; - sha256 = "0qicgvy9wm1xs5y6fda8sxdilwfg2y6albdqy3jg2n5qn7c9p0f6"; + version = "1.0.23"; + sha256 = "0w4xscgd49d6d00gvsqc210r63c0wj748dqa5ypppr4mzllsm0qv"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -98627,8 +99181,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.21"; - sha256 = "0zrcplkd0hfdfvwq7gbg8wyvsk2an8k5yj342adq1ar0zgfh064n"; + version = "1.0.22"; + sha256 = "17x0nmzawr9mqfjjbgk9s35102y4nsvxym9hwgwhh88ijnbhshhs"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -98648,8 +99202,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.22"; - sha256 = "1y7hf5kcm4kj185glb298zr6x39m61hvqrdwskk9043nrd8ifcxx"; + version = "1.0.23"; + sha256 = "0im25z9pf9j0cxj0b6lbbr3lis9kbvzzvzns65cmargbh1018959"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst haskell-gi ]; @@ -98670,8 +99224,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.21"; - sha256 = "15kg01g8cgaw98khf6nrr9sjbfss3a3d43g9zgbbv5h5qnzvjazb"; + version = "1.0.22"; + sha256 = "1kq86zc9rcla6xhgi0vf32y6bs3adi5xgkpknld6zl4dq7s70plk"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag gi-gstvideo haskell-gi @@ -98695,8 +99249,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.21"; - sha256 = "061xy3vx41pgyyg6mcbc7saj50n5zwfc72l8dw54kgv09vykp7ji"; + version = "1.0.22"; + sha256 = "0jpqj5kggg2ahvbrnmacjk6n9zg31v0klybkygz4i6i4d6absvf6"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -98718,8 +99272,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.22"; - sha256 = "0fr9pfcfsjajl5cd6p05a4kp83acmllzzdm0kc2nxnr0kmjifi5v"; + version = "1.0.23"; + sha256 = "1kb09kal08x7nznc0g8c2n9jfijapdndbnsfs5cvz0p9smvd092i"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -98756,7 +99310,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_1" = callPackage + "gi-gtk_4_0_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base @@ -98764,8 +99318,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "4.0.1"; - sha256 = "1brn4pyjvnc00bwqwf3d77dhbiknak5yjqs9xyk9mknw2pb98ppv"; + version = "4.0.2"; + sha256 = "1lmbb3q4f73f7yihnl4qjv7qvzrys3jqsh3dg9wwdg9bxg900ghp"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi @@ -98803,8 +99357,6 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -98823,8 +99375,6 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gi-gtk-hs" = callPackage @@ -98844,6 +99394,24 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "gi-gtk-hs_0_3_9" = callPackage + ({ mkDerivation, base, base-compat, containers, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl + , text, transformers + }: + mkDerivation { + pname = "gi-gtk-hs"; + version = "0.3.9"; + sha256 = "1ql14ripivfh1w65wnr6mw64f2vlwi54gz70c8qql9f5szbnjky1"; + libraryHaskellDepends = [ + base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gtk haskell-gi-base mtl text transformers + ]; + description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi @@ -98875,8 +99443,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.22"; - sha256 = "08b3ffjdgyr5xapx37kkwx3z8fsd42ydvdwk3nvh2ysfq9q86cjh"; + version = "3.0.23"; + sha256 = "13rsxjbl62q8zhwqr8jm2fh5njzfa86izqwag4d6aw8xi71wqfrn"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -98893,22 +99461,22 @@ self: { "gi-handy" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, haskell-gi + , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi , haskell-gi-base, haskell-gi-overloading, libhandy, text , transformers }: mkDerivation { pname = "gi-handy"; - version = "0.0.6"; - sha256 = "134dspf2vhwl76g25mjjj3gmdis748qg3rschmypd9w4zr2l651w"; + version = "0.0.7"; + sha256 = "0vdmby4wzxzhy9cbpi6i29r2ywq75ndcjpra3nvkavp91ba1y1c1"; setupHaskellDepends = [ - base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk + base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text - transformers + gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading + text transformers ]; libraryPkgconfigDepends = [ libhandy ]; description = "libhandy bindings"; @@ -98917,6 +99485,25 @@ self: { broken = true; }) {inherit (pkgs) libhandy;}; + "gi-harfbuzz" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-harfbuzz"; + version = "0.0.2"; + sha256 = "15l5iwnj9awd04626mqagd4rldxi2byr53gvqqnlxljbskb7ch2m"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ harfbuzz ]; + description = "HarfBuzz bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) harfbuzz;}; + "gi-ibus" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -98924,8 +99511,8 @@ self: { }: mkDerivation { pname = "gi-ibus"; - version = "1.5.1"; - sha256 = "1dvybzgckpqyvh9ivaq22x9i8paafglh3pmr4lk6i7zjlamw8kxv"; + version = "1.5.2"; + sha256 = "14chw0qhzdxixsqsn2ra31z561kn2zclk15b7hfpfzayqr6dqci1"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -98936,6 +99523,8 @@ self: { libraryPkgconfigDepends = [ ibus ]; description = "IBus bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage @@ -98945,8 +99534,8 @@ self: { }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.21"; - sha256 = "0zl2lanysqir9qhndai7v4yp6sq671115mi5k9q58rwkmvkm6w04"; + version = "4.0.22"; + sha256 = "191ipwjxn94dxz6saapidvjr8bbnl0y3p4f10s6mj6h6pkb5axjb"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -98965,8 +99554,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.21"; - sha256 = "13ifi60jlfm9jypf6gam224s5rgq2kd1cj98wfl1dg9crahghbls"; + version = "0.7.22"; + sha256 = "0j5cxx9dsxh2wafw4xa7yasr6n98h2qwpm1y08nm7m6i0kwrksap"; setupHaskellDepends = [ base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi ]; @@ -98986,8 +99575,8 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.12"; - sha256 = "0j7nd4ylz4whnsdfbn6ra7kvvnx6l6bqv2y57rgk1nnac3cc6201"; + version = "1.0.13"; + sha256 = "07k02mffidw18f104crmhayr5nf3v5xcldc8fbmxdinp7wik5c7f"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99024,6 +99613,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pango_1_0_23" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.23"; + sha256 = "18pp83nzqdxzq15g3rm0xym4hdq3f851m6mshlb4f7liy168vpl9"; + setupHaskellDepends = [ + base Cabal gi-glib gi-gobject gi-harfbuzz haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject gi-harfbuzz + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Pango bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi @@ -99032,8 +99647,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.23"; - sha256 = "0la2ga1hprwm4fnia48y0q1cg8il0aq42nwvaj5gndx6id42a1i6"; + version = "1.0.24"; + sha256 = "1yya5gsqrkagmm33rsasshlj691nmax47fqdn1p2rnf4aqx1jcqr"; setupHaskellDepends = [ base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi ]; @@ -99057,8 +99672,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.22"; - sha256 = "0bqmkijnmxi4k30nbn8zsx03i9y7mlp06ikmd2dbxj22lyazqjz4"; + version = "0.18.23"; + sha256 = "0dn6qnsrgnvbz9nbv0ig9hyjmswrq6v3z1bcnf0pybcdwr8j1zrw"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99080,8 +99695,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.11"; - sha256 = "1s3vwy0aff4m1rvkbcvfa4zwbbalaiz46ij3ymmsx319v2mwwiib"; + version = "0.0.12"; + sha256 = "19mr7mvay2slm5k6afqj0hhy4ddh0advrb5dyzqi75xysx7xagm8"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99103,8 +99718,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.22"; - sha256 = "0vgvcq9nysw9xfyjddi1qzngw7pfrfx4g1f3zngf56jcvxf8q6rw"; + version = "2.4.23"; + sha256 = "109n57ff69xmwhm3lvf0ajid3zl0l9sr1qdnvis06bhcddw9i1ap"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99125,8 +99740,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.25"; - sha256 = "0h6kqbbdr7zgpq6sfqs2pfx99c7wj1aabpzna9fryn6zhaha8j3c"; + version = "2.91.27"; + sha256 = "0a4n8yah3nirwciw0y1i8vpcjqbbk3pw15nd8av109cyxgl8nzx8"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -99172,8 +99787,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.25"; - sha256 = "1xg4xy24nnz0ngv46m58jkmaka72nv4954g03f6ixpvwappim0vm"; + version = "4.0.26"; + sha256 = "0vbsc5zd1m1k47zpq620kzsiyg2g25ag6fvkwj0hdlq24xhyiavr"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -99197,8 +99812,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.24"; - sha256 = "0lnf173c6myrswk0kdnwkhs925imvcpyvpmy50krqljnv6f2ksxn"; + version = "4.0.25"; + sha256 = "0vdzhnaj6d03cgxz3i886cahkfhl8xgcrm37wdcxqydkxx2ybh6h"; setupHaskellDepends = [ base Cabal gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -99222,8 +99837,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.7"; - sha256 = "02kgbp3h5ny7y0qmddsfng0a1gqpdmadl6yy45hmk98ws02rk9bx"; + version = "3.0.8"; + sha256 = "1zgzxx5v0cc0z9xq1nkbqixa7r0m0m00gzvdypxqddlpzvrxn63c"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gobject gi-gtk haskell-gi ]; @@ -99258,6 +99873,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) xlibsWrapper;}; + "gi-xlib_2_0_9" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + , xlibsWrapper + }: + mkDerivation { + pname = "gi-xlib"; + version = "2.0.9"; + sha256 = "02n2iz30dkkfqpsc3ngpx0zxrl6fbsafzrjf0im8an783jp3vm80"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; + description = "xlib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) xlibsWrapper;}; + "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , directory, extra, filemanip, filepath, mtl, process, semigroups @@ -99374,8 +100009,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.8.0"; - sha256 = "1wx35fm7jba69x33mhp0h6j0lszi62hmmb1inflx7gax0ncmk2n2"; + version = "0.13.8.1"; + sha256 = "00dq87p6nqk4x2n98a6b35l7a4crkmhr36zjk0xsfdsr3lf7zmr6"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -99501,79 +100136,6 @@ self: { }) {}; "git-annex" = callPackage - ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive - , clientsession, concurrent-output, conduit, connection, containers - , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq - , directory, disk-free-space, dlist, edit-distance, exceptions - , fdo-notify, feed, filepath, filepath-bytestring, free, git, gnupg - , hinotify, hslogger, http-client, http-client-tls, http-conduit - , http-types, IfElse, lsof, magic, memory, microlens, monad-control - , monad-logger, mountpoints, mtl, network, network-bsd - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent - , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun - , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unliftio-core, unordered-containers, utf8-string - , uuid, vector, wai, wai-extra, warp, warp-tls, wget, which, yesod - , yesod-core, yesod-form, yesod-static - }: - mkDerivation { - pname = "git-annex"; - version = "8.20200501"; - sha256 = "19rggaymvqy7r61n2rl2nigwdi2hzq5l1afcd5l0k1vbacwgq4jl"; - configureFlags = [ - "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" - "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" - "-fwebapp" "-fwebdav" - ]; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ - base bytestring Cabal data-default directory exceptions filepath - filepath-bytestring hslogger IfElse process split transformers - unix-compat utf8-string - ]; - executableHaskellDepends = [ - aeson async attoparsec aws base blaze-builder bloomfilter byteable - bytestring case-insensitive clientsession concurrent-output conduit - connection containers crypto-api cryptonite data-default DAV dbus - deepseq directory disk-free-space dlist edit-distance exceptions - fdo-notify feed filepath filepath-bytestring free hinotify hslogger - http-client http-client-tls http-conduit http-types IfElse magic - memory microlens monad-control monad-logger mountpoints mtl network - network-bsd network-info network-multicast network-uri old-locale - optparse-applicative path-pieces persistent persistent-sqlite - persistent-template process QuickCheck random regex-tdfa resourcet - SafeSemaphore sandi securemem shakespeare socks split stm stm-chans - tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun - template-haskell text time torrent transformers unix unix-compat - unliftio-core unordered-containers utf8-string uuid vector wai - wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static - ]; - executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which - ]; - preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = '' - ln -sf dist/build/git-annex/git-annex git-annex - ln -sf git-annex git-annex-shell - ''; - installPhase = "make PREFIX=$out BUILDER=: install install-completions"; - checkPhase = ''PATH+=":$PWD" git-annex test''; - enableSharedExecutables = false; - description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; - - "git-annex_8_20200617" = callPackage ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive , clientsession, concurrent-output, conduit, connection, containers @@ -99640,7 +100202,6 @@ self: { enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -100481,6 +101042,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gitlab-haskell_0_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, tasty, tasty-hunit, text, time, transformers + , unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.2.1"; + sha256 = "0s7ar0z2hgkb8qzsyh6j022ks87nxa1fxy99dqrrmcfndcy6by8n"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types text time + transformers unliftio unliftio-core + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A Haskell library for the GitLab web API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -101061,8 +101642,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.8.0"; - sha256 = "18k1drykl3mpmyj43kp9nvkzr9g3allr19ihscmxwc1w9ss6zklw"; + version = "0.13.8.1"; + sha256 = "170sbi1gg38sxl4yhd4z716fljlcbf21vgl58p0pcx2adnn2il6w"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -101521,6 +102102,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Low-level Haskell bindings to GLPK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) glpk;}; "glpk-hs" = callPackage @@ -104343,6 +104926,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "goldplate" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff + , directory, filepath, Glob, optparse-applicative, process + , regex-pcre-builtin, text, time, unordered-containers + }: + mkDerivation { + pname = "goldplate"; + version = "0.1.1"; + sha256 = "0qjqx3yxlyfdj6glych7vwrrh47nrp6xi0vncga2a94hb5sljzzl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty async base bytestring Diff directory filepath + Glob optparse-applicative process regex-pcre-builtin text time + unordered-containers + ]; + description = "A lightweight golden test runner"; + license = stdenv.lib.licenses.asl20; + }) {}; + "gooey" = callPackage ({ mkDerivation, base, renderable, transformers, varying }: mkDerivation { @@ -105845,21 +106448,22 @@ self: { "graphql" = callPackage ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations , hspec-megaparsec, megaparsec, parser-combinators, QuickCheck - , raw-strings-qq, text, transformers, unordered-containers + , raw-strings-qq, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "graphql"; - version = "0.7.0.0"; - sha256 = "03bfg4whf7blf91x0h4qk6q7f1j7nfvhmqh4ggpnbyxdbyzx9sk4"; + version = "0.8.0.0"; + sha256 = "08xi2q8jzk78a62q5qbi8i2d2kq0qcn0dzdx1haq2c4qjsf09798"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers megaparsec parser-combinators text - transformers unordered-containers + aeson base containers megaparsec parser-combinators scientific text + transformers unordered-containers vector ]; testHaskellDepends = [ aeson base containers hspec hspec-expectations hspec-megaparsec - megaparsec parser-combinators QuickCheck raw-strings-qq text - transformers unordered-containers + megaparsec parser-combinators QuickCheck raw-strings-qq scientific + text transformers unordered-containers vector ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -106239,8 +106843,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "1.1.0.2"; - sha256 = "0q8grqi9pslpwnh2a8frcvfw0gq71asm6m9748v97h4xqry116jg"; + version = "1.1.0.3"; + sha256 = "1q3m4m994vmfk80szphfd74vzfq6zp678bdla6v4siwqjskagyn3"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -106260,8 +106864,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.3.4"; - sha256 = "03w4glzlavj57mak1nn7qxafr937z9afwdaaaj5i8spjpr2vz4hr"; + version = "0.1.3.5"; + sha256 = "08jpgnsnmh9zbm1pw768ik28vhl3m4jz75l8cbxb3whfgwk5vyy4"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -106281,8 +106885,8 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "0.1.2.3"; - sha256 = "0jxckcjpdy1j5bbjdw37rc9sbnyznc7awifmjrcliy2yk1dwdj6w"; + version = "0.1.2.4"; + sha256 = "1w5867pdb07jlms3gddx8n3ds94qp4yq1yxcy880vcww2gyb4jda"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring greskell-core hashtables safe-exceptions stm text unordered-containers uuid @@ -107146,8 +107750,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.15.4"; - sha256 = "1wm42m4963abqiswkc3ngwf9jm4z9kyyx2h8w064f62ngnkdz84z"; + version = "0.15.5"; + sha256 = "096xawq85shmdhsqwpcmidjc4asqgqxsxv0f0xff78169jrdh6a2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -107484,8 +108088,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.15.4"; - sha256 = "17g93j8az1gqgf9kxg1k1lls6c0if45bzgbhrc99qgm8s9f2dr1c"; + version = "0.15.5"; + sha256 = "1y5wmxxpvhfw1ypli3f48k5bg3hfbx081d9xr5ks8sj3g7f7cf60"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -109271,26 +109875,25 @@ self: { "hackport" = callPackage ({ mkDerivation, array, async, base, base16-bytestring - , base64-bytestring, binary, bytestring, containers, cryptohash - , deepseq, directory, ed25519, extensible-exceptions, filepath - , ghc-prim, hashable, HTTP, HUnit, MissingH, mtl, network - , network-uri, old-locale, old-time, parsec, pretty, process - , random, regex-compat, split, stm, tar, template-haskell, text - , time, transformers, unix, xml, zlib + , base64-bytestring, binary, bytestring, containers + , cryptohash-sha256, deepseq, directory, ed25519 + , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit + , lukko, mtl, network, network-uri, old-locale, parsec, pretty + , process, random, split, stm, tar, template-haskell, text, time + , transformers, unix, xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.6.4"; - sha256 = "185b2mincqzla8j675lv4ydi8fvsj3ikyq4g8jivygbkcpawi5f5"; + version = "0.6.5"; + sha256 = "1869fkrcapnvvzgqwfaivjgcmbmmg53l335qgb6fw672g4bhkc2x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array async base base16-bytestring base64-bytestring binary - bytestring containers cryptohash deepseq directory ed25519 - extensible-exceptions filepath ghc-prim hashable HTTP MissingH mtl - network network-uri old-locale old-time parsec pretty process - random regex-compat split stm tar template-haskell text time - transformers unix xml zlib + bytestring containers cryptohash-sha256 deepseq directory ed25519 + extensible-exceptions filepath ghc-prim hashable HTTP lukko mtl + network network-uri old-locale parsec pretty process random split + stm tar template-haskell text time transformers unix xml zlib ]; testHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110118,6 +110721,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) utillinux;}; + "hakyll_4_13_4_0" = callPackage + ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring + , containers, cryptonite, data-default, deepseq, directory + , file-embed, filepath, fsnotify, http-conduit, http-types + , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, unordered-containers, utillinux, vector, wai + , wai-app-static, warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.13.4.0"; + sha256 = "0gcs79jmpayndfsmmb40avrgyl4f0f1brprm2l0mvybfah84h2m3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptonite data-default deepseq directory file-embed filepath + fsnotify http-conduit http-types lrucache memory mtl network-uri + optparse-applicative pandoc pandoc-citeproc parsec process random + regex-tdfa resourcet scientific tagsoup template-haskell text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base bytestring containers filepath QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers yaml + ]; + testToolDepends = [ utillinux ]; + description = "A static website compiler library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) utillinux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -111188,6 +111829,8 @@ self: { ]; description = "Korean spell checker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haphviz" = callPackage @@ -113628,13 +114271,13 @@ self: { }) {}; "haskell-exp-parser" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, syb, template-haskell }: mkDerivation { pname = "haskell-exp-parser"; - version = "0.1.1"; - sha256 = "0p4p5ygw068chw6grci8mny2a1bn6nz74jm1q2sj97v7gglglg55"; + version = "0.1.3"; + sha256 = "0cswfpdw6sgmd0fhdpyfi2nk0mhvl8xpv4zfkl9l3wdk5ipbcxdf"; libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base syb template-haskell ]; description = "Simple parser parser from Haskell to TemplateHaskell expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113771,6 +114414,29 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_24_2" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.24.2"; + sha256 = "1m7zcmqr9alq6bbq04szxwypvhxv54ns1f2gw9af7k4pv5mwn2p9"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -113783,6 +114449,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_24_1" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.24.1"; + sha256 = "0d777sqi1wjhgw1avsp7b1ps2irblvpr0bpnzbw1ybv3yhb49zmr"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading_0_0" = callPackage ({ mkDerivation }: mkDerivation { @@ -114310,17 +114989,17 @@ self: { "haskell-postgis" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, bytestring-lexing - , cpu, data-binary-ieee754, hspec, mtl, placeholders, text + , cpu, data-binary-ieee754, either, hspec, mtl, placeholders, text , unordered-containers, vector }: mkDerivation { pname = "haskell-postgis"; - version = "0.1.0.2"; - sha256 = "0p3zdrzfsz3qj3rcx3yihg7vffa261ig5lywrfls5qvqihw62m41"; + version = "0.2.0"; + sha256 = "0y3di09hyxr5jhwrdqk2548h09x71pd7f1dhv3g6118pzdfps6nk"; libraryHaskellDepends = [ aeson base binary bytestring bytestring-lexing cpu - data-binary-ieee754 mtl placeholders text unordered-containers - vector + data-binary-ieee754 either mtl placeholders text + unordered-containers vector ]; testHaskellDepends = [ aeson base binary bytestring bytestring-lexing cpu @@ -115647,6 +116326,8 @@ self: { ]; description = "For parsing Haskell-ish languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskellscrabble" = callPackage @@ -116174,8 +116855,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.32.1"; - sha256 = "1b79z6jngz1rwaah41fndp37isrydzgmjv0vc92hqrsl7j4xm0zl"; + version = "0.34.5"; + sha256 = "1ha9jz8zq2sxsm0557x5qy4ckjcmzsfn2qfl5mrq1vihfn3frdsl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116215,8 +116896,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.32.2"; - sha256 = "0xdjzigkygapx3r374ds11gnschddhiyacxx49xsybmhfxlhsdj7"; + version = "0.34.5"; + sha256 = "0m6wvcagdi8bfb2g6cih0j729sk5h2vl0p3pgvqy6qfqys1rv5z2"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -116230,6 +116911,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-util" = callPackage @@ -117464,6 +118147,8 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-transaction" = callPackage @@ -119256,6 +119941,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "headroom_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, data-default-class, doctest, either + , file-embed, hspec, microlens, microlens-th, mustache + , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, rio + , template-haskell, time, yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.3.0.0"; + sha256 = "1d4dcb70vzpn6694d4z52aj12vzicmfyyrbhd6x816ic68db08nc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base data-default-class either file-embed microlens + microlens-th mustache optparse-applicative pcre-heavy pcre-light + rio template-haskell time yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec optparse-applicative pcre-light QuickCheck + rio time + ]; + description = "License Header Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -119584,6 +120296,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_1_0_3" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, deepseq, directory, erf + , exceptions, fail, lifted-async, mmorph, monad-control, mtl + , pretty-show, primitive, random, resourcet, semigroups, stm + , template-haskell, text, time, transformers, transformers-base + , wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.0.3"; + sha256 = "10lv574491zldqzin433z0vqkq43f0v3shjf78j395y0g1jyky9m"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + deepseq directory erf exceptions fail lifted-async mmorph + monad-control mtl pretty-show primitive random resourcet semigroups + stm template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show semigroups text transformers + ]; + description = "Release with confidence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -119651,27 +120390,14 @@ self: { ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; - version = "0.0.1.1"; - sha256 = "05s48h0cf599x5psllid0szynvqmfgkrv5cymsgy1b5mdnc868aj"; + version = "0.0.1.3"; + sha256 = "0h0cf4y25453n52d4y1ximzdc9l04b17byd9kgjvc3c279866f1i"; libraryHaskellDepends = [ base fakedata hedgehog random ]; testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; license = stdenv.lib.licenses.bsd3; }) {}; - "hedgehog-fakedata_0_0_1_2" = callPackage - ({ mkDerivation, base, containers, fakedata, hedgehog, random }: - mkDerivation { - pname = "hedgehog-fakedata"; - version = "0.0.1.2"; - sha256 = "1fzvpicpmm39wiyj3phsdigsq3fh8lax9yjq7a28dhy6qiclp3y0"; - libraryHaskellDepends = [ base fakedata hedgehog random ]; - testHaskellDepends = [ base containers fakedata hedgehog ]; - description = "Use 'fakedata' with 'hedgehog'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hedgehog-fn" = callPackage ({ mkDerivation, base, contravariant, hedgehog, transformers }: mkDerivation { @@ -120023,8 +120749,8 @@ self: { pname = "heist"; version = "1.1.0.1"; sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq"; - revision = "2"; - editedCabalFile = "1w9iabqa3pm2160275z6mh658zlyp7vkj18ch064ry3y3a6cymbk"; + revision = "3"; + editedCabalFile = "0a456cq72fgdy3wvk6db6yqk3mpib85h7kmwrvdjl7p637dvpxzh"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -120571,6 +121297,7 @@ self: { doHaddock = false; description = "Runs Continuous Integration tasks on your machines"; license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; "hercules-ci-api-agent" = callPackage @@ -120601,6 +121328,7 @@ self: { ]; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "hercules-ci-api-core" = callPackage @@ -120623,6 +121351,7 @@ self: { ]; description = "Types and convenience modules use across Hercules CI API packages"; license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "here" = callPackage @@ -121410,6 +122139,17 @@ self: { broken = true; }) {}; + "hextra" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hextra"; + version = "0.3.0.0"; + sha256 = "13rpdrdq32d8fg9y5mgmfyxjmlpmclsck67fj6zsc1fwxx8c8f8f"; + libraryHaskellDepends = [ base ]; + description = "Generic and niche utility functions and more for Haskell"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "hextream" = callPackage ({ mkDerivation, attoparsec, base, base-compat, Cabal , cabal-doctest, containers, data-default, doctest, filepath @@ -122370,8 +123110,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.5.0"; - sha256 = "1096d9i4xx1ca9csm2gqi4wnm8q8wya4a5k37qc5ihwix531wx02"; + version = "0.5.1"; + sha256 = "0b6kll3w8g0nb1ijz8kw39dmiksyaq30nk5b5gmdgjdycz5hp9vm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124100,8 +124840,10 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.18"; - sha256 = "0rz2pbzsl8y9vwp09njiw8qazdbpxvhkaayiyxzwjbk5zw0vnvw6"; + version = "1.18.1"; + sha256 = "1yl6akcbmz5qy559m0k0cndwb6wdzvq2jqn7ahc46v3ai6hwk20c"; + revision = "1"; + editedCabalFile = "1fz1wwpxf6scr8nnrd2n1g92vya9bd0l54fcx3sqhyk5kaf8kp2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124297,8 +125039,10 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.18"; - sha256 = "021zk938001s02zg3aq6b0frj69a62zpkbh6x42c1qycdpkagiq7"; + version = "1.18.1"; + sha256 = "16fd3412n4vdnjacngjx5078yzmypn389m91308kgbd8anv6bhj4"; + revision = "1"; + editedCabalFile = "1icjbfzdq2yd3h6qx245xyb4qahxih97rx63qhxx3vaicvph40pk"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -124374,8 +125118,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.18"; - sha256 = "10qrikwx4riixylz5qiml7mdrbx2gnfgmwggax1l910l58g8czci"; + version = "1.18.1"; + sha256 = "0ggfz93f14znnjzkznzblsdk6iqbwwj2yxzx5rgsr0xcjzm8gx64"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124422,8 +125166,10 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.18"; - sha256 = "07gcb1kxlkjb37x645xravad1jzcsdcyz403zgdcnxdar21x9iw9"; + version = "1.18.1"; + sha256 = "1s10xyiqs77xl949m7rc71a4511i755yiv88jb0pc32xba7a2b1y"; + revision = "1"; + editedCabalFile = "01amhyjlw6xjh97zhxx8j05jszw0c0wnv7ka835n7rjnnv8199l3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124539,8 +125285,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.1.5"; - sha256 = "0mhcch11bph481ph0v2ymp4vxd37phxqm9393bn48i09rx0xbklq"; + version = "3.1.6"; + sha256 = "1kbzj3qw3rr4yb2x50q79abckh6fvadbzqidbzkbydqqm0yhqhnx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125435,6 +126181,8 @@ self: { pname = "hnix"; version = "0.9.0"; sha256 = "17lj5gaqigkrxchdzkhwxab613zzahgh5d8jpqa9jiz7037wgv2w"; + revision = "1"; + editedCabalFile = "0ccn3a2pp4dnd4ibhankrvi2hg7v1660w68wrmw2gabcwfir53lr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126069,6 +126817,8 @@ self: { testToolDepends = [ markdown-unlit tasty-discover ]; description = "Tools and combinators for solving constraint problems"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "holy-project" = callPackage @@ -127725,32 +128475,6 @@ self: { }) {}; "hpc-lcov" = callPackage - ({ mkDerivation, aeson, base, containers, hpc, optparse-applicative - , path, path-io, process, tasty, tasty-discover, tasty-golden - , tasty-hunit, text, unordered-containers, yaml - }: - mkDerivation { - pname = "hpc-lcov"; - version = "1.0.0"; - sha256 = "0j2v2dpqj8xrs7z8mn1f71pin1m2arynp8nmai9cd1bqxyrv56a6"; - revision = "1"; - editedCabalFile = "1h73lhmad57xllygx16kqr7q647y0d1m72gxl9d3n0w5hgdrq5sh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers hpc ]; - executableHaskellDepends = [ - aeson base containers hpc optparse-applicative path path-io process - text unordered-containers yaml - ]; - testHaskellDepends = [ - base containers hpc tasty tasty-discover tasty-golden tasty-hunit - ]; - testToolDepends = [ tasty-discover ]; - description = "Convert HPC output into LCOV format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpc-lcov_1_0_1" = callPackage ({ mkDerivation, aeson, base, containers, hpc, optparse-applicative , path, path-io, process, tasty, tasty-discover, tasty-golden , tasty-hunit, text, unordered-containers, yaml @@ -127772,7 +128496,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Convert HPC output into LCOV format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-strobe" = callPackage @@ -129747,6 +130470,8 @@ self: { ]; description = "Haskell SuperCollider"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-auditor" = callPackage @@ -130810,8 +131535,8 @@ self: { pname = "hsimport"; version = "0.11.0"; sha256 = "1z55gpwyb2gwjlll2c32g9r4aqpdybjpnjy785z60wpjdl48qwaa"; - revision = "2"; - editedCabalFile = "00blkkmxc7ldwa7jywrg32pq0nz7z8sidj56qdy5s8cpzx57gwg8"; + revision = "3"; + editedCabalFile = "017yfag3k4j9v9mj5fv7v8s2j7cla97isx8z4q6ks5wfvjvyfpjy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130826,8 +131551,6 @@ self: { doHaddock = false; description = "Extend the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hsini" = callPackage @@ -130896,6 +131619,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "LSP interface over the hsinspect binary"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsinstall" = callPackage @@ -131096,15 +131821,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_1_1_1" = callPackage + "hslua_1_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.1.1"; - sha256 = "10gga18cg03av05rff9dg1yjmcyk16lv66zd4gwpr4g60091snbl"; + version = "1.1.2"; + sha256 = "1cv4lwr91ckscwm2jksrg29ka1z32974xgkcgmna4ibpyjwkslbl"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions mtl text @@ -131128,6 +131853,8 @@ self: { pname = "hslua-aeson"; version = "1.0.2"; sha256 = "1v5saxppbnq62ds00a7diadvqg8dnsx0sjlcanjj15h13j3yw964"; + revision = "1"; + editedCabalFile = "1bikj789x82f4b1pqij1wshkncvlxwjwyxf9z1spfvg8nsb5sd7y"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -131813,6 +132540,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-golden_0_1_0_2" = callPackage + ({ mkDerivation, base, directory, hspec, hspec-core + , optparse-applicative, silently + }: + mkDerivation { + pname = "hspec-golden"; + version = "0.1.0.2"; + sha256 = "0yisrx8zjd2dhr0zb1m24sj61fjlkjwavi930rfs1cc7d34ji91i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory hspec-core ]; + executableHaskellDepends = [ base directory optparse-applicative ]; + testHaskellDepends = [ base directory hspec hspec-core silently ]; + description = "Golden tests for hspec"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-golden-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt @@ -131989,8 +132734,8 @@ self: { }: mkDerivation { pname = "hspec-need-env"; - version = "0.1.0.4"; - sha256 = "0cb6jr0mqhaylqdky38s8plgs9w8hk1pi135yxggr707bnhwsplg"; + version = "0.1.0.5"; + sha256 = "0bgjhzc4m24sbmfyczq1r61gbgm5i1lsgyql88ki4flllscg4hsh"; libraryHaskellDepends = [ base hspec-core hspec-expectations ]; testHaskellDepends = [ base hspec hspec-core setenv transformers ]; description = "Read environment variables for hspec tests"; @@ -134963,6 +135708,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http2_2_0_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base16-bytestring, bytestring, case-insensitive, containers + , directory, doctest, filepath, gauge, Glob, heaps, hspec + , http-types, mwc-random, network, network-byte-order, psqueues + , stm, text, time-manager, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "2.0.5"; + sha256 = "1rg6dnkx2yxcdp87r1vdpyxacqv7jgxiq3bb1hjz45v5jk1xj676"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager + ]; + testHaskellDepends = [ + aeson aeson-pretty array base base16-bytestring bytestring + case-insensitive containers directory doctest filepath Glob hspec + http-types network network-byte-order psqueues stm text + time-manager unordered-containers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -135041,6 +135818,8 @@ self: { ]; description = "Encoders based on `proto-lens` for gRPC over HTTP2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http2-grpc-proto3-wire" = callPackage @@ -135485,6 +136264,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_2_0_0_4" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "2.0.0.4"; + sha256 = "11d52blw31mcsg7c3w1f7khy3vk2p03h4c5z6ja6wb9k5bg4d004"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -135995,6 +136786,8 @@ self: { doHaddock = false; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-bits" = callPackage @@ -136211,6 +137004,8 @@ self: { ]; description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-excess" = callPackage @@ -136774,6 +137569,8 @@ self: { doHaddock = false; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect-base" = callPackage @@ -136892,6 +137689,8 @@ self: { ]; description = "Succint datastructures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-uri" = callPackage @@ -136984,6 +137783,8 @@ self: { ]; description = "XML parser based on succinct data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hwall-auth-iitk" = callPackage @@ -140057,8 +140858,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.0.0"; - sha256 = "1mdavvr4pmkq82yb5qnp77szjraa06ybw7v3fkys83b045plzdr6"; + version = "0.1.1.0"; + sha256 = "048y1wbwcp1vs4shgfzvcmbgg8fnm0pw2i7a8488b5kshfzf9syb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140077,6 +140878,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "implicit-hie-cradle" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, containers + , directory, extra, filepath, hie-bios, hslogger, implicit-hie + , process, temporary, text, time, transformers, unix-compat + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "implicit-hie-cradle"; + version = "0.1.0.0"; + sha256 = "0yyzfpmv5x2ivzjsjwngklxv5nkad987ns8w3g7h92s5j1fb7x82"; + libraryHaskellDepends = [ + base base16-bytestring bytestring containers directory extra + filepath hie-bios hslogger implicit-hie process temporary text time + transformers unix-compat unordered-containers vector yaml + ]; + testHaskellDepends = [ base ]; + description = "Auto generate hie-bios cradles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "implicit-logging" = callPackage ({ mkDerivation, base, mtl, time, transformers }: mkDerivation { @@ -141842,8 +142663,8 @@ self: { }: mkDerivation { pname = "interact"; - version = "0.1.0.0"; - sha256 = "100qvyh4148g1hc6lw1pf7bzr16aas3jqc3xm8gbj7mmm1i1ycnp"; + version = "0.2.0.0"; + sha256 = "0fnzhcdyd95z5jll88y8zi9dgr2z55w0ddiv4kfyjxy6jampdypj"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base bytestring hspec main-tester mtl silently @@ -142505,6 +143326,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "invertible_0_2_0_6" = callPackage + ({ mkDerivation, base, haskell-src-meta, invariant, lens + , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell + , transformers + }: + mkDerivation { + pname = "invertible"; + version = "0.2.0.6"; + sha256 = "1z53i81i8w3hxq0869l2i74s7k6sizbc3i4z0j5s7m412i119amd"; + libraryHaskellDepends = [ + base haskell-src-meta invariant lens partial-isomorphisms + semigroupoids template-haskell transformers + ]; + testHaskellDepends = [ base QuickCheck transformers ]; + description = "bidirectional arrows, bijective functions, and invariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible-grammar" = callPackage ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter , profunctors, semigroups, tagged, template-haskell, text @@ -145264,12 +146104,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jira-wiki-markup_1_3_1" = callPackage + "jira-wiki-markup_1_3_2" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.3.1"; - sha256 = "1870yrg8npjn8g5aq61a73ffn2jij9zp281111j53pzlgk0nh20q"; + version = "1.3.2"; + sha256 = "16vcy9gn6qrzvr99l26az4yi2dy9xngcb1wmj86yl7bmk1hcq3wc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -145810,8 +146650,6 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "jsaddle-webkit2gtk" = callPackage @@ -146399,37 +147237,6 @@ self: { }) {}; "json-rpc" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit - , conduit-extra, deepseq, hashable, hspec, monad-logger, mtl - , QuickCheck, stm-conduit, text, time, unliftio - , unordered-containers, vector - }: - mkDerivation { - pname = "json-rpc"; - version = "1.0.2"; - sha256 = "113mclv3dz31chlx5a1py8b1b91jn9lafh8nzpwkf41xv7b757mz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit conduit-extra deepseq - hashable monad-logger mtl QuickCheck stm-conduit text time unliftio - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring conduit conduit-extra monad-logger mtl - QuickCheck stm-conduit text time unliftio unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring conduit conduit-extra hspec monad-logger mtl - QuickCheck stm-conduit text time unliftio unordered-containers - vector - ]; - description = "Fully-featured JSON-RPC 2.0 library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "json-rpc_1_0_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit , conduit-extra, deepseq, hashable, hspec, monad-logger, mtl , QuickCheck, stm-conduit, text, time, unliftio @@ -146458,7 +147265,6 @@ self: { ]; description = "Fully-featured JSON-RPC 2.0 library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-rpc-client" = callPackage @@ -148203,6 +149009,8 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kbq-gu" = callPackage @@ -149398,30 +150206,33 @@ self: { "knit-haskell" = callPackage ({ mkDerivation, aeson-pretty, base, base64-bytestring - , blaze-colonnade, blaze-html, bytestring, case-insensitive + , blaze-colonnade, blaze-html, bytestring, case-insensitive, cereal , colonnade, constraints, containers, diagrams-lib, diagrams-svg - , directory, Glob, here, http-client, http-client-tls, http-types - , hvega, logging-effect, lucid, mtl, network, network-uri, pandoc - , plots, polysemy, polysemy-plugin, polysemy-RandomFu, polysemy-zoo - , prettyprinter, random, random-fu, random-source, svg-builder - , text, time + , directory, doctemplates, exceptions, Glob, here, http-client + , http-client-tls, http-types, hvega, lucid, monad-control, mtl + , network, network-uri, pandoc, plots, polysemy, polysemy-plugin + , polysemy-RandomFu, polysemy-zoo, prettyprinter, random, random-fu + , random-source, say, stm, store, streamly, streamly-bytestring + , svg-builder, text, time, transformers-base }: mkDerivation { pname = "knit-haskell"; - version = "0.7.0.0"; - sha256 = "06p802fx328hkl3d9rnbdvlmhh9fyx2l293hg65z5ad96c9xzwas"; + version = "0.8.0.0"; + sha256 = "1maq5s4f05fpd98nw2gljqcwgdr62hy5lpcblvybcyp2xqh8fc9i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson-pretty base base64-bytestring blaze-colonnade blaze-html - bytestring case-insensitive colonnade constraints containers - diagrams-lib diagrams-svg directory Glob http-client - http-client-tls http-types hvega logging-effect lucid mtl network - network-uri pandoc polysemy polysemy-plugin polysemy-zoo - prettyprinter random random-fu random-source svg-builder text time + bytestring case-insensitive cereal colonnade constraints containers + diagrams-lib diagrams-svg directory doctemplates exceptions Glob + http-client http-client-tls http-types hvega lucid monad-control + mtl network network-uri pandoc polysemy polysemy-plugin + polysemy-zoo prettyprinter random say stm streamly + streamly-bytestring svg-builder text time transformers-base ]; testHaskellDepends = [ - base blaze-html colonnade containers here hvega mtl plots polysemy - polysemy-plugin polysemy-RandomFu random-fu random-source text + base blaze-html bytestring colonnade containers here hvega mtl + plots polysemy polysemy-plugin polysemy-RandomFu random-fu + random-source store streamly text ]; description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; license = stdenv.lib.licenses.bsd3; @@ -149630,6 +150441,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "krank_0_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations, http-client, http-types, lifted-async, mtl + , optparse-applicative, pcre-heavy, pretty-terminal, PyF, req + , safe-exceptions, text, unordered-containers + }: + mkDerivation { + pname = "krank"; + version = "0.2.2"; + sha256 = "10w6vbpcn9n07s99w02izg7nfizpbq5m5mg6zv46f1llm35jpv6w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-types + lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions + text unordered-containers + ]; + executableHaskellDepends = [ + base containers mtl optparse-applicative pcre-heavy pretty-terminal + PyF text + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec hspec-expectations + http-client http-types lifted-async mtl pcre-heavy pretty-terminal + PyF req safe-exceptions text unordered-containers + ]; + description = "Krank checks your code source comments for important markers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "krapsh" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring , binary, bytestring, containers, cryptohash-sha256, deepseq @@ -149723,27 +150565,35 @@ self: { }) {egl = null; inherit (pkgs) glew;}; "kubernetes-client" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, containers - , data-default-class, hspec, http-client, http-client-tls - , kubernetes-client-core, microlens, mtl, pem, safe-exceptions - , streaming-bytestring, text, tls, x509, x509-store, x509-system + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, connection, containers, data-default-class, either + , file-embed, filepath, hoauth2, hspec, hspec-attoparsec + , http-client, http-client-tls, jose-jwt, jsonpath + , kubernetes-client-core, microlens, mtl, oidc-client, pem + , safe-exceptions, stm, streaming-bytestring, text, time, timerep + , tls, typed-process, uri-bytestring, x509, x509-store, x509-system , x509-validation, yaml }: mkDerivation { pname = "kubernetes-client"; - version = "0.1.0.1"; - sha256 = "0fzilm4k7cq3k6vlx01c5gzg4lnrgpfdldbiml4rbiv42f13pr7j"; + version = "0.2.0.0"; + sha256 = "07vvp8yb7jx5cgn3siykkh7jdkkcxapclyp09q4n975fzd01waww"; libraryHaskellDepends = [ - aeson base bytestring connection containers data-default-class - http-client http-client-tls kubernetes-client-core microlens mtl - pem safe-exceptions streaming-bytestring text tls x509 x509-store - x509-system x509-validation + aeson attoparsec base base64-bytestring bytestring connection + containers data-default-class either filepath hoauth2 http-client + http-client-tls jose-jwt jsonpath kubernetes-client-core microlens + mtl oidc-client pem safe-exceptions stm streaming-bytestring text + time timerep tls typed-process uri-bytestring x509 x509-store + x509-system x509-validation yaml ]; testHaskellDepends = [ - aeson base bytestring connection containers data-default-class - hspec http-client http-client-tls kubernetes-client-core microlens - mtl pem safe-exceptions streaming-bytestring text tls x509 - x509-store x509-system x509-validation yaml + aeson attoparsec base base64-bytestring bytestring connection + containers data-default-class either file-embed filepath hoauth2 + hspec hspec-attoparsec http-client http-client-tls jose-jwt + jsonpath kubernetes-client-core microlens mtl oidc-client pem + safe-exceptions stm streaming-bytestring text time timerep tls + typed-process uri-bytestring x509 x509-store x509-system + x509-validation yaml ]; description = "Client library for Kubernetes"; license = stdenv.lib.licenses.asl20; @@ -149761,10 +150611,8 @@ self: { }: mkDerivation { pname = "kubernetes-client-core"; - version = "0.1.0.1"; - sha256 = "08sxsc9a9vdsqp71zxnc309cng75k3c57mcmmryhpwwyscvgfnsk"; - revision = "1"; - editedCabalFile = "0qzh7zq36q57yfccna1izi1gz9fpki9ngnl8dgf3m6halrxwqlc7"; + version = "0.2.0.0"; + sha256 = "03f9h4cb02nj2g49grp3i22djc6zh2bqxl7yxkx1yf70fnqv2zcq"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -151303,6 +152151,43 @@ self: { broken = true; }) {}; + "language-dickinson" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring + , composition-prelude, containers, criterion, deepseq, directory + , filepath, happy, haskeline, microlens, microlens-mtl, mtl + , optparse-applicative, pretty-simple, prettyprinter, random, tasty + , tasty-golden, tasty-hunit, text, transformers, zstd + }: + mkDerivation { + pname = "language-dickinson"; + version = "0.1.0.1"; + sha256 = "0ry3mkgvabm4hvax8lm7pdm8bsmp1qiaq6kndfj5m95fc0ddd1j4"; + revision = "1"; + editedCabalFile = "16ys3vfs2cdifvmij9qxa8sgvkvhfhvk47bha865zx78iml6cy58"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring composition-prelude containers deepseq + directory filepath microlens microlens-mtl mtl prettyprinter random + text transformers + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + base binary bytestring containers directory filepath haskeline + microlens microlens-mtl mtl optparse-applicative prettyprinter + random text zstd + ]; + testHaskellDepends = [ + base bytestring filepath pretty-simple prettyprinter tasty + tasty-golden tasty-hunit text + ]; + benchmarkHaskellDepends = [ base binary bytestring criterion ]; + doHaddock = false; + description = "A language for generative literature"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-docker" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text @@ -152812,8 +153697,8 @@ self: { }: mkDerivation { pname = "layers-game"; - version = "0.6.0"; - sha256 = "03a8l2hmirhfnl7s07yq06szmwcr5lz2lapbpp22ryqjr3zpvwf6"; + version = "0.7.0"; + sha256 = "1v55940lpp9p67nnnqslzz175cbzs7sfdyinxws9dhwmjvpm4ix8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -154101,8 +154986,8 @@ self: { pname = "lens-process"; version = "0.3.0.2"; sha256 = "1bv6z7309bq9jv2lzr79bcbwg1pkhy728pnrjnl3c3nv807a3igk"; - revision = "1"; - editedCabalFile = "0cfh8yw9b88jvhq6plk9i79akq4w7bpmy6w6f7wjji0lv1mkj15m"; + revision = "2"; + editedCabalFile = "1l71hi0a5yn5x9w4br5bzypa25zdlqw6jcb69z3bhb6dx53197ma"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base filepath lens process ]; testHaskellDepends = [ @@ -154349,8 +155234,10 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.3.1.0"; - sha256 = "0jvabc8p69wgf20q3mq0nn9kg6x20gym3xl251vnbyl7chkg9can"; + version = "1.3.2.0"; + sha256 = "134f9ijnd1dw2l9k5m1ay643pc4jqmq5kx17cnijb7ff93442s0n"; + revision = "2"; + editedCabalFile = "0xijjp1ysybbd9n3f5vcaph1qdad5v9ynp0jia5aaizr34lwx94z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -154723,6 +155610,21 @@ self: { broken = true; }) {}; + "libBF" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "libBF"; + version = "0.5.1"; + sha256 = "0iwbkfbp26z1zmnk28mnkvyh8k0i0bx56wl2jwygdnqvl5lmfv6i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "A binding to the libBF library"; + license = stdenv.lib.licenses.mit; + }) {}; + "libGenI" = callPackage ({ mkDerivation, base, binary, containers, HUnit, mtl, parsec , process, QuickCheck @@ -155422,6 +156324,8 @@ self: { testPkgconfigDepends = [ libsodium ]; description = "Low-level bindings to the libsodium C library"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libsodium;}; "libssh2" = callPackage @@ -155809,6 +156713,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_1_1" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.1.1"; + sha256 = "1x02dhcih1diw2076b918r3646xw3vbzg99sqpm6iw8yd5sds20p"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -156298,10 +157224,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.21"; - sha256 = "1i00j740fpxrbdy1kjzwjxqixk975rd0dh6jxk0da622spabym5a"; - revision = "1"; - editedCabalFile = "1ld4165qy07iph2d6pq3rxqn8158bciga7m839rhsd1ay4sjxq2d"; + version = "1.21.1"; + sha256 = "0rwr8h9ddzbxrfxzdqsy841rj27xbvy73v20r2aml7jqzy0s3gqc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -156583,8 +157507,8 @@ self: { }: mkDerivation { pname = "linenoise"; - version = "0.3.1"; - sha256 = "1ywz7msb292wzyppb3icy0l144z5mlk0yp8m2yq85ib6w2vzkqv0"; + version = "0.3.2"; + sha256 = "0hs910k358mfx1s1cmrc76f8ra3r34748h22m68a64mspibd2frx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159045,6 +159969,8 @@ self: { ]; description = "A python logging style log library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logentries" = callPackage @@ -163170,8 +164096,8 @@ self: { }: mkDerivation { pname = "mason"; - version = "0.2.1"; - sha256 = "08na34n8f8r9r2z95dfnkvsbc0w76x0ic8yxvpxnykax7n2xhpia"; + version = "0.2.2"; + sha256 = "1wck31lm5ms99r0aji8mkr0ax78i9z0qzz7gy9ihwriwwhyl9yiz"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp network text ]; @@ -163180,16 +164106,15 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest - , data-default-class, deepseq, doctest, exceptions - , mersenne-random-pure64, primitive, QuickCheck, random, scheduler - , splitmix, template-haskell, unliftio-core, vector + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "0.5.2.0"; - sha256 = "0j44as40bgzjixiga4l06gr3fpgk8vifmz2y12asczxwfv6k0xp1"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.5.3.1"; + sha256 = "0biwxrs1k5jzaxvcpjw7ryzm3w5rpb67vzdn3zgi6azci1kqqs78"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive scheduler unliftio-core vector @@ -163214,6 +164139,8 @@ self: { pname = "massiv-io"; version = "0.2.1.0"; sha256 = "0p7z4nk0fv9lql17s9d18hi5mrnvr4zry6rghqnhjmhlp97g4yi6"; + revision = "1"; + editedCabalFile = "0sqlkva81p748537vwbg0pzgvlx8xs7560rpd0fjcxafhj32m03x"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions @@ -163229,6 +164156,30 @@ self: { broken = true; }) {}; + "massiv-io_0_3_0_1" = callPackage + ({ mkDerivation, base, bytestring, Color, data-default-class + , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels + , massiv, massiv-test, netpbm, QuickCheck, random, template-haskell + , unliftio, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.3.0.1"; + sha256 = "0r0nkgpdkjwsdxcfys3idk1m7q0paz5c3gx1sx7xwsj7c5gyp5gs"; + libraryHaskellDepends = [ + base bytestring Color data-default-class deepseq exceptions + filepath JuicyPixels massiv netpbm unliftio vector + ]; + testHaskellDepends = [ + base bytestring doctest hspec JuicyPixels massiv massiv-test + QuickCheck random template-haskell + ]; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-scheduler" = callPackage ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell @@ -163257,15 +164208,15 @@ self: { }: mkDerivation { pname = "massiv-test"; - version = "0.1.3"; - sha256 = "1pkqaw43vzsh19ycr6pp817wq2k06gpkxqn8i09dkfzddbgymkf6"; + version = "0.1.3.1"; + sha256 = "0nwrfxi77w2xmmy7j7fh6kb06hzhmxl8vagdb856xmr9cbq02nj5"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions hspec massiv primitive QuickCheck scheduler unliftio vector ]; testHaskellDepends = [ base bytestring containers data-default deepseq genvalidity-hspec - hspec massiv mwc-random QuickCheck scheduler vector + hspec massiv mwc-random primitive QuickCheck scheduler vector ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; @@ -163496,6 +164447,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A GLPK backend to the math-programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) glpk;}; "math-programming-tests" = callPackage @@ -163511,6 +164464,8 @@ self: { ]; description = "Utility functions for testing implementations of the math-programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mathblog" = callPackage @@ -163766,16 +164721,16 @@ self: { "matrix-sized" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, conduit - , conduit-extra, data-ordlist, ieee754, primitive, singletons + , data-ordlist, double-conversion, ieee754, primitive, singletons , store, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "matrix-sized"; - version = "0.1.0"; - sha256 = "0qmbckk1bmmg8lszdnd8lcgplniqzd53iq1aqv9jky96zdmmrna6"; + version = "0.1.1"; + sha256 = "00s08dnyr45c04k4qxydf3sfpyigrg1g8i0671z40m23wpcmzlyd"; libraryHaskellDepends = [ - base bytestring bytestring-lexing conduit conduit-extra primitive - singletons store vector + base bytestring bytestring-lexing conduit double-conversion + primitive singletons store vector ]; testHaskellDepends = [ base conduit data-ordlist ieee754 singletons store tasty @@ -164229,6 +165184,33 @@ self: { broken = true; }) {}; + "mcmc" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , directory, hspec, hspec-discover, log-domain, microlens + , mwc-random, QuickCheck, statistics, text, time, transformers + , vector, zlib + }: + mkDerivation { + pname = "mcmc"; + version = "0.1.3"; + sha256 = "1rrbbnw6wi6k1p63n65a5rjr3fznzb48ksldb1w2xdbzmsa71nim"; + libraryHaskellDepends = [ + aeson base bytestring containers directory log-domain microlens + mwc-random statistics text time transformers vector zlib + ]; + testHaskellDepends = [ + base hspec hspec-discover log-domain mwc-random QuickCheck + statistics vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion log-domain microlens mwc-random statistics text + vector + ]; + description = "Sample from a posterior using Markov chain Monte Carlo"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -164694,8 +165676,8 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.4.0.1"; - sha256 = "191saxmdh3705rhci7lz7qzcdzv2zvw9bwa7f5d62500azi13j8v"; + version = "0.4.1.0"; + sha256 = "124wa7v8vx82gd04brgv3kphyqs0p5x9hp1vlp39bkha9w1yab7w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -166710,8 +167692,8 @@ self: { }: mkDerivation { pname = "min-max-pqueue"; - version = "0.1.0.1"; - sha256 = "09lby8qvjrcdp7ygy4a4dcw8w3y689qzazbcd55249z7ljjw731s"; + version = "0.1.0.2"; + sha256 = "0nbvd8w4wj00dbh1zknxqb28wlxi87k3z3snjfqg7zz7j7mvy0jp"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hedgehog ]; benchmarkHaskellDepends = [ @@ -167424,6 +168406,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miso_1_7_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector + }: + mkDerivation { + pname = "miso"; + version = "1.7.0.0"; + sha256 = "1qww479hwydbazv2jsmrhy9n6v6miyjq5dnld431sav70l9y2y48"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data http-types lucid + network-uri servant servant-lucid text transformers vector + ]; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "miso-action-logger" = callPackage ({ mkDerivation, aeson, base, ghcjs-base, miso }: mkDerivation { @@ -167441,8 +168443,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.5.2.0"; - sha256 = "0qjppkz1fh5ygjdbjh4mymplxwy3rz01w047hyvx6ysyr4l0vnvg"; + version = "1.7.0.0"; + sha256 = "0k69yqg1qx31cbf8d3kq57yyl19b5q5a7wsa0ab3l5dhc0jdbkwc"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -167549,24 +168551,25 @@ self: { "miv" = callPackage ({ mkDerivation, aeson, async, base, concurrent-output, directory - , ghc-prim, hashable, hspec, monad-parallel, process, text, time - , unordered-containers, yaml + , filepath, ghc-prim, hashable, hspec, monad-parallel, process + , text, time, unix-compat, unordered-containers, xdg-basedir, yaml }: mkDerivation { pname = "miv"; - version = "0.3.0"; - sha256 = "1s4xkr6mrlwvmxh4v63yzljsz96v5fy9mws8xwmbybqrlpqgc5qy"; + version = "0.4.2"; + sha256 = "0yhfinygsb2fnjspg87fx447kajrbldhddm24vxl41741xmwjl8a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base concurrent-output directory ghc-prim hashable - monad-parallel process text time unordered-containers yaml + aeson async base concurrent-output directory filepath ghc-prim + hashable monad-parallel process text time unix-compat + unordered-containers xdg-basedir yaml ]; testHaskellDepends = [ aeson base directory ghc-prim hashable hspec monad-parallel process text time unordered-containers yaml ]; - description = "Manage Vim plugins with command"; + description = "Vim plugin manager written in Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -167925,8 +168928,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.7.6.0"; - sha256 = "0z8r6d7my2hbp8g2l3258461f53kx8zm3fzyq605vk4y9z6k6icb"; + version = "0.7.7.0"; + sha256 = "0ayx9mv25f8dvp30bbxm6cnbmxwpdhcpqsh0zgh6xp703vlwrfvc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167947,8 +168950,8 @@ self: { }: mkDerivation { pname = "mmsyn7l"; - version = "0.6.1.0"; - sha256 = "194rzng4akd22lb7azpapwbpmc819scsgj0rq160fs9vvl3ji56d"; + version = "0.7.0.0"; + sha256 = "0mpc782zgv63ax8mfq7ljrdida4vviqhzhiakl42i368f1zavhqm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167965,8 +168968,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.6.7.0"; - sha256 = "14siy618rby0x9s94cqlpn4ymx6d589vb9f3mnqly7ykf53rwbi3"; + version = "0.7.0.0"; + sha256 = "14vbqdhk8f6fa319c6yk57y474bivdmyhj9rmy20cqjjh7bsw229"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -167981,8 +168984,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.15.5.0"; - sha256 = "1bpg1c8mvy51ycg1cx1haskidg3zzpdf29dpm8p2fk4bjc70v0w2"; + version = "0.16.0.0"; + sha256 = "1dmiisbn9v98rf4qa7zw976w3qj6s67j11vvd82f186n9p2id7px"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -168786,18 +169789,14 @@ self: { }: mkDerivation { pname = "monad-dijkstra"; - version = "0.1.1.2"; - sha256 = "1890rnypk3ra4f0f3m7nr31df3x6pmpw6ivid77wj7h9mdp0bdb6"; - revision = "1"; - editedCabalFile = "0dwcwwlfkhjl31asr35cy1m26nacz9xjry01cnq1dyaqcg53xjjb"; + version = "0.1.1.3"; + sha256 = "13zb3k0rfqpzz3ngmkqhc4zfa6p8nzj9hcsnfilkn8179pwp0qkc"; libraryHaskellDepends = [ base containers free mtl psqueues transformers ]; testHaskellDepends = [ base hlint tasty tasty-hspec ]; description = "A monad transformer for weighted graph searches"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "monad-exception" = callPackage @@ -169038,6 +170037,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_33" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.33"; + sha256 = "0529blrs6883cw71h2rhw35dlm68rmp5hwr32kkmmzrhxcvdnkjc"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -169850,6 +170871,8 @@ self: { testHaskellDepends = [ base ]; description = "Recursion Schemes for Monadic version"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monadiccp" = callPackage @@ -170834,6 +171857,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "morpheus-graphql_0_13_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, megaparsec + , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit + , template-haskell, text, transformers, unliftio-core + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.13.0"; + sha256 = "0gcrgpdiazridddm9imjhsx05cnqxxb24dhg18d9n6c1qm1d4q30"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers megaparsec morpheus-graphql-core + mtl scientific template-haskell text transformers unliftio-core + unordered-containers uuid vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring containers megaparsec morpheus-graphql-core + mtl scientific tasty tasty-hunit template-haskell text transformers + unliftio-core unordered-containers uuid vector websockets + ]; + description = "Morpheus GraphQL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -170862,14 +171911,16 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.12.0"; - sha256 = "15sqs0b86m55asj3rzpw52wcrnmlj6x99icx3b171q19i8wi8wh0"; + version = "0.13.0"; + sha256 = "0m1a379csfs3bqysl8ai2k7ybpb2gbm9w1rccgr41p9lk7w2w40k"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-core mtl template-haskell text transformers unordered-containers ]; description = "Morpheus GraphQL Client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morpheus-graphql-core" = callPackage @@ -170896,6 +171947,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_13_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, hashable + , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell + , text, th-lift-instances, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.13.0"; + sha256 = "0ix5n3c1db6qa6zdk74r890klc81wa1f4mdlqln6g039dbh423j7"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring hashable megaparsec mtl scientific + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring directory hashable megaparsec mtl scientific + tasty tasty-hunit template-haskell text th-lift-instances + transformers unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -171286,6 +172363,27 @@ self: { broken = true; }) {inherit (pkgs) mpich;}; + "mpi-hs_0_7_2_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, monad-loops, mpich }: + mkDerivation { + pname = "mpi-hs"; + version = "0.7.2.0"; + sha256 = "1d68py61h09qshzr3lx66cgs2f2kxzdmy3z35hsf96wi9aqz3fr5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring monad-loops ]; + librarySystemDepends = [ mpich ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + executableSystemDepends = [ mpich ]; + testHaskellDepends = [ base monad-loops ]; + testSystemDepends = [ mpich ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) mpich;}; + "mpi-hs-binary" = callPackage ({ mkDerivation, base, binary, bytestring, monad-loops, mpi-hs }: mkDerivation { @@ -171394,6 +172492,8 @@ self: { ]; description = "A minimalish prelude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mpretty" = callPackage @@ -171846,8 +172946,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.6.0.0"; - sha256 = "1ijaxamabxwabyvh30blscxxgpbmr55far373nhn98w224b1jddy"; + version = "0.6.0.1"; + sha256 = "1qrbrvk4df7179zpjngq6r0xvy3jfv4r1vh88m7knzm75wkg77xx"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds mtl network template-haskell text time tls uuid-types @@ -175910,8 +177010,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.3"; - sha256 = "12yaxvf1qagby5zjyf620qsxxf4a7y0jljvqdr92i49p2jkm8xrm"; + version = "0.4.3.4"; + sha256 = "1whn8hkwbqx76vn1550j9fjkjhj7fxp295dcsv5jl25cvxpj5rml"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -175934,8 +177034,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.3"; - sha256 = "1zs579xrp52q9573ckcr69yf6n2cjh17g2p1xpw1gncaa0rljng4"; + version = "0.2.0.4"; + sha256 = "0g9p1l3pyd8c43fj1h4c29n44257n4awlsqb4g821a62s4mjypwf"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -175976,8 +177076,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl"; - version = "0.4.1.2"; - sha256 = "0ks170nwybnkqp64dgkl5zswrh66f9cw3w74i0vp6ypl8cggkwq5"; + version = "0.4.1.3"; + sha256 = "0sflq9sg4xnfgfbx2iikvkzrs44kb11s6v23h3q3zwy1kdxakhr8"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger mtl net-spider regex-applicative safe-exceptions text time @@ -176000,8 +177100,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.3.1"; - sha256 = "0y1bagnlazd7pj240ka1lf970qclf569qbsdxas27pj1pi91jb0r"; + version = "0.1.3.2"; + sha256 = "1nqhrfbii58rhh19nxhr9zaqm3pd0yvlshwdwl50xrw7hr0jjxfc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178129,18 +179229,18 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, base, base64, binary , bytestring, case-insensitive, containers, ede , enclosed-exceptions, http-client, http-types, ngx-export - , ngx-export-tools, snap-core, snap-server, template-haskell, text - , time, trifecta, unordered-containers + , ngx-export-tools, safe, snap-core, snap-server, template-haskell + , text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.4.1.1"; - sha256 = "15d5dj8mdihj8m559lrfwwpb55nkkkapwd9x84jxsv6pmnh5m0qh"; + version = "0.5.1.0"; + sha256 = "0yq5m5mkyzy90vi23pbsrmnymvf7h6s8f63wyz9dzwd9s7yvr9a4"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types - ngx-export ngx-export-tools snap-core snap-server template-haskell - text time trifecta unordered-containers + ngx-export ngx-export-tools safe snap-core snap-server + template-haskell text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; license = stdenv.lib.licenses.bsd3; @@ -178590,6 +179690,46 @@ self: { broken = true; }) {}; + "nix-tree" = callPackage + ({ mkDerivation, aeson, async, base, brick, containers, deepseq + , directory, filepath, hashable, hrfsize, lens, parallel, protolude + , text, transformers, typed-process, unordered-containers, vty + }: + mkDerivation { + pname = "nix-tree"; + version = "0.1.0.0"; + sha256 = "0agj882mfnr53jlpn1cnds31b78qw3a13md1ap6jj2rnxs2zjcai"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base brick containers deepseq directory filepath + hashable hrfsize lens parallel protolude text transformers + typed-process unordered-containers vty + ]; + description = "Interactively browse a Nix store paths dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nixdu" = callPackage + ({ mkDerivation, aeson, async, base, brick, containers, deepseq + , directory, filepath, hashable, hrfsize, lens, parallel, protolude + , text, transformers, typed-process, unordered-containers, vty + }: + mkDerivation { + pname = "nixdu"; + version = "0.1.0.0"; + sha256 = "1a9ng3xaiddnmfjzd1dsmxf87114n6ga43w8hsij06p0la84mqq5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base brick containers deepseq directory filepath + hashable hrfsize lens parallel protolude text transformers + typed-process unordered-containers vty + ]; + description = "Interactively browse a Nix store paths dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nixfmt" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, megaparsec , parser-combinators, safe-exceptions, text, unix @@ -178931,6 +180071,32 @@ self: { broken = true; }) {}; + "nom" = callPackage + ({ mkDerivation, algebra, base, base-compat, Cabal, cabal-doctest + , containers, data-default, doctest, extra, finite-typelits, flow + , hspec, hspec-discover, QuickCheck, syb, template-haskell + , TypeCompose, Unique + }: + mkDerivation { + pname = "nom"; + version = "0.1.0.1"; + sha256 = "01dg6h98pdzhrwryzhcmjrynxv6674pjpklkxkrpaymy29a9c9a0"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + algebra base containers data-default extra finite-typelits flow + QuickCheck syb TypeCompose Unique + ]; + testHaskellDepends = [ + base base-compat data-default doctest hspec QuickCheck + template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Name-binding & alpha-equivalence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "nominal" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -180099,8 +181265,8 @@ self: { }: mkDerivation { pname = "numeric-prelude"; - version = "0.4.3.1"; - sha256 = "0531yjw1rzbv3snv1lc955350frgf8526slsxbx3ias71krbdr69"; + version = "0.4.3.2"; + sha256 = "1vd777ax2yvxknfxp9isgjk7cabjv3q86dgf3hybv78hc4ji5gmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182688,6 +183854,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "opentelemetry_0_5_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events + , hashable + }: + mkDerivation { + pname = "opentelemetry"; + version = "0.5.1"; + sha256 = "1rr58ygz83xgrb160yykibz561gd5byzm9w31jp6qx8m9xy8w200"; + libraryHaskellDepends = [ + base bytestring exceptions ghc-trace-events hashable + ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opentelemetry-extra" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , directory, exceptions, filepath, ghc-events, hashable @@ -182724,6 +183905,44 @@ self: { broken = true; }) {}; + "opentelemetry-extra_0_5_1" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, clock + , containers, directory, exceptions, filepath, gauge + , generic-arbitrary, ghc-events, hashable, hashtables, http-client + , http-client-tls, http-types, hvega, opentelemetry, process + , QuickCheck, random, scientific, splitmix, stm, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, text, text-show + , typed-process, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-extra"; + version = "0.5.1"; + sha256 = "10scwjyxsfl7bl6bml1a5aj8fa1a39hmarwgzdnvw2kk6m4p82d0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring clock containers directory + exceptions filepath ghc-events hashable http-client http-client-tls + http-types opentelemetry random scientific splitmix stm text + text-show unordered-containers + ]; + executableHaskellDepends = [ + async base clock containers directory exceptions filepath + hashtables http-client http-client-tls hvega opentelemetry process + text typed-process + ]; + testHaskellDepends = [ + base bytestring generic-arbitrary ghc-events hashable opentelemetry + QuickCheck tasty tasty-discover tasty-hunit tasty-quickcheck text + text-show unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ base gauge opentelemetry ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "opentelemetry-http-client" = callPackage ({ mkDerivation, base, http-client, http-types, opentelemetry, text }: @@ -182767,6 +183986,34 @@ self: { broken = true; }) {}; + "opentelemetry-lightstep_0_5_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, clock, containers + , exceptions, filepath, ghc-events, http-client, http-client-tls + , http-types, network, opentelemetry, opentelemetry-extra + , scientific, splitmix, stm, text, typed-process + , unordered-containers + }: + mkDerivation { + pname = "opentelemetry-lightstep"; + version = "0.5.1"; + sha256 = "0nwz7z3lc4iav8wgwpz5ik6jv66fg4wix446n4qwqbhphsr6pymw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring exceptions http-client http-client-tls + http-types network opentelemetry opentelemetry-extra scientific stm + text unordered-containers + ]; + executableHaskellDepends = [ + async base bytestring clock containers exceptions filepath + ghc-events http-client http-types opentelemetry opentelemetry-extra + splitmix text typed-process unordered-containers + ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "opentelemetry-wai" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai @@ -182783,6 +184030,22 @@ self: { broken = true; }) {}; + "opentelemetry-wai_0_5_1" = callPackage + ({ mkDerivation, base, bytestring, http-types, opentelemetry, text + , wai + }: + mkDerivation { + pname = "opentelemetry-wai"; + version = "0.5.1"; + sha256 = "0h7xvxgzhbqqvyrx8lp47hjmfnpzrs0zaanag6bfi995mkc8mvkm"; + libraryHaskellDepends = [ + base bytestring http-types opentelemetry text wai + ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -183038,20 +184301,22 @@ self: { }) {}; "openweathermap" = callPackage - ({ mkDerivation, aeson, base, directory, http-client - , optparse-applicative, servant, servant-client, xdg-basedir + ({ mkDerivation, aeson, base, directory, http-api-data, http-client + , optparse-applicative, servant, servant-client + , servant-client-core, time, xdg-basedir }: mkDerivation { pname = "openweathermap"; - version = "0.1.0"; - sha256 = "140m5jlbcrz42m5fr7cmq0n7zbdb0gcxwcvlpl0cb6r1vg4xp9qj"; + version = "0.2.0"; + sha256 = "1sd8rflm3zakpgm5va9rwdw9si4cbqyvdmpysw55ly6mzgvfxad1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base http-client servant servant-client + aeson base http-api-data http-client servant servant-client + servant-client-core ]; executableHaskellDepends = [ - base directory optparse-applicative xdg-basedir + base directory optparse-applicative time xdg-basedir ]; description = "Access data at OpenWeatherMap"; license = stdenv.lib.licenses.publicDomain; @@ -183629,14 +184894,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_4_0" = callPackage + "optparse-generic_1_4_1" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , semigroups, system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.4.0"; - sha256 = "1wbakc4lk0pyxij9pg95v4hi4k4l7jd4iai0ya6ncmy5bj21fyvd"; + version = "1.4.1"; + sha256 = "0w9hl8ncw7v7bvzli68czqabxg7h15jn8b9rmgn53dn3xyw0h68y"; libraryHaskellDepends = [ base bytestring Only optparse-applicative semigroups system-filepath text time transformers void @@ -184150,6 +185415,34 @@ self: { broken = true; }) {}; + "ormolu_0_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.0.5.0"; + sha256 = "1sf22silpj89sldd7wanlr34nsv77bq0cf4i0q1x2r20pz7s4w4m"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text + ]; + executableHaskellDepends = [ + base ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ormolu" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl @@ -184157,8 +185450,8 @@ self: { }: mkDerivation { pname = "ormolu"; - version = "0.1.0.0"; - sha256 = "1wpdj04hpnkk60swhx9d9cyazkgkjn2kkzmix7q1mil7hq23ynnp"; + version = "0.1.2.0"; + sha256 = "14ndqfcbx0y71d3q5i7d0scbvg9nd5qr5pdn7qvylxlkgpbc77qp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185041,8 +186334,8 @@ self: { ({ mkDerivation, base, c2hs, pam }: mkDerivation { pname = "pam"; - version = "0.1"; - sha256 = "1lmkq12p18qavx2c7xrnha56017y0f21ri4l3cqal4fb8zy0g5nj"; + version = "0.2.0.0"; + sha256 = "0j4hm7ph0iszf8wyqpy5jiplr14jj37z2yvgcgy7p5ab5p5r38gx"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ pam ]; libraryToolDepends = [ c2hs ]; @@ -185151,6 +186444,62 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_10" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, cmark-gfm, connection, containers, criterion + , data-default, deepseq, Diff, directory, doclayout, doctemplates + , emojis, exceptions, executable-path, filepath, Glob + , haddock-library, hslua, hslua-module-system, hslua-module-text + , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, weigh, xml + , zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.10"; + sha256 = "11jj4pxbbl3b585bcfx641m7bk3hl4vl6fgriv76mach5wljl5j1"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive cmark-gfm + connection containers data-default deepseq directory doclayout + doctemplates emojis exceptions filepath Glob haddock-library hslua + hslua-module-system hslua-module-text HsYAML HTTP http-client + http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl + network network-uri pandoc-types parsec process random safe + scientific SHA skylighting skylighting-core split syb tagsoup + temporary texmath text text-conversions time unicode-transforms + unix unordered-containers xml zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + doctemplates exceptions executable-path filepath Glob hslua mtl + pandoc-types process QuickCheck tasty tasty-golden tasty-hunit + tasty-lua tasty-quickcheck temporary text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion mtl text time weigh + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -185161,8 +186510,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.17"; - sha256 = "1cgmv8zdiqcbls7c6rqdd154z5r90p9wxrdy6nwmxma8qfmfgaa7"; + version = "0.17.0.1"; + sha256 = "0hi31h4jxamnyw0jsbwnbzy9gkp3a03mhsgwy9w73hi13lywxrgk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185212,8 +186561,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.6.3"; - sha256 = "1528cn5phcsc2x3h69p64sm7jap34ca3dsdh5qw2jx1vmgn42mi5"; + version = "0.3.6.4"; + sha256 = "1k6gfjhfgzvqgm4j6qv9y3gg5p8f87kvqhql3819qzwpsm8nx3k6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185511,17 +186860,17 @@ self: { broken = true; }) {}; - "pandoc-plot_0_7_1_0" = callPackage + "pandoc-plot_0_7_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, directory , filepath, githash, hashable, hspec, hspec-expectations - , lifted-async, mtl, open-browser, optparse-applicative, pandoc - , pandoc-types, shakespeare, tasty, tasty-hspec, tasty-hunit - , template-haskell, text, typed-process, yaml + , lifted-async, mtl, optparse-applicative, pandoc, pandoc-types + , shakespeare, tasty, tasty-hspec, tasty-hunit, template-haskell + , text, typed-process, yaml }: mkDerivation { pname = "pandoc-plot"; - version = "0.7.1.0"; - sha256 = "1pknimxwfprg6cqw9gh20ixzsh7lxs1a2jnmzahgnx203zyavd0w"; + version = "0.7.2.0"; + sha256 = "1ah7j0pnf6dm7kzf01d07md5gr3023f03im5z494037hh8g7qd0d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185529,8 +186878,8 @@ self: { mtl pandoc pandoc-types shakespeare text typed-process yaml ]; executableHaskellDepends = [ - base directory filepath githash open-browser optparse-applicative - pandoc pandoc-types template-haskell text + base directory filepath githash optparse-applicative pandoc + pandoc-types template-haskell text typed-process ]; testHaskellDepends = [ base containers directory filepath hspec hspec-expectations @@ -185540,7 +186889,7 @@ self: { base criterion pandoc-types template-haskell text ]; description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -185633,6 +186982,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_21" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.21"; + sha256 = "1wbb0hhjiw0b66kj1ck3qipwgdac5v7qvjaqszsz5fll3cqp4sna"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -185721,8 +187094,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.8.0"; - sha256 = "1skyfj0phd5hzpk86lj7qx0g6n09b1cfijlf759p7v34f47g6w2s"; + version = "0.13.8.1"; + sha256 = "0by8ada93srgapdg78n8hyk5xsqb7n54mjacvplwwsbrd1b7m9j0"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -185933,7 +187306,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_0_0" = callPackage + "pantry_0_5_1_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -185947,8 +187320,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.0.0"; - sha256 = "1v5nnmrg62phnwym8cw6bjld8impdmrkq9cwxmyrab48gjwds41l"; + version = "0.5.1.1"; + sha256 = "1q1q8jflhd5r70czsclkj27yqk4v8b1njdw8f4qb3xvf9c3gzl70"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -186656,6 +188029,8 @@ self: { ]; description = "Classes and data structures for working with data-kind indexed types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paramtree" = callPackage @@ -186898,6 +188273,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parse-gcstats" = callPackage + ({ mkDerivation, attoparsec, base, conduit, conduit-extra, filepath + , tasty, tasty-golden, text, unordered-containers + }: + mkDerivation { + pname = "parse-gcstats"; + version = "0.1.0.0"; + sha256 = "07l2jy59grxqnn90kyj13zg7b5x8j21apcywf6m4yws41j8il0nc"; + libraryHaskellDepends = [ + attoparsec base text unordered-containers + ]; + testHaskellDepends = [ + attoparsec base conduit conduit-extra filepath tasty tasty-golden + text + ]; + description = "Parse machine-readable GHC GC stats"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "parse-help" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, containers , data-default, file-location, template-haskell, text, th-lift @@ -187177,8 +188571,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsek"; - version = "1.0.1.3"; - sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7"; + version = "1.0.2.0"; + sha256 = "05hi14wn6pzhknahyvjkw4cg9qfy20krig2pkx00r4s095zmpqza"; libraryHaskellDepends = [ base ]; description = "Parallel Parsing Processes"; license = stdenv.lib.licenses.gpl3; @@ -187666,6 +189060,8 @@ self: { pname = "password"; version = "2.0.1.1"; sha256 = "1fi39w79p7jaw85i5r8f4flw7s1n2ljxj5ci9gda6a556015w1p8"; + revision = "1"; + editedCabalFile = "1r27scxmkmvw8nbcg4x3k10ibq4qhrmpwgnqbnz32g1fvw7mlxg3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory text @@ -187771,8 +189167,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.4.3"; - sha256 = "1zz007l9ap9qlhgwr7jjavr6h5r1cnr9wflyxpvjmdzmn6ch74w4"; + version = "0.8.5.0"; + sha256 = "1b4g5m32dv7905q51p4f23c9d4sfy5jvwbq7wgwsa2mwl8hf5cds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187920,8 +189316,8 @@ self: { ({ mkDerivation, base, exceptions, path }: mkDerivation { pname = "path-extensions"; - version = "0.0.1.0"; - sha256 = "0pkcvk9c74pjhhkikhi42nazhvff0zxz4ihm1x5p8flckyih7yyn"; + version = "0.1.0.1"; + sha256 = "1ywirszpmhbq45gbwfvzssy5z06lmlxdhxck7gbjaffyjbkil5va"; libraryHaskellDepends = [ base exceptions path ]; description = "Enumeration of common filetype extensions for use with the path library"; license = stdenv.lib.licenses.bsd3; @@ -188062,8 +189458,8 @@ self: { }: mkDerivation { pname = "pathtype"; - version = "0.8.1"; - sha256 = "03rlj8klzxqimjv44h07xbij0acr63pddxppq9yfjlyggmaxrrnm"; + version = "0.8.1.1"; + sha256 = "0322q8wd4mbp7q0cgym6mf2dxg2srp76r38kprxl9ik53s3y3p67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188819,6 +190215,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Extracts text from PDF using poppler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {poppler-cpp = null;}; "pdynload" = callPackage @@ -189486,6 +190884,17 @@ self: { broken = true; }) {}; + "periodic-polynomials" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "periodic-polynomials"; + version = "0.2.0.0"; + sha256 = "1y7hj8cjdy5zpp7sg7yfaafcid7ssf23g4az6fwk2hrcrk97sf2i"; + libraryHaskellDepends = [ base vector ]; + description = "A library for working with periodic polynomials (very basic functionality)"; + license = stdenv.lib.licenses.mit; + }) {}; + "perm" = callPackage ({ mkDerivation, base, catch-fd, HUnit, mtl, test-framework , test-framework-hunit, transformers @@ -189581,8 +190990,8 @@ self: { }: mkDerivation { pname = "persist-state"; - version = "0.1.1.6"; - sha256 = "0qj7g3df1hf07k65wwvwv0amsv0wnggcca4qm0gsa4qgq9ww8qii"; + version = "0.2.0.0"; + sha256 = "1jmrba3nmd9qvvgmm1zz0qrhikzjdcg6rc38f4q3gq6yw4rap4kj"; libraryHaskellDepends = [ base bytestring containers ghc-prim text ]; @@ -189590,7 +190999,7 @@ self: { base bytestring QuickCheck test-framework test-framework-quickcheck2 text ]; - description = "Minimal serialization library with focus on performance"; + description = "Serialization library with state and leb128 encoding"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -194622,21 +196031,25 @@ self: { "polysemy-webserver" = callPackage ({ mkDerivation, base, bytestring, hspec, http-conduit, http-types - , polysemy, polysemy-plugin, wai, warp + , polysemy, polysemy-plugin, text, wai, wai-websockets, warp + , websockets }: mkDerivation { pname = "polysemy-webserver"; - version = "0.1.0.0"; - sha256 = "1rlmx5l3n87gy3dwf3fl6jpckn2gn70v7avdw52jaqjdlip0f6bb"; + version = "0.2.0.0"; + sha256 = "0ld1ncal2isibzjbq72jk3dp8rgvz32zyvisjdd79wxwxg1z1nad"; libraryHaskellDepends = [ - base bytestring http-types polysemy polysemy-plugin wai warp + base bytestring http-types polysemy polysemy-plugin wai + wai-websockets warp websockets ]; testHaskellDepends = [ base bytestring hspec http-conduit http-types polysemy - polysemy-plugin wai warp + polysemy-plugin text wai wai-websockets warp websockets ]; description = "Start web servers from within a Polysemy effect stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polysemy-zoo" = callPackage @@ -195042,6 +196455,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Static key-value storage backed by poppy"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "poppler" = callPackage @@ -195477,10 +196892,8 @@ self: { ({ mkDerivation, base, bytestring, process, unix, util }: mkDerivation { pname = "posix-pty"; - version = "0.2.1.1"; - sha256 = "1fdvzmk7v7lasyhwinl9wqxq8c67balyyygyb1bzljj3hzn0rid2"; - revision = "1"; - editedCabalFile = "1dhxxwlv69bczi7mbhdd9f3s9nnjb4b3jf9mlgdjg7wxqh84zrgi"; + version = "0.2.2"; + sha256 = "1wwpvjnc252miyqmg5ffvf6ba60kj1i7iknyxrpkmh3zhz31vyws"; libraryHaskellDepends = [ base bytestring process unix ]; librarySystemDepends = [ util ]; testHaskellDepends = [ base bytestring process ]; @@ -195549,8 +196962,8 @@ self: { }: mkDerivation { pname = "posplyu"; - version = "0.1.0"; - sha256 = "1whdihlfcgjy4na86qhhhixa0l494005shfxs5ns61qsdw7mwflk"; + version = "0.1.0.1"; + sha256 = "09yafx5d82h4vsx2pp2hccwy74b7nhbys971g86qcg6yf24ha621"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -196302,6 +197715,8 @@ self: { ]; description = "PostgreSQL AST parsing and rendering"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-transactional" = callPackage @@ -196326,8 +197741,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.6.1.0"; - sha256 = "1p7bcwbjb0pi96d9zad8kmlb2w3g06g4xra33xmmskynmsdyc0r9"; + version = "0.6.1.1"; + sha256 = "002bqsvsig6232d4di811rpjyjg7r45xsywb34i9l98imh51mia1"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite data-default haskell-src-meta HDBC memory network old-locale @@ -197132,8 +198547,8 @@ self: { }: mkDerivation { pname = "predicate-typed"; - version = "0.6.0.1"; - sha256 = "1izg98ql496qn8dvn3blz2654bhy8901x7hfh0dxqqzrm1gi5bf4"; + version = "0.6.2.1"; + sha256 = "11gby9bjkh6bqznxxiz3ggdr0z13qihgh6pry014rap2iqzj71za"; libraryHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory ghc-prim hashable lens mtl pcre-heavy pcre-light pretty @@ -197824,6 +199239,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; }) {}; + "pretty-simple_3_3_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest + , containers, criterion, doctest, Glob, mtl, QuickCheck + , template-haskell, text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "3.3.0.0"; + sha256 = "0g83958npqscqqz2lh5m0m666qp8ldwps4l5gvfip4b1zgy3f5nh"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal base containers mtl text transformers + ]; + testHaskellDepends = [ + base doctest Glob QuickCheck template-haskell + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }: mkDerivation { @@ -197900,7 +199340,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "prettyprinter" = callPackage + "prettyprinter_1_6_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring , containers, deepseq, doctest, gauge, mtl, pgp-wordlist , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit @@ -197923,6 +199363,32 @@ self: { ]; description = "A modern, easy to use, well-documented, extensible pretty-printer"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "prettyprinter" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , containers, deepseq, doctest, gauge, mtl, pgp-wordlist + , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.6.2"; + sha256 = "023hfz75xgvyymbipyph7xmaaki2d5qa6fh4lx9adl1h4s8g34yi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base base-compat containers deepseq gauge mtl + QuickCheck random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = stdenv.lib.licenses.bsd2; }) {}; "prettyprinter-ansi-terminal" = callPackage @@ -198197,6 +199663,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_7_1_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck + , quickcheck-classes-base, semigroups, tagged, tasty + , tasty-quickcheck, transformers, transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.7.1.0"; + sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb"; + libraryHaskellDepends = [ base deepseq transformers ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck quickcheck-classes-base + semigroups tagged tasty tasty-quickcheck transformers + transformers-compat + ]; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { @@ -198955,6 +200441,8 @@ self: { libraryHaskellDepends = [ base binary bytestring process ]; description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "processor-creative-kit" = callPackage @@ -199701,6 +201189,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prometheus-wai-middleware" = callPackage + ({ mkDerivation, async, base, clock, containers, http-types + , prometheus, text, wai, warp + }: + mkDerivation { + pname = "prometheus-wai-middleware"; + version = "1.0.0.0"; + sha256 = "0ndzhd0ghk9l2avi5agllfj3j1smamwplsnqlg0sav8n54r7n6wv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clock containers http-types prometheus text wai + ]; + executableHaskellDepends = [ + async base http-types prometheus wai warp + ]; + description = "Instrument a wai application with various metrics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "promise" = callPackage ({ mkDerivation, async, base }: mkDerivation { @@ -200120,6 +201628,8 @@ self: { ]; description = "JSON protobuf encoding for proto-lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proto-lens-optparse" = callPackage @@ -200664,8 +202174,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.9.0"; sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; - revision = "1"; - editedCabalFile = "14lgfxazr83nmbcdprygx2add8233hsq1hpdsiffx5zprgvr78vv"; + revision = "2"; + editedCabalFile = "1njlypxh9p0dfqywgqgyzgx9h822d37jbnnd9zbl0ci99k1247g6"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -201712,8 +203222,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.13"; - sha256 = "0hdipa1i5l4d60i70c1li585jc4biq0af6l826rzfhlpwjgzlh7z"; + version = "1.5.1.14"; + sha256 = "0gfn5rfyyhbrl6sq7b6qyg86afww60c9g8y65m0qci6c91jbrv3a"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -201724,7 +203234,7 @@ self: { http-client http-types QuickCheck scientific text time transformers unordered-containers vector ]; - description = "Haskell client library for the Pusher HTTP API"; + description = "Haskell client library for the Pusher Channels HTTP API"; license = stdenv.lib.licenses.mit; }) {}; @@ -203297,8 +204807,8 @@ self: { ({ mkDerivation, base, QuickCheck, random, transformers }: mkDerivation { pname = "quickcheck-transformer"; - version = "0.3.1"; - sha256 = "1jbn17gp2f5ppm83vs2gd3fcbkv3km45qfjgr6qz532ks1a8k0fl"; + version = "0.3.1.1"; + sha256 = "0al0p44qi9j829zcnv43kqf4pxaxr6fb48vkq1an15hdk6svx11j"; libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; license = stdenv.lib.licenses.mit; @@ -204564,6 +206074,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "random_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, mtl, mwc-random, primitive, rdtsc, smallcheck, split + , splitmix, tasty, tasty-expected-failure, tasty-hunit + , tasty-smallcheck, time, unliftio, vector + }: + mkDerivation { + pname = "random"; + version = "1.2.0"; + sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; + libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; + testHaskellDepends = [ + base bytestring containers doctest mwc-random primitive smallcheck + tasty tasty-expected-failure tasty-hunit tasty-smallcheck unliftio + vector + ]; + benchmarkHaskellDepends = [ + base gauge mtl rdtsc split splitmix time + ]; + description = "Pseudo-random number generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "random-access-file" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , criterion, directory, lrucaching, mwc-random, random, stm, unix @@ -204684,15 +206218,15 @@ self: { "random-fu" = callPackage ({ mkDerivation, base, erf, math-functions, monad-loops, mtl - , random-shuffle, random-source, rvar, syb, template-haskell - , transformers, vector + , random, random-shuffle, random-source, rvar, syb + , template-haskell, transformers, vector }: mkDerivation { pname = "random-fu"; - version = "0.2.7.4"; - sha256 = "13dgx069lvdfxm7l2q2l6d7q0gd3wp41b8l4l6wmhlfbl5xici3m"; + version = "0.2.7.6"; + sha256 = "1as1g6i80jy3vnj71h33bj5ywlw9bsdcqwbl3pdqqfqp0mv13rfk"; libraryHaskellDepends = [ - base erf math-functions monad-loops mtl random-shuffle + base erf math-functions monad-loops mtl random random-shuffle random-source rvar syb template-haskell transformers vector ]; description = "Random number generation"; @@ -204759,8 +206293,8 @@ self: { }: mkDerivation { pname = "random-source"; - version = "0.3.0.8"; - sha256 = "0kjvpmxhff6id99hhgjp3vvb4vlhs3shkrh1n5cbfm7450lpmmn2"; + version = "0.3.0.10"; + sha256 = "1ii7pr9dn6yfkkxsk504jmf6466phm15fhnk7894hhdg1qvfm43d"; libraryHaskellDepends = [ base flexible-defaults mersenne-random-pure64 mtl mwc-random primitive random stateref syb template-haskell th-extras @@ -205865,8 +207399,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A library for RDF processing in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rdioh" = callPackage @@ -206443,6 +207975,26 @@ self: { broken = true; }) {}; + "readability" = callPackage + ({ mkDerivation, base, bytestring, containers, html-conduit + , http-conduit, optparse-applicative, text, xml-conduit + }: + mkDerivation { + pname = "readability"; + version = "0.0.1.0"; + sha256 = "1g96fa6h2zayc3icys900sfhvk943gp991667miiv4lk0bdlpkrr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers html-conduit text xml-conduit + ]; + executableHaskellDepends = [ + base http-conduit optparse-applicative text xml-conduit + ]; + description = "Extracts text of main article from HTML document"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "readable" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -207124,8 +208676,8 @@ self: { }: mkDerivation { pname = "redis"; - version = "0.14.1"; - sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b"; + version = "0.14.2"; + sha256 = "0l52adcr6wvdqixg9nd837pn8qqdx99zv74wmw63k5497p4mbw2y"; libraryHaskellDepends = [ base bytestring concurrent-extra containers exceptions mtl network old-time utf8-string @@ -208959,8 +210511,8 @@ self: { }: mkDerivation { pname = "regexchar"; - version = "0.9.0.17"; - sha256 = "1vkljfqilk0sfwnww1b907lqsdqxd8fdy64kf4vg26r89rzcd5i9"; + version = "0.9.0.18"; + sha256 = "1xrv67w6pr3jc8rcmzsfr6ga1g3zcsq1qb327c9viqhj40s5rarm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -208983,8 +210535,8 @@ self: { }: mkDerivation { pname = "regexdot"; - version = "0.12.2.1"; - sha256 = "0s8jbkhhlhhdadwf7d8hy1cjs05mlf1r3czc861llwqrshys3c8c"; + version = "0.12.2.2"; + sha256 = "0kaqinn8v6hc67rmj89sl6chagzycz61x5ng8cxxpap0zcxwx4ya"; libraryHaskellDepends = [ base data-default deepseq extra parallel parsec toolshed ]; @@ -209151,8 +210703,37 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.7.1"; - sha256 = "163mkxrd30hxhp4awd05b3qxhqrg18lzl4m9m5r74j82s0yhq7l0"; + version = "0.1.9.0"; + sha256 = "0vblhmqjgx8h3jkqq1ch3iy2dg8xgqxj1jhnhsln3l0kzyh1d5wj"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "registry_0_1_9_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.9.1"; + sha256 = "0vnx2sq3m6mqm1wcicknf7b8pfamx4pbn51hmzs6arwnvsq23vng"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -210280,21 +211861,6 @@ self: { }) {}; "replace-attoparsec" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text - }: - mkDerivation { - pname = "replace-attoparsec"; - version = "1.4.0.0"; - sha256 = "1w0dlwfipli94g3fbqh118pmwgyzgrcwp32s60sk7a78cbr5mic4"; - libraryHaskellDepends = [ attoparsec base bytestring text ]; - testHaskellDepends = [ - attoparsec base bytestring Cabal parsers text - ]; - description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "replace-attoparsec_1_4_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text }: mkDerivation { @@ -210307,22 +211873,9 @@ self: { ]; description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "replace-megaparsec" = callPackage - ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: - mkDerivation { - pname = "replace-megaparsec"; - version = "1.4.1.0"; - sha256 = "0a51fsdmjq3iaamdnwslyrv99psh03qhqk8j0k3ikbjxqj3md3br"; - libraryHaskellDepends = [ base bytestring megaparsec text ]; - testHaskellDepends = [ base bytestring Cabal megaparsec text ]; - description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "replace-megaparsec_1_4_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec , parser-combinators, text }: @@ -210336,7 +211889,6 @@ self: { testHaskellDepends = [ base bytestring Cabal megaparsec text ]; description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "replica" = callPackage @@ -210424,6 +211976,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "repline_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, exceptions, haskeline, mtl + , process + }: + mkDerivation { + pname = "repline"; + version = "0.4.0.0"; + sha256 = "1dspwi28krinkxdd7waq4y6plz0dfmzz72885p9pcqp1r14qrhj3"; + libraryHaskellDepends = [ + base containers exceptions haskeline mtl process + ]; + testHaskellDepends = [ base containers mtl process ]; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "repo-based-blog" = callPackage ({ mkDerivation, base, blaze-html, containers, data-default , directory, dyre, filepath, filestore, hspec, hspec-discover @@ -210606,6 +212175,8 @@ self: { pname = "req"; version = "3.3.0"; sha256 = "1y6zw6j3sk2p3ch636w787zs36i8v3p94gdvbfqgjd16k3hlnaxc"; + revision = "1"; + editedCabalFile = "1lr6s11iyzxfz4ahdnlk54jzqx7z4bw4gf7d2asqkrlqzqr91fjk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -210817,6 +212388,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rescue" = callPackage + ({ mkDerivation, base, criterion, directory, directory-tree + , doctest, exceptions, ghc, Glob, hlint, hspec, hspec-core + , hspec-expectations, lens-aeson, mtl, QuickCheck + , quickcheck-instances, rio, tasty, tasty-hspec, tasty-hunit + , tasty-rerun, tasty-smallcheck, text, transformers, world-peace + , yaml + }: + mkDerivation { + pname = "rescue"; + version = "0.2.0"; + sha256 = "09mlamir7n2jjm50qxlws8w9qa5xzrm6fr21vsh9gpwf8pkd98qw"; + libraryHaskellDepends = [ + base exceptions ghc mtl text transformers world-peace + ]; + testHaskellDepends = [ + base directory directory-tree doctest exceptions ghc Glob hlint + hspec hspec-core hspec-expectations lens-aeson mtl QuickCheck + quickcheck-instances rio tasty tasty-hspec tasty-hunit tasty-rerun + tasty-smallcheck text transformers world-peace yaml + ]; + benchmarkHaskellDepends = [ + base criterion exceptions ghc mtl text transformers world-peace + ]; + description = "More understandable exceptions"; + license = stdenv.lib.licenses.asl20; + }) {}; + "reserve" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, hspec , http-conduit, http-kit, http-types, network, process, QuickCheck @@ -211088,8 +212687,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.2.4.1"; - sha256 = "0h67w4x5k4ykyks3ppwfc49n6qgwl3bzzpfcg02l6rmwqqc2zq12"; + version = "1.2.4.2"; + sha256 = "11zb4figcs22hjaq6zsknf70kf9k2bxnw6w03ab9kl9s0i10iwhp"; libraryHaskellDepends = [ base containers exceptions mtl primitive transformers unliftio-core ]; @@ -212015,6 +213614,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rhine_0_7_0" = callPackage + ({ mkDerivation, base, containers, deepseq, dunai, free + , MonadRandom, random, simple-affine-space, time, transformers + , vector-sized + }: + mkDerivation { + pname = "rhine"; + version = "0.7.0"; + sha256 = "1qnwz48ji3vsb9f44xvidhq6z1p7q06g3k8v7cnbxc54zav076p2"; + libraryHaskellDepends = [ + base containers deepseq dunai free MonadRandom random + simple-affine-space time transformers vector-sized + ]; + description = "Functional Reactive Programming with type-level clocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rhine-gloss" = callPackage ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { @@ -212029,6 +213646,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rhine-gloss_0_7_0" = callPackage + ({ mkDerivation, base, dunai, gloss, rhine, transformers }: + mkDerivation { + pname = "rhine-gloss"; + version = "0.7.0"; + sha256 = "1ldaw9ijd9kcn1x5cd5ch9yz95sb671np4aaa6mqa4sf8w4yjl0m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dunai gloss rhine transformers ]; + executableHaskellDepends = [ base ]; + description = "Gloss backend for Rhine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rhythm-game-tutorial" = callPackage ({ mkDerivation, base, call, containers, lens, mtl, objective , split @@ -212999,18 +214631,25 @@ self: { }) {}; "rock" = callPackage - ({ mkDerivation, base, containers, dependent-map, dependent-sum - , deriving-compat, mtl, protolude, transformers + ({ mkDerivation, base, constraints, constraints-extras + , dependent-hashmap, dependent-sum, deriving-compat, hashable + , hedgehog, lifted-base, monad-control, mtl, transformers + , transformers-base, unordered-containers }: mkDerivation { pname = "rock"; - version = "0.2.0.0"; - sha256 = "0h4z2ss4g9zshxpfallmbqw121jk1dv7q5s3ww39rhglw3j4dj9k"; + version = "0.3.0.0"; + sha256 = "1hssz23kifpmcv0vjnrymr4cj1f3m8z7kvvkyzsfh3ysc493514i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers dependent-map dependent-sum deriving-compat mtl - protolude transformers + base constraints-extras dependent-hashmap dependent-sum + deriving-compat hashable lifted-base monad-control mtl transformers + transformers-base unordered-containers + ]; + testHaskellDepends = [ + base constraints constraints-extras dependent-hashmap dependent-sum + hashable hedgehog mtl unordered-containers ]; description = "A build system for incremental, parallel, and demand-driven computations"; license = stdenv.lib.licenses.bsd3; @@ -213633,6 +215272,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; + "rounded-hw" = callPackage + ({ mkDerivation, array, base, Cabal, deepseq, doctest, gauge, hspec + , integer-logarithms, long-double, primitive, QuickCheck, random + , tagged, vector + }: + mkDerivation { + pname = "rounded-hw"; + version = "0.1.0.0"; + sha256 = "0kmbp7x7avadsn09zfcjd54x5b6vvc527ybmmmnaklvfdzf8r88x"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base deepseq integer-logarithms long-double primitive tagged + vector + ]; + testHaskellDepends = [ + array base deepseq doctest hspec integer-logarithms long-double + primitive QuickCheck random vector + ]; + benchmarkHaskellDepends = [ + array base deepseq gauge integer-logarithms primitive vector + ]; + description = "Directed rounding for built-in floating types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rounding" = callPackage ({ mkDerivation, array, base, numeric-extras }: mkDerivation { @@ -214491,8 +216155,8 @@ self: { }: mkDerivation { pname = "rvar"; - version = "0.2.0.4"; - sha256 = "0p67lbzcbbm5bkhv0x380bdald6kaqlf968ay2q8qj69izpvk181"; + version = "0.2.0.6"; + sha256 = "1lwcmv3x3v7sjxkil7754sh085y5r5h9zkca39czjhyyzxsqiq81"; libraryHaskellDepends = [ base MonadPrompt mtl random-source transformers ]; @@ -215964,19 +217628,19 @@ self: { "sbv" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , crackNum, criterion, deepseq, directory, doctest, filepath - , generic-deriving, ghc, Glob, hlint, mtl, pretty, process - , QuickCheck, random, syb, tasty, tasty-golden, tasty-hunit + , crackNum, deepseq, directory, doctest, filepath, gauge + , generic-deriving, Glob, hlint, mtl, pretty, process, QuickCheck + , random, silently, syb, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, time, transformers, z3 }: mkDerivation { pname = "sbv"; - version = "8.6"; - sha256 = "01y3dg8gprddn2477cw8k5a9a2gn0330qbpqyc3l2zbnwf3a2yga"; + version = "8.7"; + sha256 = "0iipl3ra0ih6fjxfs4p554va5243rg1ddkllfdbs7y2sj697841l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random syb + generic-deriving mtl pretty process QuickCheck random syb template-haskell time transformers ]; testHaskellDepends = [ @@ -215986,8 +217650,8 @@ self: { ]; testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ - base containers crackNum criterion deepseq directory filepath mtl - process random syb + base containers crackNum deepseq directory filepath gauge mtl + process random silently syb ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; @@ -216472,18 +218136,14 @@ self: { }) {}; "scheduler" = callPackage - ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest - , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec - , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly + ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions + , genvalidity-hspec, hspec, mwc-random, primitive, QuickCheck , template-haskell, unliftio, unliftio-core, vector }: mkDerivation { pname = "scheduler"; - version = "1.4.2.2"; - sha256 = "0mzwm7lr089hbv08c58l3ahiid8w1cysvjl9q6vb46x3wpa3fwia"; - revision = "1"; - editedCabalFile = "0a6xcidya383ygzmz76di3dj1c8xm6ra5zb8fp517lk50s3ly3kl"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "1.4.2.3"; + sha256 = "0xf5gmla5h0k0a84f7b5xyk98xr72a9mygjlg5c913vc29i31ccx"; libraryHaskellDepends = [ atomic-primops base deepseq exceptions primitive unliftio-core ]; @@ -216491,9 +218151,6 @@ self: { base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck template-haskell unliftio vector ]; - benchmarkHaskellDepends = [ - async base criterion deepseq monad-par parallel streamly unliftio - ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -217829,24 +219486,24 @@ self: { }) {}; "sdr" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, cereal, Chart - , Chart-cairo, colour, containers, criterion, Decimal - , dynamic-graph, fftwRaw, GLFW-b, mwc-random, OpenGL - , optparse-applicative, pango, pipes, pipes-bytestring + ({ mkDerivation, array, base, bytestring, bytestring-to-vector + , cairo, cereal, Chart, Chart-cairo, colour, containers, criterion + , Decimal, dynamic-graph, fftwRaw, GLFW-b, mwc-random, network + , OpenGL, optparse-applicative, pango, pipes, pipes-bytestring , pipes-concurrency, primitive, pulse-simple, QuickCheck, rtlsdr , storable-complex, test-framework, test-framework-quickcheck2 , time, transformers, tuple, vector }: mkDerivation { pname = "sdr"; - version = "0.1.0.12"; - sha256 = "0nikrpcyb5mihc70cfvxy24bl80jjnabc8dc8y056yx54759jkk8"; + version = "0.1.0.13"; + sha256 = "1ip89ddkzzfq2qvpm0ha321hhgx50lphf0s1yd84gw458fsw0ma7"; libraryHaskellDepends = [ - array base bytestring cairo cereal Chart Chart-cairo colour - containers Decimal dynamic-graph fftwRaw GLFW-b mwc-random OpenGL - optparse-applicative pango pipes pipes-bytestring pipes-concurrency - primitive pulse-simple rtlsdr storable-complex time transformers - tuple vector + array base bytestring bytestring-to-vector cairo cereal Chart + Chart-cairo colour containers Decimal dynamic-graph fftwRaw GLFW-b + mwc-random network OpenGL optparse-applicative pango pipes + pipes-bytestring pipes-concurrency primitive pulse-simple rtlsdr + storable-complex time transformers tuple vector ]; testHaskellDepends = [ base primitive QuickCheck storable-complex test-framework @@ -218109,15 +219766,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_0_3_0" = callPackage + "secp256k1-haskell_0_3_1" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal , deepseq, entropy, hashable, hspec, hspec-discover, HUnit , monad-par, mtl, QuickCheck, secp256k1, string-conversions }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.3.0"; - sha256 = "1zkcacmjhbmgi06qwhva37z1piacl51gxkn4b1wy70y5b8cm0y24"; + version = "0.3.1"; + sha256 = "0bhp1d4wzvmznm41fbv8zzx7sw1407v21k83zfjjv2z8apk99w4n"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable QuickCheck string-conversions @@ -218595,6 +220252,8 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; description = "Extra functions for working with Semialigns"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semialign-indexed" = callPackage @@ -220012,6 +221671,8 @@ self: { ]; description = "Avro content type for Servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-blaze" = callPackage @@ -220903,6 +222564,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-js_0_9_4_2" = callPackage + ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover + , hspec-expectations, language-ecmascript, lens, QuickCheck + , servant, servant-foreign, text + }: + mkDerivation { + pname = "servant-js"; + version = "0.9.4.2"; + sha256 = "15n5s3i491cxjxj70wa8yhpipaz47q46s04l4ysc64wgijlnm8xy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat charset lens servant servant-foreign text + ]; + testHaskellDepends = [ + base base-compat hspec hspec-expectations language-ecmascript lens + QuickCheck servant text + ]; + testToolDepends = [ hspec-discover ]; + description = "Automatically derive javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-jsonrpc" = callPackage ({ mkDerivation, aeson, base, servant }: mkDerivation { @@ -221127,24 +222812,30 @@ self: { "servant-multipart" = callPackage ({ mkDerivation, array, base, bytestring, directory, http-client - , http-media, lens, network, random, resourcet, servant + , http-media, http-types, lens, network, random, resourcet, servant , servant-client, servant-client-core, servant-docs - , servant-foreign, servant-server, text, transformers, wai - , wai-extra, warp + , servant-foreign, servant-server, string-conversions, tasty + , tasty-wai, text, transformers, wai, wai-extra, warp }: mkDerivation { pname = "servant-multipart"; - version = "0.11.5"; - sha256 = "19bz03y1fv0px30zw5q8394573d482lgchclihbnyg26w7xhmzha"; + version = "0.11.6"; + sha256 = "0yzr5hv2ki9ig4g6735bjnzv6mkpgj5l68g9hlvp9g9i0ryxqahn"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring directory http-media lens random resourcet servant servant-client-core servant-docs servant-foreign - servant-server text transformers wai wai-extra + servant-server string-conversions text transformers wai wai-extra ]; - testHaskellDepends = [ + executableHaskellDepends = [ base bytestring http-client network servant servant-client servant-client-core servant-server text transformers wai warp ]; + testHaskellDepends = [ + base bytestring http-types servant-server string-conversions tasty + tasty-wai text + ]; description = "multipart/form-data (e.g file upload) support for servant"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -221413,8 +223104,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.8.0"; - sha256 = "0zzbl8qp6pi5a59zbnaq3bfzxldfcb5xykkzp5czzgaj09ypxpgw"; + version = "0.0.9.0"; + sha256 = "042g1y4dhfbvyppy4rkd1hxmv2n84j8cja5kny12a1q05ab616yk"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -221461,6 +223152,60 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-rawm_1_0_0_0" = callPackage + ({ mkDerivation, base, servant }: + mkDerivation { + pname = "servant-rawm"; + version = "1.0.0.0"; + sha256 = "05gv21y7vzw7gdbsk0nax47rnn4isjmx7hbbwilsv0cj7l8qm1bk"; + libraryHaskellDepends = [ base servant ]; + description = "Embed a raw 'Application' in a Servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-rawm-client" = callPackage + ({ mkDerivation, base, servant-client-core, servant-rawm }: + mkDerivation { + pname = "servant-rawm-client"; + version = "1.0.0.0"; + sha256 = "1ivl8pvk3rfi3bm5nhmx334r5rwi7vdkl3pbg90fzwj7brd2vsyz"; + libraryHaskellDepends = [ base servant-client-core servant-rawm ]; + description = "The client implementation of servant-rawm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-rawm-docs" = callPackage + ({ mkDerivation, base, http-media, http-types, lens, servant-docs + , servant-rawm + }: + mkDerivation { + pname = "servant-rawm-docs"; + version = "1.0.0.0"; + sha256 = "05h6j7vylir41mbhhbwvmj5n2cpwbjr9km4xm9bc5phl9m3qxsn3"; + libraryHaskellDepends = [ + base http-media http-types lens servant-docs servant-rawm + ]; + description = "Documentation generator for 'RawM' endpoints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-rawm-server" = callPackage + ({ mkDerivation, base, bytestring, filepath, resourcet + , servant-rawm, servant-server, wai, wai-app-static + }: + mkDerivation { + pname = "servant-rawm-server"; + version = "1.0.0.0"; + sha256 = "0ipi5k5zc077146c48rysaqjn37jikmgb10qz11v6728xrvxvrzi"; + libraryHaskellDepends = [ + base bytestring filepath resourcet servant-rawm servant-server wai + wai-app-static + ]; + description = "The server implementation of servant-rawm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-reason" = callPackage ({ mkDerivation, aeson, base, Diff, directory, hspec, HUnit , interpolate, lens, mockery, process, reason-export, servant @@ -221956,16 +223701,16 @@ self: { }) {}; "servant-swagger-tags" = callPackage - ({ mkDerivation, base, containers, lens, servant, servant-mock - , servant-server, servant-swagger, swagger2, text + ({ mkDerivation, base, insert-ordered-containers, lens, servant + , servant-mock, servant-server, servant-swagger, swagger2, text }: mkDerivation { pname = "servant-swagger-tags"; - version = "0.1.0.0"; - sha256 = "1938kr3jcpwy8imias0bk7xqp0v3ijajpdfdpgibyphklfqnck64"; + version = "0.1.0.1"; + sha256 = "1hl0baa739a5kdg274b8cwyd5h5iam9bxj3ql96ljwdp9j2cnv2v"; libraryHaskellDepends = [ - base containers lens servant servant-mock servant-server - servant-swagger swagger2 text + base insert-ordered-containers lens servant servant-mock + servant-server servant-swagger swagger2 text ]; description = "Swagger Tags for Servant"; license = stdenv.lib.licenses.bsd3; @@ -222666,6 +224411,8 @@ self: { pname = "set-cover"; version = "0.1.1"; sha256 = "04jjcmjll0azz24rx91p0dp5b8ya5jc0qacr21764ri1dbkfflgw"; + revision = "1"; + editedCabalFile = "0x5hn43xcfsygjc048mvzk6g8dx51pr5csvvqr6pns8jmz5awkf8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223223,6 +224970,8 @@ self: { ]; description = "SHA-1 Hash"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shade" = callPackage @@ -223633,21 +225382,6 @@ self: { }) {}; "shake-plus" = callPackage - ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake - , within - }: - mkDerivation { - pname = "shake-plus"; - version = "0.1.6.0"; - sha256 = "0121lbjfsq0ira5nrz83v2lvm1225m9m806x9rrg2kq9j7nj1zab"; - libraryHaskellDepends = [ - base comonad extra hashable path rio shake within - ]; - description = "Re-export of Shake using well-typed paths and ReaderT"; - license = stdenv.lib.licenses.mit; - }) {}; - - "shake-plus_0_1_7_0" = callPackage ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake , within }: @@ -223660,29 +225394,46 @@ self: { ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; + }) {}; + + "shake-plus_0_1_10_0" = callPackage + ({ mkDerivation, aeson, base, comonad, extra, path, rio, shake + , within + }: + mkDerivation { + pname = "shake-plus"; + version = "0.1.10.0"; + sha256 = "0jp0b593162y2m9mxrh4fhgvjiwyxx4zk5spmr46aby5hhrgdwcr"; + libraryHaskellDepends = [ + aeson base comonad extra path rio shake within + ]; + description = "Re-export of Shake using well-typed paths and ReaderT"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakebook" = callPackage - ({ mkDerivation, aeson, aeson-with, base, comonad, comonad-extras - , doctemplates, feed, free, lens, lens-aeson, mustache, pandoc - , pandoc-types, path-extensions, relude, rio, shake-plus, slick - , split, tasty, tasty-golden, text-time, zipper-extra + ({ mkDerivation, aeson, aeson-with, base, binary-instances, comonad + , comonad-extras, doctemplates, feed, free, http-conduit + , ixset-typed, lens, lens-aeson, mustache, pandoc, pandoc-types + , path-extensions, rio, shake-plus, sitemap-gen, slick, split + , tasty, tasty-golden, text-time, zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.5.1.0"; - sha256 = "1yjk1zayfiisa927gh6rmsh0qvy64gvgw77b1vd4h22alndfchxr"; + version = "0.8.1.0"; + sha256 = "0cwd920svd7927f7im3qbkqg08ms7yy08wrvvlbzcidv6kh2554m"; libraryHaskellDepends = [ - aeson aeson-with base comonad comonad-extras doctemplates feed free - lens lens-aeson mustache pandoc pandoc-types path-extensions relude - rio shake-plus slick split text-time zipper-extra + aeson aeson-with base binary-instances comonad comonad-extras + doctemplates feed free http-conduit ixset-typed lens lens-aeson + mustache pandoc pandoc-types path-extensions rio shake-plus + sitemap-gen slick split text-time zipper-extra ]; testHaskellDepends = [ - aeson aeson-with base comonad comonad-extras doctemplates feed free - lens lens-aeson mustache pandoc pandoc-types path-extensions relude - rio shake-plus slick split tasty tasty-golden text-time - zipper-extra + aeson aeson-with base binary-instances comonad comonad-extras + doctemplates feed free http-conduit ixset-typed lens lens-aeson + mustache pandoc pandoc-types path-extensions rio shake-plus + sitemap-gen slick split tasty tasty-golden text-time zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -223735,31 +225486,6 @@ self: { }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.24"; - sha256 = "1fpkq5av7xyffsgghj5b85i8pzpnmkfcyjawhfm5lyhqpq1g5wh3"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_24_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, th-lift, time @@ -223781,7 +225507,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -224146,6 +225871,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shell-conduit_5_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , directory, filepath, hspec, hspec-expectations, monads-tf + , process, resourcet, semigroups, split, template-haskell, text + , transformers, unix, unliftio + }: + mkDerivation { + pname = "shell-conduit"; + version = "5.0.0"; + sha256 = "02zilgrb64x0rk4b4bihprwq9fr5gydzj003y3fq8ryf7r60g41w"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra directory filepath + monads-tf process resourcet semigroups split template-haskell text + transformers unix unliftio + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec hspec-expectations + template-haskell + ]; + description = "Write shell scripts with Conduit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shell-escape" = callPackage ({ mkDerivation, base, binary, bytestring, containers, vector }: mkDerivation { @@ -225267,17 +227016,6 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, filepath, process, unix }: - mkDerivation { - pname = "simple-cmd"; - version = "0.2.1"; - sha256 = "1b35hsxr63n3nbpjdf7ailsmp4yk6k8nscx8xxv453v0r3v89hss"; - libraryHaskellDepends = [ base directory filepath process unix ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_2" = callPackage ({ mkDerivation, base, directory, extra, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; @@ -225288,7 +227026,6 @@ self: { ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -225415,8 +227152,8 @@ self: { ({ mkDerivation, base, doctest, integer-gmp }: mkDerivation { pname = "simple-enumeration"; - version = "0.2"; - sha256 = "0792fcn7mxvhdvsqgc335lcyp89zcdk3fbfqyckz9fsmf6382hv4"; + version = "0.2.1"; + sha256 = "16m3i3703yb2921nq1hk4ap3s7yrxsyczw2anziv6wvy4xq252qr"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base doctest ]; description = "Finite or countably infinite sequences of values"; @@ -226436,8 +228173,8 @@ self: { }: mkDerivation { pname = "singletons-presburger"; - version = "0.3.0.0"; - sha256 = "06djkc6y5clv0q903i04gaq0vri3nkk307znb418y0rfdh6czzwx"; + version = "0.3.0.1"; + sha256 = "1j7azll9cjg5gcvpw8aq1hia1njg4bm8llwms1v941gwi7gk481m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226718,6 +228455,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sized_0_5_0_0" = callPackage + ({ mkDerivation, base, constraints, containers, deepseq + , equational-reasoning, ghc-typelits-presburger, hashable, lens + , ListLike, mono-traversable, singletons, type-natural, vector + }: + mkDerivation { + pname = "sized"; + version = "0.5.0.0"; + sha256 = "0g47mn1j4a0p7w01pjr2fxcass6lwl460a0rs4rq001kj38zxrcx"; + libraryHaskellDepends = [ + base constraints containers deepseq equational-reasoning + ghc-typelits-presburger hashable lens ListLike mono-traversable + singletons type-natural vector + ]; + description = "Sized sequence data-types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sized-grid" = callPackage ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad , constraints, distributive, generics-sop, HUnit, lens @@ -226955,6 +228711,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -227027,8 +228785,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.8.4"; - sha256 = "08fy9c3ms6xwzxispgksf1cji9mvcyy8swaj3dwvc2dc66h06xky"; + version = "0.8.5"; + sha256 = "1b8m0spspp060p5hkl2qxarh3cwji0shq5kdwz2w93kiyl8hk8sv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227048,8 +228806,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.8.4"; - sha256 = "0wyhiark5d1r1hi04xiq14ykikr9yd4dmzqbr7qswl05b0bk7gam"; + version = "0.8.5"; + sha256 = "1azcq7g8c4p18q4akk7rl0bczjvp0vl4mnqvsfmzcdf7sdjlg9f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227443,21 +229201,24 @@ self: { "slip32" = callPackage ({ mkDerivation, base, base16-bytestring, bech32, binary, bip32 - , bytestring, hedgehog, tasty, tasty-hedgehog, tasty-hunit, text + , bitcoin-keys, bytestring, hedgehog, tasty, tasty-hedgehog + , tasty-hunit, text }: mkDerivation { pname = "slip32"; - version = "0.2"; - sha256 = "1cc83lwclm68ss2pgqznfqrhbnpi5hg46d19gzja1a23a4pmp86i"; + version = "0.2.1"; + sha256 = "00ivmrdw79n543s7rb1bzpp9xn6i1gys8zbad20lams20f7a01fa"; libraryHaskellDepends = [ - base bech32 binary bip32 bytestring text + base bech32 binary bip32 bitcoin-keys bytestring text ]; testHaskellDepends = [ - base base16-bytestring bip32 bytestring hedgehog tasty + base base16-bytestring bip32 bitcoin-keys bytestring hedgehog tasty tasty-hedgehog tasty-hunit text ]; description = "SLIP-0032: Extended serialization format for BIP-32 wallets"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slist" = callPackage @@ -227617,6 +229378,8 @@ self: { doHaddock = false; description = "Serialize to bytes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smallarray" = callPackage @@ -228265,18 +230028,17 @@ self: { "smtp-mail" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , bytestring, connection, cryptohash, filepath, mime-mail, network - , network-bsd, text + , bytestring, connection, cryptonite, filepath, memory, mime-mail + , network, network-bsd, text }: mkDerivation { pname = "smtp-mail"; - version = "0.2.0.0"; - sha256 = "0qazfkh03rnrijan037bjspskbsma5x04gcavmn0g744f7xldcaz"; - revision = "1"; - editedCabalFile = "1kv84kywyj8f7iypzdq6a32wwkk8318khhy4x3p9q6mlvgv8275r"; + version = "0.2.0.1"; + sha256 = "16qwcwzgzlmfx1f5h6977nkka7x6jlm6kxpkbdsacizh0z96v1kw"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring - connection cryptohash filepath mime-mail network network-bsd text + connection cryptonite filepath memory mime-mail network network-bsd + text ]; description = "Simple email sending via SMTP"; license = stdenv.lib.licenses.bsd3; @@ -228381,6 +230143,8 @@ self: { ]; description = "GHC Source Plugin that helps to minimise imports and generate explicit exports"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snake" = callPackage @@ -230144,8 +231908,8 @@ self: { }: mkDerivation { pname = "socket"; - version = "0.8.2.0"; - sha256 = "176px9n2f8mnxi3r2sqshrpbp7i11fskch1nkjhgqzq917sz0zgb"; + version = "0.8.3.0"; + sha256 = "0gd0rw6mpzlimvcn3jiw7l0q9h4l3rhfr2n5hhg6k0bkklqp6rbr"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -231155,28 +232919,6 @@ self: { }) {}; "sparse-tensor" = callPackage - ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers - , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise - , hmatrix, parallel, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tf-random, zlib - }: - mkDerivation { - pname = "sparse-tensor"; - version = "0.2.1.3"; - sha256 = "1fcckwp9k3ky669ai62x26pgz0irir4ngk0m6g1659fsn3f2gdc8"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - ad base bytestring cereal containers deepseq ghc-typelits-knownnat - ghc-typelits-natnormalise hmatrix parallel tf-random zlib - ]; - testHaskellDepends = [ - base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "typesafe tensor algebra library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "sparse-tensor_0_2_1_4" = callPackage ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise , hmatrix, parallel, QuickCheck, tasty, tasty-hunit @@ -231196,7 +232938,6 @@ self: { ]; description = "typesafe tensor algebra library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparsebit" = callPackage @@ -232045,6 +233786,17 @@ self: { broken = true; }) {}; + "spork" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "spork"; + version = "0.4.0"; + sha256 = "1mkcb9qi9d3izf3nhn0bmiiwfhvak6ky71wq7qnrq3imsarrni6s"; + libraryHaskellDepends = [ base deepseq ]; + description = "Catch errors from pure computations in a Maybe/Either"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "spoty" = callPackage ({ mkDerivation, aeson, base, bytestring, lens, lens-aeson, pipes , text, unordered-containers, wreq @@ -232583,8 +234335,8 @@ self: { }: mkDerivation { pname = "squeeze"; - version = "1.0.4.17"; - sha256 = "10nm5jim5cw7qmkdr1j7665g646kay53w8n5rcsp1jz3lglpymdw"; + version = "1.0.4.18"; + sha256 = "0s10k1fyh8xrsf0cbj32r8f7clcj6pfyc39b9bmgsixg1qngjbdj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232601,27 +234353,27 @@ self: { }) {}; "sr-extra" = callPackage - ({ mkDerivation, base, bytestring, bzlib, Cabal, cereal, containers - , Diff, directory, exceptions, fgl, filemanip, filepath - , generic-data, hslogger, HUnit, lens, ListLike, mmorph, mtl - , network-uri, pretty, process, process-extras, pureMD5, QuickCheck - , random, safecopy, show-combinators, show-please, syb + ({ mkDerivation, base, base64-bytestring, bytestring, bzlib, Cabal + , cereal, containers, Diff, directory, exceptions, fgl, filemanip + , filepath, generic-data, hslogger, HUnit, lens, ListLike, mmorph + , mtl, network-uri, pretty, process, process-extras, pureMD5 + , QuickCheck, random, safecopy, show-combinators, show-please, syb , template-haskell, text, th-lift, th-lift-instances, th-orphans , time, transformers, unexceptionalio-trans, unix, Unixutils , userid, uuid, uuid-orphans, uuid-types, zlib }: mkDerivation { pname = "sr-extra"; - version = "1.72.3"; - sha256 = "0jm7r0lxcwppc85rpyasq6grqqkcwhxs0clwyasicqklkcx2l5xw"; + version = "1.80"; + sha256 = "03xm9km8wzvz8g1czj320k00xf2dzdi8rm74l7xdr9h7bxcwyh84"; libraryHaskellDepends = [ - base bytestring bzlib Cabal cereal containers Diff directory - exceptions fgl filemanip filepath generic-data hslogger HUnit lens - ListLike mmorph mtl network-uri pretty process process-extras - pureMD5 QuickCheck random safecopy show-combinators show-please syb - template-haskell text th-lift th-lift-instances th-orphans time - transformers unexceptionalio-trans unix Unixutils userid uuid - uuid-orphans uuid-types zlib + base base64-bytestring bytestring bzlib Cabal cereal containers + Diff directory exceptions fgl filemanip filepath generic-data + hslogger HUnit lens ListLike mmorph mtl network-uri pretty process + process-extras pureMD5 QuickCheck random safecopy show-combinators + show-please syb template-haskell text th-lift th-lift-instances + th-orphans time transformers unexceptionalio-trans unix Unixutils + userid uuid uuid-orphans uuid-types zlib ]; description = "Module limbo"; license = stdenv.lib.licenses.bsd3; @@ -232735,6 +234487,8 @@ self: { pname = "ssh"; version = "0.3.2"; sha256 = "1gr64sv802n9l72lp608xxi9nbh165dzn22m52s0yc35vf717rq1"; + revision = "1"; + editedCabalFile = "1y5c3z86mi7fc0awlvmq85y40nhws4591njjs85xj0grxrizx5bg"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-string binary bytestring cereal containers crypto-api crypto-pubkey-types @@ -233834,8 +235588,10 @@ self: { }: mkDerivation { pname = "stackcollapse-ghc"; - version = "0.0.1"; - sha256 = "0skpikc7yvdqcdaxqiyav4dk6k0sqng9160dgi4yfx54f5za1a64"; + version = "0.0.1.1"; + sha256 = "18glq0hkfr02iw8p842hmk4rv5d8sb565lyccklxdmfn708ick23"; + revision = "2"; + editedCabalFile = "0d6in3107pgblh5g1shnmw3dsb6vg10h3kdic56n7zf14gsqqjqy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -233904,6 +235660,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stan" = callPackage + ({ mkDerivation, array, base, base64, blaze-html, bytestring, clay + , colourista, containers, cryptohash-sha1, dir-traverse, directory + , extensions, filepath, ghc, ghc-boot-th, gitrev, hedgehog, hspec + , hspec-hedgehog, optparse-applicative, pretty-simple, relude + , slist, text, tomland, trial, trial-optparse-applicative + , trial-tomland, unordered-containers + }: + mkDerivation { + pname = "stan"; + version = "0.0.0.0"; + sha256 = "0x4avzclyx41kncwzaky70ky3mz4pcfcgzg17jnza8gpm7bfacxg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base base64 blaze-html bytestring clay colourista containers + cryptohash-sha1 dir-traverse directory extensions filepath ghc + ghc-boot-th gitrev optparse-applicative pretty-simple relude slist + text tomland trial trial-optparse-applicative trial-tomland + unordered-containers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers filepath ghc hedgehog hspec hspec-hedgehog + optparse-applicative relude text tomland trial unordered-containers + ]; + doHaddock = false; + description = "Haskell STatic ANalyser"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "standalone-derive-topdown" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { @@ -234225,6 +236012,8 @@ self: { ]; description = "Type-safe and interoperable static values and closures"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "static-canvas" = callPackage @@ -234575,8 +236364,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.6"; - sha256 = "0887cn2bcs9py30yla07camjhzgsmi1dh83grh9iv2hb360sc92k"; + version = "0.2.3.7"; + sha256 = "0mrkm7gr6s27dngws7p3mcfyp9pdvyr25mg9nd3ygklaql74jmng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235238,6 +237027,8 @@ self: { testHaskellDepends = [ async base QuickCheck random Unique ]; description = "STM wrapper around Control.Concurrent.Supply."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-tlist" = callPackage @@ -235469,8 +237260,8 @@ self: { }: mkDerivation { pname = "storablevector"; - version = "0.2.13"; - sha256 = "1zmr738vwnhnyxbikayqnaz31ilv2qlmscp6iqgl7adcfbal4dzq"; + version = "0.2.13.1"; + sha256 = "06fgxbnc5vwmiv7dxywj7ncjhmxv0wjs0bys5hza6mrwn3sw5r2w"; libraryHaskellDepends = [ base deepseq non-negative QuickCheck semigroups syb transformers unsafe utility-ht @@ -235661,15 +237452,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_54_0" = callPackage + "stratosphere_0_55_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.54.0"; - sha256 = "1d56fl71qvhzaka3sx1306nwlpmry9q7gykb6fxa7c92279c2nly"; + version = "0.55.0"; + sha256 = "0fs0npxspfg3yj03dzjq1a02z3ca3s82z6v92f3cb1bkn0dsqhq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236410,6 +238201,8 @@ self: { pname = "streamly"; version = "0.7.2"; sha256 = "007i3rfza0v8zy34lq9ipq2biarg82prmd1vxr5f2zz5xln37wrm"; + revision = "1"; + editedCabalFile = "15fyfvf0g2l678426fz91fqf3qgi44dagqdxh6i6am3vh0nvvg1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236748,6 +238541,8 @@ self: { libraryHaskellDepends = [ base lens strict-tuple ]; description = "Optics for the `strict-tuple` library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "strict-types" = callPackage @@ -236905,8 +238700,8 @@ self: { pname = "string-interpolate"; version = "0.2.1.0"; sha256 = "0wply8lqfhc1xnqxq88xwygwqxbq86gjrwphygbn7nz66g2abgda"; - revision = "1"; - editedCabalFile = "1xp470mrm3srvmvk6xznx9wim8xwsz93pskpv4hnk2ra3a7lr2lr"; + revision = "2"; + editedCabalFile = "00dsrl53aggn0d45cv3c7w6x82qhz3a059w957s9i3qdqfphbvx9"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -236924,6 +238719,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-interpolate_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, formatting + , haskell-src-exts, haskell-src-meta, hspec, hspec-core + , interpolate, neat-interpolation, QuickCheck, quickcheck-instances + , quickcheck-text, quickcheck-unicode, split, template-haskell + , text, text-conversions, unordered-containers, utf8-string + }: + mkDerivation { + pname = "string-interpolate"; + version = "0.3.0.0"; + sha256 = "0h7lqr5g11pr9ikzg7j26fgj9m8659j1vpcwggvndv6k71sh281a"; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta split + template-haskell text text-conversions utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck quickcheck-instances + quickcheck-text quickcheck-unicode template-haskell text + unordered-containers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq formatting interpolate + neat-interpolation QuickCheck text + ]; + description = "Haskell string/text/bytestring interpolation that just works"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -236985,8 +238809,8 @@ self: { }: mkDerivation { pname = "string-random"; - version = "0.1.2.0"; - sha256 = "1jw05cvzzmma28xvak517y8gb7gjsdmr5iafgz5snxikcjzav0l2"; + version = "0.1.3.0"; + sha256 = "18yni8zm51x65i5h1c4sr9msd5fqa3fnh3zm0dck2wk364xz7dsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238543,8 +240367,8 @@ self: { }: mkDerivation { pname = "superrecord"; - version = "0.5.0.1"; - sha256 = "0l1zimami83701djj47nk3izb10m6jxszq52zwmb8411dbn9pclb"; + version = "0.5.1.0"; + sha256 = "0dg1h7213vinlm6vmdr73xh81j0ysvs7mqmphwr58d3ymn12mfqa"; libraryHaskellDepends = [ aeson base bytestring constraints deepseq ghc-prim mtl text ]; @@ -239111,6 +240935,28 @@ self: { broken = true; }) {}; + "sweet-egison" = callPackage + ({ mkDerivation, backtracking, base, criterion, egison-pattern-src + , egison-pattern-src-th-mode, haskell-src-exts, haskell-src-meta + , logict, primes, tasty, tasty-discover, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "sweet-egison"; + version = "0.1.0.1"; + sha256 = "08lllk4z0mkcvchnkmi6f9kcxfh3srb48kxxha2kvx4p9aj7f623"; + libraryHaskellDepends = [ + backtracking base egison-pattern-src egison-pattern-src-th-mode + haskell-src-exts haskell-src-meta logict template-haskell + transformers + ]; + testHaskellDepends = [ base primes tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Shallow embedding implementation of non-linear pattern matching"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "swf" = callPackage ({ mkDerivation, base, mtl, pretty }: mkDerivation { @@ -239148,8 +240994,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.0.3"; - sha256 = "0cl34mqbda1k4spv86y8v5x0d89lv80b8dxymc7iw5hpjks1cdx3"; + version = "0.10.0.4"; + sha256 = "0rad5rx8hxh0ay4q0lfbn4jggvl3wf3chhjf34rpppzdd6b7r75m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -241851,6 +243697,8 @@ self: { ]; description = "Terminal Art"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "task" = callPackage @@ -241970,8 +243818,8 @@ self: { pname = "taskwarrior"; version = "0.3.0.0"; sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0"; - revision = "1"; - editedCabalFile = "063b4k4zppvnv6xzk72d4fji203abckwcsg2b1z387p66y3x0914"; + revision = "2"; + editedCabalFile = "16ikncs4aail9ymd2nx9n67b5d64cwk7m6kcbwvji0iggbikmsiv"; libraryHaskellDepends = [ aeson base bytestring containers process random text time unordered-containers uuid @@ -242064,13 +243912,25 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.0.0.4"; - sha256 = "0jryp6kndaaxfjd4vsws18igx9ivd36iqyqdbjpxmxbx34d1h6kn"; + version = "2.0.0.5"; + sha256 = "0yw4dsy6vcichr76da5rlw6y6g62kiagr9rqxlsxndgckb6bmyzf"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_2_0_0_6" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "2.0.0.6"; + sha256 = "0iw7yqb52cxw3fgp9did73wk41c1jxvdxx4vg0rna32bc0d7rwyh"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit @@ -242202,8 +244062,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.2"; sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; - revision = "2"; - editedCabalFile = "1v4jp3xk5ikik638vkyf2jxkhaf2n6fsw8zxqxxjv65x60082kl7"; + revision = "3"; + editedCabalFile = "0vjr63nsc3z2jzc80clx2pzhcx1l53bqscwflvwwgjy0gmsshakd"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -242476,6 +244336,8 @@ self: { ]; description = "Golden testing provider for tasty with muti-line diff output"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-program" = callPackage @@ -242521,6 +244383,8 @@ self: { testHaskellDepends = [ base QuickCheck tasty ]; description = "Pre-built tasty trees for checking lawful class properties using QuickCheck"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-rerun" = callPackage @@ -243829,6 +245693,8 @@ self: { ]; description = "TensorFlow bindings"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libtensorflow = null;}; "tensorflow-core-ops" = callPackage @@ -243849,6 +245715,8 @@ self: { ]; description = "Haskell wrappers for Core Tensorflow Ops"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-logging" = callPackage @@ -243877,6 +245745,8 @@ self: { ]; description = "TensorBoard related functionality"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-mnist" = callPackage @@ -243929,6 +245799,8 @@ self: { ]; description = "Code generation for TensorFlow operations"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-ops" = callPackage @@ -243958,6 +245830,8 @@ self: { ]; description = "Friendly layer around TensorFlow bindings"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-proto" = callPackage @@ -244060,13 +245934,12 @@ self: { ({ mkDerivation, array, base, c2hs }: mkDerivation { pname = "termbox"; - version = "0.2.0"; - sha256 = "04y1wj65c6nhv08jd83ihvph45fs5279px4ivm5cinnz5m721jqg"; + version = "0.2.0.1"; + sha256 = "0rqlhinc1vmxnmwxrcv5rb78j3jmp6iwfcabzf95nhclvjhdadr8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; description = "termbox bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -245822,8 +247695,8 @@ self: { pname = "text-show-instances"; version = "3.8.3"; sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d"; - revision = "5"; - editedCabalFile = "1czi0gl7kxc64kk8v36xw2ln0vjj2pls3x9nmh754nvdg0616jfj"; + revision = "6"; + editedCabalFile = "1masflbb26zg8l0xiz2pzy6i9sh9pc3hqfd6y3vcvyxg0wg96cxf"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -245866,8 +247739,8 @@ self: { }: mkDerivation { pname = "text-time"; - version = "0.2.0"; - sha256 = "14pk5h7mswdr6dpiw7m4z64dadgrdpw77inyq6kmwaskqc1whqng"; + version = "0.3.1"; + sha256 = "1p0vdhvpcz07wiam3hsi7fixknb6shxlhvg624vksacg06qkck41"; libraryHaskellDepends = [ attoparsec base formatting text time ]; testHaskellDepends = [ attoparsec base Cabal formatting hspec QuickCheck text time @@ -246810,15 +248683,15 @@ self: { }) {}; "theatre" = callPackage - ({ mkDerivation, base, base-prelude, contravariant, semigroups - , slave-thread, unagi-chan + ({ mkDerivation, base, contravariant, semigroups, slave-thread + , unagi-chan }: mkDerivation { pname = "theatre"; - version = "1"; - sha256 = "1jwa4851rvac084gb70bqfwarwv6rjhqcs7b48md5kaad3zvgbd2"; + version = "1.0.0.1"; + sha256 = "0vcli8i0vrxv8fzjdyp684fvp7640xmwc3yawz12mfvxcpgrs2xq"; libraryHaskellDepends = [ - base base-prelude contravariant semigroups slave-thread unagi-chan + base contravariant semigroups slave-thread unagi-chan ]; description = "Minimalistic actor library"; license = stdenv.lib.licenses.mit; @@ -247672,15 +249545,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "tidal_1_6_0" = callPackage + "tidal_1_6_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, vector, weigh }: mkDerivation { pname = "tidal"; - version = "1.6.0"; - sha256 = "0fz2sgy3fjkm3p6lzv0sa71p1madf06qfv05i3vv6zn3qrpfrx1q"; + version = "1.6.1"; + sha256 = "13n9s0s04bddl16xq86anz7a9fqcm7j3xfqn5y1mni5j1h7hn2k2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -248707,6 +250580,8 @@ self: { ]; description = "Load TimeZoneSeries from an Olson file at compile time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timezone-series" = callPackage @@ -249109,6 +250984,31 @@ self: { broken = true; }) {}; + "tldr_0_7_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers + , directory, filepath, optparse-applicative, semigroups, tasty + , tasty-golden, text, typed-process + }: + mkDerivation { + pname = "tldr"; + version = "0.7.0"; + sha256 = "1y0lw65k9kjmqk27hsq3gr40af4jnwksf739ihp2dg4llyrqgvhl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmark text + ]; + executableHaskellDepends = [ + base containers directory filepath optparse-applicative semigroups + typed-process + ]; + testHaskellDepends = [ base tasty tasty-golden ]; + description = "Haskell tldr client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, gauge, hourglass, memory @@ -249290,6 +251190,8 @@ self: { ]; description = "Start and stop a temporary postgres"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tmpl" = callPackage @@ -250022,8 +251924,8 @@ self: { }: mkDerivation { pname = "toolshed"; - version = "0.18.0.1"; - sha256 = "0sw7fxcqr1pfb7kjzvra56ji6nl02175rscb1s4bvw6rrq7xjb6v"; + version = "0.18.0.2"; + sha256 = "0iaq3fgx67w7jf3qc5rvxsnbc0y159psqd44klhm8lyvdb6rd4kh"; libraryHaskellDepends = [ array base containers data-default deepseq directory filepath QuickCheck random @@ -251888,6 +253790,44 @@ self: { broken = true; }) {}; + "trial" = callPackage + ({ mkDerivation, base, colourista, dlist, doctest, hedgehog, hspec + , hspec-hedgehog, splitmix + }: + mkDerivation { + pname = "trial"; + version = "0.0.0.0"; + sha256 = "0lnq80983bg2cjim3fy8rwisn55f6acqwp67w7791kzfdwshxkww"; + libraryHaskellDepends = [ base colourista dlist ]; + testHaskellDepends = [ + base dlist doctest hedgehog hspec hspec-hedgehog splitmix + ]; + description = "Trial Data Structure"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "trial-optparse-applicative" = callPackage + ({ mkDerivation, base, optparse-applicative, trial }: + mkDerivation { + pname = "trial-optparse-applicative"; + version = "0.0.0.0"; + sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn"; + libraryHaskellDepends = [ base optparse-applicative trial ]; + description = "Trial helper functions for optparse-applicative"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "trial-tomland" = callPackage + ({ mkDerivation, base, text, tomland, trial }: + mkDerivation { + pname = "trial-tomland"; + version = "0.0.0.0"; + sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23"; + libraryHaskellDepends = [ base text tomland trial ]; + description = "Trial helper functions for tomland"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "triangulation" = callPackage ({ mkDerivation, array, base, collada-types, haskell98, tuple , vector, vector-algorithms @@ -253387,6 +255327,8 @@ self: { ]; description = "Haskell twirp foundations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twisty" = callPackage @@ -254163,6 +256105,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-natural_0_9_0_0" = callPackage + ({ mkDerivation, base, constraints, equational-reasoning + , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons + , singletons-presburger, template-haskell + }: + mkDerivation { + pname = "type-natural"; + version = "0.9.0.0"; + sha256 = "1jg8qqha60mxj7mrbi69jbcniayksyggi2s7fxy88ap4ay1hky3a"; + libraryHaskellDepends = [ + base constraints equational-reasoning ghc-typelits-natnormalise + ghc-typelits-presburger singletons singletons-presburger + template-haskell + ]; + description = "Type-level natural and proofs of their properties"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-of-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim @@ -255881,8 +257842,8 @@ self: { pname = "unfoldable"; version = "1.0"; sha256 = "0ilzv4ks76f9fx12ilsam0v232fm2mvvsz6s50p0nllldwgkgm6a"; - revision = "1"; - editedCabalFile = "167jqv6cw9d1c9n0j2sxp5asaaqbh6ay3g8nyg8ndy96jnjb34zb"; + revision = "2"; + editedCabalFile = "0lnqjgh8nyq6w94swn0m7syl0bx6a2ml7s9sqp449inpdb8f8jaj"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -257610,25 +259571,24 @@ self: { }) {}; "update-nix-fetchgit" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring - , data-fix, errors, hnix, process, text, time, transformers - , trifecta, uniplate, utf8-string + ({ mkDerivation, aeson, async, base, bytestring, data-fix, errors + , hnix, prettyprinter, process, text, time, transformers, trifecta + , uniplate, utf8-string }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.1.0.0"; - sha256 = "1chl1a4vjd9iqyd2kp67f9v8h260c6jlfzcr8m11x0w0h592ly52"; + version = "0.1.1.0"; + sha256 = "0zk4rgpdgn2wa6x4js7sgxpa9gfly2fwd1vws5m73kh61ja7286h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint async base bytestring data-fix errors hnix + aeson async base bytestring data-fix errors hnix prettyprinter process text time transformers trifecta uniplate utf8-string ]; executableHaskellDepends = [ base text ]; description = "A program to update fetchgit values in Nix expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "update-repos" = callPackage @@ -258379,8 +260339,6 @@ self: { ]; description = "A pragmatic time and date library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "utf" = callPackage @@ -258869,6 +260827,8 @@ self: { ]; description = "UUID parsing using byteverse packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuid-crypto" = callPackage @@ -259409,17 +261369,6 @@ self: { }) {}; "validity-containers" = callPackage - ({ mkDerivation, base, containers, validity }: - mkDerivation { - pname = "validity-containers"; - version = "0.5.0.3"; - sha256 = "064sd52y3cmfz9j1yhfz6wsm3993mnh9xgyzy6jzd4cdfmh19sdd"; - libraryHaskellDepends = [ base containers validity ]; - description = "Validity instances for containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-containers_0_5_0_4" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; @@ -259428,7 +261377,6 @@ self: { libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-path" = callPackage @@ -260262,8 +262210,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "vector-doublezip"; - version = "0.1.0.0"; - sha256 = "0s5mmwc0s88cdwhb9m0hrphgkiwff2ipic0cln911qll7bxfprgl"; + version = "0.2.0.0"; + sha256 = "0z98f0fjn90x3azdbsnjpx61r9lna9hb67bjnmmhvil9a7hpd65x"; libraryHaskellDepends = [ base vector ]; description = "Some special functions to work with Vector (with zip)"; license = stdenv.lib.licenses.mit; @@ -260822,6 +262770,8 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Random verilog generation and simulator testing"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "versioning" = callPackage @@ -261228,8 +263178,8 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.12.2"; - sha256 = "1h5q5y3ni7vx48rmammf66nzjmbclwh5n1c41gln8fm98n6n96yn"; + version = "0.13.0"; + sha256 = "1ks5rzv3b5fjgcy4g54wxnfqa450ifyap18pq2sb2c8a6bkh3qlh"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ aeson base doctest hspec lens lens-aeson microlens mtl @@ -261912,8 +263862,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.4"; - sha256 = "1wwbhz9p3psrfirmzygfjlpak17gyc8qhrqgf0qd7835phid7vxb"; + version = "3.5"; + sha256 = "1jly8hwfr11aczyrrx2yf64dlq2xgyp51jxrms2kz8izgbdh0h1h"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -263499,6 +265449,24 @@ self: { broken = true; }) {}; + "wai-saml2" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, c14n + , cryptonite, data-default-class, http-types, mtl, text, time + , vault, wai, wai-extra, x509, x509-store, xml-conduit + }: + mkDerivation { + pname = "wai-saml2"; + version = "0.2.1.0"; + sha256 = "0yljqfrrp426pn17fq28arw3ygrb3i84fr28r0hns0cv4a4sz4gx"; + libraryHaskellDepends = [ + base base64-bytestring bytestring c14n cryptonite + data-default-class http-types mtl text time vault wai wai-extra + x509 x509-store xml-conduit + ]; + description = "SAML2 assertion validation as WAI middleware"; + license = stdenv.lib.licenses.mit; + }) {}; + "wai-secure-cookies" = callPackage ({ mkDerivation, base, bytestring, cryptonite, hspec , hspec-expectations, hspec-wai, http-types, memory, protolude @@ -263841,6 +265809,24 @@ self: { broken = true; }) {}; + "wakame" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, sop-core, tasty + , tasty-discover, tasty-hspec, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "wakame"; + version = "0.1.0.0"; + sha256 = "1wm87z7ag1xzvf4lxqg3xz62ac8i5b9ljzlg85vphcfadsj9khh7"; + libraryHaskellDepends = [ base sop-core ]; + testHaskellDepends = [ + base doctest QuickCheck sop-core tasty tasty-discover tasty-hspec + tasty-quickcheck text time + ]; + testToolDepends = [ tasty-discover ]; + description = "Functions to manipulate records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "waldo" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , blaze-builder, browscap, bytestring, case-insensitive, conduit @@ -263938,8 +265924,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.12"; - sha256 = "0fgglpgg2m3nfngymwgzvn467nsg2r0ff36v3xi8jdqwy9x9ia49"; + version = "3.3.13"; + sha256 = "1yqgfx7bsjk97dxcrqwddfhi8mdw0q6cbgs5abaxqjlxh3rhihdx"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -264047,6 +266033,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp-tls_3_3_0" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, streaming-commons, tls, tls-session-manager, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.3.0"; + sha256 = "03fwwggl6lhxs7swwylgpk9j8g5szq2h871nfbgs6xzr1b5hpas1"; + libraryHaskellDepends = [ + base bytestring cryptonite data-default-class network + streaming-commons tls tls-session-manager wai warp + ]; + description = "HTTP over TLS support for Warp via the TLS package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, data-default, network , streaming-commons, tls, unix, wai, warp, warp-tls, x509 @@ -264398,8 +266401,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.2.2"; - sha256 = "0cbf46d1a55y7j2d84crhfdsgy0c2x0rfmvhhwxxh5pigg846cd2"; + version = "0.1.2.3"; + sha256 = "1xk6f3z7pcn5bmr2259yvv9l9wbfyycb7990dffz4b802ahxf1xv"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -264486,18 +266489,17 @@ self: { "web-push" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , cryptonite, exceptions, hspec, http-client, http-types, jose - , memory, mtl, random, text, time, transformers - , unordered-containers + , cryptonite, hspec, http-client, http-types, lens, memory, random + , safe-exceptions, text, time, transformers }: mkDerivation { pname = "web-push"; - version = "0.1.2.0"; - sha256 = "1c9l6fl8fpz4jd9p1m8w42hknnklak8j4gjakcm4qdbw86c4w3kk"; + version = "0.3"; + sha256 = "1l03apm5l0a8p8ir418jzfvgsbrpzbh8ks6rbgjxkyz2wj0if2mi"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring cryptonite - exceptions http-client http-types jose memory mtl random text time - transformers unordered-containers + http-client http-types lens memory random safe-exceptions text time + transformers ]; testHaskellDepends = [ base base64-bytestring binary bytestring hspec @@ -265494,18 +267496,18 @@ self: { "weeder" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, containers , dhall, directory, filepath, generic-lens, ghc, lens, mtl - , optparse-applicative, regex-tdfa, transformers + , optparse-applicative, regex-tdfa, text, transformers }: mkDerivation { pname = "weeder"; - version = "2.0.1"; - sha256 = "1x5hgyp3zcwz63wcwh8bqalckcb7baakj39zwymifirxvhkws1xz"; + version = "2.1.0"; + sha256 = "0pplr61bf9b6s5wgji8s5dwpp69164zhh6skpsminf6fcpvwqwcl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs base bytestring containers dhall directory filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa - transformers + text transformers ]; executableHaskellDepends = [ base bytestring containers directory filepath ghc @@ -265523,8 +267525,8 @@ self: { }: mkDerivation { pname = "weekdaze"; - version = "0.0.0.1"; - sha256 = "13nxi6gqm4by2y6wd3vwj0rqjircpfng0nz5h2spci2jrbmv52d3"; + version = "0.0.0.2"; + sha256 = "17i8pq4xfc6mxdphc7xiiwlnqw3m70sh7d3pjnql33m1083kbkxb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -265940,8 +267942,8 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.2.5"; - sha256 = "14k1y5klxjvkdh0r041sd6a3jzmylb718azfmz45403lrnh96nq9"; + version = "0.1.2.6"; + sha256 = "1sfwz7qwlfhvdkw8f0xmywi7m3b3yd7p5hlrjndlqs8h2k8c7809"; libraryHaskellDepends = [ base containers semigroups text transformers ]; @@ -265994,8 +267996,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.9"; - sha256 = "1x3qqnampyxi6bg6279xsw38324fs5gndy1mylp6dndlcf6pw30z"; + version = "0.2.0.10"; + sha256 = "0wq6jhaq2mh476mwjqc6ianqvvrywlvrkcwh7acdxznz2djkgjm5"; libraryHaskellDepends = [ base containers fold-debounce mtl semigroups stm text transformers wild-bind X11 @@ -267116,8 +269118,8 @@ self: { }: mkDerivation { pname = "world-peace"; - version = "1.0.1.0"; - sha256 = "1fx7y9h1yyjc5xn1mpbkwas6p6h06rivzndb545z1qnnp583vzwp"; + version = "1.0.2.0"; + sha256 = "05r4ils0imcv31sx6h82mwcwcrasrfs6kkip3frdsbf0aizgzcdb"; libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; testHaskellDepends = [ base doctest Glob should-not-typecheck tasty tasty-hunit text @@ -267714,6 +269716,8 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wstunnel" = callPackage @@ -269744,16 +271748,16 @@ self: { "xmobar" = callPackage ({ mkDerivation, alsa-core, alsa-mixer, async, base, bytestring , containers, dbus, directory, extensible-exceptions, filepath - , hinotify, hspec, http-client-tls, http-conduit, http-types, iwlib - , libmpd, libXpm, libXrandr, libXrender, mtl, old-locale, parsec - , parsec-numbers, process, regex-compat, stm, temporary, time - , timezone-olson, timezone-series, transformers, unix, utf8-string - , wirelesstools, X11, X11-xft + , gauge, hinotify, hspec, http-client-tls, http-conduit, http-types + , iwlib, libmpd, libXpm, libXrandr, libXrender, mtl, old-locale + , parsec, parsec-numbers, process, regex-compat, stm, temporary + , time, timezone-olson, timezone-series, transformers, unix + , utf8-string, wirelesstools, X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.34"; - sha256 = "0x09xbz7y9ay0046j1xpr9jjk5jqivqi06vm3q6mhcrgc4y922rx"; + version = "0.35.1"; + sha256 = "1fizszhij2if9wxwzi728l93j9p5y9kfqnwnxk6nl66g64rsbp5x"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -269780,6 +271784,7 @@ self: { filepath hspec mtl old-locale parsec parsec-numbers process regex-compat stm temporary time transformers unix X11 ]; + benchmarkHaskellDepends = [ base gauge mtl ]; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; @@ -270084,6 +272089,8 @@ self: { ]; description = "Efficient XOR masking"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xorshift" = callPackage @@ -270250,43 +272257,45 @@ self: { ({ mkDerivation, aeson, aeson-options, async, base, bytestring , cmark-gfm, containers, data-default, deepseq, directory , directory-tree, filepath, fmt, Glob, hspec, hspec-discover - , http-client, http-types, lens, mtl, o-clock, optparse-applicative - , pretty-terminal, QuickCheck, req, roman-numerals - , template-haskell, text, text-metrics, th-lift-instances - , th-utilities, universum, with-utf8, yaml + , http-client, http-types, lens, modern-uri, mtl, o-clock + , optparse-applicative, pretty-terminal, QuickCheck, req + , roman-numerals, template-haskell, text, text-metrics + , th-lift-instances, th-utilities, universum, with-utf8, yaml }: mkDerivation { pname = "xrefcheck"; - version = "0.1.1.2"; - sha256 = "177pxga1jylm5kgnx0bj6sf2vsspgy24inpx7sk49hf297fnykll"; + version = "0.1.2"; + sha256 = "0m3cya6rfx7ypq4sp172z9fnnl6n11v98f6bj003phrapl6s0vnn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-options async base bytestring cmark-gfm containers data-default deepseq directory directory-tree filepath fmt Glob - http-client http-types lens mtl o-clock optparse-applicative - pretty-terminal req roman-numerals template-haskell text - text-metrics th-lift-instances th-utilities universum with-utf8 - yaml + http-client http-types lens modern-uri mtl o-clock + optparse-applicative pretty-terminal req roman-numerals + template-haskell text text-metrics th-lift-instances th-utilities + universum with-utf8 yaml ]; executableHaskellDepends = [ aeson aeson-options async base bytestring cmark-gfm containers data-default deepseq directory directory-tree filepath fmt Glob - http-client http-types lens mtl o-clock optparse-applicative - pretty-terminal req roman-numerals template-haskell text - text-metrics th-lift-instances th-utilities universum with-utf8 - yaml + http-client http-types lens modern-uri mtl o-clock + optparse-applicative pretty-terminal req roman-numerals + template-haskell text text-metrics th-lift-instances th-utilities + universum with-utf8 yaml ]; testHaskellDepends = [ aeson aeson-options async base bytestring cmark-gfm containers data-default deepseq directory directory-tree filepath fmt Glob - hspec http-client http-types lens mtl o-clock optparse-applicative - pretty-terminal QuickCheck req roman-numerals template-haskell text - text-metrics th-lift-instances th-utilities universum with-utf8 - yaml + hspec http-client http-types lens modern-uri mtl o-clock + optparse-applicative pretty-terminal QuickCheck req roman-numerals + template-haskell text text-metrics th-lift-instances th-utilities + universum with-utf8 yaml ]; testToolDepends = [ hspec-discover ]; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xsact" = callPackage @@ -271323,6 +273332,29 @@ self: { broken = true; }) {}; + "yapb" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , directory, hashable, json, network, pretty, prettyprinter + , process, regex-tdfa + }: + mkDerivation { + pname = "yapb"; + version = "0.1.0"; + sha256 = "184jrkyijlp644r4zgvicy9xlrx29xmbn7jszpwp3jk5yfavm5w2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory hashable process regex-tdfa + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers json network pretty + prettyprinter regex-tdfa + ]; + testHaskellDepends = [ base ]; + description = "Yet Another Parser Builder (YAPB)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yarn-lock" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, either , megaparsec, neat-interpolation, protolude, quickcheck-instances @@ -271497,6 +273529,8 @@ self: { ]; description = "Test suites for `yaya`"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaya-unsafe" = callPackage @@ -271528,6 +273562,8 @@ self: { ]; description = "Test suites for `yaya-unsafe`"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ycextra" = callPackage @@ -271761,8 +273797,8 @@ self: { }: mkDerivation { pname = "yesod"; - version = "1.6.0.1"; - sha256 = "113qm6x4q2s08l5423j1ksc3bdlbf9pxj4y9p8nf36gbz6dy6xqh"; + version = "1.6.0.2"; + sha256 = "0dkaa7kzhdnqryfn8sbcbw5i1plkfckz1664gb1734fqadia32gq"; libraryHaskellDepends = [ aeson base bytestring conduit data-default-class directory fast-logger monad-logger semigroups shakespeare streaming-commons @@ -272282,6 +274318,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_6_0_5" = callPackage + ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, http-client, http-client-tls, http-reverse-proxy + , http-types, network, optparse-applicative, process + , project-template, say, split, stm, streaming-commons, tar, text + , time, transformers, transformers-compat, unliftio + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.0.5"; + sha256 = "06klixw5qi12bxpll1bvyc5lngpkzd48qvq4r3v4vlppninsj2cd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal conduit conduit-extra containers + data-default-class directory file-embed filepath fsnotify + http-client http-client-tls http-reverse-proxy http-types network + optparse-applicative process project-template say split stm + streaming-commons tar text time transformers transformers-compat + unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib + ]; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -272443,6 +274507,8 @@ self: { pname = "yesod-core"; version = "1.6.18"; sha256 = "1hm0frswqcj34scvapszdryjfmnrqq5fhf5hv7qcz8sj3qf46zkd"; + revision = "1"; + editedCabalFile = "14n8l28k6gykym9b3m9kw2j1m8dmiajxqgydpnrr7v75a64xqas9"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -273740,8 +275806,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.9.1"; - sha256 = "01dr3p51nxxj8ihhivi3sdrg1xhjj7pvkzgz59ph823hhh9yd3cx"; + version = "1.6.10"; + sha256 = "0vw6yg5b22a6flbl822z23k0l23as5mmxjcdnj2zgjjv5i713yfx"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -275122,8 +277188,8 @@ self: { }: mkDerivation { pname = "zephyr"; - version = "0.3.1"; - sha256 = "1bzairza82vp7yydw5f4am0nsc1pldqrz6j4fz1c4lmrp045a87h"; + version = "0.3.2"; + sha256 = "0p0n4p4792jdivgqdwf2brbkrw6b5rxfzfq9ph0sjw7h3gkj1was"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275399,6 +277465,8 @@ self: { testHaskellDepends = [ base ]; description = "Command-line utility for working with zettelkast files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter" = callPackage @@ -275745,8 +277813,8 @@ self: { }: mkDerivation { pname = "zipper-extra"; - version = "0.1.2.0"; - sha256 = "1734kq6q64ilvxdssjgzyhgm8wpdwbwn59n5v23z40jvqwzy1c62"; + version = "0.1.3.0"; + sha256 = "069mbsqcb1z238awj934xiqcz2s0pf58mfq1cjr8wg1k7b2wvy0k"; libraryHaskellDepends = [ base comonad comonad-extras exceptions split ]; @@ -276235,8 +278303,8 @@ self: { pname = "ztail"; version = "1.2.0.2"; sha256 = "05vpq3kiv1xrby2k1qn41s42cxxxblcgxpnw1sgyznx63pal2hx1"; - revision = "1"; - editedCabalFile = "0d0cpgb0v849zxl12c2gkm3x4nmyfycka1pcfix43lawx62rky8s"; + revision = "2"; + editedCabalFile = "16w0hgjvj45azdgkzvykiznds5sa38mq9xf5022r7qfhpvps65y0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index 9a2ff6f4a2..9b9b61e6c0 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -16,4 +16,9 @@ self: super: { # spago is not released to Hackage. # https://github.com/spacchetti/spago/issues/512 spago = self.callPackage ../tools/purescript/spago/spago.nix { }; + + # HLS and its fork of ghcide that it uses + # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh + haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; + hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix index c848ebc604..cfd3bbbda4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { sha256 = "1fslfj5d7fhj3f7kh558b8mk5wllwyq4rnhfkyd96fpy144sdcka"; }; + postPatch = '' + substituteInPlace setup.ml --replace js_of_ocaml.ocamlbuild js_of_ocaml-ocamlbuild + ''; + buildInputs = [ which ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild ]); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.10.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.10.nix index d63a94d98d..04f4b5af24 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.10.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.10.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.10.3"; - sha256 = "18bqqqzvhr1zj491wc3d36a310mg1wcs12npp70zfmgqrc60q65a"; + version = "1.10.4"; + sha256 = "16j4rmm3ix088fvxhvyjqf1hnfg7wiwa87gml3b2mrwirdycbinv"; minimumOTPVersion = "21"; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix new file mode 100644 index 0000000000..6928c978fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix @@ -0,0 +1,13 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz +mkDerivation { + version = "23.0.2"; + sha256 = "19ly2m0rjay6071r75s9870cm3sph25zd1mvy67l5v4jg7mxdjzy"; + + prePatch = '' + substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" + substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index f80e1f344f..af944e6fd1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -3,6 +3,7 @@ , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +, parallelBuild ? false , withSystemd ? stdenv.isLinux, systemd # systemd support in epmd }: @@ -60,7 +61,7 @@ in stdenv.mkDerivation ({ debugInfo = enableDebugInfo; # On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step - enableParallelBuilding = false; + enableParallelBuilding = parallelBuild; # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index 4430298beb..5d3d3de85d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} + wrapProgram $out/bin/evcxr_jupyter --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} rm $out/bin/testing_runtime ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index 32312401f9..52d0b37191 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "0kx3c4v0481b4xx239w10ajwp8ngq8smxzh3m77dazd89r997n1g"; + sha256 = "18k6dzxzr149p0bby4r0z6kybylig87rwj7gk3z6a98zf6k4xmsw"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix index 823ab6d109..efe670f976 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.15.4"; + version = "0.15.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1ad6cdqadd1zs9zh85zyhdiiv6ir28k28w034vzsx5zaipvy4kml"; + sha256 = "0v4mamd5zkw7r9gfl4rzy4mr1d7ni9klryd93izqssgps954bikz"; }; vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix index 79cb1c7154..6ce5eb905f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.11.1"; + version = "9.2.12.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "1p4ml5rqidqllc7z85zn2q4pyyih71j0gb71wl43j4v74p44j17i"; + sha256 = "013c1q1n525y9ghp369z1jayivm9bw8c1x0g5lz7479hqhj62zrh"; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix index b56824c772..6e11b02611 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -8,7 +8,7 @@ let { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 - , systemd, valgrind + , systemd, valgrind, xcbuild , version , sha256 @@ -143,7 +143,8 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ] + ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = # PCRE extension @@ -177,7 +178,10 @@ let ++ lib.optional (!cliSupport) "--disable-cli" ++ lib.optional fpmSupport "--enable-fpm" ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] - ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" + ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ + "--enable-libxml" + "--with-libxml-dir=${libxml2.dev}" + ] ++ lib.optional pharSupport "--enable-phar" ++ lib.optional phpdbgSupport "--enable-phpdbg" @@ -264,24 +268,24 @@ let }; php72base = callPackage generic (_args // { - version = "7.2.29"; - sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; + version = "7.2.32"; + sha256 = "19wqbpvsd6c6iaad00h0m0xnx4r8fj56pwfhki2cw5xdfi10lp3i"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }); php73base = callPackage generic (_args // { - version = "7.3.16"; - sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; + version = "7.3.20"; + sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }); php74base = callPackage generic (_args // { - version = "7.4.6"; - sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6"; + version = "7.4.8"; + sha256 = "0ql01sfg8l7y2bfwmnjxnfw9irpibnz57ssck24b00y00nkd6j3a"; }); defaultPhpExtensions = { all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/zlib-darwin-tests.patch b/third_party/nixpkgs/pkgs/development/interpreters/php/zlib-darwin-tests.patch new file mode 100644 index 0000000000..ef61f0a878 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/zlib-darwin-tests.patch @@ -0,0 +1,44 @@ +diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt +index a0d22f4fcebf4846da6781f424f87821626de5ea..e650fe6909f555d04834f4c08f7fd0d354b783e2 100644 +--- a/ext/zlib/tests/bug55544.phpt ++++ b/ext/zlib/tests/bug55544.phpt +@@ -6,6 +6,9 @@ extension_loaded("zlib") or die("skip"); + if (substr(PHP_OS, 0, 3) == 'WIN') { + die("skip not for windows"); + } ++if (PHP_OS == "Darwin") { ++ die("skip not for darwin"); ++} + ?> + --INI-- + output_handler=ob_gzhandler +diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt +index c966b2cbc5b7..2f953168fa22 100644 +--- a/ext/zlib/tests/gzencode_variation1.phpt ++++ b/ext/zlib/tests/gzencode_variation1.phpt +@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) { + if (!extension_loaded("zlib")) { + print "skip - ZLIB extension not loaded"; + } ++ ++if (PHP_OS == "Darwin") { ++ print "skip - OS is encoded in headers, tested header is non Darwin"; ++} + ?> + --FILE-- + + --FILE-- + +Date: Thu, 25 Jul 2019 10:25:55 -0700 +Subject: [PATCH] On all posix systems, not just Darwin, set LDSHARED (if not + set) according to CC + +This patch is slightly different from https://bugs.python.org/issue24935 +, except that we now handle LDSHARED according to CC on all posix +systems, not just Darwin or Linux. +--- + Lib/distutils/sysconfig.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 37feae5df7..9fdce6896d 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -199,10 +199,10 @@ def customize_compiler(compiler): + + if 'CC' in os.environ: + newcc = os.environ['CC'] +- if (sys.platform == 'darwin' ++ if (os.name == 'posix' + and 'LDSHARED' not in os.environ + and ldshared.startswith(cc)): +- # On OS X, if CC is overridden, use that as the default ++ # On POSIX systems, if CC is overridden, use that as the default + # command for LDSHARED as well + ldshared = newcc + ldshared[len(cc):] + cc = newcc +-- +2.25.1 + diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 694f661a96..e6c8b301c0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -140,6 +140,9 @@ in with passthru; stdenv.mkDerivation { sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; } ) + ] ++ [ + # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules. + ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index 4eefe22d3f..770739b36b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -11,7 +11,9 @@ pipInstallPhase() { export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" pushd dist || return 1 - @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags --build tmpbuild + mkdir tmpbuild + NIX_PIP_INSTALL_TMPDIR=tmpbuild @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags + rm -rf tmpbuild popd || return 1 runHook postInstall diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix index 2833a4d567..4ad5bc14c3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.05.1"; + version = "2020.06"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1m4xpghhgi7iijbzvr7bzkay7k93bwpvdg58jp31csrwdzz4q5z1"; + sha256 = "06kj8vfkkspmcdyd3zf2pyxwmijbbfnhv3jcaihvb8p3za5gxn2c"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix index a7b57c9287..1cee0eaef6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.05"; + version = "2020.06"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "0jw29846nky7gz129knjcx58qr7nbn8j7hs8k92i11zaj73d4s4k"; + sha256 = "1hlxm5p1n9fclma2z9kynkxrknsxdihzkbsb3wxnvjvndzqmk5yv"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix index 40133287f9..15f0e0f9f5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.05"; + version = "2020.06"; src = fetchurl { url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0xxm0vlra1g467cxc5v65p8pc46w7r9wkcddjl8nk2lnvgcr46r9"; + sha256 = "13wkhdxxs86wl6ahfzhyp45dy6hk6qnij3dm8d8893b2rxs377m4"; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 5c8fe16408..c820534469 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "02a3awnjr1mgb9275xvp3xms80vcxkq55ffi8sbjzxpwyadj5y5k"; + sha256 = "17a5ns0ph8626q3b4wv9v2n0zqmhqbqyzjzxa387kr19qs933yy6"; }; buildInputs = [ rakudo makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix index 7100a730a6..36d28f62e2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix @@ -7,11 +7,11 @@ let python3Env = buildPackages.python3.withPackages (p: [p.six]); in stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "68.7.0"; + version = "68.10.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "0w3mad0r4khcd7hfmm3xix9x6mp5yp8g8kyh18vanfnjqdls0gmd"; + sha256 = "0azdinwqjfv2q37gqpxmfvzsk86pvsi6cjaq1310zs26gric5j1f"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 5e8cba94e1..120d1c29f3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "bytecodealliance"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "149nav392wf4sr50dpdlnvfq3vfrrl9lqgr98g5dyzfjrf5jbzm3"; + cargoSha256 = "0r92jafxbji2sgc5a4syycsk705zcx4wqfwgg73sx568mfxkw225"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ diff --git a/third_party/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix b/third_party/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix new file mode 100644 index 0000000000..2eb3096312 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + version = "2.2.0"; + pname = "LASzip"; + + src = fetchurl { + url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; + sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; + homepage = "https://laszip.org"; + license = licenses.lgpl2; + maintainers = [ maintainers.michelk ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/LASzip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/LASzip/default.nix index fb747dc9f3..0300aa37f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/LASzip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/LASzip/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "2.2.0"; + version = "3.4.3"; pname = "LASzip"; - src = fetchurl { - url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; - sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2"; + src = fetchFromGitHub { + owner = "LASzip"; + repo = "LASzip"; + rev = version; + sha256 = "09lcsgxwv0jq50fhsgfhx0npbf1zcwn3hbnq6q78fshqksbxmz7m"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ + cmake + ]; meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 5f3d42b4da..31624bee2f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -42,9 +42,14 @@ stdenv.mkDerivation rec { substituteInPlace include/SDL_opengl_glext.h \ --replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \ --replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;" + + substituteInPlace configure \ + --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`' ''; - nativeBuildInputs = [ pkgconfig ]; + depsBuildBuild = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig ] ++ optionals waylandSupport [ wayland ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; diff --git a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix index 2f468c7f4c..db5284e912 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl, gnum4 }: -let - version = "1.5.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "adns"; - inherit version; + version = "1.6.0"; src = fetchurl { urls = [ @@ -13,25 +10,38 @@ stdenv.mkDerivation { "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; - sha256 = "1ssfh94ck6kn98nf2yy6743srpgqgd167va5ja3bwx42igqjc42v"; + sha256 = "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv"; }; + nativeBuildInputs = [ gnum4 ]; + preConfigure = - stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; + lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details. doCheck = false; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libadns.so.1.5 $out/lib/libadns.so.1.5 + postInstall = let suffix = lib.versions.majorMinor version; + in lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libadns.so.${suffix} $out/lib/libadns.so.${suffix} ''; - meta = { + # darwin executables fail, but I don't want to fail the 100-500 packages depending on this lib + doInstallCheck = !stdenv.isDarwin; + installCheckPhase = '' + set -eo pipefail + + for prog in $out/bin/*; do + $prog --help > /dev/null && echo $(basename $prog) shows usage + done + ''; + + meta = with lib; { homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; description = "Asynchronous DNS Resolver Library"; - license = stdenv.lib.licenses.lgpl2; + license = licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = platforms.unix; + maintainers = [ maintainers.peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix index 7165172626..030ff73f97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix @@ -3,23 +3,24 @@ }: stdenv.mkDerivation rec { - version = "3.7.18"; + version = "3.7.19"; pname = "afflib"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; rev = "v${version}"; - sha256 = "0963gw316p4nyxa9zxmgif29p8i99k898av2g78g28dxafqj3w8c"; + sha256 = "1qs843yi33yqbp0scqirn753lxzg762rz6xy2h3f8f77fijqj2qb"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib curl expat fuse openssl python3 ]; + buildInputs = [ zlib curl expat openssl python3 ] + ++ stdenv.lib.optionals stdenv.isLinux [ fuse ]; meta = { homepage = "http://afflib.sourceforge.net/"; description = "Advanced forensic format library"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.raskin ]; inherit version; diff --git a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix index 0c3ba0abaa..1157142e5b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.7.12"; + version = "1.7.13"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "0a9icrv6pwh2b73lywq1aj7i19pmzpg59iy3ngal8vq4zdciylqc"; + sha256 = "01j4fsq917jckdh16nvmc35xiy11j4g1sc17y6g8qxa00s2sfsa4"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix new file mode 100644 index 0000000000..893f09809d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -0,0 +1,85 @@ +{ stdenv +, lib +, fetchpatch +, fetchRepoProject +, cmake +, ninja +, patchelf +, perl +, pkgconfig +, python3 +, expat +, libdrm +, ncurses +, openssl +, wayland +, xorg +, zlib +}: + +stdenv.mkDerivation rec { + pname = "amdvlk"; + version = "2020.Q2.6"; + + src = fetchRepoProject { + name = "${pname}-src"; + manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; + rev = "refs/tags/v-${version}"; + sha256 = "1h5j4qaqm4kg5jybkkk6v1mdy0jx0k06mrb8n8jl415z08f0pjgj"; + }; + + buildInputs = [ + expat + ncurses + openssl + wayland + xorg.libX11 + xorg.libxcb + xorg.xcbproto + xorg.libXext + xorg.libXrandr + xorg.libXft + xorg.libxshmfence + zlib + ]; + + nativeBuildInputs = [ + cmake + ninja + patchelf + perl + pkgconfig + python3 + ]; + + rpath = lib.makeLibraryPath [ + libdrm + stdenv.cc.cc.lib + xorg.libX11 + xorg.libxcb + xorg.libxshmfence + ]; + + cmakeDir = "../drivers/xgl"; + + installPhase = '' + install -Dm755 -t $out/lib icd/amdvlk64.so + install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd64.json + + substituteInPlace $out/share/vulkan/icd.d/amd_icd64.json --replace \ + "/usr/lib64" "$out/lib" + + patchelf --set-rpath "$rpath" $out/lib/amdvlk64.so + ''; + + # Keep the rpath, otherwise vulkaninfo and vkcube segfault + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "AMD Open Source Driver For Vulkan"; + homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index c09fb8d91e..8490541546 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.15.13"; + version = "5.16.0"; src = fetchurl { - sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96"; + sha256 = "0x68l4n0v2jqmbawdgpghmhnchpg1jsvxzskj6s4hjll6hdgb6fk"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix index 6544c48118..f961c577aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://www.lysator.liu.se/~nisse/misc/"; description = "Standalone version of arguments parsing functions from GLIBC"; - platforms = with platforms; darwin ++ [ "x86_64-linux" ]; + platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ amar1729 ]; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index b559ef96f4..d9bf6752da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -42,6 +42,13 @@ in stdenv.mkDerivation rec { sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y"; stripLen = 1; }) + + # fix build for "ZSTD_SOURCE=SYSTEM" + (fetchpatch { + url = "https://github.com/apache/arrow/commit/13cb3dbded1928d2e96574895bebaf9098a4796d.diff"; + sha256 = "12z3ys47qp2x8f63lggiyj4xs2kmg804ri4xqysw5krbjz2hr6rb"; + stripLen = 1; + }) ] ++ lib.optionals (!enableShared) [ # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. ./jemalloc-disable-shared.patch @@ -89,6 +96,7 @@ in stdenv.mkDerivation rec { "-DARROW_WITH_SNAPPY=ON" "-DARROW_WITH_ZLIB=ON" "-DARROW_WITH_ZSTD=ON" + "-DARROW_ZSTD_USE_SHARED=OFF" # TODO use shared zstd once #91984 hits the master # Parquet options: "-DARROW_PARQUET=ON" "-DPARQUET_BUILD_EXECUTABLES=ON" diff --git a/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix index 4c7e5321f5..3f36b87af7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages -, expat, gettext, intltool, glib, libiconv +, expat, gettext, intltool, glib, libiconv, writeShellScriptBin , gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false @@ -9,6 +9,11 @@ assert qt4Support -> qt4 != null; +let + # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it + pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; +in + stdenv.mkDerivation rec { name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}"; version = "0.7"; @@ -18,6 +23,11 @@ stdenv.mkDerivation rec { sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; + prePatch = '' + substituteInPlace configure \ + --replace pkg-config "$PKG_CONFIG" + ''; + patches = [ ./no-mkdir-localstatedir.patch (fetchpatch { @@ -35,7 +45,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); - nativeBuildInputs = [ pkgconfig gettext intltool glib ]; + nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 22578dad38..d99ee57ef9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.3.1"; + version = "4.4.0"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1y91jcrma4kjqpm6w5ahlygjsyvx7l8zjrjvq7g2n39jmw175cvs"; + sha256 = "1r3ymwk10ry6mz4zd08q7l5msq7h15931l7f0clw2siqs8r81x7c"; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index 2eb5a2dfcf..d54539d9f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "14fqp6r9rf7z6j5phbsrdxlbjak03hs8kb94b6jgcrcdxrxhy3fy"; + sha256 = "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6"; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/c-blosc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/c-blosc/default.nix index 85905778e8..e6a25ea6d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/c-blosc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70"; + sha256 = "03z0wybw7w5yvakn1dzfmn8vz586hbqy2mq1vz1zg15md4x6zvbx"; }; buildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix index 9020ccf08b..ad2517f258 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "0hfdnhlbskagzgvby8wy6lrxj53zfzpfqimbhga68c0ji2yw1969"; + sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cgui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cgui/default.nix index 39ed74d007..d6c550a8da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cgui/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "A multiplatform basic GUI library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.free; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/check/default.nix b/third_party/nixpkgs/pkgs/development/libraries/check/default.nix index 0a51e7e592..e98fa465e0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/check/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "check"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; - sha256 = "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx"; + sha256 = "0q5cs6rqbq8a1m9ij3dxnsjcs31mvg0b2i77g0iykqd6iz3f78mf"; }; # Test can randomly fail: https://hydra.nixos.org/build/7243912 diff --git a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix index 9da5a80f62..4702d67a01 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, ffmpeg_3 }: +{ stdenv, fetchurl, cmake, boost, ffmpeg }: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg_3 ]; + buildInputs = [ boost ffmpeg ]; cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix index aaf4099810..eaddcb86f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/f4exb/cm256cc"; platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; + license = licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/console-bridge/default.nix b/third_party/nixpkgs/pkgs/development/libraries/console-bridge/default.nix new file mode 100644 index 0000000000..e2370ecce6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/console-bridge/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake, validatePkgConfig }: + +stdenv.mkDerivation rec { + pname = "console-bridge"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "ros"; + repo = "console_bridge"; + rev = version; + sha256 = "18qycrjnf7v8n5bipij91jsv7ap98z5dsp93w2gz9rah4lfjb80q"; + }; + + nativeBuildInputs = [ cmake validatePkgConfig ]; + + meta = with lib; { + description = "A ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages"; + homepage = "https://github.com/ros/console_bridge"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix index 01da4753b0..47ec7a1a6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "cpp-hocon"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { - sha256 = "1c8zy4hi0182k0vfx5l8bjq1iv7lvvw1zi4vy3429s898rx7z3d3"; + sha256 = "0b24anpwkmvbsn5klnr58vxksw00ci9pjhwzx7a61kplyhsaiydw"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = " A C++ port of the Typesafe Config library"; + description = "A C++ port of the Typesafe Config library"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 4b2520d714..88d2f59f56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "18sy1jrz5adzy7c8k42kqlpicc4h0igimjqwaa6m9swwkhwiqqjz"; + sha256 = "1kzwclf8l89dbw10ya0grhdj7dspmj7rg7rkaa8b7n5lgla968jr"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix index 6b42af05c1..a9929ea2ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [libxml2 openssl bzip2]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Peer-to-Peer file sharing client"; + homepage = "http://dcgui.berlios.de"; + platforms = platforms.linux; + license = [ licenses.openssl licenses.gpl2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix index f3ed36db31..5a25610568 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65"; + sha256 = "1yi95saqv8qb3ix6w8d7ffvs7qbwvqmq6wblckhxhicxxdxk85cd"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix index aed7dc59bc..9ebdeda781 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4"; + sha256 = "0wm7vkapjg8hdjm6bi48hwsf4w4ppgn3r655gqms5ssjxm50m15d"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sqlite-replication ]; - # tests hang for ever on x86_64-linux + # tests fail doCheck = false; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix index 1a6d67ba80..7040ad0f45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix @@ -1,44 +1,24 @@ -{stdenv, fetchurl +{stdenv, fetchFromGitHub, autoreconfHook , drmSupport ? false # Digital Radio Mondiale }: with stdenv.lib; stdenv.mkDerivation rec { pname = "faad2"; - version = "2.8.8"; + version = "2.9.2"; - src = fetchurl { - url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; - sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; + src = fetchFromGitHub { + owner = "knik0"; + repo = "faad2"; + rev = builtins.replaceStrings [ "." ] [ "_" ] version; + sha256 = "0rdi6bmyryhkwf4mpprrsp78m6lv1nppav2f0lf1ywifm92ng59c"; }; - patches = let - fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl { - url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}" - + "/debian/patches/${pname}.patch?inline=false"; - inherit name sha256; - }; - in [ - (fp { - # critical bug addressed in vlc 3.0.7 (but we use system-provided faad) - pname = "0004-Fix-a-couple-buffer-overflows"; - sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq"; - }) - (fp { - name = "CVE-2018-20362.patch"; - pname = "0009-syntax.c-check-for-syntax-element-inconsistencies"; - sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81"; - }) - (fp { - name = "CVE-2018-20194.patch"; - pname = "0010-sbr_hfadj-sanitize-frequency-band-borders"; - sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4"; - }) - ]; - configureFlags = [] ++ optional drmSupport "--with-drm"; + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = "https://www.audiocoding.com/faad2.html"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/farstream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/farstream/default.nix index 763caa811e..0ce0f56d71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/farstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/farstream/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch"; sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn"; }) + # Fix build with newer gnumake. + (fetchpatch { + url = "https://gitlab.freedesktop.org/farstream/farstream/-/commit/54987d44.diff"; + sha256 = "02pka68p2j1wg7768rq7afa5wl9xv82wp86q7izrmwwnxdmz4zyg"; + }) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix index 7bc0790f04..d139aca92b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -3,14 +3,14 @@ #TODO: tests stdenv.mkDerivation rec { - pname = "faudio"; - version = "20.06"; + pname = "faudio"; + version = "20.07"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "1dyx9l7ldhlbb77ca3wk0l218589blvh78mdfyzpk9k1izk2yih1"; + sha256 = "14fi0jwax9qzn2k89qazdkhxvklk5zcwhbi6pxi1l5i9zk4ly2h7"; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix new file mode 100644 index 0000000000..15f2f42af3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchgit, pkg-config, meson, ninja, freetype, fontconfig, pixman, tllist }: + +stdenv.mkDerivation rec { + pname = "fcft"; + version = "0.4.3"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/fcft.git"; + rev = "${version}"; + sha256 = "1r2k5726k6ps8ml2s1vqmpiggqxzq9pbzs7m0dsxk29mh8vg0psj"; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ freetype fontconfig pixman tllist ]; + + meta = with lib; { + homepage = "https://codeberg.org/dnkl/fcft"; + description = "Simple library for font loading and glyph rasterization"; + maintainers = with maintainers; [ fionera ]; + license = licenses.mit; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 95be159b2e..1cbcc5471e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -118,6 +118,7 @@ #, shine ? null # Fixed-point MP3 encoder , soxr ? null # Resampling via soxr , speex ? null # Speex de/encoder +, srt ? null # Secure Reliable Transport (SRT) protocol #, twolame ? null # MP2 encoder #, utvideo ? null # Ut Video de/encoder , vid-stab ? null # Video stabilization @@ -242,8 +243,6 @@ stdenv.mkDerivation rec { pname = "ffmpeg-full"; inherit (ffmpeg) src version; - patches = [ ./prefer-libdav1d-over-libaom.patch ]; - prePatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' @@ -357,6 +356,7 @@ stdenv.mkDerivation rec { #(enableFeature (libnut != null) "libnut") (enableFeature (libopus != null) "libopus") (enableFeature (librsvg != null) "librsvg") + (enableFeature (srt != null) "libsrt") (enableFeature (libssh != null) "libssh") (enableFeature (libtheora != null) "libtheora") (enableFeature (if isLinux then libv4l != null else false) "libv4l2") @@ -420,7 +420,7 @@ stdenv.mkDerivation rec { libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr - samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore + samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch deleted file mode 100644 index 789bfc2674..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c -index d2f9a39ce5..2342399a8e 100644 ---- a/libavcodec/allcodecs.c -+++ b/libavcodec/allcodecs.c -@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder; - extern AVCodec ff_pcm_mulaw_at_decoder; - extern AVCodec ff_qdmc_at_decoder; - extern AVCodec ff_qdm2_at_decoder; -+extern AVCodec ff_libdav1d_decoder; - extern AVCodec ff_libaom_av1_decoder; - extern AVCodec ff_libaom_av1_encoder; - extern AVCodec ff_libaribb24_decoder; - extern AVCodec ff_libcelt_decoder; - extern AVCodec ff_libcodec2_encoder; - extern AVCodec ff_libcodec2_decoder; --extern AVCodec ff_libdav1d_decoder; - extern AVCodec ff_libdavs2_decoder; - extern AVCodec ff_libfdk_aac_encoder; - extern AVCodec ff_libfdk_aac_decoder; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix index 5d1f93a9e0..309cd2b3b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (rec { - version = "${branch}.16"; + version = "${branch}.17"; branch = "2.8"; - sha256 = "0lfmfd6rhywis9rblkxv33rpwfga9xv261fq4cn3pkx1izih7ybk"; + sha256 = "05bnhvs2f82aq95z1wd3wr42sljdfq4kiyzqwhpji983mndx14vl"; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix index 6c16b55dfe..629fdba567 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (rec { version = branch; - branch = "3.4.7"; - sha256 = "0hj91gjps92f4w3yyqss89yrs6s75574hbj5gz9g5affd6294yhc"; + branch = "3.4.8"; + sha256 = "1d0r4yja2dkkyhdwx1migq46gsrcbajiv66263a5sq5bfr9dqkch"; darwinFrameworks = [ Cocoa CoreMedia ]; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 1a7c619a12..7e3941d3f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.2.3"; - branch = "4.2"; - sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1"; + version = "4.3.1"; + branch = "4.3"; + sha256 = "1nghcpm2r9ir2h6xpqfn9381jq6aiwlkwlnyplxywvkbjiisr97l"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index cafbe116b1..e2734c6b19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "0r9dbg4cbk47gwmayys31a83m3y67k0kh1f6pl8i869rbd609ndh"; + sha256 = "16xlk8h4mfszl4rig22fgpj9kw312az22981ph6pmkf35xsvvv66"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix index 745c96f579..a4b5752e88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -1,29 +1,39 @@ -{ stdenv, fetchurl, cmake, vtk_7, darwin }: +{ stdenv, fetchurl, cmake, vtk_7, darwin +, enablePython ? false, python ? null, swig ? null}: stdenv.mkDerivation rec { - version = "3.0.6"; + version = "3.0.7"; pname = "gdcm"; src = fetchurl { url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2"; - sha256 = "048ycvhk143cvsf09r7vwmp4sm9ah9bh5pbbrl366m5a4sp7fr89"; + sha256 = "1mm1190fv059k2vrilh3znm8z1ilygwld1iazdgh5s04mi1qljni"; }; dontUseCmakeBuildDir = true; + + cmakeFlags = [ + "-DGDCM_BUILD_APPLICATIONS=ON" + "-DGDCM_BUILD_SHARED_LIBS=ON" + "-DGDCM_USE_VTK=ON" + ] + ++ stdenv.lib.optional enablePython [ + "-DGDCM_WRAP_PYTHON:BOOL=ON" + "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" + ]; + preConfigure = '' cmakeDir=$PWD mkdir ../build cd ../build ''; - cmakeFlags = [ - "-DGDCM_BUILD_APPLICATIONS=ON" - "-DGDCM_BUILD_SHARED_LIBS=ON" - "-DGDCM_USE_VTK=ON" - ]; - enableParallelBuilding = true; - buildInputs = [ cmake vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = [ cmake vtk_7 ] + ++ stdenv.lib.optional stdenv.isDarwin [ + darwin.apple_sdk.frameworks.ApplicationServices + darwin.apple_sdk.frameworks.Cocoa + ] ++ stdenv.lib.optional enablePython [ swig python ]; propagatedBuildInputs = [ ]; meta = with stdenv.lib; { @@ -37,4 +47,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index 357bf07645..1cad5c0deb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -29,11 +29,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.3"; + version = "1.64.4"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rl524rmdbpmp5xdkm8dx3znq47l7dgvh192x80zjf8wc1af35lx"; + sha256 = "0k6l2qc2vkws34zrgdhl57qxf0jjkar2iziz6qn4n1w7va73mk53"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch deleted file mode 100644 index 2c558f53b7..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch +++ /dev/null @@ -1,18 +0,0 @@ -Adapted from https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=4d5cfeb510125345cb41431afc9022492994cffa, omitting changes to NEWS -diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -index 1943691..ac694c0 100644 ---- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -@@ -31,7 +31,8 @@ - environment variable, LD_PREFER_MAP_32BIT_EXEC. */ - #define EXTRA_LD_ENVVARS \ - case 21: \ -- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ -+ if (!__libc_enable_secure \ -+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ - GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \ - |= bit_arch_Prefer_MAP_32BIT_EXEC; \ - break; --- -2.9.3 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch new file mode 100644 index 0000000000..8334398e89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch @@ -0,0 +1,79 @@ +diff --git a/sysdeps/ieee754/ldbl-96/Makefile b/sysdeps/ieee754/ldbl-96/Makefile +index 995e90d6da..318628aed6 100644 +--- a/sysdeps/ieee754/ldbl-96/Makefile ++++ b/sysdeps/ieee754/ldbl-96/Makefile +@@ -17,5 +17,6 @@ + # . + + ifeq ($(subdir),math) +-tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 ++tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 test-sinl-pseudo ++CFLAGS-test-sinl-pseudo.c += -fstack-protector-all + endif +diff --git a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +index 5f742321ae..bcdf20179f 100644 +--- a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c ++++ b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +@@ -210,6 +210,18 @@ __ieee754_rem_pio2l (long double x, long double *y) + return 0; + } + ++ if ((i0 & 0x80000000) == 0) ++ { ++ /* Pseudo-zero and unnormal representations are not valid ++ representations of long double. We need to avoid stack ++ corruption in __kernel_rem_pio2, which expects input in a ++ particular normal form, but those representations do not need ++ to be consistently handled like any particular floating-point ++ value. */ ++ y[1] = y[0] = __builtin_nanl (""); ++ return 0; ++ } ++ + /* Split the 64 bits of the mantissa into three 24-bit integers + stored in a double array. */ + exp = j0 - 23; +--- /dev/null ++++ b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c +@@ -0,0 +1,41 @@ ++/* Test sinl for pseudo-zeros and unnormals for ldbl-96 (bug 25487). ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ for (int i = 0; i < 64; i++) ++ { ++ uint64_t sig = i == 63 ? 0 : 1ULL << i; ++ long double ld; ++ SET_LDOUBLE_WORDS (ld, 0x4141, ++ sig >> 32, sig & 0xffffffffULL); ++ /* The requirement is that no stack overflow occurs when the ++ pseudo-zero or unnormal goes through range reduction. */ ++ volatile long double ldr; ++ ldr = sinl (ld); ++ (void) ldr; ++ } ++ return 0; ++} ++ ++#include diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index 36b6bea61c..8afea21729 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -36,9 +36,9 @@ } @ args: let - version = "2.30"; + version = "2.31"; patchSuffix = ""; - sha256 = "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72"; + sha256 = "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj"; in assert withLinuxHeaders -> linuxHeaders != null; @@ -108,8 +108,8 @@ stdenv.mkDerivation ({ }) ./fix-x64-abi.patch - ./2.27-CVE-2019-19126.patch ./2.30-cve-2020-1752.patch + ./2.31-cve-2020-10029.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix index 039231c014..410e790255 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1jb30zxmw7h9qxa8yi76rfxj4ssk60rv8n9y41m6pzqfk9lwis0y"; }; - buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; + # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux + buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix b/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix index e540604c9c..3fc0094f10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "graphene"; - version = "1.10.0"; + version = "1.10.2"; outputs = [ "out" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "ebassi"; repo = pname; rev = version; - sha256 = "16vqwih5bfxv7r3mm7iiha804rpsxzxjfrs4kx76d9q5yg2hayxr"; + sha256 = "1ljhhjafi1nlndjswx7mg0d01zci90wz77yvz5w8bd9mm8ssw38s"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index ad978e903f..a19e8ca6a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -56,5 +56,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + # https://github.com/NixOS/nixpkgs/pull/91090#issuecomment-653753497 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix index f8f1f20cc2..49405c655e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mono +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, mono , glib , pango , gtk3 @@ -14,29 +18,32 @@ , monoDLLFixer }: -stdenv.mkDerivation { - name = "gtk-sharp-2.99.3"; +stdenv.mkDerivation rec { + pname = "gtk-sharp"; + version = "2.99.3"; builder = ./builder.sh; src = fetchurl { - #"mirror://gnome/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; - url = "http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; - # patch bad usage of glib, which wasn't tolerated anymore - # prePatch = '' - # for f in glib/glue/{thread,list,slist}.c; do - # sed -i 's,#include ,#include ,g' "$f" - # done - # ''; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; + patches = [ + # Fixes MONO_PROFILE_ENTER_LEAVE undeclared when compiling against newer versions of mono. + # @see https://github.com/mono/gtk-sharp/pull/266 + (fetchpatch { + name = "MONO_PROFILE_ENTER_LEAVE.patch"; + url = "https://github.com/mono/gtk-sharp/commit/401df51bc461de93c1a78b6a7a0d5adc63cf186c.patch"; + sha256 = "0hrkcr5a7wkixnyp60v4d6j3arsb63h54rd30lc5ajfjb3p92kcf"; + }) + ]; + dontStrip = true; inherit monoDLLFixer; @@ -47,6 +54,5 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; - broken = true; # 2018-09-21, build has failed since 2018-04-28 }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index fcb5e7918d..7f494e8bdd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -4,28 +4,34 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8"; + sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ flex yacc zlib libxml2 ]; - # This file is normally generated by igraph's bootstrap.sh, but we can do it - # ourselves. ~ C. + # Normally, igraph wants us to call bootstrap.sh, which will call + # tools/getversion.sh. Instead, we're going to put the version directly + # where igraph wants, and then let autoreconfHook do the rest of the + # bootstrap. ~ C. postPatch = '' - echo "${version}" > VERSION + echo "${version}" > IGRAPH_VERSION ''; + doCheck = true; + meta = { description = "The network analysis package"; homepage = "https://igraph.org/"; license = lib.licenses.gpl2; + # NB: Known to fail tests on aarch64. + platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 23b26c9a89..7b3cb0a252 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.1.1"; + version = "20.2.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "0k130yiq8n34ppddpgl7kwq5w2y7n49jxiyk7x52y773m97xd6y1"; + sha256 = "1gr4xfw8a99jwir7dxqwbfs42lrap3gimwkd7mrhi8vgacvkkvhf"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index a49320fef4..077c2d9c88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.1.1"; + version = "20.2.0"; src = fetchurl { url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; - sha256 = "1p13b4abslq31pbgqf0bzs2ixns85yfdsm94326h2vcg0q7hqc24"; + sha256 = "1b138xpa73y78gxwappxkm58c9j2vqq8zy173z7n4pdwiwsx1kxc"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jabcode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jabcode/default.nix new file mode 100644 index 0000000000..c875e4a394 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/jabcode/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, lib +, subproject ? "library" # one of "library", "reader" or "writer" +, zlib, libpng, libtiff +, jabcode +}: +let + subdir = lib.getAttr subproject { + "library" = "jabcode"; + "reader" = "jabcodeReader"; + "writer" = "jabcodeWriter"; + }; +in stdenv.mkDerivation rec { + pname = "jabcode-${subproject}"; + version = "git-2020-05-13"; + src = fetchFromGitHub { + repo = "jabcode"; + owner = "jabcode"; + rev = "a7c25d4f248078f257b014e31c791bfcfcd083e1"; + sha256 = "1c4cv9b0d7r4bxzkwzdv9h651ziq822iya6fbyizm57n1nzdkk4s"; + }; + + nativeBuildInputs = + [ zlib libpng libtiff ] + ++ lib.optionals (subproject != "library") [ jabcode ]; + + preConfigure = "cd src/${subdir}"; + + installPhase = if subproject == "library" then '' + mkdir -p $out/lib + cp build/* $out/lib + '' else '' + mkdir -p $out/bin + cp -RT bin $out/bin + ''; + + meta = with lib; { + description = "A high-capacity 2D color bar code (${subproject})"; + longDescription = "JAB Code (Just Another Bar Code) is a high-capacity 2D color bar code, which can encode more data than traditional black/white (QR) codes. This is the ${subproject} part."; + homepage = "https://jabcode.org/"; + license = licenses.lgpl21; + maintainers = [ maintainers.xaverdh ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/json-c/default.nix index 81ebc7baeb..c7a9b3c4a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/json-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/json-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf }: +{ stdenv, fetchurl, fetchpatch, autoconf }: stdenv.mkDerivation rec { name = "json-c-0.13.1"; @@ -7,6 +7,15 @@ stdenv.mkDerivation rec { sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll"; }; + patches = [ + # https://nvd.nist.gov/vuln/detail/CVE-2020-12762 + (fetchpatch { + name = "CVE-2020-12762.patch"; + url = "https://github.com/json-c/json-c/commit/865b5a65199973bb63dff8e47a2f57e04fec9736.patch"; + sha256 = "1g5afk4khhm1sb70xrva1pyznshcw3ipzp1g5z60dpzxy303pp6h"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoconf ]; # for autoheader @@ -16,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/json-c/json-c/wiki"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.mit; longDescription = '' JSON-C implements a reference counting object model that allows you to diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 155103af3c..8635c1fb40 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, fetchpatch }: +{ stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -28,10 +28,16 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python validatePkgConfig ]; - # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 - patches = stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + patches = [ + # Fix generation of pkg-config file (https://github.com/open-source-parsers/jsoncpp/pull/1199) + (fetchpatch { + url = "https://github.com/open-source-parsers/jsoncpp/commit/b05a21342a646a986b11c28ba6b19665756d21d2.patch"; + sha256 = "0dn4cvvkcp9mnxbzyaqb49z6bv5yqsx1wlf1lyki1n2rni2hn63p"; + }) + ] ++ stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 (fetchpatch { url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix index 1db37bc787..9ac3ed11b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix @@ -83,7 +83,7 @@ let in mkDerivation (args // { name = "${name}-${version}"; - inherit meta outputs setupHook src; + inherit meta outputs setupHook src version; }); }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index b7e6d78147..81a755bd3b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.68/ ) +WGET_ARGS=(https://download.kde.org/stable/frameworks/5.71/) diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch similarity index 66% rename from third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch rename to third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch index cc041b9aa3..32adca6d2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch @@ -1,8 +1,17 @@ +From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 13 Jul 2020 11:23:36 -0500 +Subject: [PATCH] kcmutils follow symlinks + +--- + src/kpluginselector.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index 137c865..097ab75 100644 +index 46deef5..2eacb9f 100644 --- a/src/kpluginselector.cpp +++ b/src/kpluginselector.cpp -@@ -303,7 +303,7 @@ void KPluginSelector::addPlugins(const QString &componentName, +@@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName, QStringList desktopFileNames; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); for (const QString &dir : dirs) { @@ -11,3 +20,6 @@ index 137c865..097ab75 100644 while (it.hasNext()) { desktopFileNames.append(it.next()); } +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index 0c661dcdd4..29689c789d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -14,5 +14,7 @@ mkDerivation { qtdeclarative ]; propagatedBuildInputs = [ kconfigwidgets kservice ]; - patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); + patches = [ + ./0001-kcmutils-follow-symlinks.patch + ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch deleted file mode 100644 index f966064f92..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kcmutils-5.33.0/src/kcmoduleloader.cpp -=================================================================== ---- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp -+++ kcmutils-5.33.0/src/kcmoduleloader.cpp -@@ -95,7 +95,7 @@ KCModule *KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep - KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); - KPluginFactory* factory = loader.factory(); - if (!factory) { -- qWarning() << "Couldn't load plugin:" << loader.errorString(); -+ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); - } else { - std::unique_ptr cm(factory->create(nullptr, args2)); - if (!cm) { diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/series deleted file mode 100644 index f2c22554a4..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/series +++ /dev/null @@ -1,2 +0,0 @@ -kcmutils-follow-symlinks.patch -kcmutils-debug-module-loader.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch index 3e18d304c3..d39ffbfde6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch @@ -1,28 +1,14 @@ -Index: kio-5.17.0/src/core/ksambashare.cpp -=================================================================== ---- kio-5.17.0.orig/src/core/ksambashare.cpp -+++ kio-5.17.0/src/core/ksambashare.cpp -@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( - +diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp +index 1895783..9fe7286 100644 +--- a/src/core/ksambashare.cpp ++++ b/src/core/ksambashare.cpp +@@ -73,8 +73,7 @@ KSambaSharePrivate::~KSambaSharePrivate() bool KSambaSharePrivate::isSambaInstalled() { -- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) -- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { -- return true; -+ const QByteArray pathEnv = qgetenv("PATH"); -+ if (!pathEnv.isEmpty()) { -+ QLatin1Char pathSep(':'); -+ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); -+ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { -+ it->append(QStringLiteral("/smbd")); -+ if (QFile::exists(*it)) { -+ return true; -+ } -+ } + const bool daemonExists = +- !QStandardPaths::findExecutable(QStringLiteral("smbd"), +- {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); ++ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); + if (!daemonExists) { + qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; } - -- //qDebug() << "Samba is not installed!"; -- - return false; - } - diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff.nix index df384648e6..a6b811c0ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff.nix @@ -2,7 +2,7 @@ mkDerivation, lib, fetchpatch, extra-cmake-modules, attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, - kio, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase, + kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase, qtdeclarative, kirigami2, }: @@ -12,6 +12,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews + kpackage ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2 ]; propagatedBuildInputs = [ attica kservice kxmlgui ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix index 826999f2f9..7dd91ffb24 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,17 +1,26 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, qtdeclarative, solid, threadweaver, kwindowsystem }: -mkDerivation { - name = "krunner"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons ki18n kio kservice qtdeclarative solid - threadweaver - ]; - propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ]; -} +let + self = mkDerivation { + name = "krunner"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + # Un-deprecate virtual method to restore binary compatibility. + (assert !(lib.versionOlder "5.72" self.version); fetchpatch { + url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff"; + sha256 = "124xqxpgmc5fdn1mcf8x1564pqc5y81j7lhzcirql2xcs0sbcyby"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons ki18n kio kservice qtdeclarative solid + threadweaver + ]; + propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ]; + }; +in self diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index ffea42c130..8ac9d33c8d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,659 +4,659 @@ { attica = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/attica-5.68.0.tar.xz"; - sha256 = "9b4001a32831c9bae1d44161247acd5e6d3048ca2ece98c2c756c72a1464b9e9"; - name = "attica-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/attica-5.71.0.tar.xz"; + sha256 = "9e24fd7f58c66879a05e056b781637196eea69d3276ed470643c505f9fd46d3d"; + name = "attica-5.71.0.tar.xz"; }; }; baloo = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/baloo-5.68.0.tar.xz"; - sha256 = "4b599fb279ef92dc4f575847767c370f2633b27e884e372c3f7b92f08917865e"; - name = "baloo-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/baloo-5.71.0.tar.xz"; + sha256 = "23378213d00ecf1f26eeb417987984f5a63bbd643359403dfd20638cbc1ec84b"; + name = "baloo-5.71.0.tar.xz"; }; }; bluez-qt = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/bluez-qt-5.68.0.tar.xz"; - sha256 = "99889cac874820e83a32bee938b6cc8e25dca6a3013d4a589ac7b8f5d32b4224"; - name = "bluez-qt-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/bluez-qt-5.71.0.tar.xz"; + sha256 = "7014e946f16db62218fe8e9af808999922d447034355f17b9e09b31321e53bad"; + name = "bluez-qt-5.71.0.tar.xz"; }; }; breeze-icons = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/breeze-icons-5.68.0.tar.xz"; - sha256 = "750fff6560abfa85a2243187d14f1b8f1d3d1c4097d84cbf8c58d2f48102fe8d"; - name = "breeze-icons-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/breeze-icons-5.71.0.tar.xz"; + sha256 = "72217c46e071b204a80ff8064b1b7319c7a7f9f0b08e69d8add2065e5d301155"; + name = "breeze-icons-5.71.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/extra-cmake-modules-5.68.0.tar.xz"; - sha256 = "4d60869ca96a323b56f00b40c4728a70dfebe2132bbae040442a6a2ef90e2d6e"; - name = "extra-cmake-modules-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/extra-cmake-modules-5.71.0.tar.xz"; + sha256 = "64f41c0b4b3164c7be8fcab5c0181253d97d1e9d62455fd540cb463afd051878"; + name = "extra-cmake-modules-5.71.0.tar.xz"; }; }; frameworkintegration = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/frameworkintegration-5.68.0.tar.xz"; - sha256 = "5bb3c2e56b2c4c41d8a472363f80445fd3fc28656e6a3163d48ed826a133985a"; - name = "frameworkintegration-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/frameworkintegration-5.71.0.tar.xz"; + sha256 = "f5ba2d5c363dcb09177424b82d9a59ce0f0a6b2dea372799dcba000452764961"; + name = "frameworkintegration-5.71.0.tar.xz"; }; }; kactivities = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kactivities-5.68.0.tar.xz"; - sha256 = "1853135feb6adfec252e6fab0b1472450422afd5998a9a31d942e8672fbe7111"; - name = "kactivities-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kactivities-5.71.0.tar.xz"; + sha256 = "b4e63fec6532e4bdc41470985cea46b0a88c1b2298b80286cbf0ed2d2139b66f"; + name = "kactivities-5.71.0.tar.xz"; }; }; kactivities-stats = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kactivities-stats-5.68.0.tar.xz"; - sha256 = "fb645db4685113dfd98834f48d8941529fee53d5e26ec5e36cfee8a9bfae97ae"; - name = "kactivities-stats-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kactivities-stats-5.71.0.tar.xz"; + sha256 = "79fe4f674d7bae457ce6af0357104a8691f5822963b0ef1f99cd5a43e3666978"; + name = "kactivities-stats-5.71.0.tar.xz"; }; }; kapidox = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kapidox-5.68.0.tar.xz"; - sha256 = "4f60582cb0771c38733989f192694636b1c93ecae290bfbe551030dd397e976e"; - name = "kapidox-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kapidox-5.71.0.tar.xz"; + sha256 = "da75660fc2808f38441ec0f59d3c58ce29fcfdcea29e251308a11a92546f1ed5"; + name = "kapidox-5.71.0.tar.xz"; }; }; karchive = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/karchive-5.68.0.tar.xz"; - sha256 = "518f07629d87e5778e1d8ce066f5590941472d9fffa7bd74819759be5c6edf0d"; - name = "karchive-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/karchive-5.71.0.tar.xz"; + sha256 = "cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624"; + name = "karchive-5.71.0.tar.xz"; }; }; kauth = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kauth-5.68.0.tar.xz"; - sha256 = "b9a7cd724709ea188852f7656fbeda2dc3cc40cc5d09573049c2680c0edbd41f"; - name = "kauth-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kauth-5.71.0.tar.xz"; + sha256 = "a0de83bd662e20253011216ab8cba597f8db7429f8706237e7307580125025b5"; + name = "kauth-5.71.0.tar.xz"; }; }; kbookmarks = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kbookmarks-5.68.0.tar.xz"; - sha256 = "80dc06188a5e1d960d46f527bd82d9b79df75a785164fa29a088a7b705abbf84"; - name = "kbookmarks-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kbookmarks-5.71.0.tar.xz"; + sha256 = "e00db1e62a769863a1bf90bb508f108f2740298aa40173cad34ef34a1c23a01a"; + name = "kbookmarks-5.71.0.tar.xz"; }; }; kcalendarcore = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kcalendarcore-5.68.0.tar.xz"; - sha256 = "50ffbe4feb9a602c09e130d6f10f0f260fa7625bc266003697895e1d716d6ba9"; - name = "kcalendarcore-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kcalendarcore-5.71.0.tar.xz"; + sha256 = "d5138db971f6be606be8ae7d761bad778af3cacada8e85fb2f469190c347cd94"; + name = "kcalendarcore-5.71.0.tar.xz"; }; }; kcmutils = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kcmutils-5.68.0.tar.xz"; - sha256 = "a688d54286fe11b23e11e2100536a513a332d2a7d784fcbebeaccbfb980d83d1"; - name = "kcmutils-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kcmutils-5.71.0.tar.xz"; + sha256 = "27743a81e9aa48baac12bb844e48d3098250699122ed6040b1e3c50a5e8f276d"; + name = "kcmutils-5.71.0.tar.xz"; }; }; kcodecs = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kcodecs-5.68.0.tar.xz"; - sha256 = "5f1e6ae3a51ca817aa0a5082ce4ce5490cb527388ef1888a642fb374c5e2bb48"; - name = "kcodecs-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kcodecs-5.71.0.tar.xz"; + sha256 = "3392c4df652e3a44a2b941ccb419dee9521642e503104de403ec1c6be9f43a28"; + name = "kcodecs-5.71.0.tar.xz"; }; }; kcompletion = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kcompletion-5.68.0.tar.xz"; - sha256 = "642d68b4c472e11a8861a61238297633be288bfd72c13547707754f1ae2be33a"; - name = "kcompletion-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kcompletion-5.71.0.tar.xz"; + sha256 = "bf0b6ce1ee133900f169662dbd35da6f766d3e4e02c0c102a9402e20450a22a4"; + name = "kcompletion-5.71.0.tar.xz"; }; }; kconfig = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kconfig-5.68.0.tar.xz"; - sha256 = "c3bf138a7a4d002475f2483987baf40a61cda7d491c3cc292dd2c6da726ee898"; - name = "kconfig-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kconfig-5.71.0.tar.xz"; + sha256 = "618ff0d168abf8fb73dc83431b9a76f7859d522bea100ff07c7e1632e129e3f4"; + name = "kconfig-5.71.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kconfigwidgets-5.68.0.tar.xz"; - sha256 = "f50421e9dbb6669e8d7c10605f7779ad03f30ea7c9c4451a70a7be66cd9df995"; - name = "kconfigwidgets-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kconfigwidgets-5.71.0.tar.xz"; + sha256 = "5778523c49a5294e9376ce8ee6db1a51ffaa506418a19e8632f73287a596276f"; + name = "kconfigwidgets-5.71.0.tar.xz"; }; }; kcontacts = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kcontacts-5.68.0.tar.xz"; - sha256 = "532f1e89c7412e971db8c431d627d38144470ddf5c978a7fa9348e418b6cd3c3"; - name = "kcontacts-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kcontacts-5.71.0.tar.xz"; + sha256 = "57f511a624406b27a7de25c83deb4104c95e851f9fda4f6d94450155ab08f4bd"; + name = "kcontacts-5.71.0.tar.xz"; }; }; kcoreaddons = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kcoreaddons-5.68.0.tar.xz"; - sha256 = "c578ae30b4161e45e672d613d2d9c5575a849d21909d9817f90a441044df65d7"; - name = "kcoreaddons-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kcoreaddons-5.71.0.tar.xz"; + sha256 = "e95008b032e299cf47f596739d9236701e2f55e507734f33b8ea497882fd130b"; + name = "kcoreaddons-5.71.0.tar.xz"; }; }; kcrash = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kcrash-5.68.0.tar.xz"; - sha256 = "60daf2cee87c652619b098b688edce6f993c7960783159cd8be9d9145df29f7f"; - name = "kcrash-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kcrash-5.71.0.tar.xz"; + sha256 = "526242aa9fde7cff11ecaa88bf75d6fbbfc412f46bf19a7a9e185f2adb616005"; + name = "kcrash-5.71.0.tar.xz"; }; }; kdbusaddons = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kdbusaddons-5.68.0.tar.xz"; - sha256 = "839fe42f9ac8df353f87245110fd7b515a8eb29f0840f54481bd89e5175bf1af"; - name = "kdbusaddons-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kdbusaddons-5.71.0.tar.xz"; + sha256 = "b441f525248d9d675333cebedf97ee0232a3a9b7aa9aff84d825dfcdb3bcd23c"; + name = "kdbusaddons-5.71.0.tar.xz"; }; }; kdeclarative = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kdeclarative-5.68.0.tar.xz"; - sha256 = "96a032bcb360e0ffcfe51d4d2f6153786682c2f967592bffcf15b9e6cd4cd3ae"; - name = "kdeclarative-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kdeclarative-5.71.0.tar.xz"; + sha256 = "ace0e52f561a9cfba1de4b77144a0a68037a1229530fb39070dc837da80ac8f8"; + name = "kdeclarative-5.71.0.tar.xz"; }; }; kded = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kded-5.68.0.tar.xz"; - sha256 = "b03afe48fbdbd7d92c46b3b60bdb4b825f77e1a9d00c16a5f236b24a0135e4b7"; - name = "kded-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kded-5.71.0.tar.xz"; + sha256 = "404c8caae0f4abe2ef85c2e82b5db2b14ae4b607fa30e4f16d15dad53c269fcc"; + name = "kded-5.71.0.tar.xz"; }; }; kdelibs4support = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/portingAids/kdelibs4support-5.68.0.tar.xz"; - sha256 = "2fca7bf9d31b081e7568631b6b6d2f7847068217261e47ef0dea106470c22df1"; - name = "kdelibs4support-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/kdelibs4support-5.71.0.tar.xz"; + sha256 = "1110ed68a29e38059d195817735d58df45e59b57fa9ac48ef2036c1037a23fb7"; + name = "kdelibs4support-5.71.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/portingAids/kdesignerplugin-5.68.0.tar.xz"; - sha256 = "ae433e0eeaf0007312b1f32fc4349cf26c34617a5a9951ae4155c5c4e4009b72"; - name = "kdesignerplugin-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/kdesignerplugin-5.71.0.tar.xz"; + sha256 = "e77a96c2a6cd518f3040e9366f013f0128200791b6c93c3c5b2310af16fb040b"; + name = "kdesignerplugin-5.71.0.tar.xz"; }; }; kdesu = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kdesu-5.68.0.tar.xz"; - sha256 = "427ba50bcd14308980cbdfdc77a6b7419277942a42d83da72ff3afbc1ec78903"; - name = "kdesu-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kdesu-5.71.0.tar.xz"; + sha256 = "b183e67c089b02f984284b5eb3c05f7216d289bef7ae08a9e6c6f991b2a1a23a"; + name = "kdesu-5.71.0.tar.xz"; }; }; kdewebkit = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/portingAids/kdewebkit-5.68.0.tar.xz"; - sha256 = "181b14bd80e9f34aa2f896d39aca5be91f65d65bfaaf47660e91fdd98b7f36a2"; - name = "kdewebkit-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/kdewebkit-5.71.0.tar.xz"; + sha256 = "04b8b90734ddf6d5e72ffa69707d473e1d1f8605ba06d4ceca83f4a1d195c65d"; + name = "kdewebkit-5.71.0.tar.xz"; }; }; kdnssd = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kdnssd-5.68.0.tar.xz"; - sha256 = "3369da85c0088c375f2123a82132fb84490c46ebc8e9cd1253c795ef45fd4403"; - name = "kdnssd-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kdnssd-5.71.0.tar.xz"; + sha256 = "bc269f0a74eee99d6c49550fc608450ced753a599cd03f77ea577af4c2e87958"; + name = "kdnssd-5.71.0.tar.xz"; }; }; kdoctools = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kdoctools-5.68.0.tar.xz"; - sha256 = "93f5bee9dfaacacacfbeb3e915b192b5e645c1d01057b0cea4081c9ae5285670"; - name = "kdoctools-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kdoctools-5.71.0.tar.xz"; + sha256 = "1e2fcaa97a014e82f68c0c36591ce84568ead7abd59b66e534789103e162cd09"; + name = "kdoctools-5.71.0.tar.xz"; }; }; kemoticons = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kemoticons-5.68.0.tar.xz"; - sha256 = "e03fe81ad34e107dc5fe61f9bf424ecef7716bf8a62f8abb78fd3f6bd6806f56"; - name = "kemoticons-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kemoticons-5.71.0.tar.xz"; + sha256 = "20bcb111971cc2e8c17b38a0c20aff7cf453174f885c4b4bcc5899141113e2fc"; + name = "kemoticons-5.71.0.tar.xz"; }; }; kfilemetadata = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kfilemetadata-5.68.0.tar.xz"; - sha256 = "c2a8aee8243efa30fc921b7f50b390b47ee2cf83aa83b125a530a25de6d6fe21"; - name = "kfilemetadata-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kfilemetadata-5.71.0.tar.xz"; + sha256 = "2e302958065157c1f9ea4a189bbca40b7dbed019767a3380e34e0b6a633c75fe"; + name = "kfilemetadata-5.71.0.tar.xz"; }; }; kglobalaccel = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kglobalaccel-5.68.0.tar.xz"; - sha256 = "2eb710a3f29cbc8b7875fb3e8315d7c8e3b5bb93867e0a34cd5cdbac690bcbbf"; - name = "kglobalaccel-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kglobalaccel-5.71.0.tar.xz"; + sha256 = "218d77aa4f6089d57932d627c4a46a8a4a5e964c2bfcee0d1c54338c25c7a06c"; + name = "kglobalaccel-5.71.0.tar.xz"; }; }; kguiaddons = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kguiaddons-5.68.0.tar.xz"; - sha256 = "cdbf694e92b47358c2e2c31917bf5f01382042c2cb99b65faf3bc00a0eb52c64"; - name = "kguiaddons-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kguiaddons-5.71.0.tar.xz"; + sha256 = "c1f7bf540a689319962275916c0434f47ba5ed8f7d46a78704393163e32eccd2"; + name = "kguiaddons-5.71.0.tar.xz"; }; }; kholidays = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kholidays-5.68.0.tar.xz"; - sha256 = "067a544c22f5988cf959a475b66ed62e419b975b3ee22810667a076f3d50dbba"; - name = "kholidays-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kholidays-5.71.0.tar.xz"; + sha256 = "5469718d6ede7edb2ab06bbaff8af01567ba77ffe2160c2c2d47c666cfebf417"; + name = "kholidays-5.71.0.tar.xz"; }; }; khtml = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/portingAids/khtml-5.68.0.tar.xz"; - sha256 = "af97da0a5d877c928d98690c3629a8f9788b29b27f583c9e3e26144a6abb9dcc"; - name = "khtml-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/khtml-5.71.0.tar.xz"; + sha256 = "df8d2a4776f98e1490a21e71e31a2ea7694bc7452da35f88623b19214b6e1c10"; + name = "khtml-5.71.0.tar.xz"; }; }; ki18n = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/ki18n-5.68.0.tar.xz"; - sha256 = "2c59dd55d032c95710e338e376a31bf11d799bceba8ebfdb148c8b77067a1e92"; - name = "ki18n-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/ki18n-5.71.0.tar.xz"; + sha256 = "f2fc8c40c10576da8b74070b7dc8e752fdd04204cb2bfe522f37a0458fbaf881"; + name = "ki18n-5.71.0.tar.xz"; }; }; kiconthemes = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kiconthemes-5.68.0.tar.xz"; - sha256 = "ac3f322f2644dd0468cd2b07cc0c7f853f1ac4bc714fe532bbe92e88141f6729"; - name = "kiconthemes-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kiconthemes-5.71.0.tar.xz"; + sha256 = "3fa986207e9d967840bd7a3f1af1e4d0105905012a0e4cf56f7ef1b3740b3496"; + name = "kiconthemes-5.71.0.tar.xz"; }; }; kidletime = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kidletime-5.68.0.tar.xz"; - sha256 = "cd6309d403ea36553abc99af4fa7e4ed3f8b3b2c55d14887ef09d68e5627b3e7"; - name = "kidletime-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kidletime-5.71.0.tar.xz"; + sha256 = "1bcacd6c9ec8d65f93434f51d865723a50609ec074f88da2890a8f37ea8d207d"; + name = "kidletime-5.71.0.tar.xz"; }; }; kimageformats = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kimageformats-5.68.0.tar.xz"; - sha256 = "498fab29d19f10f2c91c796134f959b2cf3ce8372087b5eeb62f07e62af85949"; - name = "kimageformats-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kimageformats-5.71.0.tar.xz"; + sha256 = "0d6d6a8664e4a01df27e9970ec9ec10a92c1d43a00a3e9ef0471d740b4c93d94"; + name = "kimageformats-5.71.0.tar.xz"; }; }; kinit = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kinit-5.68.0.tar.xz"; - sha256 = "fa136996eaaa7d2adb5a341c2b7a1abe86d8139c6f18999e0b0dc0220e512559"; - name = "kinit-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kinit-5.71.0.tar.xz"; + sha256 = "6ea625bced2c19b0f3e5bb504775dd6764358f02412364a16cbad731c5c299b6"; + name = "kinit-5.71.0.tar.xz"; }; }; kio = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kio-5.68.0.tar.xz"; - sha256 = "9cc2fb2da84d6661a90eac81eb12c2e37921a5c34cbc1975f48d613e5a9d9eef"; - name = "kio-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kio-5.71.0.tar.xz"; + sha256 = "b972c8dede50be3e89babb5a536054759db2a87003e6df770c598c7c1c94b8d6"; + name = "kio-5.71.0.tar.xz"; }; }; kirigami2 = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kirigami2-5.68.0.tar.xz"; - sha256 = "ad5f78afc916e9cb26f23918a6eb1983d4a57aa7e4f7314a8c23fb81e0fcaf4b"; - name = "kirigami2-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kirigami2-5.71.0.tar.xz"; + sha256 = "f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356"; + name = "kirigami2-5.71.0.tar.xz"; }; }; kitemmodels = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kitemmodels-5.68.0.tar.xz"; - sha256 = "4f435db4362832cf63e49896229affd07f125567931fc499751d37ac3bafb149"; - name = "kitemmodels-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kitemmodels-5.71.0.tar.xz"; + sha256 = "68205f09d63a916f236e2b3b729c0055377d852de48f7cf29fa7174ca97b84e7"; + name = "kitemmodels-5.71.0.tar.xz"; }; }; kitemviews = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kitemviews-5.68.0.tar.xz"; - sha256 = "5196885ac42347d67779df61a03d7f9c54f38053ff91348ef6fdc08439b4742f"; - name = "kitemviews-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kitemviews-5.71.0.tar.xz"; + sha256 = "2843ef166ff5bf69c1132bbc09545b59ad208313c0acad71d0cd951fde1d33de"; + name = "kitemviews-5.71.0.tar.xz"; }; }; kjobwidgets = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kjobwidgets-5.68.0.tar.xz"; - sha256 = "a11ba51ed0ab330f9a921cf0a61e604c27d88c1c2ea477a875bc0a0cd228a292"; - name = "kjobwidgets-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kjobwidgets-5.71.0.tar.xz"; + sha256 = "63f3b2fc1c062b1a485ff543e2d5afa68a9f9a918676bf3a6a5dc8f56f5f30e3"; + name = "kjobwidgets-5.71.0.tar.xz"; }; }; kjs = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/portingAids/kjs-5.68.0.tar.xz"; - sha256 = "18e3d7c667aec21e9e4d0d4730ad32a10475b7db5a574a674a8b90a6f9e0cd0e"; - name = "kjs-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/kjs-5.71.0.tar.xz"; + sha256 = "702224482139e500da1ea4e0d2b5132bf762f87f426f294587a0f2f47b9a9734"; + name = "kjs-5.71.0.tar.xz"; }; }; kjsembed = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/portingAids/kjsembed-5.68.0.tar.xz"; - sha256 = "e9b9ac63f06447ffc6870806eb1507f0281281bae907fdbae42ee87a2b926db2"; - name = "kjsembed-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/kjsembed-5.71.0.tar.xz"; + sha256 = "9352a31b5f735d71d6db4b09825ca01adb337e37f2b0cfce48c679e932238486"; + name = "kjsembed-5.71.0.tar.xz"; }; }; kmediaplayer = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/portingAids/kmediaplayer-5.68.0.tar.xz"; - sha256 = "aa07466ea27b2e042e03d76fe3a23c570ba6521f57a2a51dc0ddf32fc8276db0"; - name = "kmediaplayer-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/kmediaplayer-5.71.0.tar.xz"; + sha256 = "72492a6c877dded4f2333f140c025fdc4a271a68695c635c0dbc09b08d832eca"; + name = "kmediaplayer-5.71.0.tar.xz"; }; }; knewstuff = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/knewstuff-5.68.0.tar.xz"; - sha256 = "f7c13b133f8b87ceece2d33d3f69215912b3b8c1dbb92ac39a1a6a0a42b7c93a"; - name = "knewstuff-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/knewstuff-5.71.0.tar.xz"; + sha256 = "aba867855d69641f73db30405e787fc9ea22e3386a45be9626ba84cbe208f855"; + name = "knewstuff-5.71.0.tar.xz"; }; }; knotifications = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/knotifications-5.68.0.tar.xz"; - sha256 = "646bd3bac073fbf4f19f9047360325c933751d605cf1311f4c922d7457fbda51"; - name = "knotifications-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/knotifications-5.71.0.tar.xz"; + sha256 = "b900146340621d54f6113600e85d287b28225d82515affb8690704433e5d0440"; + name = "knotifications-5.71.0.tar.xz"; }; }; knotifyconfig = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/knotifyconfig-5.68.0.tar.xz"; - sha256 = "36c7c93964f2b9b584d73de1757f75d6ee8bb29ebe860e8fd6905354d2f10145"; - name = "knotifyconfig-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/knotifyconfig-5.71.0.tar.xz"; + sha256 = "226b7f956f7013027621c4018b4376b76129ea4195df67fc7df4435c54baf50e"; + name = "knotifyconfig-5.71.0.tar.xz"; }; }; kpackage = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kpackage-5.68.0.tar.xz"; - sha256 = "49727d89f1ca7ee504397d6e8b5cd25c26cd0061596b26d8ab2b64e3987d2d16"; - name = "kpackage-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kpackage-5.71.0.tar.xz"; + sha256 = "c4b924e7c506cb75bdaaf68bd881e79a73999bd6436f29157f56c76f32b48cba"; + name = "kpackage-5.71.0.tar.xz"; }; }; kparts = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kparts-5.68.0.tar.xz"; - sha256 = "fd17d0b0ff41d66c122530bbd8d1187f3271382207f63237ce72147865bf6d29"; - name = "kparts-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kparts-5.71.0.tar.xz"; + sha256 = "d038f97dfdccdd85dbac09c0f64cf852191ec2e535fd7928740e03d4ffe63b90"; + name = "kparts-5.71.0.tar.xz"; }; }; kpeople = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kpeople-5.68.0.tar.xz"; - sha256 = "1cae86d527d650d9fa311f6007cc33b5dcd858bcfe4eb7cae65b5402205c4675"; - name = "kpeople-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kpeople-5.71.0.tar.xz"; + sha256 = "d63d5f5cbbedc2e4ef85fa8c2ff4adcd5cb9e05d1d1ee0e7b2c2d151193f5403"; + name = "kpeople-5.71.0.tar.xz"; }; }; kplotting = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kplotting-5.68.0.tar.xz"; - sha256 = "ccae7f90c016a1c517db820f352bb962f600678efdc4ac6b12e33d2c48f5c268"; - name = "kplotting-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kplotting-5.71.0.tar.xz"; + sha256 = "84bacfbd86105e454f3d97f4ac4062e2f992556fca66d2c73806d1d12095bec1"; + name = "kplotting-5.71.0.tar.xz"; }; }; kpty = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kpty-5.68.0.tar.xz"; - sha256 = "35b838cff80311db52d83e1f61bc365277d54929742ee34265f36a12ce7689e3"; - name = "kpty-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kpty-5.71.0.tar.xz"; + sha256 = "7629d35ff783aff8fe801db30eb146efe50620f7500c4f7f1bf7d2619568c6b9"; + name = "kpty-5.71.0.tar.xz"; }; }; kquickcharts = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kquickcharts-5.68.0.tar.xz"; - sha256 = "2cfb78bc2a7659a8c4ca6b072ff586c44e6da64e10b84a0fb0c5e3f03c944628"; - name = "kquickcharts-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kquickcharts-5.71.0.tar.xz"; + sha256 = "a1befe13903676a9779030b02b91da9889540e689e1f6a0afd54ff484109642a"; + name = "kquickcharts-5.71.0.tar.xz"; }; }; kross = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/portingAids/kross-5.68.0.tar.xz"; - sha256 = "2f5a79a2097f84bfd2033ca183abdbf6626f6e5dc2c6f781c312f15c97dace33"; - name = "kross-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/kross-5.71.0.tar.xz"; + sha256 = "ac42ed4ec39ddaea0a4668803271f6f5de513fcdd1243d02b296544ab601bb1c"; + name = "kross-5.71.0.tar.xz"; }; }; krunner = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/krunner-5.68.0.tar.xz"; - sha256 = "4575ae1d658d32c15f9d57dc30616073e9d143d1a7f9632556906ef10e82e3b8"; - name = "krunner-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/krunner-5.71.0.tar.xz"; + sha256 = "fb3ce4c587a1b114550487b5716f0aba53b775018b6eef2ae48b8d6fdda40952"; + name = "krunner-5.71.0.tar.xz"; }; }; kservice = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kservice-5.68.0.tar.xz"; - sha256 = "c774ce1738081c17e6e105e506aa89c22a9db07e73972d4b18ce733ec8ad0a8a"; - name = "kservice-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kservice-5.71.0.tar.xz"; + sha256 = "6b7f4784cb514ec966f3cb01d26aa2dbdfd2425919efa57a4efa6117fcafc9ce"; + name = "kservice-5.71.0.tar.xz"; }; }; ktexteditor = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/ktexteditor-5.68.0.tar.xz"; - sha256 = "dad373d4c136d113cca1ee6d700753563b7348813ff3229db670eedc63980cd6"; - name = "ktexteditor-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/ktexteditor-5.71.0.tar.xz"; + sha256 = "6e50b6669b288f8e624cba11bca53b78748faf6cb978628f02664038cfa294da"; + name = "ktexteditor-5.71.0.tar.xz"; }; }; ktextwidgets = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/ktextwidgets-5.68.0.tar.xz"; - sha256 = "23b354469afed21c840ca36e2bb5b2b383ed5c4ec3690bb009e273c39fbe00c0"; - name = "ktextwidgets-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/ktextwidgets-5.71.0.tar.xz"; + sha256 = "0a7fae03d8b59ec8a4f7c49a228536ea4121bd3d8f19fb1ff9831ada428509f4"; + name = "ktextwidgets-5.71.0.tar.xz"; }; }; kunitconversion = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kunitconversion-5.68.0.tar.xz"; - sha256 = "39ec06e2439306ce5b5efe5fe972d201e8c8e5fda634652cdc01c58427574adb"; - name = "kunitconversion-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kunitconversion-5.71.0.tar.xz"; + sha256 = "65bfba8e88e2cf6de40e06ce24fe5f48948cc92f16ce78eb8538de532dcf36cb"; + name = "kunitconversion-5.71.0.tar.xz"; }; }; kwallet = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kwallet-5.68.0.tar.xz"; - sha256 = "7524eeffdde3166df182f0dbf0f3f461905547bfd7a06387c7c503cd1ab75ecf"; - name = "kwallet-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kwallet-5.71.0.tar.xz"; + sha256 = "d53b5bc4bbe054101b012d63672efc30af6a5aea58f467037cab4735b6ace9b5"; + name = "kwallet-5.71.0.tar.xz"; }; }; kwayland = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kwayland-5.68.0.tar.xz"; - sha256 = "7c99bfac8f4bff457a5384c846be776c385649ced76be0f48699c6e12de24e7c"; - name = "kwayland-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kwayland-5.71.0.tar.xz"; + sha256 = "369ba54b485214687e719bc9216e3bb50849df3af9a3ec0e95cf5d5687c847c2"; + name = "kwayland-5.71.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kwidgetsaddons-5.68.0.tar.xz"; - sha256 = "b4ff96b4ec6365e5f9e4da5e651da99be491799a4e6cfd982d0838dda39844ac"; - name = "kwidgetsaddons-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kwidgetsaddons-5.71.0.tar.xz"; + sha256 = "897077995bcf4125d0f90d2964500e718d2a3fd5f117e1b7906177ad13a5082e"; + name = "kwidgetsaddons-5.71.0.tar.xz"; }; }; kwindowsystem = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kwindowsystem-5.68.0.tar.xz"; - sha256 = "859c930a04c2588f792bfb9a28ed40b226db632b15c2851b186301b70d4c825a"; - name = "kwindowsystem-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kwindowsystem-5.71.0.tar.xz"; + sha256 = "a3613aea6fa73ebc53f28c011a6bca31ed157e29f85df767e617c44399360cda"; + name = "kwindowsystem-5.71.0.tar.xz"; }; }; kxmlgui = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kxmlgui-5.68.0.tar.xz"; - sha256 = "6310e9a725a982d3b70672367c5858727437fe08c8e409458e48b6015c7bf10e"; - name = "kxmlgui-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/kxmlgui-5.71.0.tar.xz"; + sha256 = "2e4b2563daeedf35a54d38002c05d7c39017a36c0b8a19c236ea87324eebf7cc"; + name = "kxmlgui-5.71.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/kxmlrpcclient-5.68.0.tar.xz"; - sha256 = "e49f2ab649aafb292e01dacefb7b6f28fc596606764bef61e7ce622b67241324"; - name = "kxmlrpcclient-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/portingAids/kxmlrpcclient-5.71.0.tar.xz"; + sha256 = "5947de8ec9cd57d8ccf6ea8a764066733d2633d93e11f94ecfb47a75e1e7a91f"; + name = "kxmlrpcclient-5.71.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/modemmanager-qt-5.68.0.tar.xz"; - sha256 = "9c0febf18a04b69e47cffdb4563390a79a4a673da856502cbf50d5c7707670ec"; - name = "modemmanager-qt-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/modemmanager-qt-5.71.0.tar.xz"; + sha256 = "b2e5e2a8b8fe2e9fb22bb7dc77177a975727991c6c0ee19d5a9b0a2ab513531d"; + name = "modemmanager-qt-5.71.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/networkmanager-qt-5.68.0.tar.xz"; - sha256 = "6a9bea5e6d58f5322848114e4e827edadee6b5a890a3549446ff23a568325e2c"; - name = "networkmanager-qt-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/networkmanager-qt-5.71.0.tar.xz"; + sha256 = "7fe6a0c9d9b25c434c6a200de19f722d942165252cc9161f1d8fcddf64147034"; + name = "networkmanager-qt-5.71.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/oxygen-icons5-5.68.0.tar.xz"; - sha256 = "75a8113e567d8cbba57bda3c8829d116d58ebf6bc5ace88aed7700b28a00c463"; - name = "oxygen-icons5-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/oxygen-icons5-5.71.0.tar.xz"; + sha256 = "a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04"; + name = "oxygen-icons5-5.71.0.tar.xz"; }; }; plasma-framework = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/plasma-framework-5.68.0.tar.xz"; - sha256 = "d27c7a62231784ecad1246f8a81b02fd6db2e9818244a06650fd6c972a69ea74"; - name = "plasma-framework-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz"; + sha256 = "a54c8603ca261c89609a3009536a9217ce3415a7fd63527ed36f266399613067"; + name = "plasma-framework-5.71.0.tar.xz"; }; }; prison = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/prison-5.68.0.tar.xz"; - sha256 = "22e2b8e9ca06e4fb7ab91afeddbaebe6e2b6792bbcd5ba6c440c6fad0df176b7"; - name = "prison-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/prison-5.71.0.tar.xz"; + sha256 = "44762ee7a3993bd7527f0b33ee09bacc1d5a518641b79932e5490a511ac7e87f"; + name = "prison-5.71.0.tar.xz"; }; }; purpose = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/purpose-5.68.0.tar.xz"; - sha256 = "c8c8f8244b568e52b4c02b89b71611bb8ba7cd07173645caa022b4bd90b41ab0"; - name = "purpose-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/purpose-5.71.0.tar.xz"; + sha256 = "de0531a84f671a15fe4a6348220e922a3230178554e26baf392a1f295044e4be"; + name = "purpose-5.71.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/qqc2-desktop-style-5.68.0.tar.xz"; - sha256 = "0f522861e5757de6a1205c86a2e5f8d2a7375c96eac1ece95d03a35858dc7b03"; - name = "qqc2-desktop-style-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/qqc2-desktop-style-5.71.0.tar.xz"; + sha256 = "b968ce6fc7c1d111aa2c63584dddc0f74e9066a0b4ea26d1194e46e2f7b38700"; + name = "qqc2-desktop-style-5.71.0.tar.xz"; }; }; solid = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/solid-5.68.0.tar.xz"; - sha256 = "472c1934b3c9cf917f28ac0e5b0864de442b96852744c301d88d8ab7269d74c3"; - name = "solid-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/solid-5.71.0.tar.xz"; + sha256 = "72a7bdd8306ec4cda5f504819e0ff3f8baca6530fa04e33f10b6b89dc010505b"; + name = "solid-5.71.0.tar.xz"; }; }; sonnet = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/sonnet-5.68.0.tar.xz"; - sha256 = "079c4f5fcb9fe670e1242b18648e178aaa01eb81dbdfc881805eea1ec585bd67"; - name = "sonnet-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/sonnet-5.71.0.tar.xz"; + sha256 = "cd663b3e1b23aef58d85f72dfdc92aaae33f358b22ad1fc36fde6c66eb7f0e72"; + name = "sonnet-5.71.0.tar.xz"; }; }; syndication = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/syndication-5.68.0.tar.xz"; - sha256 = "0715fc1b7312b5081521b781d0878d88cc70dcb77272ee173cecca03cc221fd3"; - name = "syndication-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/syndication-5.71.0.tar.xz"; + sha256 = "c515fd48d3736b55c8e7990c72471bfddd55363c4bcb049713be741eaa7b07e0"; + name = "syndication-5.71.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/syntax-highlighting-5.68.0.tar.xz"; - sha256 = "a857c743aa60b21eea7e4b986e8b195882aa2c18358412e767e68d93ce35e134"; - name = "syntax-highlighting-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/syntax-highlighting-5.71.0.tar.xz"; + sha256 = "845ae0c7b8523c23c3ad704a6c551260a358d96b0094a5c2b062879e58173f84"; + name = "syntax-highlighting-5.71.0.tar.xz"; }; }; threadweaver = { - version = "5.68.0"; + version = "5.71.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.68/threadweaver-5.68.0.tar.xz"; - sha256 = "e28c0bfff375b3e1e9e4eec72f0a804f3f41c4ec5fd59af9b951708d229eff64"; - name = "threadweaver-5.68.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.71/threadweaver-5.71.0.tar.xz"; + sha256 = "039e73d70f38af38a63235cfb554111ee0d58a6ac168bff0745f0d029c5c528d"; + name = "threadweaver-5.71.0.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix new file mode 100644 index 0000000000..dde2e5cb1a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix @@ -0,0 +1,39 @@ +{ mkDerivation, lib, fetchurl +, cmake +, qtbase +}: + +let + version = "1.9.0"; +in + +mkDerivation { + pname = "kdsoap"; + inherit version; + meta = { + description = "A Qt-based client-side and server-side SOAP component"; + longDescription = '' + KD Soap is a Qt-based client-side and server-side SOAP component. + + It can be used to create client applications for web services and also + provides the means to create web services without the need for any further + component such as a dedicated web server. + ''; + license = with lib.licenses; [ gpl2 gpl3 lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + src = fetchurl { + url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; + sha256 = "0a28k48cmagqxhaayyrqnxsx1zbvw4f06dgs16kl33xhbinn5fg3"; + }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase ]; + postInstall = '' + moveToOutput bin/kdwsdl2cpp "$dev" + sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ + -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" + sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ + -e "s@$out/bin@$dev/bin@" + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 3704cbb779..a42f1c0a51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; - version = "2020.03.13"; + version = "2020.06.16"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - sha256 = "0zk6fyfrklx8a848613rfcx0y4yn0dsxkxzzl9pgdh9i6qdfjj9k"; + sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy"; }; patches = stdenv.lib.lists.optional withTracing ./tracing.patch; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix index 33a9974211..52daebf832 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0xkps414ndb87abla7dlv44ndnfg5r5vwgmkm3ngcq9knbv1x6w7"; + sha256 = "0kmzs2s7fvar9ksaxyiqlh8q8mbwc7bxrq9w1y91zlyb23p142wy"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 8a34f05f6c..4623e5ca70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,21 +2,16 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { - sha256 = "00qigglp67a14ki4dhjxd3j540a80rkmzhysx7hra8v2rgbsqgj8"; + sha256 = "1mgd7jqfg6f0y2yrh2m1njlwrpd15kas88776jdd5fsl7gvb5khn"; rev = version; repo = "leatherman"; owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = builtins.toString [ - "-Wno-error=ignored-qualifiers" - "-Wno-error=class-memaccess" - "-Wno-error=catch-value" - "-Wno-error=deprecated-copy" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; @@ -28,7 +23,7 @@ stdenv.mkDerivation rec { description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix index 818e2ad85b..95569c0a81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip, fixDarwinDylibNames }: +{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "libLAS-1.8.1"; @@ -9,13 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ] + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" - "-DLASZIP_INCLUDE_DIR=${LASzip}/include" + # libLAS is currently not compatible with LASzip 3, + # see https://github.com/libLAS/libLAS/issues/144. + "-DLASZIP_INCLUDE_DIR=${LASzip2}/include" "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix index 7863e596e1..aff56994f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix @@ -24,4 +24,10 @@ stdenv.mkDerivation { doCheck = false; # hasdescriptor.c test fails, hrm. installPhase = ''prefix="/" DESTDIR=$out ./installlib''; + + meta = with stdenv.lib; { + description = "Installs the BlocksRuntime library from the compiler-rt"; + homepage = "https://github.com/mackyle/blocksruntime"; + license = licenses.mit; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix index 0acab60233..5936853dcb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2 }: +{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }: stdenv.mkDerivation rec { @@ -12,13 +12,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl pcsclite opensc libxml2 ]; + buildInputs = [ openssl pcsclite opensc libxml2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ]; meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; - homepage = "http://www.id.ee/"; + homepage = "https://github.com/open-eid/libdigidoc"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jagajaga ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 4052f6e45d..940093ed4b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.2"; + version = "3.14.3"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "0d3p72gvnj00bxl6lzh6n5x1r37wj54mzzv700gngcvr3m62lkbv"; + sha256 = "1hq1q2frqnm4wxcfr7vn8kqwyfdz3hx22w40kn69zh140pig6jc5"; }; nativeBuildInputs = [ cmake pkgconfig xxd ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libe57format/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libe57format/default.nix new file mode 100644 index 0000000000..6bb48c9530 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libe57format/default.nix @@ -0,0 +1,55 @@ +{ + stdenv, + cmake, + fetchFromGitHub, + boost, + xercesc, + icu, +}: + +stdenv.mkDerivation rec { + pname = "libe57format"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "asmaloney"; + repo = "libE57Format"; + rev = "v${version}"; + sha256 = "05z955q68wjbd9gc5fw32nqg69xc82n2x75j5vchxzkgnn3adcpi"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + icu + xercesc + ]; + + # The build system by default builds ONLY static libraries, and with + # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see: + # https://github.com/asmaloney/libE57Format/issues/48 + # https://github.com/asmaloney/libE57Format/blob/f657d470da5f0d185fe371c4c011683f6e30f0cb/CMakeLists.txt#L82-L89 + # We support building both by building statically and then + # building an .so file here manually. + # The way this is written makes this Linux-only for now. + postInstall = '' + cd $out/lib + g++ -Wl,--no-undefined -shared -o libE57FormatShared.so -L. -Wl,-whole-archive -lE57Format -Wl,-no-whole-archive -lxerces-c + mv libE57FormatShared.so libE57Format.so + + if [ "$dontDisableStatic" -ne "1" ]; then + rm libE57Format.a + fi + ''; + + meta = with stdenv.lib; { + description = "Library for reading & writing the E57 file format (fork of E57RefImpl)"; + homepage = "https://github.com/asmaloney/libE57Format"; + license = licenses.boost; + maintainers = with maintainers; [ chpatrick nh2 ]; + platforms = platforms.linux; # because of the .so buiding in `postInstall` above + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix index cbfcf5af04..29c4b4c3b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libebml"; - version = "1.3.10"; + version = "1.4.0"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "1vn0g4hsygrm29qvnzhrblpwjcy2x6swf799ibxv3bzpi1j0gris"; + sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index a3d515c504..49aaec66c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; + # Necessary to generate correct assembly when compiling for aarch32 on + # aarch64 + configurePlatforms = [ "host" "build" ]; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix index 51ee70f070..5493343fc2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.36.0"; + version = "3.36.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bd30g3facfcgf18y2110xhc7ijly313y49mpwdkvl482z0fxzyj"; + sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix index 03324c15d8..c413642803 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix @@ -1,49 +1,62 @@ -{ stdenv, fetchFromGitHub -, cmake, flex, bison -, libxml2, python -, libusb1, runtimeShell +{ stdenv +, fetchFromGitHub +, cmake +, flex +, bison +, libxml2 +, python +, libusb1 +, runtimeShell }: stdenv.mkDerivation rec { pname = "libiio"; - version = "0.20"; - - src = fetchFromGitHub { - owner = "analogdevicesinc"; - repo = "libiio"; - rev = "refs/tags/v${version}"; - sha256 = "1929gvizkqmm9cwh3vihxxszfxvgcp5saq9q6chdk3fpdhzajc00"; - }; + version = "0.21"; outputs = [ "out" "lib" "dev" "python" ]; - nativeBuildInputs = [ cmake flex bison ]; - buildInputs = [ libxml2 libusb1 ]; + src = fetchFromGitHub { + owner = "analogdevicesinc"; + repo = "libiio"; + rev = "v${version}"; + sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7"; + }; + + nativeBuildInputs = [ + cmake + flex + bison + ]; + + buildInputs = [ + python + libxml2 + libusb1 + ]; + + cmakeFlags = [ + "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" + "-DPYTHON_BINDINGS=on" + ]; postPatch = '' + # Hardcode path to the shared library into the bindings. + sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1 + substituteInPlace libiio.rules.cmakein \ --replace /bin/sh ${runtimeShell} ''; - # since we can't expand $out in cmakeFlags - preConfigure = '' - cmakeFlags="$cmakeFlags -DUDEV_RULES_INSTALL_DIR=$out/etc/udev/rules.d" - ''; - postInstall = '' - mkdir -p $python/lib/${python.libPrefix}/site-packages/ - touch $python/lib/${python.libPrefix}/site-packages/ - cp ../bindings/python/iio.py $python/lib/${python.libPrefix}/site-packages/ - - substitute ../bindings/python/iio.py $python/lib/${python.libPrefix}/site-packages/iio.py \ - --replace 'libiio.so.0' $lib/lib/libiio.so.0 + # Move Python bindings into a separate output. + moveToOutput ${python.sitePackages} "$python" ''; meta = with stdenv.lib; { description = "API for interfacing with the Linux Industrial I/O Subsystem"; - homepage = "https://github.com/analogdevicesinc/libiio"; - license = licenses.lgpl21; - platforms = platforms.linux; + homepage = "https://github.com/analogdevicesinc/libiio"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiio/hardcode-library-path.patch b/third_party/nixpkgs/pkgs/development/libraries/libiio/hardcode-library-path.patch new file mode 100644 index 0000000000..dad35851cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libiio/hardcode-library-path.patch @@ -0,0 +1,38 @@ +diff --git a/bindings/python/iio.py b/bindings/python/iio.py +index 5306daa..f8962ee 100644 +--- a/bindings/python/iio.py ++++ b/bindings/python/iio.py +@@ -229,9 +229,9 @@ if "Windows" in _system(): + _iiolib = "libiio.dll" + else: + # Non-windows, possibly Posix system +- _iiolib = "iio" ++ _iiolib = "@libiio@" + +-_lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True) ++_lib = _cdll(_iiolib, use_errno=True, use_last_error=True) + + _get_backends_count = _lib.iio_get_backends_count + _get_backends_count.restype = c_uint +diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein +index cd14e2e..516c409 100644 +--- a/bindings/python/setup.py.cmakein ++++ b/bindings/python/setup.py.cmakein +@@ -62,7 +62,7 @@ class InstallWrapper(install): + _iiolib = "libiio.dll" + else: + # Non-windows, possibly Posix system +- _iiolib = "iio" ++ _iiolib = "@libiio@" + try: + import os + +@@ -72,7 +72,7 @@ class InstallWrapper(install): + fulllibpath = find_recursive(destdir, "libiio.so") + _lib = _cdll(fulllibpath, use_errno=True, use_last_error=True) + else: +- _lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True) ++ _lib = _cdll(_iiolib, use_errno=True, use_last_error=True) + if not _lib._name: + raise OSError + except OSError: diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 72d8b96774..9bd909d3f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; }) + + (fetchpatch { + name = "cve-2020-13790.patch"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d.diff"; + sha256 = "0hm5i6qir5w3zxb0xvqdh4jyvbfg7xnd28arhyfsaclfz9wdb0pb"; + }) ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix index 2f0da5edf4..d627bf81cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix @@ -1,11 +1,11 @@ { buildPackages, stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.3.5"; + name = "libksba-1.4.0"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21"; + sha256 = "1dj1razn35srkgadx3i30yr0q037cr0dn54m6a54vxgh3zlsirmz"; }; outputs = [ "out" "dev" "info" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix index 2d56a6db76..6e65bcdad9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libmatroska"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "057iib6p62x31g1ikdjsjzmqzjlajqx6p74h7y4r524pzgb27fzy"; + sha256 = "118xxdgd3gkwamf59ac2c90s52pz5r0g2jmlrsj1kppybxka5f07"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 71fbda7b47..ecec1e7949 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.20"; + version = "8.0.21"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "1jrrbfy6sw4pni72c1hgvchx1zzfpnamp34sjnv82mlvsp8ypsjh"; + sha256 = "08z40419aip26z6ss30g59mvnddb8dfam82l556jyj3gxs0irqbh"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix index 1e925eb7b4..76aa3c99e3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnsl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "1chzqhcgh0yia9js8mh92cmhyka7rh32ql6b3mgdk26n94dqzs8b"; + sha256 = "1dayj5i4bh65gn7zkciacnwv2a0ghm6nn58d78rsi4zby4lyj5w5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix index 29edf37d80..830465fb11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.15.5"; + version = "2.15.6"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "1f21dzzkxzi74hv17fs9kb2w6indqvvm4lkxclz4j4x98k8q3n59"; + sha256 = "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2"; }; nativeBuildInputs = [ cmake ]; + buildInputs = [ protozero zlib bzip2 expat boost ]; + doCheck = true; meta = with stdenv.lib; { description = "Fast and flexible C++ library for working with OpenStreetMap data"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix index d9cb91e4fb..fcb599e00f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation rec { ''; postInstall = '' - rm -f $out/lib/libpcap.a + if [ "$dontDisableStatic" -ne "1" ]; then + rm -f $out/lib/libpcap.a + fi ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index cee6d3f184..e57f279883 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -2,32 +2,33 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config +, python3Packages , vulkan-headers , vulkan-loader , shaderc , glslang , lcms2 +, epoxy }: stdenv.mkDerivation rec { pname = "libplacebo"; - version = "1.29.1"; + version = "2.72.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "1ly5bwy0pwgvqigpaak8hnig5hksjwf0pzvj3mdv3j2f6f7ya2zz"; + sha256 = "1yhf9xyxdawbihsx89dpjlac800wrmpwx63rphad2nj225y9q40f"; }; - postPatch = "substituteInPlace meson.build --replace 1.29.0 1.29.1"; - nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config + python3Packages.Mako ]; buildInputs = [ @@ -36,13 +37,25 @@ stdenv.mkDerivation rec { shaderc glslang lcms2 + epoxy + ]; + + mesonFlags = [ + "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" ]; meta = with stdenv.lib; { description = "Reusable library for GPU-accelerated video/image rendering primitives"; + longDescription = '' + Reusable library for GPU-accelerated image/view processing primitives and + shaders, as well a batteries-included, extensible, high-quality rendering + pipeline (similar to mpv's vo_gpu). Supports Vulkan, OpenGL and Metal (via + MoltenVK). + ''; homepage = "https://code.videolan.org/videolan/libplacebo"; + changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ primeos tadeokondrak ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix index ec72578ba2..15a2a1db18 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }: +{ stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.24.12"; + version = "1.25.900"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd"; + sha256 = "0a96f4ab7qy4szwzqs8ir2mvsnpqzk7zsiv6zahlhpf0jhp1vxf7"; }; outputs = [ "out" "dev" "devdoc" ]; configureFlags = [ "--with-udev-base-dir=${placeholder "out"}/lib/udev" + "--enable-introspection" ]; nativeBuildInputs = [ - pkgconfig + pkg-config + gobject-introspection python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 21f80f80ef..263aa613a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.35.2"; + version = "2.36.0"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "14vf76vlyhh7b4yjzsnqpg1x3wdhwxrf1syvgf8wyxbjwb9plw82"; + sha256 = "1dfkhnybnd8qnljf3y3hjyamaqzw733hb3swy4hjcsdm9dh0wpay"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix new file mode 100644 index 0000000000..76f01f9a50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, texinfo, pcre2 +, enablePython ? false, python, swig, libxml2, ncurses +}: +let + isPython3 = enablePython && python.pythonAtLeast "3"; +in +stdenv.mkDerivation rec { + pname = "libredwg"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "LibreDWG"; + repo = pname; + rev = version; + sha256 = "1zd721z2nriw1jlrh4y1fj59b0dnymhd4kwp8rqw16bs84gda37n"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] + ++ lib.optional enablePython swig; + + buildInputs = [ pcre2 ] + ++ lib.optionals enablePython [ python ] + # configurePhase fails with python 3 when ncurses is missing + ++ lib.optional isPython3 ncurses + ; + + # prevent python tests from running when not building with python + configureFlags = lib.optional (!enablePython) "--disable-python"; + + doCheck = true; + + # the "xmlsuite" test requires the libxml2 c library as well as the python module + checkInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; + + meta = with lib; { + description = "Free implementation of the DWG file format"; + homepage = "https://savannah.gnu.org/projects/libredwg/"; + maintainers = with maintainers; [ tweber ]; + license = licenses.gpl3Plus; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix index ee31e22628..0413d8a8ab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "1hajbdwx20a48hp8kv6jqbjvnzjvcdqmbjfsymzy2xa80idqkfab"; + sha256 = "0pzgjj2x2vrjshrzrl2x39xp5lgwg4b4y9vs8xvadh1ycl10v3fv"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix index d9e9df5932..4587701011 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ stdenv, fetchurl, fetchpatch, libtool }: stdenv.mkDerivation rec { pname = "libtomcrypt"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-17362.patch"; + url = "https://github.com/libtom/libtomcrypt/pull/508/commits/25c26a3b7a9ad8192ccc923e15cf62bf0108ef94.patch"; + sha256 = "1bwsj0pwffxw648wd713z3xcyrbxc2z646psrzp38ys564fjh5zf"; + }) + ]; + nativeBuildInputs = [ libtool ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix index 519023bb27..e029781220 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "0.6pre600_${builtins.substring 0 8 src.rev}"; + version = "0.7"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; - rev = "f2e1f3590f7bed3040bd1691676b50839f7d5c39"; - sha256 = "0wg0pgcbilbb2wg08hsvd18q1m8vdk46b3piz7qb1pvgyq01idj2"; + rev = "liburing-${version}"; + sha256 = "15z44l7y4c6s6dlf7v8lq4znlsjbja2r4ifbni0l8cdcnq0w3zh3"; }; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index d0bd2ecc00..7f690f0997 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -7,29 +7,16 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.7.1"; # Also update the hash for libva-utils! + version = "2.8.0"; # Also update the hash for libva-utils! # update libva-utils and vaapiIntel as well src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq"; + sha256 = "190cq173jzp5rkrczi8gzbwa0y3xk253v4wd205a5ilfngm7srns"; }; - patches = [ - (fetchpatch { # meson: Allow for libdir and includedir to be absolute paths - url = "https://github.com/intel/libva/commit/de902e2905abff635f3bb151718cc52caa3f669c.patch"; - sha256 = "1lpc8qzvsxnlsh9g0ab5lja204zxz8rr2p973pfihcw7dcxc3gia"; - }) - ]; - - postPatch = '' - # Remove the execute bit from all source code files - # https://github.com/intel/libva/commit/dbd2cd635f33af1422cbc2079af0a7e68671c102 - chmod -x va/va{,_dec_av1,_trace,_vpp}.h - ''; - outputs = [ "dev" "out" ]; nativeBuildInputs = [ meson pkg-config ninja wayland ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva-utils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/libraries/libva-utils/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix index 90f1849aee..5b9f4cdd8a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9"; + sha256 = "081hw2jnj64bpqwh9p41n5caqzm6dnj1ggnvvc5wrf4m2z1h2bjb"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 3c0cc9751e..27f345a9c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -17,19 +17,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "6.2.0"; + version = "6.3.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "1c8grqf751blsgs15wx2p05wvankdrady6290vwc85v94cgqij5f"; + sha256 = "1xcng497hs1gary3pz3fp590a4r1kqs4d0d8k5p370j0scw981kl"; } else fetchgit { url = "git://libvirt.org/libvirt.git"; rev = "v${version}"; - sha256 = "1wyihi8bhwsck9b7f3b8yhlz145sjdyyj3ykjiszrqnp0y99xxy2"; + sha256 = "129b3p72jlb40dsidak3nvpssv75xx2v99y63gzp5k074fp8y8x4"; fetchSubmodules = true; }; @@ -65,6 +65,7 @@ in stdenv.mkDerivation rec { dontAddDisableDepTrack = true; configureFlags = [ + "--with-runstatedir=/run" # TODO: remove when autoconf 1.70 is released "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" @@ -97,6 +98,7 @@ in stdenv.mkDerivation rec { ]; installFlags = [ + "runstatedir=${placeholder "out"}/run" "localstatedir=$(TMPDIR)/var" "sysconfdir=$(out)/var/lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index fb494909c8..6c2b61cf11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3"; + sha256 = "18w0z3w90fdbzsqaa4diwvq0xmvg0aiw4hi3aaa4pq0zgnb8g3mk"; }; sourceRoot = "source/libvmaf"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; platforms = platforms.unix; - license = licenses.asl20; + license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix index c9adad6f64..c4e82b1c32 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix @@ -7,9 +7,9 @@ let s = # Generated upstream information rec { pname = "libvncserver"; - version = "0.9.12"; + version = "0.9.13"; url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; - sha256 = "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"; # unpacked archive checksum + sha256 = "0zz0hslw8b1p3crnfy3xnmrljik359h83dpk64s697dqdcrzy141"; # unpacked archive checksum }; in stdenv.mkDerivation { @@ -17,18 +17,7 @@ stdenv.mkDerivation { src = fetchzip { inherit (s) url sha256; }; - patches = [ - (fetchpatch { - name = "CVE-2018-20750.patch"; - url = "https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec.patch"; - sha256 = "004h50786nvjl3y3yazpsi2b767vc9gqrwm1ralj3zgy47kwfhqm"; - }) - (fetchpatch { - name = "CVE-2019-15681.patch"; - url = "https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a.patch"; - sha256 = "0hf0ss7all2m50z2kan4mck51ws44yim4ymn8p0d991y465y6l9s"; - }) - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg openssl libgcrypt libpng diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index ddafc9bc65..c56781931f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -16,8 +16,13 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + cmakeFlags = [ + "-DLWS_WITH_PLUGINS=ON" + "-DLWS_WITH_IPV6=ON" + "-DLWS_WITH_SOCKS5=ON" + ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; meta = with stdenv.lib; { description = "Light, portable C library for websockets"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix index 8e190f998d..59e349b4e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "libwhereami"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { - sha256 = "16xjb6zp60ma76aa3kq3q8i8zn0n61gf39fny12cny8nggwjpbww"; + sha256 = "05fc28dri2h858kxbvldk5b6wd5is3fjcdsiqj3nxf95i66bb3xp"; rev = version; repo = "libwhereami"; owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Library to report hypervisor information from inside a VM"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; # fails on aarch64 + platforms = with platforms; [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64 }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix index 2b28499864..d555ecea06 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxls"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; - sha256 = "1akadsyl10rp101ccjmrxr7933c3v641k377bn74jv6cdkcm4zld"; + sha256 = "0rl513wpq5qh7wkmdk4g9c68rzffv3mcbz48p4xyg4969zrx8lnm"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 7c39d80390..9ea7dc6c9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch -, zlib, xz, python, ncurses, findXMLCatalogs +, zlib, xz, python, gettext, ncurses, findXMLCatalogs , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null , enableShared ? stdenv.hostPlatform.libc != "msvcrt" @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ++ lib.optional (enableStatic && enableShared) "static"; buildInputs = lib.optional pythonSupport python + ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a diff --git a/third_party/nixpkgs/pkgs/development/libraries/marisa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/marisa/default.nix index 9a4d178d3d..99d82970fe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/marisa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/marisa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "marisa"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "s-yata"; repo = "marisa-trie"; rev = "v${version}"; - sha256 = "0z4bf55np08q3cbi6gvj3cpw3zp8kf2d0jq6k74pjk066m7rapbb"; + sha256 = "1hy8hfksizk1af6kg8z3b9waiz6d5ggd73fiqcvmhfgra36dscyq"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mp4v2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mp4v2/default.nix index 8fe1477aa6..9601ae1eea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mp4v2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mp4v2/default.nix @@ -1,39 +1,39 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "mp4v2-2.0.0"; + pname = "mp4v2"; + version = "4.1.3"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/${name}.tar.bz2"; - sha256 = "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683"; + src = fetchFromGitHub { + # 2020-06-20: THE current upstream, maintained and used in distros fork. + owner = "TechSmith"; + repo = "mp4v2"; + rev = "Release-ThirdParty-MP4v2-${version}"; + sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv"; }; patches = [ (fetchurl { - name = "gcc-7.patch"; - url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/" - + "0004-Fix-GCC7-build.patch?id=d7aeedabb"; + # 2020-06-19: NOTE: # Fix build with C++11 + # Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed. + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713"; sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; }) ]; - buildFlags = [ "CXXFLAGS=-std=c++03" ]; - # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; meta = { - description = "Abandoned library. Provides functions to read, create, and modify mp4 files"; + description = "Provides functions to read, create, and modify mp4 files"; longDescription = '' MP4v2 library provides an API to work with mp4 files as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This container format is derived from Apple's QuickTime format. ''; - homepage = "https://code.google.com/archive/p/mp4v2/"; + homepage = "https://github.com/TechSmith/mp4v2"; maintainers = [ lib.maintainers.Anton-Latukha ]; platforms = lib.platforms.unix; license = lib.licenses.mpl11; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 22b6644230..842d144005 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"; + sha256 = "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix index a63d367b80..cafc5c85f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix @@ -50,6 +50,8 @@ in stdenv.mkDerivation rec { --subst-var-by python ${pythonRuntime}/bin/python \ --subst-var-by out $out chmod +x $out/bin/protoc-gen-nanopb + + cp ../pb_common.c ../pb_decode.c ../pb_encode.c $out/include/ ''; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix index 57c47c79f8..7de16c7c11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2"; + sha256 = "0wbb6dwmzlsyy224y0liis0azgzwbjdvcyzc31pw1aw6vbp36na6"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; maintainers = with maintainers; [ fpletz ]; + license = licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix index f74030a02d..8d3c2179bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nv-codec-headers"; - version = "9.0.18.1"; + version = "9.1.23.1"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; rev = "n${version}"; - sha256 = "0354fivb92ix341jds7a7qn3mgwimrnxbganhlhr4vayj25c3hw5"; + sha256 = "1xfvb3mhz6wfx9c732888xa82ivaig903lhvvrqqzs31qfznsplh"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix index d5c2308623..66ed41e8ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w"; + sha256 = "15l6cf029ghfk5bf8ii6nyy86gc90ji8n5hspjhj1xmzmk61xb4j"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 7d9adca074..01ce51be18 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9"; + sha256 = "0diiy3g4wz5lnz5mdvka5p2nwmrpfldsz83sssr5yiir29m4lqap"; }; outputs = [ "out" "dev" "doc" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://01.org/dnnl"; changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ alexarice bhipple ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 7d0a9342aa..06d0d194cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -4,17 +4,22 @@ stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "1alhb7nvlxrr9yf757gs4hkzksbk3mxyv5zcmmpl82ibl65vh55k"; + sha256 = "0rbk1jbfc447x2wybz2hsba6w1ij0fq21996l52cqv39898lvy9d"; # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. # submodules increase src size and compile times significantly # not currently feasible due to how integrated cmake build is with git fetchSubmodules = true; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + postFetch = '' + rm -rf $out/winml/test/collateral/models/UnicodePath/ + ''; }; # TODO: build server, and move .so's to lib output @@ -36,8 +41,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Donnxruntime_USE_OPENMP=ON" "-Donnxruntime_BUILD_SHARED_LIB=ON" - # flip back to ON next release - "-Donnxruntime_ENABLE_LTO=OFF" # https://github.com/microsoft/onnxruntime/issues/2828 + "-Donnxruntime_ENABLE_LTO=ON" ]; # ContribOpTest.StringNormalizerTest sets locale to en_US.UTF-8" diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix index 682a547d8f..aaf6390d00 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencl-headers-${version}"; - version = "2020.03.13"; + version = "2020.06.16"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; rev = "v${version}"; - sha256 = "1d9ibiwicaj17757h9yyjc9i2hny8d8npn4spbjscins8972z3hw"; + sha256 = "0viiwhfqccw90r3mr45ab3wyhabpdrihplj5842brn5ny0ayh73z"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix index c8b1205bc9..f9b2e07fb4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "0qz9mdkanz4vd38bdpwvcwvbpzf19i6019rmqw3k1vh5mh22ljhr"; + sha256 = "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal"; }; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix index a7098fe930..2ac74c6c24 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.2.1"; + version = "1.2.2"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "1f8s69ixv7nsdap9hc2njli2x75zmlrfq8cy79772gz83kph8s25"; + sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp"; }; nativeBuildInputs = [ cmake python ispc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index a4274f064e..b60eb4fbaa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { "STRIP=" "prefix=$(out)" "moduledir=$(out)/lib/modules" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + "CC=${stdenv.cc.targetPrefix}cc" + ]; configureFlags = [ "--enable-overlays" @@ -40,8 +41,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; postBuild = '' - make $makeFlags -C contrib/slapd-modules/passwd/sha2 - make $makeFlags -C contrib/slapd-modules/passwd/pbkdf2 + make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2 + make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/pbkdf2 ''; doCheck = false; # needs a running LDAP server diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 5c185f630d..13f633ac0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin -, libpsm2, libfabric +, libpsm2, libfabric, pmix # Enable CUDA support , cudaSupport ? false, cudatoolkit ? null @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl ] + ++ lib.optionals isLinux [ libnl numactl pmix ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core @@ -55,8 +55,11 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; configureFlags = with stdenv; lib.optional (!cudaSupport) "--disable-mca-dso" - ++ lib.optional isLinux "--with-libnl=${libnl.dev}" - ++ lib.optional enableSGE "--with-sge" + ++ lib.optionals isLinux [ + "--with-libnl=${libnl.dev}" + "--with-pmix=${pmix}" + "--with-pmix-libdir=${pmix}/lib" + ] ++ lib.optional enableSGE "--with-sge" ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default" # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build # https://github.com/openucx/ucx diff --git a/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix new file mode 100644 index 0000000000..9f2c974803 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev }: + +stdenv.mkDerivation rec { + pname = "pc-ble-driver"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "pc-ble-driver"; + rev = "v${version}"; + sha256 = "1llhkpbdbsq9d91m873vc96bprkgpb5wsm5fgs1qhzdikdhg077q"; + }; + + cmakeFlags = [ + "-DNRF_BLE_DRIVER_VERSION=${version}" + ]; + + nativeBuildInputs = [ cmake git ]; + buildInputs = [ catch2 asio udev ]; + + meta = with stdenv.lib; { + description = "Desktop library for Bluetooth low energy development"; + homepage = "https://github.com/NordicSemiconductor/pc-ble-driver"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ jschievink ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix new file mode 100644 index 0000000000..2059b4db7f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +# , openscenegraph +, curl +, gdal +, hdf5-cpp +, LASzip +, libe57format +, libgeotiff +, libxml2 +, postgresql +, tiledb +, xercesc +, zlib +, zstd +}: + +stdenv.mkDerivation rec { + pname = "pdal"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "PDAL"; + repo = "PDAL"; + rev = version; + sha256 = "0zb3zjqgmjjryb648c1hmwh1nfa7893bjzbqpmr6shjxvzgnj9p6"; + }; + + patches = [ + # Fix duplicate paths like + # /nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0//nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0/lib + # similar to https://github.com/NixOS/nixpkgs/pull/82654. + # TODO Remove on release > 2.1.0 + (fetchpatch { + name = "pdal-Fixup-install-config.patch"; + url = "https://github.com/PDAL/PDAL/commit/2f887ef624db50c6e20f091f34bb5d3e65b5c5c8.patch"; + sha256 = "0pdw9v5ypq7w9i7qzgal110hjb9nqi386jvy3x2h4vf1dyalzid8"; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + # openscenegraph + curl + gdal + hdf5-cpp + LASzip + libe57format + libgeotiff + libxml2 + postgresql + tiledb + xercesc + zlib + zstd + ]; + + cmakeFlags = [ + "-DBUILD_PLUGIN_E57=ON" + "-DBUILD_PLUGIN_HDF=ON" + "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" + "-DBUILD_PLUGIN_TILEDB=ON" + + # Plugins that can probably be made working relatively easily: + # As of writing, seems to be incompatible (build error): + # error: no matching function for call to 'osg::TriangleFunctor::operator()(const Vec3&, const Vec3&, const Vec3&)' + "-DBUILD_PLUGIN_OPENSCENEGRAPH=OFF" # requires OpenGL + + # Plugins can probably not be made work easily: + "-DBUILD_PLUGIN_CPD=OFF" + "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs + "-DBUILD_PLUGIN_GEOWAVE=OFF" + "-DBUILD_PLUGIN_I3S=OFF" + "-DBUILD_PLUGIN_ICEBRIDGE=OFF" + "-DBUILD_PLUGIN_MATLAB=OFF" + "-DBUILD_PLUGIN_MBIO=OFF" + "-DBUILD_PLUGIN_MRSID=OFF" + "-DBUILD_PLUGIN_NITF=OFF" + "-DBUILD_PLUGIN_OCI=OFF" + "-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs + "-DBUILD_PLUGIN_RIVLIB=OFF" + ]; + + meta = with stdenv.lib; { + description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data."; + homepage = "https://pdal.io"; + license = licenses.bsd3; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix index 08d57cda6c..855df954eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix @@ -32,7 +32,9 @@ stdenv.mkDerivation { cp exe/* $out/bin ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "PDF to XML converter"; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix index 41908e0383..b27d947ea5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix @@ -2,28 +2,25 @@ stdenv.mkDerivation rec { pname = "hepmc"; - version = "2.06.10"; + version = "2.06.11"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz"; - sha256 = "190i9jlnwz1xpc495y0xc70s4zdqb9s2zdq1zkjy2ivl7ygdvpjs"; + sha256 = "1pp89bs05nv60wjk1690ndwh4dsd5mk20bzsd4a2lklysdifvb6f"; }; - patches = [ ./in_source.patch ]; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-Dmomentum:STRING=GEV" "-Dlength:STRING=MM" ]; - enableParallelBuilding = true; - - meta = { + meta = with stdenv.lib; { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; - license = stdenv.lib.licenses.gpl2; + license = licenses.lgpl21; homepage = "http://hepmc.web.cern.ch/hepmc/"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/in_source.patch b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/in_source.patch deleted file mode 100644 index 836a565586..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/in_source.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,21 +37,6 @@ message(STATUS "default momentum and length are ${HEPMC_DEFAULT_MOM_UNIT} ${HEPM - # find the HepMC cmake modules - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH}) - --# make sure we are not building from within the source code directory --string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" in_source) --string( REGEX MATCH "${CMAKE_SOURCE_DIR}/" in_source_subdir --"${CMAKE_BINARY_DIR}") --if (in_source OR in_source_subdir) -- message(FATAL_ERROR " --ERROR: In source builds of this project are not allowed. --A separate build directory is required. --Please create one and run cmake from the build directory. --Also note that cmake has just added files to your source code directory. --We suggest getting a new copy of the source code. --Otherwise, delete `CMakeCache.txt' and the directory `CMakeFiles'. -- ") --endif () -- - # build_docs is OFF (false) by default - if ( build_docs ) - message(STATUS "documents WILL be built and installed" ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index bcf986346a..abf37def8c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1cgr9jyfd9r7dwbk8fr3rys5dc74cmbx368441jvqngqymmb563w"; + sha256 = "0yjpx7n6ry3pfgkf7d7v7mcc3yv7681kf8nq2b1fgspl8jbd0hf0"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index 9d4d60949c..1a8d5a6fd3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "1nqbv334iwdvbsc5bw8g936cxzc1hyzv9r8kjy4v124vrw8qqmc9"; + sha256 = "12msmjiajvy2xj2m64n2fxblai5xg06a829wi7scsc7nw2jhxpfr"; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix new file mode 100644 index 0000000000..c8d8be4e8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, perl, autoconf, automake +, libtool, flex, libevent, hwloc, munge, zlib +} : + +let + version = "3.1.5"; + +in stdenv.mkDerivation { + pname = "pmix"; + inherit version; + + src = fetchFromGitHub { + repo = "openpmix"; + owner = "openpmix"; + rev = "v${version}"; + sha256 = "0fvfsig20amcigyn4v3gcdxc0jif44vqg37b8zzh0s8jqqj7jz5w"; + }; + + postPatch = '' + patchShebangs ./autogen.pl + patchShebangs ./config + ''; + + nativeBuildInputs = [ perl autoconf automake libtool flex ]; + + buildInputs = [ libevent hwloc munge zlib ]; + + configureFlags = [ + "--with-libevent=${libevent.dev}" + "--with-munge=${munge}" + "--with-hwloc=${hwloc.dev}" + ]; + + preConfigure = '' + ./autogen.pl + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Process Management Interface for HPC environments"; + homepage = "https://openpmix.github.io/"; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix new file mode 100644 index 0000000000..57f4ef5956 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, libmicrohttpd +}: +let + build = + { pname + , subdir + , buildInputs ? [ ] + , description + }: + stdenv.mkDerivation rec { + inherit pname; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "digitalocean"; + repo = "prometheus-client-c"; + rev = "v${version}"; + sha256 = "0g69s24xwrv5974acshrhnp6i8rpby8c6bhz15m3d8kpgjw3cm8f"; + }; + + nativeBuildInputs = [ cmake ]; + inherit buildInputs; + + # These patches will be in 0.1.2 + patches = [ + # Required so CMAKE_INSTALL_PREFIX is honored, otherwise it + # installs headers in /usr/include (absolute) + ( + fetchpatch { + url = "https://github.com/digitalocean/prometheus-client-c/commit/5fcedeb506b7d47dd7bab35797f2c3f23db6fe10.patch"; + sha256 = "10hzg8v5jcgxz224kdq0nha9vs78wz098b0ys7gig2iwgrg018fy"; + } + ) + ( + fetchpatch { + url = "https://github.com/digitalocean/prometheus-client-c/commit/0c15e7e45ad0c3726593591fdd7d8f2fde845fe3.patch"; + sha256 = "06899v1xz3lpsdxww4p3q7pv8nrymnibncdc472056znr5fidlp0"; + } + ) + ]; + + preConfigure = '' + cd ${subdir} + ''; + + meta = { + homepage = "https://github.com/digitalocean/prometheus-client-c/"; + inherit description; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.cfsmp3 ]; + }; + }; +in +rec { + libprom = build { + pname = "libprom"; + subdir = "prom"; + description = "A Prometheus Client in C"; + }; + libpromhttp = build { + pname = "libpromhttp"; + subdir = "promhttp"; + buildInputs = [ libmicrohttpd libprom ]; + description = "A Prometheus HTTP Endpoint in C"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix index 00d9ec7f96..6f9add8adc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.12.0"; - sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a"; + version = "3.12.3"; + sha256 = "0q4sn9d6x8w0zgzydfx9f7b2zdk0kiplk8h9jxyxhw6m9qn276ax"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index 1c972e5440..8512806e45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -3,8 +3,9 @@ , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libmng, which, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi -, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base -, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) +, buildMultimedia ? false # ancient gstreamer is broken +, alsaLib, gstreamer, gst-plugins-base +, buildWebkit ? false , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , flashplayerFix ? false, gdk-pixbuf , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index f17165b5ed..2120c69385 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0cv0lxyi2sr0k7f03rsh1j28avdxd0l0480jsa95ca3d2lq392g3"; + sha256 = "0jq3y63c36nr2rprg7im9ik112p5zvhj46vzgxfbnpvskmg0cchm"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix index 4ca3be7fe7..c399298b8f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "quazip"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; rev = "v${version}"; - sha256 = "0psvf3d9akyyx3bckc9325nmbp97xiagf8la4vhca5xn2f430fbn"; + sha256 = "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"; }; buildInputs = [ zlib qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qwt/6.nix b/third_party/nixpkgs/pkgs/development/libraries/qwt/6.nix index 54af3f3084..1a29bb90fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qwt/6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qwt/6.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { - name = "qwt-6.1.4"; + name = "qwt-6.1.5"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m"; + sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"; }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index ed3d7ae9e7..68c4a95d0b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.9.18"; + version = "0.9.23"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "v${version}"; - sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k"; + sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; @@ -18,13 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /usr/bin/ " " ''; - # test fails - # - #append/finalizeSegment [ ERROR ] - #Error: test/integration/test_uv_append.c:264: assertion failed: test_dir_has_file(f->dir, "0000000000000001-0000000000000004") is not true - #Error: child killed by signal 6 (Aborted) - - doCheck = false; + doCheck = true; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/randomx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/randomx/default.nix index 5b0c2b8a65..6de7ecdfef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/randomx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.7"; + version = "1.1.8"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "1d42dw4zrd7mzfqs6gwk27jj6lsh6pwv85p1ckx9dxy8mw3m52ah"; + sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix b/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix index 10b7510468..9c0774f925 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "robin-map"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; rev = "v${version}"; - sha256 = "0y532zg0aaqz3fpv785n2drwpnryaclr53drpqimnbf3cs0jw997"; + sha256 = "1li70vwsksva9c4yly90hjafgqfixi1g6d52qq9p6r60vqc4pkjj"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix new file mode 100644 index 0000000000..f1917b8f2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, fetchFromGitHub +, cmake +, rocm-cmake +, clang +, rocm-comgr +, rocm-opencl-runtime +, rocm-runtime +, rocm-thunk +, libelf +, libglvnd +, libX11 +}: + +stdenv.mkDerivation rec { + pname = "rocclr"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "ROCclr"; + rev = "roc-${version}"; + sha256 = "0j70lxpwrdrb1v4lbcyzk7kilw62ip4py9fj149d8k3x5x6wkji1"; + }; + + nativeBuildInputs = [ cmake rocm-cmake ]; + + buildInputs = [ clang rocm-comgr rocm-runtime rocm-thunk clang ]; + + propagatedBuildInputs = [ libelf libglvnd libX11 ]; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_CURRENT_BINARY_DIR}/amdrocclr_staticTargets.cmake")' \ + 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_INSTALL_LIBDIR}/cmake/amdrocclr_staticTargets.cmake")' \ + --replace 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_CURRENT_BINARY_DIR}/lib)' \ + 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' + substituteInPlace device/comgrctx.cpp \ + --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" + ''; + + cmakeFlags = [ + "-DOPENCL_DIR=${rocm-opencl-runtime.src}" + ]; + + preFixup = '' + mv $out/include/include/* $out/include + ln -s $out/include/compiler/lib/include/* $out/include/include + ln -s $out/include/compiler/lib/include/* $out/include + sed "s|^\([[:space:]]*IMPORTED_LOCATION_RELEASE \).*|\1 \"$out/lib/libamdrocclr_static.a\"|" -i $out/lib/cmake/amdrocclr_staticTargets.cmake + ''; + + meta = with stdenv.lib; { + description = "Radeon Open Compute common language runtime"; + homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + # rocclr seems to have some AArch64 ifdefs, but does not seem + # to be supported yet by the build infrastructure. Recheck in + # the future. + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 6606f57bc4..9bc3770f21 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -1,42 +1,49 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, cmake, ninja -, bzip2, lz4, snappy, zlib, zstd +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, ninja +, bzip2 +, lz4 +, snappy +, zlib +, zstd , enableLite ? false }: stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.4.6"; + version = "6.10.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0s0n4p1b4jzmslz9d2xd4ajra0m6l9x26mjwlbgw0klxjggmy8qn"; + sha256 = "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1"; }; nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ bzip2 lz4 snappy zlib zstd ]; patches = [ - # https://github.com/facebook/rocksdb/pull/6076 + # Without this change private dependencies are exported. + # Can be removed after the next release. + # https://github.com/facebook/rocksdb/pull/6790 (fetchpatch { - url = "https://github.com/facebook/rocksdb/commit/c0be4b2ff1a5393419673fab961cb9b09ba38752.diff"; - sha256 = "1f2wg9kqlmf2hiiihmbp8m5fr2wnn7896g6i9yg9hdgi40pw30w6"; + url = "https://github.com/facebook/rocksdb/commit/07204837ce8d66e1e6e4893178f3fd040f9c1044.patch"; + sha256 = "17097ybkhy0i089zzkpvcj65c7g5skvjvdzi1k09x4i1d719wm39"; }) ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " - ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [ "-DPORTABLE=1" "-DWITH_JEMALLOC=0" "-DWITH_JNI=0" - "-DWITH_TESTS=0" + "-DWITH_BENCHMARK_TOOLS=0" + "-DWITH_TESTS=1" "-DWITH_TOOLS=0" "-DWITH_BZ2=1" "-DWITH_LZ4=1" diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix new file mode 100644 index 0000000000..c86b081a14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }: + +stdenv.mkDerivation rec { + pname = "rocm-comgr"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "ROCm-CompilerSupport"; + rev = "rocm-${version}"; + sha256 = "0h9bxz98sskgzc3xpnp469iq1wi59nbijbqprlylha91y10hqb88"; + }; + + sourceRoot = "source/lib/comgr"; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ clang device-libs lld llvm ]; + + cmakeFlags = [ + "-DCLANG=${clang}/bin/clang" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_C_COMPILER=${clang}/bin/clang" + "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" + "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm" + "-DLLD_INCLUDE_DIRS=${lld.src}/include" + "-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\"" + ]; + + # The comgr build tends to link against the static LLVM libraries + # *and* the dynamic library. Linking against both causes errors + # about command line options being registered twice. This patch + # removes the static library linking. + patchPhase = '' + sed -e '/^llvm_map_components_to_libnames/,/[[:space:]]*Symbolize)/d' \ + -i CMakeLists.txt + ''; + + meta = with stdenv.lib; { + description = "APIs for compiling and inspecting AMDGPU code objects"; + homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; + license = licenses.ncsa; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix new file mode 100644 index 0000000000..a71a6a880c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, cmake +, clang +, clang-unwrapped +, lld +, llvm +, rocm-runtime +}: + +stdenv.mkDerivation rec { + pname = "rocm-device-libs"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "ROCm-Device-Libs"; + rev = "rocm-${version}"; + sha256 = "0n160jwbh7jnqckz5bn979ll8afh2a97lf962xh9xv3cx025vnrn"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ clang lld llvm rocm-runtime ]; + + cmakeBuildType = "Release"; + + cmakeFlags = [ + "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${clang-unwrapped}/lib/cmake/clang" + "-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'" + "-DCLANG=${clang}/bin/clang" + ]; + + meta = with stdenv.lib; { + description = "Set of AMD-specific device-side language runtime libraries"; + homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; + license = licenses.ncsa; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix new file mode 100644 index 0000000000..6830d95619 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -0,0 +1,20 @@ +{ stdenv, rocm-opencl-runtime }: + +stdenv.mkDerivation rec { + pname = "rocm-opencl-icd"; + version = "3.5.0"; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/etc/OpenCL/vendors + echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd + ''; + + meta = with stdenv.lib; { + description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix new file mode 100644 index 0000000000..0c7ce26021 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, fetchFromGitHub +, addOpenGLRunpath +, cmake +, rocm-cmake +, clang +, clang-unwrapped +, libGLU +, libX11 +, lld +, llvm +, mesa +, python2 +, rocclr +, rocm-comgr +, rocm-device-libs +, rocm-runtime +, rocm-thunk +}: + +let + version = "3.5.0"; + tag = "roc-${version}"; +in stdenv.mkDerivation rec { + inherit version; + + pname = "rocm-opencl-runtime"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "ROCm-OpenCL-Runtime"; + rev = tag; + sha256 = "1wrr6mmn4gf6i0vxp4yqk0ny2wglvj1jfj50il8czjwy0cwmhykk"; + name = "ROCm-OpenCL-Runtime-${tag}-src"; + }; + + nativeBuildInputs = [ cmake rocm-cmake ]; + + buildInputs = [ + clang + clang-unwrapped + libGLU + libX11 + lld + llvm + mesa + python2 + rocclr + rocm-comgr + rocm-device-libs + rocm-runtime + rocm-thunk + ]; + + cmakeFlags = [ + "-DAMDGPU_TARGET_TRIPLE='amdgcn-amd-amdhsa'" + "-DCLANG_OPTIONS_APPEND=-Wno-bitwise-conditional-parentheses" + "-DClang_DIR=${clang-unwrapped}/lib/cmake/clang" + "-DLIBROCclr_STATIC_DIR=${rocclr}/lib/cmake" + "-DLLVM_DIR=${llvm.out}/lib/cmake/llvm" + "-DUSE_COMGR_LIBRARY='yes'" + ]; + + dontStrip = true; + + # Fix the ICD installation path for NixOS + postPatch = '' + substituteInPlace khronos/icd/loader/linux/icd_linux.c \ + --replace 'ICD_VENDOR_PATH' '"${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors/"' + echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt + ''; + + preFixup = '' + patchelf --set-rpath "$out/lib" $out/bin/clinfo + ''; + + meta = with stdenv.lib; { + description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; + homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/default.nix new file mode 100644 index 0000000000..3962804306 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, autoPatchelfHook, rpmextract, rocm-runtime }: + +stdenv.mkDerivation rec { + pname = "rocm-runtime-ext"; + version = "3.5.1"; + + src = fetchurl { + url = "https://repo.radeon.com/rocm/yum/3.5.1/hsa-ext-rocr-dev-1.1.30501.0-rocm-rel-3.5-34-def83d8a-Linux.rpm"; + sha256 = "0r7lrmnplr10hs6wrji55i3dnczfzlmp8jahm1g3mhq2x12zmly0"; + }; + + nativeBuildInputs = [ autoPatchelfHook rpmextract ]; + + buildInputs = [ rocm-runtime stdenv.cc.cc ]; + + unpackPhase = "rpmextract ${src}"; + + installPhase = '' + mkdir -p $out/lib + cp -R opt/rocm-${version}/hsa/lib $out/lib/rocm-runtime-ext + ''; + + setupHook = ./setup-hook.sh; + + meta = with stdenv.lib; { + description = "Platform runtime for ROCm (closed-source extensions)"; + longDescription = '' + This package provides closed-source extensions to the ROCm + runtime. Currently this adds support for OpenCL image + processing. + + In order for the ROCm runtime to pick up the extension, you + should either set the ROCR_EXT_DIR environment variable should + be set to ''${rocm-runtime-ext}/lib/rocm-runtime-ext or this + package should be added to the hardware.opengl.extraPackages + NixOS configuration option. + ''; + homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; + license = with licenses; [ unfreeRedistributable ]; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh new file mode 100644 index 0000000000..150d65570e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh @@ -0,0 +1,7 @@ +addRocmRuntimeExtDir () { + if [[ -z "${ROCR_EXT_DIR-}" ]]; then + export ROCR_EXT_DIR="@out@/lib/rocm-runtime-ext" + fi +} + +addEnvHooks "$hostOffset" addRocmRuntimeExtDir diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix new file mode 100644 index 0000000000..7470784d48 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, addOpenGLRunpath +, cmake +, elfutils +, rocm-thunk }: + +stdenv.mkDerivation rec { + pname = "rocm-runtime"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "ROCR-Runtime"; + rev = "rocm-${version}"; + sha256 = "028x1f0if6lw41cpfpysp82ikp6c3fdxxd2a6ixs0vpm4424svb1"; + }; + + sourceRoot = "source/src"; + + buildInputs = [ cmake elfutils ]; + + cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; + + # Use the ROCR_EXT_DIR environment variable and/or OpenGL driver + # link path to try to find binary-only ROCm runtime extension + # libraries. Without this change, we would have to rely on + # LD_LIBRARY_PATH to let the HSA runtime discover the shared + # libraries. + patchPhase = '' + substitute '${./rocr-ext-dir.diff}' ./rocr-ext-dir.diff \ + --subst-var-by rocrExtDir "${addOpenGLRunpath.driverLink}/lib/rocm-runtime-ext" + patch -p2 < ./rocr-ext-dir.diff + ''; + + fixupPhase = '' + rm -r $out/lib $out/include + mv $out/hsa/lib $out/hsa/include $out + ''; + + meta = with stdenv.lib; { + description = "Platform runtime for ROCm"; + homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; + license = with licenses; [ ncsa ]; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff new file mode 100644 index 0000000000..21ffe7d8c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff @@ -0,0 +1,23 @@ +diff --git a/src/core/runtime/runtime.cpp b/src/core/runtime/runtime.cpp +index dd6a15c..fb6de49 100644 +--- a/src/core/runtime/runtime.cpp ++++ b/src/core/runtime/runtime.cpp +@@ -1358,7 +1358,17 @@ void Runtime::LoadExtensions() { + core::HsaApiTable::HSA_EXT_FINALIZER_API_TABLE_ID); + + // Update Hsa Api Table with handle of Image extension Apis +- extensions_.LoadImage(kImageLib[os_index(os::current_os)]); ++ // ++ // Use ROCR_EXT_DIR when it is non-empty. Otherwise, try to load the ++ // library from the OpenGL driver path. ++ std::string extDirVar = os::GetEnvVar("ROCR_EXT_DIR"); ++ if (!extDirVar.empty()) { ++ extensions_.LoadImage(extDirVar + "/" + kImageLib[os_index(os::current_os)]); ++ } else { ++ std::string globalDriverDir("@rocrExtDir@"); ++ extensions_.LoadImage(globalDriverDir + "/" + kImageLib[os_index(os::current_os)]); ++ } ++ + hsa_api_table_.LinkExts(&extensions_.image_api, + core::HsaApiTable::HSA_EXT_IMAGE_API_TABLE_ID); + } diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix new file mode 100644 index 0000000000..42b632d293 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, numactl +}: + +stdenv.mkDerivation rec { + pname = "rocm-thunk"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "ROCT-Thunk-Interface"; + rev = "rocm-${version}"; + sha256 = "0xn1z0xc3phjc9vabwxgph5any4ffhc8wgs5yb15m5wpg87l8x1z"; + }; + + preConfigure = '' + export cmakeFlags="$cmakeFlags " + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ numactl ]; + + postInstall = '' + cp -r $src/include $out + ''; + + meta = with stdenv.lib; { + description = "Radeon open compute thunk interface"; + homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; + license = with licenses; [ bsd2 mit ]; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 318922d7f2..89d88bdf56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -99,12 +99,12 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal"; + sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b"; }; inherit blas64; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index 6eeeda9e92..a4d0850c77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,27 +2,37 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.13.1"; + version = "3.13.2"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0pr604b9pnryl9q0q5arlhs0xdx7wslca0sbz0pzs9qylmz775qp"; + sha256 = "0yf5lm8dqpbz1yq9nvd5g2iy2w0rgjp9vcj44ba63rwig37j3clp"; }; - nativeBuildInputs = [ blas gfortran.cc.lib lapack python ]; + nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + # Upstream does some hot she-py-bang stuff, this change streamlines that + # process. The original script in upstream is both a shell script and a + # python script, where the shellscript just finds a suitable python + # interpreter to execute the python script. See + # https://github.com/NixOS/nixpkgs/pull/89299#discussion_r450203444 + # for more details. + prePatch = '' + substituteInPlace configure \ + --replace /bin/sh /usr/bin/python + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace config/install.py \ --replace /usr/bin/install_name_tool install_name_tool ''; preConfigure = '' + export FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" patchShebangs . configureFlagsArray=( $configureFlagsArray "--CC=$CC" "--with-cxx=$CXX" - "--with-fc=0" + "--with-fc=$FC" "--with-mpi=0" "--with-blas-lib=[${blas}/lib/libblas.so,${gfortran.cc.lib}/lib/libgfortran.a]" "--with-lapack-lib=[${lapack}/lib/liblapack.so,${gfortran.cc.lib}/lib/libgfortran.a]" diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 5a2c28d3c0..5244ccdb28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.2.2"; + version = "3.3.0"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "04hprrgj0f44ml2f0w4jfwgrvy8l2s6ya0c9xc8gwlbmkc7a4c62"; + sha256 = "1fin9741ild3dv7c9gk07kpizsnnx17ar9cv9lny8vl47pms940h"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix index 178cee5e69..d711cd9fc8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/f4exb/serialdv"; platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; + license = licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix index ab4fd2c7bf..3a7c0b3c41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.1.1"; + version = "2020.1.3"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "1z52r28xg05q6hdlh4szzfjlpgkvbdyn2dpaji9b57y58ccrqsfh"; + sha256 = "1l8kiicm0klbx0b05994vqd8a8wj7k0djbbg41a6i3q5d17jrnk6"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix index 10a60c3698..cf0896170c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mesa, libX11 }: +{ stdenv, fetchurl, unzip, mesa, libX11, libGL }: stdenv.mkDerivation { name = "soil"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52"; }; - buildInputs = [ unzip mesa libX11 ]; + buildInputs = [ unzip mesa libGL libX11 ]; sourceRoot = "Simple OpenGL Image Library/projects/makefile"; preBuild = "mkdir obj"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix index e8d4f3eb4e..1b5abe16f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -1,24 +1,54 @@ -{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libbsd, libuuid, numactl, openssl }: +{ stdenv +, fetchurl +, fetchFromGitHub +, fetchpatch +, ncurses +, python3 +, cunit +, dpdk +, libaio +, libbsd +, libuuid +, numactl +, openssl +}: -stdenv.mkDerivation rec { +let + dpdk-compat-patch = fetchurl { + url = "https://review.spdk.io/gerrit/plugins/gitiles/spdk/spdk/+/6acb9a58755856fb9316baf9dbbb7239dc6b9446%5E%21/?format=TEXT"; + sha256 = "18q0956fkjw19r29hp16x4pygkfv01alj9cld2wlqqyfgp41nhn0"; + }; +in stdenv.mkDerivation rec { pname = "spdk"; - version = "20.01.1"; + version = "20.04.1"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "1ci0kj0bv5jp5yipa8g0q0ah71qv6pjvvban1ad0v24f7lq4xh0w"; + sha256 = "ApMyGamPrMalzZLbVkJlcwatiB8dOJmoxesdjkWZElk="; }; - patches = [ ./spdk-dpdk-meson.patch ]; + patches = [ + ./spdk-dpdk-meson.patch + # https://review.spdk.io/gerrit/c/spdk/spdk/+/3134 + (fetchpatch { + url = "https://github.com/spdk/spdk/commit/c954b5b722c5c163774d3598458ff726c48852ab.patch"; + sha256 = "1n149hva5qxmpr0nmav10nya7zklafxi136f809clv8pag84g698"; + }) + ]; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ + python3 + ]; - buildInputs = [ cunit dpdk libaio libbsd libuuid numactl openssl ]; + buildInputs = [ + cunit dpdk libaio libbsd libuuid numactl openssl ncurses + ]; postPatch = '' patchShebangs . + base64 -d ${dpdk-compat-patch} | patch -p1 ''; configureFlags = [ "--with-dpdk=${dpdk}" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix index cf8a9aaa73..5c65c84e54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "sqlite-analyzer"; - version = "3.32.2"; + version = "3.32.3"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1jqhs896cvp9l399mjpbv1x2qbfvq875l1vrgnl3zc4ffdjxs9z0"; + sha256 = "1fgmslzf013ry3a7g2vms7zyg24gs53gfj308r6ki4inbn3g04lk"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 35d3d062ab..cd0042e722 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.32.2"; + version = "3.32.3"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1130bcd70s2vlsq0d638pb5qrw9kwqvjswnp2dfypghx9hjz3gid"; + sha256 = "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix index 46cf437d72..24980e9b70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -11,14 +11,14 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "sundials"; - version = "5.1.0"; + version = "5.3.0"; buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ]; nativeBuildInputs = [ cmake ]; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "08cvzmbr2qc09ayq4f5j07lw97hl06q4dl26vh4kh822mm7x28pv"; + sha256 = "19xwi7pz35s2nqgldm6r0jl2k0bs36zhbpnmmzc56s1n3bhzgpw8"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix index b8e438819d..2addb86246 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let - inherit (python2Packages) python dbus-python; + inherit (python3Packages) python dbus-python; in stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.7"; + name = "telepathy-qt-0.9.8"; src = fetchurl { url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; + sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad"; }; nativeBuildInputs = [ cmake pkgconfig python ]; @@ -16,14 +16,6 @@ in stdenv.mkDerivation rec { buildInputs = [ dbus-glib ]; checkInputs = [ dbus.daemon dbus-python ]; - patches = [ - # https://github.com/TelepathyIM/telepathy-qt/issues/25 - (fetchpatch { - url = "https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch"; - sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh"; - }) - ]; - # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix new file mode 100644 index 0000000000..1b5ea1ff39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchgit, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "tllist"; + version = "1.0.1"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/tllist.git"; + rev = "${version}"; + sha256 = "0xifbbfg1kn281jybdc6ns5kzz0daha4hf47bd0yc0wcmvcfbgmp"; + }; + + nativeBuildInputs = [ + meson ninja + ]; + + meta = with lib; { + homepage = "https://codeberg.org/dnkl/tllist"; + description = "C header file only implementation of a typed linked list"; + maintainers = with maintainers; [ fionera ]; + license = licenses.mit; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/tremor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tremor/default.nix index c2cb8a836b..722094f859 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tremor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tremor/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: +{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }: stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; - src = fetchgit { - url = "https://git.xiph.org/tremor.git"; + src = fetchFromGitLab { + owner = "xiph"; + repo = "tremor"; + domain = "gitlab.xiph.org"; rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f"; sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix index d3c30028ba..f2de470288 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tweeny"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "mobius3"; repo = "tweeny"; rev = "v${version}"; - sha256 = "0qvby57g9a2m4afd1mgard3k7nm4ynbvali7nzm1qn3ygdmqid7n"; + sha256 = "0zk7p21i54hfz0l50617i3gxhxh0n9yy86n2fxg8m26cvf4yhsj7"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/uci/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uci/default.nix index e3bdea8c88..aa2a88653b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uci/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uci/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2020-01-27"; + version = "unstable-2020-04-27"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "e8d83732f9eb571dce71aa915ff38a072579610b"; - sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by"; + rev = "ec8d3233948603485e1b97384113fac9f1bab5d6"; + sha256 = "0p765l8znvwhzhgkq7dp36w62k5rmzav59vgdqmqq1bjmlz1yyi6"; }; hardeningDisable = [ "all" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/urdfdom-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/urdfdom-headers/default.nix new file mode 100644 index 0000000000..91fc747b84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/urdfdom-headers/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, validatePkgConfig }: + +stdenv.mkDerivation rec { + pname = "urdfdom-headers"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "ros"; + repo = "urdfdom_headers"; + rev = version; + sha256 = "1abzhcyv2vad8l36vy0fcz9kpgns834la7hf9zal962bwycqnkmg"; + }; + + patches = [ + # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom_headers/pull/66) + (fetchpatch { + url = "https://github.com/ros/urdfdom_headers/commit/990fd233b1a3ff68872a3552f3ea5ccbe105848c.patch"; + sha256 = "1hxf2kw3mkll3fzvsby104b2m854bdpiy9gr3r9ysmw2r537gqdy"; + }) + ]; + + nativeBuildInputs = [ cmake validatePkgConfig ]; + + meta = with lib; { + description = "URDF (U-Robot Description Format) headers provides core data structure headers for URDF"; + homepage = "https://github.com/ros/urdfdom_headers"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/urdfdom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/urdfdom/default.nix new file mode 100644 index 0000000000..1b75851c93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/urdfdom/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, validatePkgConfig +, tinyxml, boost, urdfdom-headers, console-bridge }: + +stdenv.mkDerivation rec { + pname = "urdfdom"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "ros"; + repo = pname; + rev = version; + sha256 = "0wambq06d7dvja25zcv4agc055q9rmf3xkrnxy8lsf4nic7ra2rr"; + }; + + patches = [ + # Fix CMake saying console-bridge 1.0 is incompatible + (fetchpatch { + url = "https://github.com/ros/urdfdom/commit/6faba176d41cf39114785a3e029013f941ed5a0e.patch"; + sha256 = "1pn9hcg5wkkc7y28sbkxvffqxgvazzsp3g1xmz6h055v4f9ikjbs"; + }) + # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom/pull/142) + (fetchpatch { + url = "https://github.com/ros/urdfdom/commit/707c97c3d1f739ba0ab6e93e1bf7cd01d68a8c07.patch"; + sha256 = "10bv7sv7gfy6lj8z5bkw7v291y12fbrrxsiqxqjxg4i65rfg92ng"; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config validatePkgConfig ]; + buildInputs = [ tinyxml boost ]; + propagatedBuildInputs = [ urdfdom-headers console-bridge ]; + + meta = with lib; { + description = "Provides core data structures and a simple XML parser for populating the class data structures from an URDF file"; + homepage = "https://github.com/ros/urdfdom"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix index c61429324e..81edb9caea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,38 +1,32 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 +{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext , enableHybridCodec ? false, vaapi-intel-hybrid }: stdenv.mkDerivation rec { pname = "intel-vaapi-driver"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "intel-vaapi-driver"; rev = version; - sha256 = "019w0hvjc9l85yqhy01z2bvvljq208nkb43ai2v377l02krgcrbl"; + sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp"; }; - patchPhase = '' - patchShebangs ./src/shaders/gpp.py - ''; - - preConfigure = '' - sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure - ''; + # Set the correct install path: + LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; postInstall = stdenv.lib.optionalString enableHybridCodec '' ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ ''; configureFlags = [ - "--enable-drm" "--enable-x11" "--enable-wayland" ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec"; - nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ]; buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ] ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid; @@ -42,8 +36,18 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://01.org/linuxmedia"; license = licenses.mit; - description = "Intel driver for the VAAPI library"; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; + description = "VA-API user mode driver for Intel GEN Graphics family"; + longDescription = '' + This VA-API video driver backend provides a bridge to the GEN GPUs through + the packaging of buffers and commands to be sent to the i915 driver for + exercising both hardware and shader functionality for video decode, + encode, and processing. + VA-API is an open-source library and API specification, which provides + access to graphics hardware acceleration capabilities for video + processing. It consists of a main library and driver-specific acceleration + backends for each supported hardware vendor. + ''; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix index fb8c0e0fa2..bca025d622 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports ''; - meta = { + meta = with stdenv.lib; { description = "WASI libc implementation for WebAssembly"; homepage = "https://wasi.dev"; - platforms = lib.platforms.wasi; - maintainers = [ lib.maintainers.matthewbauer ]; + platforms = platforms.wasi; + maintainers = [ maintainers.matthewbauer ]; + license = with licenses; [ asl20 mit llvm-exception ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/waylandpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/waylandpp/default.nix index 5b02ce826a..5fc466cec2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/waylandpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/waylandpp/default.nix @@ -16,13 +16,13 @@ assert docSupport -> doxygen != null; with stdenv.lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz"; + sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix index 0b57d09931..d13cdaff8c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "7.2"; + version = "7.3"; pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="0fbf6ypq7ag9dmjn65ja5vbfxswb6511bja8rbna25wmhns9x5b3"; + sha256 ="0q99k61l2zh6irzkd5195aama37mlm0nivamz6j6r8l2ad1cy0ab"; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 53d0ae966b..0bc480b635 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -61,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.28.2"; + version = "2.28.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1g9hik3bprki5s9d7y5288q5irwckbzajr6rnlvjrlnqrwjkblmr"; + sha256 = "08imj2q6h975mz7714dqdrmbav0s884990gf98xf2862fb08m2gh"; }; patches = optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wiiuse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wiiuse/default.nix new file mode 100644 index 0000000000..4dcc8a4710 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/wiiuse/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, bluez +}: +stdenv.mkDerivation rec { + + pname = "WiiUse"; + version = "0.15.5"; + + src = fetchFromGitHub { + owner = "wiiuse"; + repo = "wiiuse"; + rev = "${version}"; + sha256 = "05gc3s0wxx7ga4g32yyibyxdh46rm9bbslblrc72ynrjxq98sg13"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ (lib.getDev bluez) ]; + + cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=NO" ]; + + meta = with lib; { + description = "Feature complete cross-platform Wii Remote access library"; + license = licenses.gpl3; + homepage = "https://github.com/wiiuse/wiiuse"; + maintainers = with maintainers; [ shamilton ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 33db6e9d75..46a1fc45d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0j2lh9vc92zhn44rjbia5aw3y1rpgfng1x1h17lcvj5m4i6vj0pc"; + sha256 = "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p"; }; # $out for the library and $examples for the example programs (in examples): @@ -21,11 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ - libGL wayland-protocols libinput libxkbcommon pixman + libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa libpng ffmpeg ]; + mesonFlags = [ "-Dlogind-provider=systemd" ]; + postInstall = '' # Copy the library to $examples mkdir -p $examples/lib diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index da29eacdc0..f125ac9dca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm , gtk2, GConf ? null, gtk3 -, xorgproto, gstreamer, gst-plugins-base, setfile +, xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported , libGLU ? null, libGL ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base + libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base ] ++ optionals withGtk2 [ gtk2 GConf ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix index 790968a88f..c62a11f91b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm , gtk2, GConf ? null, gtk3 -, xorgproto, gstreamer, gst-plugins-base, setfile +, xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat28 ? false, compat30 ? true, unicode ? true @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base + libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base ] ++ optionals withGtk2 [ gtk2 GConf ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix index ef50bf31a3..33a4fb93cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -18,6 +18,7 @@ let nativeBuildInputs = [ autoreconfHook ]; doCheck = true; + AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; @@ -37,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.15" "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i"; + xapian_1_4 = generic "1.4.16" "4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 994c2864e7..90265d61c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1gpbjkfkrpk96krc1zbccrq7sih282mg303ifxaaxbnj6d8drm5h"; + sha256 = "183iha9dxmvprn99ymgz17jx1lyn1fj5jyj6ghxl716zn9mxmird"; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 gnome3.gnome-desktop + gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc) ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 02c039b8ea..b06edc6327 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -6,7 +6,7 @@ , pkgconfig , libxml2 , glib -, pipewire_0_2 +, pipewire , fontconfig , flatpak , gsettings-desktop-schemas @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.6.0"; + version = "1.7.2"; outputs = [ "out" "installedTests" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "0fbsfpilwbv7j6cimsmmz6g0r96bw0ziwyk9z4zg2rd1mfkmmp9a"; + sha256 = "0rkwpsmbn3d3spkzc2zsd50l2r8pp4la390zcpsawaav8w7ql7xm"; }; patches = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - pipewire_0_2 + pipewire fontconfig flatpak acl @@ -61,10 +61,6 @@ stdenv.mkDerivation rec { json-glib ]; - # Seems to get stuck after "PASS: test-portals 39 /portal/inhibit/monitor" - # TODO: investigate! - doCheck = false; - configureFlags = [ "--enable-installed-tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xxHash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xxHash/default.nix index 9d2ed44cb4..58bf562b08 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xxHash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a"; + sha256 = "08j7wxshhzpyrnyilfnvhyv5ycm0yv5m7jf6q4kxcd7j4dcbhmpb"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zlog/default.nix index 4788613a3d..f0ca99b766 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zlog/default.nix @@ -1,33 +1,23 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.2.14"; + version = "1.2.15"; pname = "zlog"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz"; - sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5"; + src = fetchFromGitHub { + owner = "HardySimpson"; + repo = pname; + rev = version; + sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb"; }; - configurePhase = '' - sed -i 's;-Werror;;' src/makefile - ''; - - buildPhase = '' - mkdir -p $out - make PREFIX=$out - ''; - - installPhase = '' - make PREFIX=$out install - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; - homepage = "http://hardysimpson.github.com/zlog"; + homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; - platforms = platforms.linux; # cannot test on something else + platforms = platforms.unix; maintainers = [ maintainers.matthiasbeyer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix index 670a911cb6..228dfdcf77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix @@ -1,7 +1,6 @@ { stdenv -, cmake +, perl , pkg-config -, ninja , fetchFromGitHub , fetchpatch , zip @@ -23,12 +22,6 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix ninja parsing - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/75e22f3c365b62acbad8d8645d5404242800dfba.patch"; - sha256 = "IB0am3K0x4+Ug1CKvowTtkS8JD6zHJJ247A7guJOw80="; - }) - # Install man pages (fetchpatch { url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch"; @@ -44,9 +37,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake + perl pkg-config - ninja # make fails, unable to find test2.zip zip python3 xmlto @@ -60,10 +52,6 @@ stdenv.mkDerivation rec { unzip ]; - cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - ]; - # tests are broken (https://github.com/gdraheim/zziplib/issues/20), # and test/zziptests.py requires network access # (https://github.com/gdraheim/zziplib/issues/24) diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 7eae27d85c..06d917b74c 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -1407,6 +1407,23 @@ rapidjson = buildLuarocksPackage { license.fullName = "MIT"; }; }; +readline = buildLuarocksPackage { + pname = "readline"; + version = "2.6-0"; + + src = fetchurl { + url = mirror://luarocks/readline-2.6-0.src.rock; + sha256 = "1fvz7nqvkdazp30wn5n62n8i97qrfgznbykdpf8cnflqfpd1shms"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua luaposix ]; + + meta = with stdenv.lib; { + homepage = "http://www.pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + }; +}; say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index 94edbd0737..26260872e1 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -328,6 +328,23 @@ with super; ''; }); + readline = (super.readline.override ({ + unpackCmd = '' + unzip "$curSrc" + tar xf *.tar.gz + ''; + propagatedBuildInputs = super.readline.propagatedBuildInputs ++ [ pkgs.readline ]; + extraVariables = rec { + READLINE_INCDIR = "${pkgs.readline.dev}/include"; + HISTORY_INCDIR = READLINE_INCDIR; + }; + })).overrideAttrs (old: { + # Without this, source root is wrongly set to ./readline-2.6/doc + setSourceRoot = '' + sourceRoot=./readline-2.6 + ''; + }); + pulseaudio = super.pulseaudio.override({ buildInputs = [ pkgs.libpulseaudio diff --git a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix index 2b82cc2c0a..32f65c0925 100644 --- a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "h3"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "uber"; repo = "h3"; rev = "v${version}"; - sha256 = "1zgq496m2pk2c1l0r1di0p39nxwza00kxzqa971qd4xgbrvd4w55"; + sha256 = "1a4scs5n9srq6sjkz8d60ffzpc6aadkxmk1i3hdj081j0jzsrpf7"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix index 3c7ff00151..471dd5b312 100644 --- a/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix @@ -1,10 +1,22 @@ -{ stdenv, fetchFromGitHub, libusb-compat-0_1, readline ? null }: +{ stdenv +, fetchFromGitHub +, autoPatchelfHook +, libusb-compat-0_1 +, readline ? null +, enableReadline ? true +, hidapi ? null +, pkg-config ? null +, mspds ? null +, enableMspds ? false +}: -let +assert stdenv.isDarwin -> hidapi != null && pkg-config != null; +assert enableReadline -> readline != null; +assert enableMspds -> mspds != null; + +stdenv.mkDerivation rec { version = "0.25"; -in stdenv.mkDerivation { pname = "mspdebug"; - inherit version; src = fetchFromGitHub { owner = "dlbeer"; repo = "mspdebug"; @@ -12,9 +24,34 @@ in stdenv.mkDerivation { sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c"; }; - buildInputs = [ libusb-compat-0_1 readline ]; - makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++ - (if readline == null then [ "WITHOUT_READLINE=1" ] else []); + enableParallelBuilding = true; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config + ++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; + buildInputs = [ libusb-compat-0_1 ] + ++ stdenv.lib.optional stdenv.isDarwin hidapi + ++ stdenv.lib.optional enableReadline readline; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + # TODO: remove once a new 0.26+ release is made + substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} + + # Makefile only uses pkg-config if it detects homebrew + substituteInPlace Makefile --replace brew true + ''; + + # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ + runtimeDependencies = stdenv.lib.optional enableMspds mspds; + postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) '' + # autoPatchelfHook only works on linux so... + for dep in $runtimeDependencies; do + install_name_tool -add_rpath $dep/lib $out/bin/$pname + done + ''; + + installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; + makeFlags = [ "UNAME_S=$(unameS)" ] ++ + stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; + unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin"; meta = with stdenv.lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index d106b8e2ef..af3a7e9a29 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -115,6 +115,7 @@ , {"lumo-build-deps": "../interpreters/clojurescript/lumo" } , "madoko" , "markdown-link-check" +, "mastodon-bot" , "mathjax" , "meat" , "meguca" @@ -142,7 +143,9 @@ , "prettier" , "pscid" , "pulp" +, "purescript-language-server" , "purescript-psa" +, "purty" , "react-native-cli" , "react-tools" , "reveal.js" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 594225a07a..a010165bc0 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -22,13 +22,22 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.9" = { + "@angular-devkit/architect-0.1000.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.9"; + version = "0.1000.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.9.tgz"; - sha512 = "Xokyh7bv4qICHpb5Xui1jPTi6ZZvzR5tbTIxT0DFWqw16TEkFgkNubQsW6mFSR3g3CXdySMfOwWExfa/rE1ggA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.2.tgz"; + sha512 = "n1e/ZdE70C6hDauTWLAiofKDI6m88nhb91Ddqum0eeUh3HL3Ppv/sT9O+UYsab3gIdIOFJwHBpZ96SM/2Ja5NA=="; + }; + }; + "@angular-devkit/core-10.0.2" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "10.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.2.tgz"; + sha512 = "gD8iUP28GscsHqGKKu+NtX97bt7aXDZmIYqWTv4SThrcsPYY2A4tBw+NBbNAwjHkNfn4jflpqTmcN9gBAoLoSg=="; }; }; "@angular-devkit/core-9.1.7" = { @@ -49,6 +58,15 @@ let sha512 = "SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q=="; }; }; + "@angular-devkit/schematics-10.0.2" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "10.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.2.tgz"; + sha512 = "BUUWAreHoxk4Z91Xhr+wtFUhK6+7AOczsIxlZmJnQwSUhN2ZdiDjOXeO3NFkDdL8CtNOz5khGu2iNBqn08FpUw=="; + }; + }; "@angular-devkit/schematics-9.1.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -184,13 +202,13 @@ let sha512 = "bQVb6PE34iDmZj6wZZzYm3rLjguxoSqHZj4QReVQsOle/LdIwl48hV9Iz/Pivy9NtVCui9LL/lmSQzMt0G0jkw=="; }; }; - "@apollo/federation-0.16.2" = { + "@apollo/federation-0.17.0" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.16.2"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.16.2.tgz"; - sha512 = "pjTkcl1KGxLZOPpVyTygZNuLxZJCCMvGVonPJMoFzQYt63/o0DwpwbcNlbvpdryWjjFgvi5diqJxRFGuxndEPA=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.17.0.tgz"; + sha512 = "vSW/M8+SGdu5xALsA/RL37GgB+wNFZpXCyPAcg3b68c8x7uoQHgYwqwUu7D+GnAGeOpDUrNnFPdKAYW7elYkyQ=="; }; }; "@apollo/protobufjs-1.0.4" = { @@ -256,6 +274,24 @@ let sha512 = "XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ=="; }; }; + "@arcanis/slice-ansi-1.0.2" = { + name = "_at_arcanis_slash_slice-ansi"; + packageName = "@arcanis/slice-ansi"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@arcanis/slice-ansi/-/slice-ansi-1.0.2.tgz"; + sha512 = "lDL63z0W/L/WTgqrwVOuNyMAsTv+pvjybd21z9SWdStmQoXT59E/iVWwat3gYjcdTNBf6oHAMoyFm8dtjpXEYw=="; + }; + }; + "@ardatan/aggregate-error-0.0.1" = { + name = "_at_ardatan_slash_aggregate-error"; + packageName = "@ardatan/aggregate-error"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.1.tgz"; + sha512 = "UQ9BequOTIavs0pTHLMwQwKQF8tTV1oezY/H2O9chA+JNPFZSua55xpU5dPSjAU9/jLJ1VwU+HJuTVN8u7S6Fg=="; + }; + }; "@azu/format-text-1.0.1" = { name = "_at_azu_slash_format-text"; packageName = "@azu/format-text"; @@ -274,283 +310,283 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/code-frame-7.10.1" = { + "@babel/code-frame-7.10.4" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz"; - sha512 = "IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.10.1" = { + "@babel/compat-data-7.10.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz"; - sha512 = "CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.4.tgz"; + sha512 = "t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw=="; }; }; - "@babel/core-7.10.2" = { + "@babel/core-7.10.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.10.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz"; - sha512 = "KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.10.4.tgz"; + sha512 = "3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA=="; }; }; - "@babel/generator-7.10.2" = { + "@babel/generator-7.10.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.10.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz"; - sha512 = "AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz"; + sha512 = "toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng=="; }; }; - "@babel/helper-annotate-as-pure-7.10.1" = { + "@babel/helper-annotate-as-pure-7.10.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz"; - sha512 = "ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; + sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.10.1" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz"; - sha512 = "cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; + sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; }; }; - "@babel/helper-builder-react-jsx-7.10.1" = { + "@babel/helper-builder-react-jsx-7.10.4" = { name = "_at_babel_slash_helper-builder-react-jsx"; packageName = "@babel/helper-builder-react-jsx"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz"; - sha512 = "KXzzpyWhXgzjXIlJU1ZjIXzUPdej1suE6vzqgImZ/cpAsR/CC8gUcX4EWRmDfWz/cs6HOCPMBIJ3nKoXt3BFuw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; + sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg=="; }; }; - "@babel/helper-builder-react-jsx-experimental-7.10.1" = { + "@babel/helper-builder-react-jsx-experimental-7.10.4" = { name = "_at_babel_slash_helper-builder-react-jsx-experimental"; packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz"; - sha512 = "irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.4.tgz"; + sha512 = "LyacH/kgQPgLAuaWrvvq1+E7f5bLyT8jXCh7nM67sRsy2cpIGfgWJ+FCnAKQXfY+F0tXUaN6FqLkp4JiCzdK8Q=="; }; }; - "@babel/helper-compilation-targets-7.10.2" = { + "@babel/helper-compilation-targets-7.10.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.10.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz"; - sha512 = "hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; + sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.2" = { + "@babel/helper-create-class-features-plugin-7.10.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz"; - sha512 = "5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz"; + sha512 = "9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.10.1" = { + "@babel/helper-create-regexp-features-plugin-7.10.4" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz"; - sha512 = "Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; + sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; }; }; - "@babel/helper-define-map-7.10.1" = { + "@babel/helper-define-map-7.10.4" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz"; - sha512 = "+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz"; + sha512 = "nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA=="; }; }; - "@babel/helper-explode-assignable-expression-7.10.1" = { + "@babel/helper-explode-assignable-expression-7.10.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz"; - sha512 = "vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz"; + sha512 = "4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A=="; }; }; - "@babel/helper-function-name-7.10.1" = { + "@babel/helper-function-name-7.10.4" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz"; - sha512 = "fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="; }; }; - "@babel/helper-get-function-arity-7.10.1" = { + "@babel/helper-get-function-arity-7.10.4" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz"; - sha512 = "F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="; }; }; - "@babel/helper-hoist-variables-7.10.1" = { + "@babel/helper-hoist-variables-7.10.4" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz"; - sha512 = "vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; + sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.10.1" = { + "@babel/helper-member-expression-to-functions-7.10.4" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz"; - sha512 = "u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz"; + sha512 = "m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A=="; }; }; - "@babel/helper-module-imports-7.10.1" = { + "@babel/helper-module-imports-7.10.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz"; - sha512 = "SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; + sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; }; }; - "@babel/helper-module-transforms-7.10.1" = { + "@babel/helper-module-transforms-7.10.4" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz"; - sha512 = "RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz"; + sha512 = "Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q=="; }; }; - "@babel/helper-optimise-call-expression-7.10.1" = { + "@babel/helper-optimise-call-expression-7.10.4" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz"; - sha512 = "a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; + sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg=="; }; }; - "@babel/helper-plugin-utils-7.10.1" = { + "@babel/helper-plugin-utils-7.10.4" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz"; - sha512 = "fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-regex-7.10.1" = { + "@babel/helper-regex-7.10.4" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz"; - sha512 = "7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g=="; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.4.tgz"; + sha512 = "inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.10.1" = { + "@babel/helper-remap-async-to-generator-7.10.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz"; - sha512 = "RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz"; + sha512 = "86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg=="; }; }; - "@babel/helper-replace-supers-7.10.1" = { + "@babel/helper-replace-supers-7.10.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz"; - sha512 = "SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; + sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A=="; }; }; - "@babel/helper-simple-access-7.10.1" = { + "@babel/helper-simple-access-7.10.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz"; - sha512 = "VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; + sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; }; }; - "@babel/helper-split-export-declaration-7.10.1" = { + "@babel/helper-split-export-declaration-7.10.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz"; - sha512 = "UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; + sha512 = "pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg=="; }; }; - "@babel/helper-validator-identifier-7.10.1" = { + "@babel/helper-validator-identifier-7.10.4" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz"; - sha512 = "5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; }; }; - "@babel/helper-wrap-function-7.10.1" = { + "@babel/helper-wrap-function-7.10.4" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz"; - sha512 = "C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; + sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug=="; }; }; - "@babel/helpers-7.10.1" = { + "@babel/helpers-7.10.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz"; - sha512 = "muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz"; + sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA=="; }; }; - "@babel/highlight-7.10.1" = { + "@babel/highlight-7.10.4" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz"; - sha512 = "8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; + sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.10.2" = { + "@babel/parser-7.10.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.10.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz"; - sha512 = "PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz"; + sha512 = "8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -562,103 +598,103 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.10.1" = { + "@babel/plugin-proposal-async-generator-functions-7.10.4" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz"; - sha512 = "vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz"; + sha512 = "MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg=="; }; }; - "@babel/plugin-proposal-class-properties-7.10.1" = { + "@babel/plugin-proposal-class-properties-7.10.4" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz"; - sha512 = "sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; + sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.10.1" = { + "@babel/plugin-proposal-dynamic-import-7.10.4" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz"; - sha512 = "Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; + sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; }; }; - "@babel/plugin-proposal-json-strings-7.10.1" = { + "@babel/plugin-proposal-json-strings-7.10.4" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz"; - sha512 = "m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; + sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz"; - sha512 = "56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; + sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.10.1" = { + "@babel/plugin-proposal-numeric-separator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz"; - sha512 = "jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; + sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.10.1" = { + "@babel/plugin-proposal-object-rest-spread-7.10.4" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz"; - sha512 = "Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz"; + sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.10.1" = { + "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz"; - sha512 = "VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; + sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.10.1" = { + "@babel/plugin-proposal-optional-chaining-7.10.4" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz"; - sha512 = "dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz"; + sha512 = "ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.10.1" = { + "@babel/plugin-proposal-private-methods-7.10.4" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz"; - sha512 = "RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; + sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.10.1" = { + "@babel/plugin-proposal-unicode-property-regex-7.10.4" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz"; - sha512 = "JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; + sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -679,13 +715,13 @@ let sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; }; - "@babel/plugin-syntax-class-properties-7.10.1" = { + "@babel/plugin-syntax-class-properties-7.10.4" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz"; - sha512 = "Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; + sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -697,22 +733,22 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-flow-7.10.1" = { + "@babel/plugin-syntax-flow-7.10.4" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.1.tgz"; - sha512 = "b3pWVncLBYoPP60UOTc7NMlbtsHQ6ITim78KQejNHK6WJ2mzV5kCcg4mIWpasAfJEgwVTibwo2e+FU7UEIKQUg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz"; + sha512 = "yxQsX1dJixF4qEEdzVbst3SZQ58Nrooz8NV9Z9GL4byTE25BvJgl5lf0RECUf0fh28rZBb/RYTWn/eeKwCMrZQ=="; }; }; - "@babel/plugin-syntax-import-meta-7.10.1" = { + "@babel/plugin-syntax-import-meta-7.10.4" = { name = "_at_babel_slash_plugin-syntax-import-meta"; packageName = "@babel/plugin-syntax-import-meta"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz"; - sha512 = "ypC4jwfIVF72og0dgvEcFRdOM2V9Qm1tu7RGmdZOlhsccyK0wisXmMObGuWEOd5jQ+K9wcIgSNftCpk2vkjUfQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; + sha512 = "Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g=="; }; }; "@babel/plugin-syntax-json-strings-7.8.3" = { @@ -724,22 +760,22 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.10.1" = { + "@babel/plugin-syntax-jsx-7.10.4" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz"; - sha512 = "+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz"; + sha512 = "KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g=="; }; }; - "@babel/plugin-syntax-logical-assignment-operators-7.10.1" = { + "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; packageName = "@babel/plugin-syntax-logical-assignment-operators"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.1.tgz"; - sha512 = "XyHIFa9kdrgJS91CUH+ccPVTnJShr8nLGc5bG2IhGXv5p1Rd+8BleGE5yzIg2Nc1QZAdHDa0Qp4m6066OL96Iw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; }; }; "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { @@ -751,13 +787,13 @@ let sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; }; }; - "@babel/plugin-syntax-numeric-separator-7.10.1" = { + "@babel/plugin-syntax-numeric-separator-7.10.4" = { name = "_at_babel_slash_plugin-syntax-numeric-separator"; packageName = "@babel/plugin-syntax-numeric-separator"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz"; - sha512 = "uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; }; }; "@babel/plugin-syntax-object-rest-spread-7.8.3" = { @@ -787,346 +823,346 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.10.1" = { + "@babel/plugin-syntax-top-level-await-7.10.4" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz"; - sha512 = "hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; + sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ=="; }; }; - "@babel/plugin-syntax-typescript-7.10.1" = { + "@babel/plugin-syntax-typescript-7.10.4" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.1.tgz"; - sha512 = "X/d8glkrAtra7CaQGMiGs/OGa6XgUzqPcBXCIGFCpCqnfGlT0Wfbzo/B89xHhnInTaItPK8LALblVXcUOEh95Q=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"; + sha512 = "oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ=="; }; }; - "@babel/plugin-transform-arrow-functions-7.10.1" = { + "@babel/plugin-transform-arrow-functions-7.10.4" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz"; - sha512 = "6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; + sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA=="; }; }; - "@babel/plugin-transform-async-to-generator-7.10.1" = { + "@babel/plugin-transform-async-to-generator-7.10.4" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz"; - sha512 = "XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; + sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.10.1" = { + "@babel/plugin-transform-block-scoped-functions-7.10.4" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz"; - sha512 = "B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; + sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; }; }; - "@babel/plugin-transform-block-scoping-7.10.1" = { + "@babel/plugin-transform-block-scoping-7.10.4" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz"; - sha512 = "8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz"; + sha512 = "J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A=="; }; }; - "@babel/plugin-transform-classes-7.10.1" = { + "@babel/plugin-transform-classes-7.10.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz"; - sha512 = "P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; + sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA=="; }; }; - "@babel/plugin-transform-computed-properties-7.10.1" = { + "@babel/plugin-transform-computed-properties-7.10.4" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz"; - sha512 = "mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; + sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw=="; }; }; - "@babel/plugin-transform-destructuring-7.10.1" = { + "@babel/plugin-transform-destructuring-7.10.4" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz"; - sha512 = "V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; + sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA=="; }; }; - "@babel/plugin-transform-dotall-regex-7.10.1" = { + "@babel/plugin-transform-dotall-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz"; - sha512 = "19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; + sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.10.1" = { + "@babel/plugin-transform-duplicate-keys-7.10.4" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz"; - sha512 = "wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; + sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.10.1" = { + "@babel/plugin-transform-exponentiation-operator-7.10.4" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz"; - sha512 = "lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; + sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.10.1" = { + "@babel/plugin-transform-flow-strip-types-7.10.4" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.1.tgz"; - sha512 = "i4o0YwiJBIsIx7/liVCZ3Q2WkWr1/Yu39PksBOnh/khW2SwIFsGa5Ze+MSon5KbDfrEHP9NeyefAgvUSXzaEkw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.4.tgz"; + sha512 = "XTadyuqNst88UWBTdLjM+wEY7BFnY2sYtPyAidfC7M/QaZnSuIZpMvLxqGT7phAcnGyWh/XQFLKcGf04CnvxSQ=="; }; }; - "@babel/plugin-transform-for-of-7.10.1" = { + "@babel/plugin-transform-for-of-7.10.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz"; - sha512 = "US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; + sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ=="; }; }; - "@babel/plugin-transform-function-name-7.10.1" = { + "@babel/plugin-transform-function-name-7.10.4" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz"; - sha512 = "//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; + sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg=="; }; }; - "@babel/plugin-transform-literals-7.10.1" = { + "@babel/plugin-transform-literals-7.10.4" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz"; - sha512 = "qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; + sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.10.1" = { + "@babel/plugin-transform-member-expression-literals-7.10.4" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz"; - sha512 = "UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; + sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; }; }; - "@babel/plugin-transform-modules-amd-7.10.1" = { + "@babel/plugin-transform-modules-amd-7.10.4" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz"; - sha512 = "31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz"; + sha512 = "3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.10.1" = { + "@babel/plugin-transform-modules-commonjs-7.10.4" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz"; - sha512 = "AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; + sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.1" = { + "@babel/plugin-transform-modules-systemjs-7.10.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz"; - sha512 = "ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz"; + sha512 = "Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.10.1" = { + "@babel/plugin-transform-modules-umd-7.10.4" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz"; - sha512 = "EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; + sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; - sha512 = "f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; + sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA=="; }; }; - "@babel/plugin-transform-new-target-7.10.1" = { + "@babel/plugin-transform-new-target-7.10.4" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz"; - sha512 = "MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; + sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw=="; }; }; - "@babel/plugin-transform-object-super-7.10.1" = { + "@babel/plugin-transform-object-super-7.10.4" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz"; - sha512 = "WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; + sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; }; }; - "@babel/plugin-transform-parameters-7.10.1" = { + "@babel/plugin-transform-parameters-7.10.4" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz"; - sha512 = "tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz"; + sha512 = "RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ=="; }; }; - "@babel/plugin-transform-property-literals-7.10.1" = { + "@babel/plugin-transform-property-literals-7.10.4" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz"; - sha512 = "Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; + sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g=="; }; }; - "@babel/plugin-transform-react-jsx-7.10.1" = { + "@babel/plugin-transform-react-jsx-7.10.4" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz"; - sha512 = "MBVworWiSRBap3Vs39eHt+6pJuLUAaK4oxGc8g+wY+vuSJvLiEQjW1LSTqKb8OUPtDvHCkdPhk7d6sjC19xyFw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz"; + sha512 = "L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A=="; }; }; - "@babel/plugin-transform-regenerator-7.10.1" = { + "@babel/plugin-transform-regenerator-7.10.4" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz"; - sha512 = "B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; + sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw=="; }; }; - "@babel/plugin-transform-reserved-words-7.10.1" = { + "@babel/plugin-transform-reserved-words-7.10.4" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz"; - sha512 = "qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; + sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; }; }; - "@babel/plugin-transform-runtime-7.10.1" = { + "@babel/plugin-transform-runtime-7.10.4" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz"; - sha512 = "4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz"; + sha512 = "8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.10.1" = { + "@babel/plugin-transform-shorthand-properties-7.10.4" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz"; - sha512 = "AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; + sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; }; }; - "@babel/plugin-transform-spread-7.10.1" = { + "@babel/plugin-transform-spread-7.10.4" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz"; - sha512 = "8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz"; + sha512 = "1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ=="; }; }; - "@babel/plugin-transform-sticky-regex-7.10.1" = { + "@babel/plugin-transform-sticky-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz"; - sha512 = "j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; + sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; }; }; - "@babel/plugin-transform-template-literals-7.10.1" = { + "@babel/plugin-transform-template-literals-7.10.4" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz"; - sha512 = "t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz"; + sha512 = "4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.10.1" = { + "@babel/plugin-transform-typeof-symbol-7.10.4" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz"; - sha512 = "qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; + sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; }; }; - "@babel/plugin-transform-typescript-7.10.1" = { + "@babel/plugin-transform-typescript-7.10.4" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.1.tgz"; - sha512 = "v+QWKlmCnsaimLeqq9vyCsVRMViZG1k2SZTlcZvB+TqyH570Zsij8nvVUZzOASCRiQFUxkLrn9Wg/kH0zgy5OQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz"; + sha512 = "3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.10.1" = { + "@babel/plugin-transform-unicode-escapes-7.10.4" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz"; - sha512 = "zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; + sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg=="; }; }; - "@babel/plugin-transform-unicode-regex-7.10.1" = { + "@babel/plugin-transform-unicode-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz"; - sha512 = "Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; + sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; "@babel/polyfill-7.7.0" = { @@ -1138,22 +1174,22 @@ let sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; }; }; - "@babel/preset-env-7.10.2" = { + "@babel/preset-env-7.10.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.10.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.2.tgz"; - sha512 = "MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz"; + sha512 = "tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw=="; }; }; - "@babel/preset-flow-7.10.1" = { + "@babel/preset-flow-7.10.4" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.10.1.tgz"; - sha512 = "FuQsibb5PaX07fF1XUO5gjjxdEZbcJv8+ugPDaeFEsBIvUTib8hCtEJow/c2F0jq9ZUjpHCQ8IQKNHRvKE1kJQ=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.10.4.tgz"; + sha512 = "XI6l1CptQCOBv+ZKYwynyswhtOKwpZZp5n0LG1QKCo8erRhqjoQV6nvx61Eg30JHpysWQSBwA2AWRU3pBbSY5g=="; }; }; "@babel/preset-modules-0.1.3" = { @@ -1174,22 +1210,22 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.10.1" = { + "@babel/preset-typescript-7.10.4" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.1.tgz"; - sha512 = "m6GV3y1ShiqxnyQj10600ZVOFrSSAa8HQ3qIUk2r+gcGtHTIRw0dJnFLt1WNXpKjtVw7yw1DAPU/6ma2ZvgJuA=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz"; + sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; }; }; - "@babel/register-7.10.1" = { + "@babel/register-7.10.4" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.10.1.tgz"; - sha512 = "sl96+kB3IA2B9EzpwwBmYadOT14vw3KaXOknGDbJaZCOj52GDA4Tivudq9doCJcB+bEIKCEARZYwRgBBsCGXyg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.10.4.tgz"; + sha512 = "whHmgGiWNVyTVnYTSawtDWhaeYsc+noeU8Rmi+MPnbGhDYmr5QpEDMrQcIA07D2RUv0BlThPcN89XcHCqq/O4g=="; }; }; "@babel/runtime-7.10.2" = { @@ -1201,6 +1237,15 @@ let sha512 = "6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg=="; }; }; + "@babel/runtime-7.10.4" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz"; + sha512 = "UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw=="; + }; + }; "@babel/runtime-7.7.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1210,49 +1255,40 @@ let sha512 = "uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA=="; }; }; - "@babel/runtime-7.9.2" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; - sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; - }; - }; - "@babel/runtime-corejs3-7.10.2" = { + "@babel/runtime-corejs3-7.10.4" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.10.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz"; - sha512 = "+a2M/u7r15o3dV1NEizr9bRi+KUVnrs/qYxF0Z06DAPx/4VCWaz1WA7EcbE+uqGgt39lp5akWGmHsTseIkHkHg=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.10.4.tgz"; + sha512 = "BFlgP2SoLO9HJX9WBwN67gHWMBhDX/eDz64Jajd6mR/UAUzqrNMm99d4qHnVaKscAElZoFiPv+JpR/Siud5lXw=="; }; }; - "@babel/template-7.10.1" = { + "@babel/template-7.10.4" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz"; - sha512 = "OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz"; + sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.10.1" = { + "@babel/traverse-7.10.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz"; - sha512 = "C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz"; + sha512 = "aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q=="; }; }; - "@babel/types-7.10.2" = { + "@babel/types-7.10.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.10.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz"; - sha512 = "AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz"; + sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; "@chemzqm/neovim-5.1.9" = { @@ -1363,6 +1399,15 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; + "@dabh/diagnostics-2.0.2" = { + name = "_at_dabh_slash_diagnostics"; + packageName = "@dabh/diagnostics"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; + }; + }; "@emmetio/extract-abbreviation-0.1.6" = { name = "_at_emmetio_slash_extract-abbreviation"; packageName = "@emmetio/extract-abbreviation"; @@ -1372,13 +1417,13 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; - "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" = { + "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" = { name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.1.tgz"; - sha512 = "bhUR9035PbgL6A/nfLayjoqKo4W7hCtzxqVxq2cgDB+Ndpsa3dGIr71/ymgY3vCTCQaufkFxAcEeoECyJ498CA=="; + url = "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.2.tgz"; + sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A=="; }; }; "@evocateur/libnpmaccess-3.1.2" = { @@ -1435,94 +1480,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-toolkit/common-0.10.7" = { - name = "_at_graphql-toolkit_slash_common"; - packageName = "@graphql-toolkit/common"; - version = "0.10.7"; + "@graphql-tools/delegate-6.0.12" = { + name = "_at_graphql-tools_slash_delegate"; + packageName = "@graphql-tools/delegate"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-toolkit/common/-/common-0.10.7.tgz"; - sha512 = "epcJvmIAo+vSEY76F0Dj1Ef6oeewT5pdMe1obHj7LHXN9V22O86aQzwdEEm1iG91qROqSw/apcDnSCMjuVeQVA=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.0.12.tgz"; + sha512 = "52bac1Ct1s0c8aSTVCbnc5FI2LC+NqUFSs+5/mP1k5hIEW2GROGBeZdbRs2GQaHir1vKUYIyHzlZIIBMzOZ/gA=="; }; }; - "@graphql-toolkit/core-0.10.7" = { - name = "_at_graphql-toolkit_slash_core"; - packageName = "@graphql-toolkit/core"; - version = "0.10.7"; + "@graphql-tools/graphql-file-loader-6.0.12" = { + name = "_at_graphql-tools_slash_graphql-file-loader"; + packageName = "@graphql-tools/graphql-file-loader"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-toolkit/core/-/core-0.10.7.tgz"; - sha512 = "LXcFLG7XcRJrPz/xD+0cExzLx/ptVynDM20650/FbmHbKOU50d9mSbcsrzAOq/3f4q3HrRDssvn0f6pPm0EHMg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.0.12.tgz"; + sha512 = "DUoby0HXQ5fGR9U3tMN3V/6l1XdRzg2XF0kuZy/9TUEH9VBFKYT7PLEVb6ZKDh9xWe0OgHUjgpfJhjtcJwn+fw=="; }; }; - "@graphql-toolkit/graphql-file-loader-0.10.7" = { - name = "_at_graphql-toolkit_slash_graphql-file-loader"; - packageName = "@graphql-toolkit/graphql-file-loader"; - version = "0.10.7"; + "@graphql-tools/import-6.0.12" = { + name = "_at_graphql-tools_slash_import"; + packageName = "@graphql-tools/import"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-toolkit/graphql-file-loader/-/graphql-file-loader-0.10.7.tgz"; - sha512 = "6tUIuw/YBlm0VyVgXgMrOXsEQ+WpXVgr2NQwHNzmZo82kPGqImveq7A2D3gBWLyVTcinDScRcKJMxM4kCF5T0A=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.0.12.tgz"; + sha512 = "tSY8EVTl4UDo4cwbKfMfyGqd0aPd4GH81YcYIgoy4hXMJPZyImGWjjChM0A579IsI7NFzm8eXzDU2dIFb8QSWA=="; }; }; - "@graphql-toolkit/json-file-loader-0.10.7" = { - name = "_at_graphql-toolkit_slash_json-file-loader"; - packageName = "@graphql-toolkit/json-file-loader"; - version = "0.10.7"; + "@graphql-tools/json-file-loader-6.0.12" = { + name = "_at_graphql-tools_slash_json-file-loader"; + packageName = "@graphql-tools/json-file-loader"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-toolkit/json-file-loader/-/json-file-loader-0.10.7.tgz"; - sha512 = "nVISrODqvn5LiQ4nKL5pz1Let/W1tuj2viEwrNyTS+9mcjaCE2nhV5MOK/7ZY0cR+XeA4N2u65EH1lQd63U3Cw=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.0.12.tgz"; + sha512 = "WLSqEfcHcu8LYMdtz3ipzu3CdlkhuHqvuCmCUt5Yq3SvLhWXu+39BLVS6FtfQdNAdM2Bl+C7YRrYYsDA9Rzeag=="; }; }; - "@graphql-toolkit/schema-merging-0.10.7" = { - name = "_at_graphql-toolkit_slash_schema-merging"; - packageName = "@graphql-toolkit/schema-merging"; - version = "0.10.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-toolkit/schema-merging/-/schema-merging-0.10.7.tgz"; - sha512 = "VngxJbVdRfXYhdMLhL90pqN+hD/2XTZwhHPGvpWqmGQhT6roc98yN3xyDyrWFYYsuiY4gTexdmrHQ3d7mzitwA=="; - }; - }; - "@graphql-toolkit/url-loader-0.10.7" = { - name = "_at_graphql-toolkit_slash_url-loader"; - packageName = "@graphql-toolkit/url-loader"; - version = "0.10.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-toolkit/url-loader/-/url-loader-0.10.7.tgz"; - sha512 = "Ec3T4Zuo63LwG+RfK2ryz8ChPfncBf8fiSJ1xr68FtLDVznDNulvlNKFbfREE5koWejwsnJrjLCv6IX5IbhExg=="; - }; - }; - "@graphql-tools/load-6.0.10" = { + "@graphql-tools/load-6.0.12" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.0.10"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.10.tgz"; - sha512 = "/Q07DuSvhRTu7iYr+iZDXuXLjQJ/0uZEadjC4uKthD4gX6x4bvV49GLdqka+J1zq02C5U5mAOdDT7+lHIrEBFg=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.12.tgz"; + sha512 = "BlGptzuY6+/SunejobN+P3RTxl5QKiMrIikttUZROrgObOBlkSFxsjW1cOw+HX2BL4dPUyN9usOKYoMxKHoWpA=="; }; }; - "@graphql-tools/merge-6.0.10" = { + "@graphql-tools/merge-6.0.12" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.0.10"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.10.tgz"; - sha512 = "fnz9h5vdA8LXc9TvmhnRXykwFZWZ4FdBeo4g3R1KqcQCp65ByCMcBuCJtYf4VxPrcgTLGlWtVOHrItCi0kdioA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.12.tgz"; + sha512 = "GGvdIoTad6PJk/d1omPlGQ25pCFWmjuGkARYZ71qWI/c4FEA8EdGoOoPz3shhaKXyLdRiu84S758z4ZtDQiYVw=="; }; }; - "@graphql-tools/schema-6.0.10" = { + "@graphql-tools/schema-6.0.12" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.0.10"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.10.tgz"; - sha512 = "g8iy36dgf/Cpyz7bHSE2axkE8PdM5VYdS2tntmytLvPaN3Krb8IxBpZBJhmiICwyAAkruQE7OjDfYr8vP8jY4A=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.12.tgz"; + sha512 = "XUmKJ+ipENaxuXIX4GapsLAUl1dFQBUg+S4ZbgtKVlwrPhZJ9bkjIqnUHk3wg4S4VXqzLX97ol1e4g9N6XLkYg=="; }; }; - "@graphql-tools/utils-6.0.10" = { + "@graphql-tools/url-loader-6.0.12" = { + name = "_at_graphql-tools_slash_url-loader"; + packageName = "@graphql-tools/url-loader"; + version = "6.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.0.12.tgz"; + sha512 = "XK3D9oXshhlwQCNA92qqRIGPwCrhZGrGguYEkCyvEB4Y4e/MbzRPCExyeiZLI8mEepMJKhbAfx0ieQFPRbhx9Q=="; + }; + }; + "@graphql-tools/utils-6.0.12" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.0.10"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.10.tgz"; - sha512 = "1s3vBnYUIDLBGEaV1VF3lv1Xq54lT8Oz7tNNypv7K7cv3auKX7idRtjP8RM6hKpGod46JNZgu3NNOshMUEyEyA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.12.tgz"; + sha512 = "MuFSkxXCe2QoD5QJPJ/1WIm0YnBzzXpkq9d/XznVAWptHFRwtwIbZ1xcREjYquFvoZ7ddsjZfyvUN/5ulmHhhg=="; + }; + }; + "@graphql-tools/wrap-6.0.12" = { + name = "_at_graphql-tools_slash_wrap"; + packageName = "@graphql-tools/wrap"; + version = "6.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.0.12.tgz"; + sha512 = "x/t6004aNLzTbOFzZiau15fY2+TBy0wbFqP2du+I+yh8j6KmAU1YkPolBJ4bAI04WD3qcLNh7Rai+VhOxidOkw=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -1732,6 +1777,15 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; + "@josh-brown/vector-3.4.0" = { + name = "_at_josh-brown_slash_vector"; + packageName = "@josh-brown/vector"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@josh-brown/vector/-/vector-3.4.0.tgz"; + sha512 = "E2FcWwiAMXwr4MUv+SkxmtKsgwgaEaCNK7IlyCfQ1Rz1QzeaV36SooA8/GNkLh0WnlIda59WmDDSL7S1S73lUg=="; + }; + }; "@kwsites/exec-p-0.4.0" = { name = "_at_kwsites_slash_exec-p"; packageName = "@kwsites/exec-p"; @@ -2299,58 +2353,58 @@ let sha512 = "MOnJPqKPpuwBHDdw96gHoshd/QEYrUlLPF92xQFXm6uIOo1EGISg8OOSoji2isEtp2gHpO+bL8p/h4oPG10Fqw=="; }; }; - "@node-red/editor-api-1.0.6" = { + "@node-red/editor-api-1.1.2" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.0.6"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.6.tgz"; - sha512 = "9LieY6LSDtvj43IbpmCs9MmSGdPjOEmtsi+T13dXxxmil4ngedvJ7uMP1d96eKLW/b6Viuk7kx2olSGtUqgqLg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.1.2.tgz"; + sha512 = "yvA7sO9kqpnojwtnO+K03CsRfU9XBIVYTnPHJYcA94IhxF/sm+iCL1VlZPEMXTEt4VvMfTRKY9U1bHIVAKBtLA=="; }; }; - "@node-red/editor-client-1.0.6" = { + "@node-red/editor-client-1.1.2" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.0.6"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.6.tgz"; - sha512 = "V8zsj+wKY6RzOX92ePdgJtJdmOT9Whfz6CTN34/H2pZlzFA/+KE/sippkInRrx+ujTp4uI2ycAGJ7i1Qkt8ztw=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.1.2.tgz"; + sha512 = "cHsRxs/0QWqSO8LtTlwIsbEdTADjy3N5KOB2V1E3pNhz4zPy3+6472bnDF93HmywRen1wOWVXxBQTAf5aOHfaQ=="; }; }; - "@node-red/nodes-1.0.6" = { + "@node-red/nodes-1.1.2" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.0.6"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.6.tgz"; - sha512 = "4+wTiwhJlhLL6HV3YBLOGHSIcfygf4YxP/fJDkG+vy09pRyux/NqZ06NiqhYs+d+Ndf13LIc20KTEzN3pLW2Rw=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.1.2.tgz"; + sha512 = "sVwwrkCpT/padCcPMIQH4Yro4+qOYBBCkn85FnTY+7KlGLUPLhFQr4A30mWoJX5Wk+zTpe3nXqr9R0ccGrhWYg=="; }; }; - "@node-red/registry-1.0.6" = { + "@node-red/registry-1.1.2" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.0.6"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.6.tgz"; - sha512 = "jDNfcNyphjpywHmXfNuZhM593ox9qHMYmL6ZQQiyERwiJwSkGp2zzNicNBe10ysk5ENr36xdP46BryWu/j9xIA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.1.2.tgz"; + sha512 = "ApbQviP0q77zI1BREFhbMbNzP972RB4BtZHUOFbXGbcSLaQpX7QLt7+gNTkwTEg5VwHt1nQPNWbAVdP+Aq3RiA=="; }; }; - "@node-red/runtime-1.0.6" = { + "@node-red/runtime-1.1.2" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.0.6"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.6.tgz"; - sha512 = "6eat9FZlIcydm0+VoUjlbxf9TyyLu0zTCWWANqGhu5Ab8o366WSOAxyIzJ5QL56FLQ+V6040YWmurBl+bGRGjg=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.1.2.tgz"; + sha512 = "szt7L6/wWZax84VsgER8uZB3rnBHofjb2b1qQzRm4yG02O8YZ8elw1kKi0b6B6D+Xo5h3z29h/oJyYdBS8/9sA=="; }; }; - "@node-red/util-1.0.6" = { + "@node-red/util-1.1.2" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.0.6"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.6.tgz"; - sha512 = "uncyHShA6strCJr1puqrpxsKcb7We2bmo/8xHk91pAQw4dr3jm4S+v/m9tYqVqtXkkW2cfJ6n3bRHJHbOZNW0Q=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.1.2.tgz"; + sha512 = "9G45g4W7HcCJ9IpIF76sCbDuqHWHmkAHI+lNE02TC8yvGzEOyb6VMvU0vph5JT499752WSlNQwk/g823VrqYLw=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -2398,13 +2452,13 @@ let sha512 = "JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA=="; }; }; - "@npmcli/git-2.0.2" = { + "@npmcli/git-2.0.3" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.2.tgz"; - sha512 = "uv9+EuP5YWluNPgkEOL+iyB/+MVt4U5PMBCfl+I8korKluFdiSp7RxjXYzpWM/wU4wXaROAUFiOiCMmBftonjw=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.3.tgz"; + sha512 = "c/ODsV5ppjB12VDXKc6hzVNgg6ZJX/etILUn3WgF5NLAYBhQLJ3fBq6uB2jQD4OwqOzJdPT1/xA3Xh3aaWGk5w=="; }; }; "@npmcli/installed-package-contents-1.0.5" = { @@ -2443,15 +2497,6 @@ let sha512 = "9Ea57XJjNLtBFRAaiKqqdoqRrL2QkM0vvCbMjPecljhog5IHupStPtZULbl0CoGN00N3lhLWJ4PaIEC0MGjqJw=="; }; }; - "@oclif/color-0.0.0" = { - name = "_at_oclif_slash_color"; - packageName = "@oclif/color"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/color/-/color-0.0.0.tgz"; - sha512 = "KKd3W7eNwfNF061tr663oUNdt8EMnfuyf5Xv55SGWA1a0rjhWqS/32P7OeB7CbXcJUBdfVrPyR//1afaW12AWw=="; - }; - }; "@oclif/color-0.1.2" = { name = "_at_oclif_slash_color"; packageName = "@oclif/color"; @@ -2461,31 +2506,31 @@ let sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA=="; }; }; - "@oclif/command-1.6.1" = { + "@oclif/command-1.7.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.6.1.tgz"; - sha512 = "pvmMmfGn+zm4e4RwVw63mg9sIaqKqmVsFbImQoUrCO/43UmWzoSHWNXKdgEGigOezWrkZfFucaeZcSbp149OWg=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.7.0.tgz"; + sha512 = "TkknFtWcZI8te0E8sW+ohiblExrLx73rIcV4KdIzDX01u+oTZWZaap51F6TSGFnR/Gey0WctaDvJhZlt4xgKdA=="; }; }; - "@oclif/config-1.15.1" = { + "@oclif/config-1.16.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz"; - sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.16.0.tgz"; + sha512 = "vOnMPQcHokC03WBCuLipTxksTwgZcmDOnH2H0UHqndfKKN9GVDzpZTH6zaFVQBdjTME5VtRzg9A2UaNmq6OXWw=="; }; }; - "@oclif/errors-1.2.2" = { + "@oclif/errors-1.3.3" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; - version = "1.2.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.2.2.tgz"; - sha512 = "Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg=="; + url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.3.tgz"; + sha512 = "EJR6AIOEkt/NnARNIVAskPDVtdhtO5TTNXmhDrGqMoWVsr0R6DkkLrMyq95BmHvlVWM1nduoq4fQPuCyuF2jaA=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -2542,13 +2587,13 @@ let sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg=="; }; }; - "@oclif/plugin-plugins-1.7.9" = { + "@oclif/plugin-plugins-1.9.0" = { name = "_at_oclif_slash_plugin-plugins"; packageName = "@oclif/plugin-plugins"; - version = "1.7.9"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.7.9.tgz"; - sha512 = "o7qfmiUGl+NUyA2lM18/Ch5sasGGYPIINR3cZ/AjwtdQ3ooINnF00pUDcUOtbjW97gRmk6/j79tcyTo8i7rHZg=="; + url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.0.tgz"; + sha512 = "sq31nJk/n5pH5qGDioj2Z9x6MlRUrc/kkQrfCYKRPbQM80qewSP4RcPK3/gDvDSOAWD3wLAK9oMbDQO9lqImMA=="; }; }; "@oclif/plugin-warn-if-update-available-1.7.0" = { @@ -2650,13 +2695,13 @@ let sha512 = "2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw=="; }; }; - "@octokit/rest-16.43.1" = { + "@octokit/rest-16.43.2" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.43.1"; + version = "16.43.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz"; - sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.2.tgz"; + sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ=="; }; }; "@octokit/types-2.16.2" = { @@ -2722,13 +2767,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@primer/octicons-9.6.0" = { + "@primer/octicons-10.0.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "9.6.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-9.6.0.tgz"; - sha512 = "B5Wzk5izRXXz0JqEXJkVUtqhCXSpUKgqYkVwegMkp5sziBW+ksd9LPbONlCWyyLODwf9GsI2sBXekR7m+JJDBw=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-10.0.0.tgz"; + sha512 = "iuQubq62zXZjPmaqrsfsCZUqIJgZhmA6W0tKzIKGRbkoLnff4TFFCL87hfIRATZ5qZPM4m8ioT8/bXI7WVa9WQ=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -2821,22 +2866,22 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@rollup/plugin-commonjs-12.0.0" = { + "@rollup/plugin-commonjs-13.0.2" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; - version = "12.0.0"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-12.0.0.tgz"; - sha512 = "8+mDQt1QUmN+4Y9D3yCG8AJNewuTSLYPJVzKKUZ+lGeQrI+bV12Tc5HCyt2WdlnG6ihIL/DPbKRJlB40DX40mw=="; + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-13.0.2.tgz"; + sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ=="; }; }; - "@rollup/plugin-node-resolve-8.0.1" = { + "@rollup/plugin-node-resolve-8.4.0" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; - version = "8.0.1"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.0.1.tgz"; - sha512 = "KIeAmueDDaYMqMBnUngLVVZhURwxA12nq/YB6nGm5/JpVyOMwI1fCVU3oL/dAnnLBG7oiPXntO5LHOiMrfNXCA=="; + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.4.0.tgz"; + sha512 = "LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ=="; }; }; "@rollup/pluginutils-3.1.0" = { @@ -2866,13 +2911,13 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.9" = { + "@schematics/angular-10.0.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.9"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.9.tgz"; - sha512 = "c8YGZ6pDfr8IDD1qaOjlEBAkEz14KFSxDj0hCWs0xIM0py513tu5sW8+ziYxGG4bgqpsgVR/KAxuY78iBfUVag=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.2.tgz"; + sha512 = "viSf1HQH2vxZAonkfdAjJ/0Z8VgKptsi4UYtJDwabKRbbyp2EQ/vhEPI/ddV4QgrQqR8mkOl7nu8JqL2M0+v6A=="; }; }; "@schematics/schematics-0.901.9" = { @@ -2884,13 +2929,13 @@ let sha512 = "Nca8Ig/mFFnhLmosbdWysX4N2HiwVOzA4gQj2TZnMCJ98Cftdebs388LstjsJwGtJyvAa2v4yoaPaUMIGVgQ9w=="; }; }; - "@schematics/update-0.901.9" = { + "@schematics/update-0.1000.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.9"; + version = "0.1000.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.9.tgz"; - sha512 = "VChX0VO/oyfCF3y+HjMTU2qN3vGgJYxEI1V+Q9aAlwl95t3GAufuaFY1CNW3YV4XkYIjD88e3yWl8d5yO4qf4w=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.2.tgz"; + sha512 = "6PSJ+WexBqY0ESo0Kp6fa9wPWAXKE9oyLNjISJ1S9QKCVowoHa8FV+7BalVOUYwUhnUzwPCF6n7PqcJiZR632g=="; }; }; "@serverless/cli-1.5.1" = { @@ -2911,13 +2956,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.30.20" = { + "@serverless/components-2.31.12" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.30.20"; + version = "2.31.12"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.20.tgz"; - sha512 = "2g9eLSXgKa0gOt3zu/z7zuI7Ghf1bfWJqLtG5tHVEIv73+l484pD9HoW9zJz3hpeIAXpcSPzkjUk9bug/o6fgw=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.31.12.tgz"; + sha512 = "ew721nj0Tz1ffS5nBCxZ1CtNGymGCCN+thld5yS4j3alwug605RVTUG/C9nxO59Lq2Jm3WbPe5qroYbvntpx0w=="; }; }; "@serverless/core-1.1.2" = { @@ -2929,13 +2974,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.6.13" = { + "@serverless/enterprise-plugin-3.6.15" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.6.13"; + version = "3.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.13.tgz"; - sha512 = "L7DOqo7LviAbYIySV5n+sURwyI5rf6IfVKRzFF3CK/EtbHUBJn7gEdHNo86Xmsm4I251ZggGSsorQvSIzT2VUQ=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.15.tgz"; + sha512 = "g0qCNei+nV+CaP+D/k89PnhSoYEtT13t1A+wW38EjC6IhfsnVUQuHyNObUuu469gJbLr1D856CjVvGQ5H23Wng=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -2965,13 +3010,22 @@ let sha512 = "ww5GBt5QEHYppLH8X+gEFiuMoFu9xdXK0bEROYbuxUliiB0IfXTXLzWR5whhi/S94R7pTnJ4O+WUiFj0PcV/tQ=="; }; }; - "@serverless/platform-client-china-1.0.18" = { + "@serverless/platform-client-1.0.9" = { + name = "_at_serverless_slash_platform-client"; + packageName = "@serverless/platform-client"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.0.9.tgz"; + sha512 = "1y2oMld4QzuhM00GCEE65XrVL+Vy4dvqzkWMNHGJwSkcetj6wc5bAQep+h+FP4s+m/0lRMGTe2QXrJsE2RScig=="; + }; + }; + "@serverless/platform-client-china-1.0.25" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.18"; + version = "1.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.18.tgz"; - sha512 = "M6bucQXgnHF6M+4D4Wt8KCz1bUxpMtG8CPS/WiOhzwwTdG79aYwNIOIC1xo0wtDmrlTwh8ECD8WclAWSHmfaqg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.25.tgz"; + sha512 = "8SYd0kKAuLyrpljr1gvW5g2Q7GC2JMUXr1m09H2rhNKYTpPEDgNSUgfnhE4r5Z2bvpfLEPhgM43mUFRDwqTBhA=="; }; }; "@serverless/platform-sdk-2.3.1" = { @@ -2992,22 +3046,22 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-1.1.0" = { + "@serverless/utils-1.2.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-1.1.0.tgz"; - sha512 = "MZBLphb8Dz9/mGclFQ53INznSFHZAwS2z4H8RZb6UPCqcRhW0SRrdLwLmn9JIqLWH4Zn95LbNsAjmzJ4Dl3CPQ=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-1.2.0.tgz"; + sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-china-0.1.15" = { + "@serverless/utils-china-0.1.17" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.15"; + version = "0.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.15.tgz"; - sha512 = "f7yPv3fJ2UNfo+w/O+Pt/vlHyCqzR8OAIbPnUi9wJD7AnK+95KK6tEEhDRSE/E+qpa5AbUN3cAJ00ih1HrGYAw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.17.tgz"; + sha512 = "GhveUbvj32whixPOztLhHJdLZUP5L3Ni+giOyM2vOl00Dnf1oklau2QCiDxvSWj5+ZlBGxyDMRJUXAfO1F6SPA=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3037,6 +3091,15 @@ let sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; + "@sindresorhus/is-3.0.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-3.0.0.tgz"; + sha512 = "kqA5I6Yun7PBHk8WN9BBP1c7FfN2SrD05GuVSEYPqDb4nerv7HqYfgBfMIKmT/EuejURkJKLZuLyGKGs6WEG9w=="; + }; + }; "@slack/client-3.16.0" = { name = "_at_slack_slash_client"; packageName = "@slack/client"; @@ -3127,6 +3190,15 @@ let sha512 = "/0phOICMk4hkX2KtZgi+4KNd5G9oYDIlxQDQk+ui2xl4gonPvK6Q5MFzHP7Xet1YY/XoU33ox41i+IO48qZ+zQ=="; }; }; + "@snyk/docker-registry-v2-client-1.13.5" = { + name = "_at_snyk_slash_docker-registry-v2-client"; + packageName = "@snyk/docker-registry-v2-client"; + version = "1.13.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.5.tgz"; + sha512 = "lgJiC071abCpFVLp47OnykU8MMrhdQe386Wt6QaDmjI0s2DQn/S58NfdLrPU7s6l4zoGT7UwRW9+7paozRgFTA=="; + }; + }; "@snyk/gemfile-1.2.0" = { name = "_at_snyk_slash_gemfile"; packageName = "@snyk/gemfile"; @@ -3199,6 +3271,15 @@ let sha512 = "4V1xJMqsK6J3jHu9UufKySorzA8O1vNLRIK1JgJf5KcXQCP44SJI5dk9Xr9iFGXXtGo8iI9gmokQcHlGpkPSJg=="; }; }; + "@snyk/snyk-docker-pull-3.2.0" = { + name = "_at_snyk_slash_snyk-docker-pull"; + packageName = "@snyk/snyk-docker-pull"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.0.tgz"; + sha512 = "uWKtjh29I/d0mfmfBN7w6RwwNBQxQVKrauF5ND/gqb0PVsKV22GIpkI+viWjI7KNKso6/B0tMmsv7TX2tsNcLQ=="; + }; + }; "@sorg/log-2.1.0" = { name = "_at_sorg_slash_log"; packageName = "@sorg/log"; @@ -3316,13 +3397,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@tencent-sdk/capi-0.2.15-alpha.0" = { + "@tencent-sdk/capi-0.2.17" = { name = "_at_tencent-sdk_slash_capi"; packageName = "@tencent-sdk/capi"; - version = "0.2.15-alpha.0"; + version = "0.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-0.2.15-alpha.0.tgz"; - sha512 = "1P3tlXJgQaQIqphh1jVeyXDOajFUFIU4J7MoU3Pwxdx58dOwS59/suTq4El0Fe12pc3Gmhw+eDeQc35GaHYViw=="; + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-0.2.17.tgz"; + sha512 = "DIenMFJXrd4yb35BbW/7LiikCQotbm9HEBG9S4HKV47tcKt6e4nZrNPO3R2hHgQ2jdo0xfqmlUlCP0O4Q3b9pw=="; }; }; "@textlint/ast-node-types-4.2.5" = { @@ -3487,22 +3568,22 @@ let sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; }; }; - "@types/babel-types-7.0.7" = { + "@types/babel-types-7.0.8" = { name = "_at_types_slash_babel-types"; packageName = "@types/babel-types"; - version = "7.0.7"; + version = "7.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz"; - sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ=="; + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.8.tgz"; + sha512 = "jvu8g4LR7+p6ao30RhTREnEhHxmP4/R9D9/rOR/Kq14FztORty9SKgtOZUNZNMB9CXLxZ54EWu4dArUE8WdTsw=="; }; }; - "@types/babel__core-7.1.8" = { + "@types/babel__core-7.1.9" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.8"; + version = "7.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.8.tgz"; - sha512 = "KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz"; + sha512 = "sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw=="; }; }; "@types/babel__generator-7.6.1" = { @@ -3523,13 +3604,13 @@ let sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; }; - "@types/babel__traverse-7.0.12" = { + "@types/babel__traverse-7.0.13" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.12"; + version = "7.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.12.tgz"; - sha512 = "t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; + sha512 = "i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ=="; }; }; "@types/babylon-6.16.5" = { @@ -3559,6 +3640,24 @@ let sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; }; }; + "@types/caseless-0.12.2" = { + name = "_at_types_slash_caseless"; + packageName = "@types/caseless"; + version = "0.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"; + sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; + }; + }; + "@types/chalk-2.2.0" = { + name = "_at_types_slash_chalk"; + packageName = "@types/chalk"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/chalk/-/chalk-2.2.0.tgz"; + sha512 = "1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw=="; + }; + }; "@types/color-name-1.1.1" = { name = "_at_types_slash_color-name"; packageName = "@types/color-name"; @@ -3622,6 +3721,15 @@ let sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; }; }; + "@types/emscripten-1.39.4" = { + name = "_at_types_slash_emscripten"; + packageName = "@types/emscripten"; + version = "1.39.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.4.tgz"; + sha512 = "k3LLVMFrdNA9UCvMDPWMbFrGPNb+GcPyw29ktJTo1RCN7RmxFG5XzPZcPKRlnLuLT/FRm8wp4ohvDwNY7GlROQ=="; + }; + }; "@types/eslint-visitor-keys-1.0.0" = { name = "_at_types_slash_eslint-visitor-keys"; packageName = "@types/eslint-visitor-keys"; @@ -3640,13 +3748,13 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.44" = { + "@types/estree-0.0.45" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.44"; + version = "0.0.45"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz"; - sha512 = "iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz"; + sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g=="; }; }; "@types/express-4.17.4" = { @@ -3658,13 +3766,13 @@ let sha512 = "DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w=="; }; }; - "@types/express-serve-static-core-4.17.7" = { + "@types/express-serve-static-core-4.17.8" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.7"; + version = "4.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz"; - sha512 = "EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.8.tgz"; + sha512 = "1SJZ+R3Q/7mLkOD9ewCBDYD2k0WyZQtWYqF/2VvoNN2/uhI49J9CDN4OAm+wGMA0DbArA4ef27xl4+JwMtGggw=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -3676,13 +3784,13 @@ let sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ=="; }; }; - "@types/glob-7.1.2" = { + "@types/glob-7.1.3" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz"; - sha512 = "VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA=="; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; + sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; }; }; "@types/graceful-fs-4.1.3" = { @@ -3757,22 +3865,22 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jquery-3.3.38" = { + "@types/jquery-3.5.0" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.3.38"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.38.tgz"; - sha512 = "nkDvmx7x/6kDM5guu/YpXkGZ/Xj/IwGiLDdKM99YA5Vag7pjGyTJ8BNUh/6hxEn/sEu5DKtyRgnONJ7EmOoKrA=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.0.tgz"; + sha512 = "C7qQUjpMWDUNYQRTXsP5nbYYwCwwgy84yPgoTT7fPN69NH92wLeCtFaMsWeolJD1AF/6uQw3pYt62rzv83sMmw=="; }; }; - "@types/js-yaml-3.12.4" = { + "@types/js-yaml-3.12.5" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "3.12.4"; + version = "3.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.4.tgz"; - sha512 = "fYMgzN+9e28R81weVN49inn/u798ruU91En1ZnGvSZzCRc5jXx9B2EDhlRaWmcO1RIxFHL8AajRXzxDuJu93+A=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.5.tgz"; + sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; "@types/json-schema-7.0.5" = { @@ -3829,13 +3937,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.155" = { + "@types/lodash-4.14.157" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.155"; + version = "4.14.157"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.155.tgz"; - sha512 = "vEcX7S7aPhsBCivxMwAANQburHBtfN9RdyXFk84IJmu2Z4Hkg1tOFgaslRiEqqvoLtbCBi6ika1EMspE+NZ9Lg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.157.tgz"; + sha512 = "Ft5BNFmv2pHDgxV5JDsndOWTRJ+56zte0ZpYLowp03tW+K+t8u8YMOzAnpuqPgzX6WO1XpDIUm7u04M8vdDiVQ=="; }; }; "@types/long-4.0.1" = { @@ -3883,31 +3991,40 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/node-10.17.26" = { + "@types/node-10.17.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.26"; + version = "10.17.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz"; - sha512 = "myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.27.tgz"; + sha512 = "J0oqm9ZfAXaPdwNXMMgAhylw5fhmXkToJd06vuDUSAgEDZ/n/69/69UmyBZbc+zT34UnShuDSBqvim3SPnozJg=="; }; }; - "@types/node-13.13.12" = { + "@types/node-12.7.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.12"; + version = "12.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.12.tgz"; - sha512 = "zWz/8NEPxoXNT9YyF2osqyA9WjssZukYpgI4UYZpOjcyqwIUqWGkcCionaEb9Ki+FULyPyvNFpg/329Kd2/pbw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz"; + sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-14.0.13" = { + "@types/node-13.13.14" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.13"; + version = "13.13.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz"; - sha512 = "rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.14.tgz"; + sha512 = "Az3QsOt1U/K1pbCQ0TXGELTuTkPLOiFIQf3ILzbOyo0FqgV9SxRnxbxM5QlAveERZMHpZY+7u3Jz2tKyl+yg6g=="; + }; + }; + "@types/node-14.0.23" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz"; + sha512 = "Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw=="; }; }; "@types/node-6.14.10" = { @@ -3937,6 +4054,15 @@ let sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; }; }; + "@types/object-assign-4.0.30" = { + name = "_at_types_slash_object-assign"; + packageName = "@types/object-assign"; + version = "4.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/object-assign/-/object-assign-4.0.30.tgz"; + sha1 = "8949371d5a99f4381ee0f1df0a9b7a187e07e652"; + }; + }; "@types/parse-json-4.0.0" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; @@ -3973,6 +4099,24 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; + "@types/request-2.48.5" = { + name = "_at_types_slash_request"; + packageName = "@types/request"; + version = "2.48.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; + sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; + }; + }; + "@types/request-promise-native-1.0.17" = { + name = "_at_types_slash_request-promise-native"; + packageName = "@types/request-promise-native"; + version = "1.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.17.tgz"; + sha512 = "05/d0WbmuwjtGMYEdHIBZ0tqMJJQ2AD9LG2F6rKNBGX1SSFR27XveajH//2N/XYtual8T9Axwl+4v7oBtPUZqg=="; + }; + }; "@types/resolve-0.0.8" = { name = "_at_types_slash_resolve"; packageName = "@types/resolve"; @@ -3982,6 +4126,15 @@ let sha512 = "auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ=="; }; }; + "@types/resolve-1.17.1" = { + name = "_at_types_slash_resolve"; + packageName = "@types/resolve"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"; + sha512 = "yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="; + }; + }; "@types/responselike-1.0.0" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; @@ -4045,13 +4198,22 @@ let sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; - "@types/uglify-js-3.9.2" = { + "@types/tough-cookie-4.0.0" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; + }; + }; + "@types/uglify-js-3.9.3" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.2.tgz"; - sha512 = "d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.3.tgz"; + sha512 = "KswB5C7Kwduwjj04Ykz+AjvPcfgv/37Za24O2EDzYNbwyzOo8+ydtvzUfZ5UMguiVu29Gx44l1A6VsPPcmYu9w=="; }; }; "@types/unist-2.0.3" = { @@ -4081,13 +4243,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.45.0" = { + "@types/vscode-1.47.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.45.0"; + version = "1.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.45.0.tgz"; - sha512 = "b0Gyir7sPBCqiKLygAhn/AYVfzWD+SMPkWltBrIuPEyTOxSU1wVApWY/FcxYO2EWTRacoubTl4+gvZf86RkecA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.47.0.tgz"; + sha512 = "nJA37ykkz9FYA0ZOQUSc3OZnhuzEW2vUhUEo4MiduUo82jGwwcLfyvmgd/Q7b0WrZAAceojGhZybg319L24bTA=="; }; }; "@types/webpack-4.41.17" = { @@ -4108,13 +4270,22 @@ let sha512 = "c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ=="; }; }; - "@types/ws-7.2.5" = { + "@types/websocket-1.0.0" = { + name = "_at_types_slash_websocket"; + packageName = "@types/websocket"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.0.tgz"; + sha512 = "MLr8hDM8y7vvdAdnoDEP5LotRoYJj7wgT6mWzCUQH/gHqzS4qcnOT/K4dhC0WimWIUiA3Arj9QAJGGKNRiRZKA=="; + }; + }; + "@types/ws-7.2.6" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "7.2.5"; + version = "7.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.5.tgz"; - sha512 = "4UEih9BI1nBKii385G9id1oFrSkLcClbwtDfcYj8HJLQqZVAtb/42vXVrYvRWCcufNF/a+rZD3MxNwghA7UmCg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.6.tgz"; + sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; }; }; "@types/xml2js-0.4.5" = { @@ -4162,13 +4333,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-3.3.0" = { + "@typescript-eslint/eslint-plugin-3.6.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.3.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.3.0.tgz"; - sha512 = "Ybx/wU75Tazz6nU2d7nN6ll0B98odoiYLXwcuwS5WSttGzK46t0n7TPRQ4ozwcTv82UY6TQoIvI+sJfTzqK9dQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.6.1.tgz"; + sha512 = "06lfjo76naNeOMDl+mWG9Fh/a0UHKLGhin+mGaIw72FUMbMGBkdi/FEJmgEDzh4eE73KIYzHWvOCYJ0ak7nrJQ=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -4180,13 +4351,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-3.3.0" = { + "@typescript-eslint/experimental-utils-3.6.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.3.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.3.0.tgz"; - sha512 = "d4pGIAbu/tYsrPrdHCQ5xfadJGvlkUxbeBB56nO/VGmEDi/sKmfa5fGty5t5veL1OyJBrUmSiRn1R1qfVDydrg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.1.tgz"; + sha512 = "oS+hihzQE5M84ewXrTlVx7eTgc52eu+sVmG7ayLfOhyZmJ8Unvf3osyFQNADHP26yoThFfbxcibbO0d2FjnYhg=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -4198,13 +4369,22 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-3.3.0" = { + "@typescript-eslint/parser-3.6.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.3.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.3.0.tgz"; - sha512 = "a7S0Sqn/+RpOOWTcaLw6RD4obsharzxmgMfdK24l364VxuBODXjuJM7ImCkSXEN7oz52aiZbXSbc76+2EsE91w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.6.1.tgz"; + sha512 = "SLihQU8RMe77YJ/jGTqOt0lMq7k3hlPVfp7v/cxMnXA9T0bQYoMDfTsNgHXpwSJM1Iq2aAJ8WqekxUwGv5F67Q=="; + }; + }; + "@typescript-eslint/types-3.6.1" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.6.1.tgz"; + sha512 = "NPxd5yXG63gx57WDTW1rp0cF3XlNuuFFB5G+Kc48zZ+51ZnQn9yjDEsjTPQ+aWM+V+Z0I4kuTFKjKvgcT1F7xQ=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -4225,49 +4405,58 @@ let sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.3.0" = { + "@typescript-eslint/typescript-estree-3.6.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.3.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.3.0.tgz"; - sha512 = "3SqxylENltEvJsjjMSDCUx/edZNSC7wAqifUU1Ywp//0OWEZwMZJfecJud9XxJ/40rAKEbJMKBOQzeOjrLJFzQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.1.tgz"; + sha512 = "G4XRe/ZbCZkL1fy09DPN3U0mR6SayIv1zSeBNquRFRk7CnVLgkC2ZPj8llEMJg5Y8dJ3T76SvTGtceytniaztQ=="; }; }; - "@vue/cli-shared-utils-4.4.4" = { + "@typescript-eslint/visitor-keys-3.6.1" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.1.tgz"; + sha512 = "qC8Olwz5ZyMTZrh4Wl3K4U6tfms0R/mzU4/5W3XeUZptVraGVmbptJbn6h2Ey6Rb3hOs3zWoAUebZk8t47KGiQ=="; + }; + }; + "@vue/cli-shared-utils-4.4.6" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz"; - sha512 = "ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.6.tgz"; + sha512 = "ba+FZZCjiTSu2otnLjY4qXqASe7ZIQ/QBljk5oRPgqrR0p1NUkDPUcZhqa041aOaSW1yAfSfhOD7Q84nMnWhzQ=="; }; }; - "@vue/cli-ui-4.4.4" = { + "@vue/cli-ui-4.4.6" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.4.tgz"; - sha512 = "BKzDvUgy6fsZolrMLBvMLlue7s3dFeIJdxWWJtc8/CjD5VvLG+XawAePx8W+24QZwCZpvoZIz4zU38D341IT9A=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.6.tgz"; + sha512 = "9l67vb0J9iubf14Lj6aI8Fg9DPIgB9gCLbwQWVrFtoaDTapdbo0X6cf0zK1RNeN/5CrGa5baIntqsWwC1Iqlcw=="; }; }; - "@vue/cli-ui-addon-webpack-4.4.4" = { + "@vue/cli-ui-addon-webpack-4.4.6" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.4.tgz"; - sha512 = "qx3MnLxk4JeKpkGK2h5ZihuA8Asgu7sbLDagOOaEbF6GpnHSfkrYioE7es8AHm4QHBgn/MWqnkBts5XDN5r4LA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.6.tgz"; + sha512 = "odDx8lo+MNFCnhOB6fsjWJnoWP/YhDhDuCUQC8YQHCtsGRHI8/mJQk1tLI8cPVrY37aAH8Z0loitg4q3klItlQ=="; }; }; - "@vue/cli-ui-addon-widgets-4.4.4" = { + "@vue/cli-ui-addon-widgets-4.4.6" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.4.tgz"; - sha512 = "nOe6LOwZsKCiaH+jrAO2/G90qAkzB1RYivcWGnXirQAH7nec1ZysDNQv1HMDIfWbhCkJMWhGICuWcrn+rtb/8Q=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.6.tgz"; + sha512 = "GqtqxFR30LCxiQ+y/8b+XmAaZ983ojYT/6xOeqD0V0bZ3sNrthTxRcTXKJHbw7xdeE7bWHikHKYQ7Jn3J/Dyjw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -4648,6 +4837,42 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; + "@yarnpkg/core-2.1.1" = { + name = "_at_yarnpkg_slash_core"; + packageName = "@yarnpkg/core"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/core/-/core-2.1.1.tgz"; + sha512 = "qeBxz8nHjKAbGTP2ZcXBnXGfM7+cN0A73mIai/24uru1ayvCIgfjWL1uIj/MM+m+K5lJX0Dcn94ZBHWits9JWQ=="; + }; + }; + "@yarnpkg/fslib-2.1.0" = { + name = "_at_yarnpkg_slash_fslib"; + packageName = "@yarnpkg/fslib"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.1.0.tgz"; + sha512 = "E+f8w5yQZnTf1soyTWy7qdf+GmHsY+A0yEN4Di44/Txk6XRIMruyc1ShDi93mOI6ilnXxD87rNms18zJ8WnspA=="; + }; + }; + "@yarnpkg/json-proxy-2.1.0" = { + name = "_at_yarnpkg_slash_json-proxy"; + packageName = "@yarnpkg/json-proxy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/json-proxy/-/json-proxy-2.1.0.tgz"; + sha512 = "rOgCg2DkyviLgr80mUMTt9vzdf5RGOujQB26yPiXjlz4WNePLBshKlTNG9rKSoKQSOYEQcw6cUmosfOKDatrCw=="; + }; + }; + "@yarnpkg/libzip-2.1.0" = { + name = "_at_yarnpkg_slash_libzip"; + packageName = "@yarnpkg/libzip"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.1.0.tgz"; + sha512 = "39c7KuSWcYUqVxlBLZwfqdD/D6lS+jplNVWd6uAnk8EpnacaYGJRegvkqWyfw5c8KHukNMeEGF5JHrXPZYBM0w=="; + }; + }; "@yarnpkg/lockfile-1.1.0" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -4657,6 +4882,33 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; + "@yarnpkg/parsers-2.1.0" = { + name = "_at_yarnpkg_slash_parsers"; + packageName = "@yarnpkg/parsers"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.1.0.tgz"; + sha512 = "75OYQ6PMs1C3zm+W+T1xhLyVDX78zXQGEVHpWd4o/QwpAbhneB3/5FXVGRzI3gjPPWWSb/pKOPB1S6p0xmQD2Q=="; + }; + }; + "@yarnpkg/pnp-2.1.0" = { + name = "_at_yarnpkg_slash_pnp"; + packageName = "@yarnpkg/pnp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/pnp/-/pnp-2.1.0.tgz"; + sha512 = "b8NlB71EFifv1jDX47nFaRXrykROxHcS7YuGb2dQ+Gp9gqJ0thIaZ3yB9+qWF8acdWtNcMpjCug4xkfAAR5Odw=="; + }; + }; + "@yarnpkg/shell-2.1.0" = { + name = "_at_yarnpkg_slash_shell"; + packageName = "@yarnpkg/shell"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/shell/-/shell-2.1.0.tgz"; + sha512 = "9i9ZWqeKHGV0DOfdxTVq5zl73Li8Fg947v57uLBEaytNF+HywkDfouNkg/6HfgBrpI0WH8OJ9Pz/uDaE5cpctw=="; + }; + }; "@zeit/schemas-2.6.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; @@ -5026,13 +5278,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.23.0" = { + "addons-linter-1.26.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.23.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.23.0.tgz"; - sha512 = "4ozo5E+KnsU9h94J496WQs6NYSnofxtw5/Sy63PmeB5FJ3KWERx1S9D8A+ixMAIMgaSiexHpp5alp9yjE0t4gg=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.26.0.tgz"; + sha512 = "PKytX6qxbZapc076auO0LBhAGuw2z7eyPnYusMgNBPbY72MAXzUCt3AhSbwGhZ43d5Tn/3At5H0xPi31VXG2Mg=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -5053,13 +5305,13 @@ let sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; }; }; - "adm-zip-0.4.14" = { + "adm-zip-0.4.16" = { name = "adm-zip"; packageName = "adm-zip"; - version = "0.4.14"; + version = "0.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz"; - sha512 = "/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g=="; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz"; + sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="; }; }; "adverb-where-0.0.9" = { @@ -5134,13 +5386,13 @@ let sha512 = "TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="; }; }; - "agent-base-6.0.0" = { + "agent-base-6.0.1" = { name = "agent-base"; packageName = "agent-base"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz"; - sha512 = "j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz"; + sha512 = "01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg=="; }; }; "agentkeepalive-3.5.2" = { @@ -5242,6 +5494,15 @@ let sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; + "ajv-6.12.3" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"; + sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; + }; + }; "ajv-6.5.3" = { name = "ajv"; packageName = "ajv"; @@ -5278,13 +5539,13 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "ajv-keywords-3.5.0" = { + "ajv-keywords-3.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.0.tgz"; - sha512 = "eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw=="; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz"; + sha512 = "KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA=="; }; }; "ajv-merge-patch-4.1.0" = { @@ -5296,13 +5557,13 @@ let sha512 = "0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw=="; }; }; - "alex-5.1.0" = { + "alex-8.1.1" = { name = "alex"; packageName = "alex"; - version = "5.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/alex/-/alex-5.1.0.tgz"; - sha512 = "ouNJOHx7KKNwFsmX3WWXo8c2RTrsyhcX5QlFb6IM/cHCy9IkHr1k833jiIhcbwkUeGgACI2BJtp9LLvnFjbhbA=="; + url = "https://registry.npmjs.org/alex/-/alex-8.1.1.tgz"; + sha512 = "WH3BEF0fr+Pj7N8caH6Y+DInOUIB2VnRyT8UJ/39cmHivCu6raX++d0ZcYwbD/ONLTWU+VMAiQjCYaNywIZAjw=="; }; }; "align-text-0.1.4" = { @@ -5395,15 +5656,6 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; - "ansi-colors-3.2.3" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; - sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; - }; - }; "ansi-colors-3.2.4" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -5719,13 +5971,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.28.3" = { + "apollo-2.29.1" = { name = "apollo"; packageName = "apollo"; - version = "2.28.3"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.28.3.tgz"; - sha512 = "+X1RqODYOz1VPO0a/6tZpZiFQr7K6z0ZSm7H9oT9PmuZ9TMC27mwOh2N0i1p+OP+6JORKh8lHmjMvle+doZ82A=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.29.1.tgz"; + sha512 = "2wobALKlgjQsSPEjP4jN+ceH7DnZdOkcY28owNP6v1hdPhsznOdc0AYYvR9dMlb+NzcBqTOlqJekFUkzfM00Ig=="; }; }; "apollo-cache-1.3.5" = { @@ -5737,13 +5989,13 @@ let sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA=="; }; }; - "apollo-cache-control-0.11.0" = { + "apollo-cache-control-0.11.1" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.0.tgz"; - sha512 = "dmRnQ9AXGw2SHahVGLzB/p4UW/taFBAJxifxubp8hqY5p9qdlSu4MPRq8zvV2ULMYf50rBtZyC4C+dZLqmHuHQ=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.1.tgz"; + sha512 = "6iHa8TkcKt4rx5SKRzDNjUIpCQX+7/FlZwD7vRh9JDnM4VH8SWhpj8fUR3CiEY8Kuc4ChXnOY8bCcMju5KPnIQ=="; }; }; "apollo-cache-inmemory-1.6.6" = { @@ -5764,76 +6016,76 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.37.3" = { + "apollo-codegen-core-0.37.5" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.37.3"; + version = "0.37.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.3.tgz"; - sha512 = "/DwAhOOFzl57GdBfRGNnqIAcfZAXpsgFIeWYqlu3I/eIucGBCFWo9CEW1TcNwkZzYGAmSE8tURwPgt7dtnhFpg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.5.tgz"; + sha512 = "mCfizUDuYsHQlZOwizc5Z2YRlvTakvQDjpDDQUAHW2ULMaCAnRSFEo+ksN+e1VdR4fAOZ1cEtCmIZ+HqpL2Bpw=="; }; }; - "apollo-codegen-flow-0.35.3" = { + "apollo-codegen-flow-0.35.5" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.35.3"; + version = "0.35.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.3.tgz"; - sha512 = "npDt9PEJiw/ygKUsKxaDGHCnjQUANPlg/F9piIbQ71jwBjNNoNSXrRaRiD5632MfcTvEuBvanElEX3AO2sA1gw=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.5.tgz"; + sha512 = "1/fPPehm758yFuZIcMWKbYjJtapa6Pwuqo0broYKBSQ9lp42LSvbCfwtANktBnmxrFmlIFPFrBOnsjrz2eW+5w=="; }; }; - "apollo-codegen-scala-0.36.3" = { + "apollo-codegen-scala-0.36.5" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.36.3"; + version = "0.36.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.3.tgz"; - sha512 = "KOmcP/0RiqSGY03fXdF87IzQ1RSsApbno3/M8KRVF2yhf+4X3GQXQRpXejHMt4DxnnfPBOn7MqwtP/cDMJIiyw=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.5.tgz"; + sha512 = "QCtD1rV5OtYjlxiLJ7rfrRxALNRYUwYdlxXiyqfZrIRqtpGVHwPp/nDqFF0bYUIT135vj7dXz7xzzlvK5x+z6A=="; }; }; - "apollo-codegen-swift-0.37.3" = { + "apollo-codegen-swift-0.37.5" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.37.3"; + version = "0.37.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.3.tgz"; - sha512 = "0BpwtSE+IP12C7OdoScsOWUgxbcuThgwVRsxybBNugUcmddF5sCdGiRbdm+oKvX1vErsG+XimwmIuZnBPWv6ew=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.5.tgz"; + sha512 = "5WdO4IEA/tvEhnbBbbMYujUT/L65Dy3LNS88s/Wa5MkgG0g603wRgFsFOETFXiBiPIVguCszKIqFcK/uGBfsYQ=="; }; }; - "apollo-codegen-typescript-0.37.3" = { + "apollo-codegen-typescript-0.37.5" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.37.3"; + version = "0.37.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.3.tgz"; - sha512 = "tuf/AQTFcNrngQrT4q4WKRdiuPbglyR1m3L58g/nNevoO0cRmF6koIix4NB5sO05LgF8XJmd2zHvInUI5v33Ig=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.5.tgz"; + sha512 = "vfyr2P1ywUedepc410TwaX/+4M4KT/GOBWWL+fbeicWnxlecsDz5BMbD94nahRsvP8Iqd6ZIp3oxq4UeCSZbHQ=="; }; }; - "apollo-datasource-0.7.1" = { + "apollo-datasource-0.7.2" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.1.tgz"; - sha512 = "h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz"; + sha512 = "ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw=="; }; }; - "apollo-engine-reporting-2.2.0" = { + "apollo-engine-reporting-2.2.1" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.2.0.tgz"; - sha512 = "FmfWTpyEATO392QHcot3PNMrxNhEJ4Kq+QiYY263vN/OBLZQ5zpkFY25iB6gVuiJoz3NUkByhxq5f/XjarJVvA=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.2.1.tgz"; + sha512 = "HPwf70p4VbxKEagHYWTwldqfYNekBE33BXcryHI9owxMm5B8/vutQfx67+4Bf351kOpndCG9I91aOiFBfC2/iQ=="; }; }; - "apollo-engine-reporting-protobuf-0.5.1" = { + "apollo-engine-reporting-protobuf-0.5.2" = { name = "apollo-engine-reporting-protobuf"; packageName = "apollo-engine-reporting-protobuf"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz"; - sha512 = "TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw=="; + url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.2.tgz"; + sha512 = "4wm9FR3B7UvJxcK/69rOiS5CAJPEYKufeRWb257ZLfX7NGFTMqvbc1hu4q8Ch7swB26rTpkzfsftLED9DqH9qg=="; }; }; "apollo-env-0.6.5" = { @@ -5854,13 +6106,22 @@ let sha512 = "0qa7UOoq7E71kBYE7idi6mNQhHLVdMEDInWk6TNw3KsSWZE2/I68gARP84Mj+paFTO5NYuw1Dht66PVX76Cc2w=="; }; }; - "apollo-language-server-1.22.3" = { + "apollo-graphql-0.5.0" = { + name = "apollo-graphql"; + packageName = "apollo-graphql"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.5.0.tgz"; + sha512 = "YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig=="; + }; + }; + "apollo-language-server-1.23.1" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.22.3"; + version = "1.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.22.3.tgz"; - sha512 = "RurKlBUNE1RrvY4m93b5WS/DXInUEI47MlzuvholRqZSQovt2rQi81R0RvmS/l3d6y5TBfxbPFpT5RyHbdAntw=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.1.tgz"; + sha512 = "tP+B4jvs5KO/l1HYy4V6S302ypbmkyyDaWheQzlu0KStO9hlECDWk67nInmvKbRQ1Rov9oHDkujLADvH3pJkBA=="; }; }; "apollo-link-1.2.14" = { @@ -5935,76 +6196,76 @@ let sha512 = "mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw=="; }; }; - "apollo-server-caching-0.5.1" = { + "apollo-server-caching-0.5.2" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.1.tgz"; - sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz"; + sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; }; }; - "apollo-server-core-2.15.0" = { + "apollo-server-core-2.15.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.15.0.tgz"; - sha512 = "PwNm/G5IXReev7E0ZaRAekQ7pN9BTuXH8c2QVgfMGMno3XiN5Dj+1DXYQthpwNJch0y5zhhLcb/JbClijgSEsA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.15.1.tgz"; + sha512 = "ZRSK3uVPS6YkIV3brm2CjzVphg6NHY0PRhFojZD8BjoQlGo3+pPRP1IHFDvC3UzybGWfyCelcfF4YiVqh4GJHw=="; }; }; - "apollo-server-env-2.4.4" = { + "apollo-server-env-2.4.5" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz"; - sha512 = "c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz"; + sha512 = "nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA=="; }; }; - "apollo-server-errors-2.4.1" = { + "apollo-server-errors-2.4.2" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz"; - sha512 = "7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz"; + sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.15.0" = { + "apollo-server-express-2.15.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.15.0.tgz"; - sha512 = "ECptVIrOVW2cmMWvqtpkZfyZrQL8yTSgbVvP4M8qcPV/3XxDJa6444zy7vxqN7lyYl8IJAsg/IwC0vodoXe//A=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.15.1.tgz"; + sha512 = "anNb9HJo+KTpgvUqiPOjEl4wPq8y8NmWaIUz/QqPZlhIEDdf7wd/kQo3Sdbov++7J9JNJx6Ownnvw+wxfogUgA=="; }; }; - "apollo-server-plugin-base-0.9.0" = { + "apollo-server-plugin-base-0.9.1" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz"; - sha512 = "LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.1.tgz"; + sha512 = "kvrX4Z3FdpjrZdHkyl5iY2A1Wvp4b6KQp00DeZqss7GyyKNUBKr80/7RQgBLEw7EWM7WB19j459xM/TjvW0FKQ=="; }; }; - "apollo-server-types-0.5.0" = { + "apollo-server-types-0.5.1" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz"; - sha512 = "zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.1.tgz"; + sha512 = "my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA=="; }; }; - "apollo-tracing-0.11.0" = { + "apollo-tracing-0.11.1" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.0.tgz"; - sha512 = "I9IFb/8lkBW8ZwOAi4LEojfT7dMfUSkpnV8LHQI8Rcj0HtzL9HObQ3woBmzyGHdGHLFuD/6/VHyFD67SesSrJg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.1.tgz"; + sha512 = "l7g+uILw7v32GA46IRXIx5XXbZhFI96BhSqrGK9yyvfq+NMcvVZrj3kIhRImPGhAjMdV+5biA/jztabElAbDjg=="; }; }; "apollo-upload-client-11.0.0" = { @@ -6016,15 +6277,6 @@ let sha512 = "JChTrBi1VSF8u6OPrkWUApJlyUvzwhw98kqRB3fSi7/CU6z0OUD42Mee9s5h8mfjKEfOanK6GNZhF4t2tIPXSw=="; }; }; - "apollo-upload-client-13.0.0" = { - name = "apollo-upload-client"; - packageName = "apollo-upload-client"; - version = "13.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz"; - sha512 = "lJ9/bk1BH1lD15WhWRha2J3+LrXrPIX5LP5EwiOUHv8PCORp4EUrcujrA3rI5hZeZygrTX8bshcuMdpqpSrvtA=="; - }; - }; "apollo-utilities-1.3.4" = { name = "apollo-utilities"; packageName = "apollo-utilities"; @@ -6151,13 +6403,13 @@ let sha512 = "5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg=="; }; }; - "archiver-4.0.1" = { + "archiver-4.0.2" = { name = "archiver"; packageName = "archiver"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-4.0.1.tgz"; - sha512 = "/YV1pU4Nhpf/rJArM23W6GTUjT0l++VbjykrCRua1TSXrn+yM8Qs7XvtwSiRse0iCe49EPNf7ktXnPsWuSb91Q=="; + url = "https://registry.npmjs.org/archiver/-/archiver-4.0.2.tgz"; + sha512 = "B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ=="; }; }; "archiver-utils-1.3.0" = { @@ -7168,13 +7420,13 @@ let sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ=="; }; }; - "autoprefixer-9.8.0" = { + "autoprefixer-9.8.5" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "9.8.0"; + version = "9.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz"; - sha512 = "D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.5.tgz"; + sha512 = "C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg=="; }; }; "available-typed-arrays-1.0.2" = { @@ -7213,13 +7465,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.700.0" = { + "aws-sdk-2.713.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.700.0"; + version = "2.713.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.700.0.tgz"; - sha512 = "faBkr/D3IavfL2mwst4/thiKsHkN8YCwU9927Mkiushbe7n4UXxlcNf7LnVxFyjr3WIf4KfziSw4bajRAiAjYA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.713.0.tgz"; + sha512 = "axR1eOVn134KXJc1IT+Au2TXcK6oswY+4nvGe5GfU3pXeehhe0xNeP9Bw9yF36TRBxuvu4IJ2hRHDKma05smgA=="; }; }; "aws-sign2-0.6.0" = { @@ -7924,6 +8176,15 @@ let sha512 = "taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg=="; }; }; + "bcrypt-3.0.8" = { + name = "bcrypt"; + packageName = "bcrypt"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.8.tgz"; + sha512 = "jKV6RvLhI36TQnPDvUFqBEnGX9c8dRRygKxCZu7E+MgLfKZbmmXL8a7/SFFOyHoPNX9nV81cKRC5tbQfvEQtpw=="; + }; + }; "bcrypt-nodejs-0.0.3" = { name = "bcrypt-nodejs"; packageName = "bcrypt-nodejs"; @@ -8023,15 +8284,6 @@ let sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; }; }; - "bezier-js-2.6.1" = { - name = "bezier-js"; - packageName = "bezier-js"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.6.1.tgz"; - sha512 = "jelZM33eNzcZ9snJ/5HqJLw3IzXvA8RFcBjkdOB8SDYyOvW8Y2tTosojAiBTnD1MhbHoWUYNbxUXxBl61TxbRg=="; - }; - }; "biased-opener-0.2.8" = { name = "biased-opener"; packageName = "biased-opener"; @@ -8104,13 +8356,13 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "binary-extensions-2.0.0" = { + "binary-extensions-2.1.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; }; }; "binary-search-1.3.6" = { @@ -8401,13 +8653,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "blueimp-md5-2.14.0" = { + "blueimp-md5-2.16.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.14.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.14.0.tgz"; - sha512 = "fhX8JsIgugJ39g9MUJ4Y0S+WYd/1HATNVzW4nEVknP5uJU1mA7LZCV3OuVH9OvxpuYQXu6ttst0IYIlAyVfBQg=="; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.16.0.tgz"; + sha512 = "j4nzWIqEFpLSbdhUApHRGDwfXbV8ALhqOn+FY5L6XBdKPAXU9BpGgFSbDsgqogfqPPR9R2WooseWCsfhfEC6uQ=="; }; }; "bn.js-4.11.9" = { @@ -8851,13 +9103,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.12.0" = { + "browserslist-4.13.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.12.0"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz"; - sha512 = "UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz"; + sha512 = "MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ=="; }; }; "bser-2.1.1" = { @@ -9076,6 +9328,15 @@ let sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg=="; }; }; + "bufferstreams-2.0.1" = { + name = "bufferstreams"; + packageName = "bufferstreams"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-2.0.1.tgz"; + sha512 = "ZswyIoBfFb3cVDsnZLLj2IDJ/0ppYdil/v2EGlZXvoefO689FokEmFEldhN5dV7R2QBxFneqTJOMIpfqhj+n0g=="; + }; + }; "bufferutil-1.3.0" = { name = "bufferutil"; packageName = "bufferutil"; @@ -9175,6 +9436,15 @@ let sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; }; }; + "bunyan-1.8.14" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.14"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.14.tgz"; + sha512 = "LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg=="; + }; + }; "bunyan-syslog-udp-0.2.0" = { name = "bunyan-syslog-udp"; packageName = "bunyan-syslog-udp"; @@ -9310,13 +9580,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-15.0.4" = { + "cacache-15.0.5" = { name = "cacache"; packageName = "cacache"; - version = "15.0.4"; + version = "15.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.0.4.tgz"; - sha512 = "YlnKQqTbD/6iyoJvEY3KJftjrdBYroCbxxYXzhOzsFLWlp6KX4BOlEf4mTx0cMUfVaTS3ENL2QtDWeRYoGLkkw=="; + url = "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz"; + sha512 = "lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A=="; }; }; "cache-base-1.0.1" = { @@ -9346,6 +9616,15 @@ let sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; + "cacheable-lookup-5.0.3" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz"; + sha512 = "W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w=="; + }; + }; "cacheable-request-2.1.4" = { name = "cacheable-request"; packageName = "cacheable-request"; @@ -9589,13 +9868,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001084" = { + "caniuse-lite-1.0.30001099" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001084"; + version = "1.0.30001099"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001084.tgz"; - sha512 = "ftdc5oGmhEbLUuMZ/Qp3mOpzfZLCxPYKcvGv6v2dJJ+8EdqcvZRbAGOiLmkM/PV1QGta/uwBs8/nCl6sokDW6w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz"; + sha512 = "sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA=="; + }; + }; + "capital-case-1.0.3" = { + name = "capital-case"; + packageName = "capital-case"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/capital-case/-/capital-case-1.0.3.tgz"; + sha512 = "OlUSJpUr7SY0uZFOxcwnDOU7/MpHlKTZx2mqnDYQFrDudXLFm0JJ9wr/l4csB+rh2Ug0OPuoSO53PqiZBqno9A=="; }; }; "capture-exit-2.0.0" = { @@ -9625,15 +9913,6 @@ let sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505"; }; }; - "caryll-shapeops-0.3.1" = { - name = "caryll-shapeops"; - packageName = "caryll-shapeops"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz"; - sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og=="; - }; - }; "caseless-0.11.0" = { name = "caseless"; packageName = "caseless"; @@ -9724,6 +10003,15 @@ let sha512 = "azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA=="; }; }; + "chainsaw-0.0.9" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.0.9.tgz"; + sha1 = "11a05102d1c4c785b6d0415d336d5a3a1612913e"; + }; + }; "chalk-0.4.0" = { name = "chalk"; packageName = "chalk"; @@ -9814,13 +10102,13 @@ let sha512 = "g9YLQVHVZS/3F+zIicfB58vjcxopvYQRp7xHzvyDFDhXH1aRZI/JhwSAO0X5qYiQluoGnaNAU6wByD2KTxJN1A=="; }; }; - "change-case-3.1.0" = { + "change-case-4.1.1" = { name = "change-case"; packageName = "change-case"; - version = "3.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/change-case/-/change-case-3.1.0.tgz"; - sha512 = "2AZp7uJZbYEzRPsFoa+ijKdvp9zsrnnt6+yFokfwEpeJm0xuJDVoxiRCAaTzyJND8GJkofo2IcKWaUZ/OECVzw=="; + url = "https://registry.npmjs.org/change-case/-/change-case-4.1.1.tgz"; + sha512 = "qRlUWn/hXnX1R1LBDF/RelJLiqNjKjUqlmuBVSEIyye8kq49CXqkZWKmi8XeUAdDXWFOcGLUMZ+aHn3Q5lzUXw=="; }; }; "character-entities-1.2.4" = { @@ -9976,6 +10264,15 @@ let sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA=="; }; }; + "child-process-1.0.2" = { + name = "child-process"; + packageName = "child-process"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/child-process/-/child-process-1.0.2.tgz"; + sha1 = "98974dc7ed1ee4c6229f8e305fa7313a6885a7f2"; + }; + }; "child-process-ext-2.1.1" = { name = "child-process-ext"; packageName = "child-process-ext"; @@ -10048,15 +10345,6 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; - "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=="; - }; - }; "chokidar-3.3.1" = { name = "chokidar"; packageName = "chokidar"; @@ -10129,13 +10417,13 @@ let sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; }; }; - "chrome-launcher-0.13.1" = { + "chrome-launcher-0.13.3" = { name = "chrome-launcher"; packageName = "chrome-launcher"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.1.tgz"; - sha512 = "q8UiCNAknw6kCUvCVBTAEw1BwT0vaxabCrSjN3B/NWohp12YBD9+DalymYElSoKRD4KpVSu4CCl0us4v/J81Sg=="; + url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.3.tgz"; + sha512 = "ovrDuFXgXS96lzeDqFPQRsczkxla+6QMvzsF+1u0mKlD1KE8EuhjdLwiDfIFedb0FSLz18RK3y6IbKu8oqA0qw=="; }; }; "chrome-net-3.3.4" = { @@ -10282,6 +10570,15 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; + "cldr-5.6.0" = { + name = "cldr"; + packageName = "cldr"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cldr/-/cldr-5.6.0.tgz"; + sha512 = "0apGe49Gv3glmLbLHp0X2iEjee+xAwO8H4OVUHczIpCUBWN4aAwbXBw8nn2xpitAtd2fVIr8pvwI0znk/RnfLw=="; + }; + }; "clean-css-3.4.28" = { name = "clean-css"; packageName = "clean-css"; @@ -10327,15 +10624,6 @@ let sha512 = "eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q=="; }; }; - "clean-stack-1.3.0" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; - sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; - }; - }; "clean-stack-2.2.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -10345,6 +10633,15 @@ let sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; }; + "clean-stack-3.0.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.0.tgz"; + sha512 = "RHxtgFvXsRQ+1AM7dlozLDY7ssmvUUh0XEnfnyhYgJTO6beNZHBogiaCwGM9Q3rFrUkYxOtsZRC0zAturg5bjg=="; + }; + }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -10516,13 +10813,13 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.4.6" = { + "cli-ux-5.4.9" = { name = "cli-ux"; packageName = "cli-ux"; - version = "5.4.6"; + version = "5.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.6.tgz"; - sha512 = "EeiS2TzEndRVknCqE+8Ri8g0bsP617a1nq6n+3Trwft1JCDzyUNlX2J1fl7fwTgRPWtmBmiF6xIyueL5YGs65g=="; + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.9.tgz"; + sha512 = "4yCKJbFQqNQxf1v0E5T5aBJLt3SbW6dXc/R7zHp4ycdPMg9fAy5f2vhPsWgXEGCMQg+fgN0Sp7EYcZ1XGkFyUA=="; }; }; "cli-width-1.1.1" = { @@ -10543,6 +10840,15 @@ let sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; }; + "cli-width-3.0.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"; + sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; + }; + }; "cliclopts-1.1.1" = { name = "cliclopts"; packageName = "cliclopts"; @@ -10570,6 +10876,15 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; + "clipanion-2.4.2" = { + name = "clipanion"; + packageName = "clipanion"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clipanion/-/clipanion-2.4.2.tgz"; + sha512 = "kBCYtQKI4/R/zjierdwoDAsNUSvoh4pX2tseYxgLYQcKIpdPsHZrFWiQOfbe2Scd/btsqJEc4q6g55q0p5DZAw=="; + }; + }; "clipboard-2.0.6" = { name = "clipboard"; packageName = "clipboard"; @@ -10597,13 +10912,13 @@ let sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; }; }; - "clipper-lib-1.0.0" = { + "clipper-lib-6.4.2" = { name = "clipper-lib"; packageName = "clipper-lib"; - version = "1.0.0"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz"; - sha1 = "e902ceb26e28ee5cfa6014abdf790a51efff4ecb"; + url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-6.4.2.tgz"; + sha512 = "knglhjQX5ihNj/XCIs6zCHrTemdvHY3LPZP9XB2nq2/3igyYMFueFXtfp84baJvEE+f8pO1ZS4UVeEgmLnAprQ=="; }; }; "cliss-0.0.2" = { @@ -11056,6 +11371,15 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; + "colorette-1.2.1" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz"; + sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="; + }; + }; "colornames-1.1.1" = { name = "colornames"; packageName = "colornames"; @@ -11407,13 +11731,13 @@ let sha512 = "Ke1ejo/RZ+Hzku4gcW34uPMOR4Cpq87MAotELgV9mwiAzDN726cu+eWo0zWg1vRIfyf6yK5bW9uIW+c/SksQ5w=="; }; }; - "compare-func-1.3.4" = { + "compare-func-2.0.0" = { name = "compare-func"; packageName = "compare-func"; - version = "1.3.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz"; - sha512 = "sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q=="; + url = "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz"; + sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; }; }; "compare-version-0.1.2" = { @@ -11425,15 +11749,6 @@ let sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080"; }; }; - "complex.js-2.0.11" = { - name = "complex.js"; - packageName = "complex.js"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz"; - sha512 = "6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw=="; - }; - }; "component-bind-1.0.0" = { name = "component-bind"; packageName = "component-bind"; @@ -11740,13 +12055,13 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; - "constant-case-2.0.0" = { + "constant-case-3.0.3" = { name = "constant-case"; packageName = "constant-case"; - version = "2.0.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz"; - sha1 = "4175764d389d3fa9c8ecd29186ed6005243b6a46"; + url = "https://registry.npmjs.org/constant-case/-/constant-case-3.0.3.tgz"; + sha512 = "FXtsSnnrFYpzDmvwDGQW+l8XK3GV1coLyBN0eBz16ZUzGaZcT2ANVCJmLeuw2GQgxKHQIe9e0w2dzkSfaRlUmA=="; }; }; "constantinople-3.1.2" = { @@ -11894,13 +12209,13 @@ let sha1 = "3243397ae93a71d655b3026834a51590b958b9e8"; }; }; - "conventional-changelog-angular-5.0.10" = { + "conventional-changelog-angular-5.0.11" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "5.0.10"; + version = "5.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.10.tgz"; - sha512 = "k7RPPRs0vp8+BtPsM9uDxRl6KcgqtCJmzRD1wRtgqmhQ96g8ifBGo9O/TZBG23jqlXS/rg8BKRDELxfnQQGiaA=="; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz"; + sha512 = "nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw=="; }; }; "conventional-changelog-core-3.2.3" = { @@ -11921,13 +12236,13 @@ let sha512 = "GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g=="; }; }; - "conventional-changelog-writer-4.0.16" = { + "conventional-changelog-writer-4.0.17" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.16"; + version = "4.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.16.tgz"; - sha512 = "jmU1sDJDZpm/dkuFxBeRXvyNcJQeKhGtVcFFkwTphUAzyYWcwz2j36Wcv+Mv2hU3tpvLMkysOPXJTLO55AUrYQ=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz"; + sha512 = "IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw=="; }; }; "conventional-commits-filter-2.0.6" = { @@ -12029,6 +12344,15 @@ let sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; }; + "cookie-0.4.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + }; + }; "cookie-parser-1.4.5" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -12227,13 +12551,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "core_d-1.0.1" = { + "core_d-2.0.0" = { name = "core_d"; packageName = "core_d"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/core_d/-/core_d-1.0.1.tgz"; - sha512 = "Uge+GU4vDha5IEf0PxX/NdBZBMAE69t93OKasRfWlr+tylp5DDhRQSb7QDDFw/EySwgdS0HV9bsN9iFk6SBDHg=="; + url = "https://registry.npmjs.org/core_d/-/core_d-2.0.0.tgz"; + sha512 = "oIb3QJj/ayYNbg2WYTYM1h3d8XvKF/RBUFhNeVVOfXDskeQC43fypCwnvdGqgTK7rbJ/a8tvxeErCr8vJhJ4vA=="; }; }; "cors-2.8.5" = { @@ -12452,6 +12776,15 @@ let sha512 = "MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw=="; }; }; + "cross-fetch-3.0.5" = { + name = "cross-fetch"; + packageName = "cross-fetch"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.5.tgz"; + sha512 = "FFLcLtraisj5eteosnX1gf01qYDCOc4fDy0+euOt8Kn9YBY2NtXL/pCoYPavw24NIQkQqm5ZOLsGD5Zzj0gyew=="; + }; + }; "cross-spawn-4.0.2" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -12839,13 +13172,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-2.6.10" = { + "csstype-2.6.11" = { name = "csstype"; packageName = "csstype"; - version = "2.6.10"; + version = "2.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz"; - sha512 = "D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w=="; + url = "https://registry.npmjs.org/csstype/-/csstype-2.6.11.tgz"; + sha512 = "l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw=="; }; }; "csurf-1.11.0" = { @@ -12911,15 +13244,6 @@ let sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; }; - "cubic2quad-1.1.1" = { - name = "cubic2quad"; - packageName = "cubic2quad"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz"; - sha1 = "69b19c61a3f5b41ecf2f1d5fae8fb03415aa8b15"; - }; - }; "currently-unhandled-0.4.1" = { name = "currently-unhandled"; packageName = "currently-unhandled"; @@ -12929,13 +13253,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "cuss-1.19.0" = { + "cuss-1.20.0" = { name = "cuss"; packageName = "cuss"; - version = "1.19.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.19.0.tgz"; - sha512 = "RGVhyJ5/9wfTOsVApjBtAvI8zV8+DZvJ5K72TLfMt+KqtmwlqsYkOVVdtuZkvvIMpx+Ctv4KsIKlhkXWoT1fiQ=="; + url = "https://registry.npmjs.org/cuss/-/cuss-1.20.0.tgz"; + sha512 = "ca6Z5roeWhHgXeDLn0g3SLrG68Cb9922MvHme7Q/dz4XfwuxcBLalW4RqFUyZOiczzAqKc2XVtR2Kof+sIfinQ=="; }; }; "custom-error-instance-2.1.1" = { @@ -13253,13 +13577,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.28" = { + "dayjs-1.8.29" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.28"; + version = "1.8.29"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.28.tgz"; - sha512 = "ccnYgKC0/hPSGXxj7Ju6AV/BP4HUkXC2u15mikXT5mX9YorEaoi1bEKOmAqdkJHN4EEkmAf97SpH66Try5Mbeg=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.29.tgz"; + sha512 = "Vm6teig8ZWK7rH/lxzVGxZJCljPdmUr6q/3f4fr5F0VWNGVkZEjZOQJsAN8hUHUqn+NK4XHNEpJZS1MwLyDcLw=="; }; }; "de-indent-1.0.2" = { @@ -13271,6 +13595,15 @@ let sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; }; }; + "deasync-0.1.15" = { + name = "deasync"; + packageName = "deasync"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.15.tgz"; + sha512 = "pxMaCYu8cQIbGkA4Y1R0PLSooPIpH1WgFBLeJ+zLxQgHfkZG86ViJSmZmONSjZJ/R3NjwkMcIWZAzpLB2G9/CA=="; + }; + }; "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; @@ -13442,15 +13775,6 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; - "decimal.js-10.2.0" = { - name = "decimal.js"; - packageName = "decimal.js"; - version = "10.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz"; - sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw=="; - }; - }; "decimal.js-7.5.1" = { name = "decimal.js"; packageName = "decimal.js"; @@ -13631,6 +13955,15 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; + "deep-extend-0.5.1" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"; + sha512 = "N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w=="; + }; + }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -14171,13 +14504,13 @@ let sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg=="; }; }; - "detective-es6-2.1.0" = { + "detective-es6-2.2.0" = { name = "detective-es6"; packageName = "detective-es6"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.1.0.tgz"; - sha512 = "QSHqKGOp/YBIfmIqKXaXeq2rlL+bp3bcIQMfZ+0PvKzRlELSOSZxKRvpxVcxlLuocQv4QnOfuWGniGrmPbz8MQ=="; + url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.2.0.tgz"; + sha512 = "fSpNY0SLER7/sVgQZ1NxJPwmc9uCTzNgdkQDhAaj8NPYwr7Qji9QBcmbNvtMCnuuOGMuKn3O7jv0An+/WRWJZQ=="; }; }; "detective-less-1.0.2" = { @@ -14333,13 +14666,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.8" = { + "diff2html-3.1.9" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.8.tgz"; - sha512 = "Irnht4VZ/Nd15H2jhC/TV3YPAmILbDutiwJWn1V94J6/mY6JY/iJ4FCh/QmENL1CWqGvckKWgCQnNg5Unez3UA=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.9.tgz"; + sha512 = "LNGOF6tAze8p3gbm7UlXqgj3LrUk5zGuQs/WmiM3D+TXnMyg6tUPZapbWh3CnENacvMnL25VNNRj6DGnXoV0Jg=="; }; }; "diff3-0.0.3" = { @@ -14594,15 +14927,6 @@ let sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; }; }; - "dockerfile-ast-0.0.12" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz"; - sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw=="; - }; - }; "dockerfile-ast-0.0.19" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -14612,40 +14936,40 @@ let sha512 = "iDRNFeAB2j4rh/Ecc2gh3fjciVifCMsszfCfHlYF5Wv8yybjZLiRDZUBt/pS3xrAz8uWT8fCHLq4pOQMmwCDwA=="; }; }; - "dockerfile-ast-0.0.25" = { + "dockerfile-ast-0.0.27" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.0.25"; + version = "0.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.25.tgz"; - sha512 = "Yiolk/ktLUjThacBuIEqyoRYzDdGrp8rjKjcdZA/hhtIUHrU5iVrS1MIm3p3PWKpnD7va4Jlp/FV0ywP3AdKrg=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.27.tgz"; + sha512 = "U+1B6aA7qJw9hswL6rCg4/dHnXy+zmt1bwU6ONi+f+0w0AOSmrz4IcrZQu62g1RD+NoTO4dvJce3FjoXUHd9Dw=="; }; }; - "dockerfile-language-service-0.0.12" = { + "dockerfile-ast-0.0.28" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; + version = "0.0.28"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.28.tgz"; + sha512 = "221P0R4+tx5C1ra99alQxmdRvtfKMbBE7MkESN4VEBN5CX90wijrcIg+EiRaGTCCT5OPk5KBeKy+EIOnmEu4xA=="; + }; + }; + "dockerfile-language-service-0.1.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.0.12"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.12.tgz"; - sha512 = "73ZEQW8LCL/SIWzWekqqLdH41pZ8+N2BYD5K16cBQCQfsZPjFoJC04tv7jlTnEPypJZs3zV0hpBLVTi7zhRFfw=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.1.0.tgz"; + sha512 = "vvFBLvQ/4RE5JyPzI1EynvT5h6Mg/jJ8HUcMs53uyfjy3RbaGeUL5c0eN6mk39WVF2Y8fsH1FKo4L29Z/W4N6g=="; }; }; - "dockerfile-utils-0.0.11" = { + "dockerfile-utils-0.1.0" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.0.11"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.11.tgz"; - sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ=="; - }; - }; - "dockerfile-utils-0.0.16" = { - name = "dockerfile-utils"; - packageName = "dockerfile-utils"; - version = "0.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.16.tgz"; - sha512 = "d/XlyVUEs+oGqoffvgYYItbGLNNSz3I2vIwzXxT9Xbx5YHH8WA8dFvTQU21k5j2Z8MoU6OYfyEZpbUqRC9N2fA=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.1.0.tgz"; + sha512 = "eHDiSOSXzXaFTwp7UX+bMVKUDQd2E2x8IF/3xdSvNkGhBliRhjwLIL+ALLDmi8GqSlm+7xwc4mGLcvtCI668PQ=="; }; }; "doctrine-2.1.0" = { @@ -14855,22 +15179,13 @@ let sha512 = "CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg=="; }; }; - "dot-case-2.1.1" = { + "dot-case-3.0.3" = { name = "dot-case"; packageName = "dot-case"; - version = "2.1.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz"; - sha1 = "34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"; - }; - }; - "dot-prop-3.0.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz"; + sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; }; }; "dot-prop-4.2.0" = { @@ -15278,13 +15593,22 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.478" = { + "ejs-3.1.3" = { + name = "ejs"; + packageName = "ejs"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz"; + sha512 = "wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg=="; + }; + }; + "electron-to-chromium-1.3.497" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.478"; + version = "1.3.497"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.478.tgz"; - sha512 = "pt9GUDD52uEO9ZXWcG4UuW/HwE8T+a8iFP7K2qqWrHB5wUxbbvCIXGBVpQDDQwSR766Nn4AkmLYxOUNd4Ji5Dw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.497.tgz"; + sha512 = "sPdW5bUDZwiFtoonuZCUwRGzsZmKzcLM0bMVhp6SMCfUG+B3faENLx3cE+o+K0Jl+MPuNA9s9cScyFjOlixZpQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -15441,6 +15765,15 @@ let sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; }; }; + "enabled-2.0.0" = { + name = "enabled"; + packageName = "enabled"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"; + sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; + }; + }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -15450,13 +15783,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "encoding-0.1.12" = { + "encoding-0.1.13" = { name = "encoding"; packageName = "encoding"; - version = "0.1.12"; + version = "0.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; }; }; "encoding-down-6.3.0" = { @@ -15612,6 +15945,15 @@ let sha512 = "S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ=="; }; }; + "enquirer-2.3.6" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; + }; + }; "ensure-posix-path-1.1.1" = { name = "ensure-posix-path"; packageName = "ensure-posix-path"; @@ -15918,15 +16260,6 @@ let sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; }; }; - "es6-promisify-6.1.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz"; - sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw=="; - }; - }; "es6-promisify-6.1.1" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -15981,6 +16314,15 @@ let sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; + "escalade-3.0.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz"; + sha512 = "DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="; + }; + }; "escape-goat-2.1.1" = { name = "escape-goat"; packageName = "escape-goat"; @@ -15999,15 +16341,6 @@ let sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; }; - "escape-latex-1.2.0" = { - name = "escape-latex"; - packageName = "escape-latex"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz"; - sha512 = "nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="; - }; - }; "escape-regexp-component-1.0.2" = { name = "escape-regexp-component"; packageName = "escape-regexp-component"; @@ -16053,13 +16386,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "escodegen-1.14.2" = { + "escodegen-1.14.3" = { name = "escodegen"; packageName = "escodegen"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz"; - sha512 = "InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz"; + sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; "escodegen-1.3.3" = { @@ -16134,22 +16467,22 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; - "eslint-7.2.0" = { + "eslint-7.4.0" = { name = "eslint"; packageName = "eslint"; - version = "7.2.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.2.0.tgz"; - sha512 = "B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.4.0.tgz"; + sha512 = "gU+lxhlPHu45H3JkEGgYhWhkR9wLHHEXC9FbWFnTlEkbKyZKWgWRLgf61E8zWmBuI6g5xKBph9ltg3NtZMVF8g=="; }; }; - "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { - name = "eslint-plugin-no-unsafe-innerhtml"; - packageName = "eslint-plugin-no-unsafe-innerhtml"; - version = "1.0.16"; + "eslint-plugin-no-unsanitized-3.1.2" = { + name = "eslint-plugin-no-unsanitized"; + packageName = "eslint-plugin-no-unsanitized"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz"; - sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; + url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.1.2.tgz"; + sha512 = "KPShfliA3Uy9qqwQx35P1fwIOeJjZkb0FbMMUFztRYRposzaynsM8JCEb952fqkidROl1kpqY80uSvn+TcWkQQ=="; }; }; "eslint-plugin-vue-6.2.2" = { @@ -16206,15 +16539,6 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; - "eslint-visitor-keys-1.1.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; - }; - }; "eslint-visitor-keys-1.2.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -16224,6 +16548,15 @@ let sha512 = "WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ=="; }; }; + "eslint-visitor-keys-1.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + }; "esm-3.2.25" = { name = "esm"; packageName = "esm"; @@ -16512,15 +16845,6 @@ let sha512 = "z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="; }; }; - "event-stream-0.5.3" = { - name = "event-stream"; - packageName = "event-stream"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; - sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; - }; - }; "event-stream-0.9.8" = { name = "event-stream"; packageName = "event-stream"; @@ -16746,13 +17070,13 @@ let sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="; }; }; - "execa-4.0.2" = { + "execa-4.0.3" = { name = "execa"; packageName = "execa"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz"; - sha512 = "QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q=="; + url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz"; + sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A=="; }; }; "execall-1.0.0" = { @@ -16908,15 +17232,6 @@ let sha1 = "3a2ad27f7bebc90fc533d110d7c6d83097bcd057"; }; }; - "express-session-1.17.0" = { - name = "express-session"; - packageName = "express-session"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.17.0.tgz"; - sha512 = "t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg=="; - }; - }; "express-session-1.17.1" = { name = "express-session"; packageName = "express-session"; @@ -17088,15 +17403,6 @@ let sha512 = "qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w=="; }; }; - "extract-files-8.1.0" = { - name = "extract-files"; - packageName = "extract-files"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-files/-/extract-files-8.1.0.tgz"; - sha512 = "PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ=="; - }; - }; "extract-stack-1.0.0" = { name = "extract-stack"; packageName = "extract-stack"; @@ -17106,6 +17412,15 @@ let sha1 = "b97acaf9441eea2332529624b732fc5a1c8165fa"; }; }; + "extract-stack-2.0.0" = { + name = "extract-stack"; + packageName = "extract-stack"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-stack/-/extract-stack-2.0.0.tgz"; + sha512 = "AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ=="; + }; + }; "extract-zip-1.7.0" = { name = "extract-zip"; packageName = "extract-zip"; @@ -17403,13 +17718,13 @@ let sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; }; }; - "fd-lock-1.0.2" = { + "fd-lock-1.1.1" = { name = "fd-lock"; packageName = "fd-lock"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fd-lock/-/fd-lock-1.0.2.tgz"; - sha512 = "8O4zSv6rlNNghVfzVkj/p7LUIeBm7Xxk6QnhfmR1WJm/W4kwS8IyShy4X1peRnFUYZUYLlcwEMKXF8QWxJCMvg=="; + url = "https://registry.npmjs.org/fd-lock/-/fd-lock-1.1.1.tgz"; + sha512 = "Ng+IXbq6LPMDvvVb0Vr325NjqhPwqlLIvmf43ii7t3WQvo2sHU6V6jQY1cclflxPaPfvNUAuD5VdPuIO1sp50g=="; }; }; "fd-read-stream-1.1.0" = { @@ -17430,13 +17745,13 @@ let sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; }; - "fecha-2.3.3" = { + "fecha-4.2.0" = { name = "fecha"; packageName = "fecha"; - version = "2.3.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz"; - sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; + sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; "fields-0.1.24" = { @@ -18033,13 +18348,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.127.0" = { + "flow-parser-0.129.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.127.0"; + version = "0.129.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.127.0.tgz"; - sha512 = "T4T92hVeVtrkYYvU01L2KFANsA0TJQrgy46efIU/JBxDhVjxIdS7KzaBEsPJu7RPOM44FCR7wcFQg6rWtGGrLQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.129.0.tgz"; + sha512 = "kzxyoEl8vG0JF0/h/u0UjALXmsGvwU2NBfKczCSNO/It2fKb8hz1gMt05OuZAlMLYXcvgjntWJadIABeKGPK4g=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -18168,6 +18483,15 @@ let sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; }; }; + "fn.name-1.1.0" = { + name = "fn.name"; + packageName = "fn.name"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"; + sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; + }; + }; "follow-redirects-1.12.1" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -18276,22 +18600,22 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "forever-monitor-3.0.0" = { + "forever-monitor-3.0.1" = { name = "forever-monitor"; packageName = "forever-monitor"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-3.0.0.tgz"; - sha512 = "F3E8C9CTPK+uRGdVTMBHGo7mHX+KRtClLzkegR6ux1yy+ByxOziumpTzxajzfhICHfYdnGWY4Bokl8dirYsDeA=="; + url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-3.0.1.tgz"; + sha512 = "47VfT5AYpxn1bnsnH6UfpBWKpMVnSz42MZwH+hwz/wACd9THyUu/fRoCRIT758fzCAbRoHIlkVUAL+WmlxSKeg=="; }; }; - "fork-ts-checker-webpack-plugin-5.0.1" = { + "fork-ts-checker-webpack-plugin-5.0.4" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "5.0.1"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.1.tgz"; - sha512 = "bys+hPwlPckrSCzNkg0BSUTsCRZWS6qIRiwk+8AjKitLWTqokda0QVImCx/Vm9cL/OGZZUnrFXazsVc99nijKQ=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.4.tgz"; + sha512 = "nSEqM3KhAjTf8VmuZym2k6WadIasvXybJExFegqMJDkTrOBOY8yGjsXG2FGFJls3DOHtXKzrr3Bv0ZD1LaM7cA=="; }; }; "form-data-1.0.0-rc3" = { @@ -18402,22 +18726,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.6.6" = { + "fp-ts-2.7.0" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.6.6"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.6.6.tgz"; - sha512 = "zYfhPNb2fwpkrJ5RpgEMsrvMv8r9x+guJptnaEBF295YtoVr3+jbGDXZqSqPcfEWas5Trj3FpbDkzmXbx0YYzQ=="; - }; - }; - "fraction.js-4.0.12" = { - name = "fraction.js"; - packageName = "fraction.js"; - version = "4.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz"; - sha512 = "8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.7.0.tgz"; + sha512 = "J7EIg4MEVuOm1vZspQDVYRD/CTsQECQk01cP5VEBvQ5LnSSjp6sckun1m1eUPSuvtMIlGgm9NqqOxE0+QyntWQ=="; }; }; "fragment-cache-0.2.1" = { @@ -18564,15 +18879,6 @@ let sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; - "fs-extra-3.0.1" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; - sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; - }; - }; "fs-extra-4.0.3" = { name = "fs-extra"; packageName = "fs-extra"; @@ -18717,15 +19023,6 @@ let sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; - "fsevents-2.1.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; - sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; - }; - }; "fsevents-2.1.3" = { name = "fsevents"; packageName = "fsevents"; @@ -18834,13 +19131,13 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fx-runner-1.0.11" = { + "fx-runner-1.0.12" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.11.tgz"; - sha512 = "igHogHf5wTqqaPPTOav18MMTVq/eoeTJiw/PvPUuwnzU8vbyZInFPgR66G9ZBwvwxC7e611nbtB4xSMcYVhlvg=="; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.12.tgz"; + sha512 = "SLATlfKI2lyIcQsU8Sgfcwrni6PpC1VMTgp3aRomK/6azrzSQ3r63HqoTRliE/6JP8WjqVkIdCOGWk1ZqhfceA=="; }; }; "gauge-1.2.7" = { @@ -19167,13 +19464,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-5.2.0" = { + "getmac-5.11.0" = { name = "getmac"; packageName = "getmac"; - version = "5.2.0"; + version = "5.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-5.2.0.tgz"; - sha512 = "FBQqEBO4hFlv//gtN8+x4tINgfb4noOGl3WCSGd9xaPRMkMK3Lt/FF1/dwiD3p7i2F0u3uL6oV61MQyHqYqVlw=="; + url = "https://registry.npmjs.org/getmac/-/getmac-5.11.0.tgz"; + sha512 = "p3g41fJt9du5KKkIXaJm7bcUrwUxn8Jg/8AVBgUmBNdCCorczRJXHLqWSETJuib9dptwNuNcfbct/OoM/meiMA=="; }; }; "getpass-0.1.6" = { @@ -19446,15 +19743,6 @@ let sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; - "glob-7.1.3" = { - name = "glob"; - packageName = "glob"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; - }; - }; "glob-7.1.5" = { name = "glob"; packageName = "glob"; @@ -19735,15 +20023,6 @@ let sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; }; }; - "globby-11.0.0" = { - name = "globby"; - packageName = "globby"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz"; - sha512 = "iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg=="; - }; - }; "globby-11.0.1" = { name = "globby"; packageName = "globby"; @@ -19915,6 +20194,15 @@ let sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; }; }; + "got-11.5.0" = { + name = "got"; + packageName = "got"; + version = "11.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-11.5.0.tgz"; + sha512 = "vOZEcEaK0b6x11uniY0HcblZObKPRO75Jvz53VKuqGSaKCM/zEt0sj2LGYVdqDYJzO3wYdG+FPQQ1hsgoXy7vQ=="; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -20032,22 +20320,22 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; - "graphql-14.6.0" = { + "graphql-14.7.0" = { name = "graphql"; packageName = "graphql"; - version = "14.6.0"; + version = "14.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.6.0.tgz"; - sha512 = "VKzfvHEKybTKjQVpTFrA5yUq2S9ihcZvfJAtsDBBCuV6wauPu1xl/f9ehgVf0FcEJJs4vz6ysb/ZMkGigQZseg=="; + url = "https://registry.npmjs.org/graphql/-/graphql-14.7.0.tgz"; + sha512 = "l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA=="; }; }; - "graphql-15.1.0" = { + "graphql-15.3.0" = { name = "graphql"; packageName = "graphql"; - version = "15.1.0"; + version = "15.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-15.1.0.tgz"; - sha512 = "0TVyfOlCGhv/DBczQkJmwXOK6fjWkjzY3Pt7wY8i0gcYXq8aogG3weCsg48m72lywKSeOqedEHvVPOvZvSD51Q=="; + url = "https://registry.npmjs.org/graphql/-/graphql-15.3.0.tgz"; + sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w=="; }; }; "graphql-anywhere-4.2.7" = { @@ -20059,22 +20347,22 @@ let sha512 = "fJHvVywWVWjiHuPIMs16Nfjf4zdQUwSO1LKycwBJCWIPeoeQ8LqXK2BgYoZAHkhKEFktZZeYyzS4o/uIUG0z5A=="; }; }; - "graphql-config-3.0.2" = { + "graphql-config-3.0.3" = { name = "graphql-config"; packageName = "graphql-config"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config/-/graphql-config-3.0.2.tgz"; - sha512 = "efoimZ4F2wF2OwZJzPq2KdPjQs1K+UgJSfsHoHBBA0TwveGyQ/0kS3lUphhJg/JXIrZociuRkfjrk8JC4iPPJQ=="; + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-3.0.3.tgz"; + sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g=="; }; }; - "graphql-extensions-0.12.3" = { + "graphql-extensions-0.12.4" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.3.tgz"; - sha512 = "W7iT0kzlwTiZU7fXfw9IgWnsqVj7EFLd0/wVcZZRAbR8L3f4+YsGls0oxKdsrvYBnbG347BXKQmIyo6GTEk4XA=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.4.tgz"; + sha512 = "GnR4LiWk3s2bGOqIh6V1JgnSXw2RCH4NOgbCFEWvB6JqWHXTlXnLZ8bRSkCiD4pltv7RHUPWqN/sGh8R6Ae/ag=="; }; }; "graphql-subscriptions-1.1.0" = { @@ -20095,6 +20383,15 @@ let sha512 = "4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA=="; }; }; + "graphql-tag-2.10.4" = { + name = "graphql-tag"; + packageName = "graphql-tag"; + version = "2.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.4.tgz"; + sha512 = "O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA=="; + }; + }; "graphql-tools-4.0.8" = { name = "graphql-tools"; packageName = "graphql-tools"; @@ -20104,15 +20401,6 @@ let sha512 = "MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg=="; }; }; - "graphql-tools-5.0.0" = { - name = "graphql-tools"; - packageName = "graphql-tools"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-5.0.0.tgz"; - sha512 = "5zn3vtn//382b7G3Wzz3d5q/sh+f7tVrnxeuhTMTJ7pWJijNqLxH7VEzv8VwXCq19zAzHYEosFHfXiK7qzvk7w=="; - }; - }; "graphql-type-json-0.2.4" = { name = "graphql-type-json"; packageName = "graphql-type-json"; @@ -20230,6 +20518,15 @@ let sha512 = "zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A=="; }; }; + "gulp-eslint-3.0.1" = { + name = "gulp-eslint"; + packageName = "gulp-eslint"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-3.0.1.tgz"; + sha1 = "04e57e3e18c6974267c12cf6855dc717d4a313bd"; + }; + }; "gulp-less-3.5.0" = { name = "gulp-less"; packageName = "gulp-less"; @@ -20653,6 +20950,15 @@ let sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }; }; + "hashish-0.0.4" = { + name = "hashish"; + packageName = "hashish"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz"; + sha1 = "6d60bc6ffaf711b6afd60e426d077988014e6554"; + }; + }; "hashlru-2.3.0" = { name = "hashlru"; packageName = "hashlru"; @@ -20671,6 +20977,15 @@ let sha512 = "0FfLHmfArWOizbdwjL+Rc9QIBzqP80juicNl4S4NEPq5OYWBCgYrtYDPUDoSyQQ9IQlBn9W7++fpYQNzZSq/wQ=="; }; }; + "hast-util-from-parse5-5.0.3" = { + name = "hast-util-from-parse5"; + packageName = "hast-util-from-parse5"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz"; + sha512 = "gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA=="; + }; + }; "hast-util-has-property-1.0.4" = { name = "hast-util-has-property"; packageName = "hast-util-has-property"; @@ -20680,13 +20995,13 @@ let sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="; }; }; - "hast-util-is-body-ok-link-1.0.3" = { + "hast-util-is-body-ok-link-1.0.4" = { name = "hast-util-is-body-ok-link"; packageName = "hast-util-is-body-ok-link"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.3.tgz"; - sha512 = "NB8jW4iqT+iVld2oCjSk0T2S2FyR86rDZ7nKHx3WNf/WX16fjjdfoog6T+YeJFsPzszVKsNlVJL+k5c4asAHog=="; + url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.4.tgz"; + sha512 = "mFblNpLvFbD8dG2Nw5dJBYZkxIHeph1JAh5yr4huI7T5m8cV0zaXNiqzKPX/JdjA+tIDF7c33u9cxK132KRjyQ=="; }; }; "hast-util-is-element-1.0.4" = { @@ -20707,13 +21022,31 @@ let sha512 = "gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA=="; }; }; - "hast-util-to-string-1.0.3" = { + "hast-util-phrasing-1.0.5" = { + name = "hast-util-phrasing"; + packageName = "hast-util-phrasing"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-phrasing/-/hast-util-phrasing-1.0.5.tgz"; + sha512 = "P3uxm+8bnwcfAS/XpGie9wMmQXAQqsYhgQQKRwmWH/V6chiq0lmTy8KjQRJmYjusdMtNKGCUksdILSZy1suSpQ=="; + }; + }; + "hast-util-to-nlcst-1.2.7" = { + name = "hast-util-to-nlcst"; + packageName = "hast-util-to-nlcst"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.7.tgz"; + sha512 = "IeHm2Ndwu9G7xtLswt51k3zpprLMckg7ahsvvJAG6hTPXfg+pwIu4FS30lrcxyWVMzNt35ZEoW78z4QCFTp0qw=="; + }; + }; + "hast-util-to-string-1.0.4" = { name = "hast-util-to-string"; packageName = "hast-util-to-string"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.3.tgz"; - sha512 = "3lDgDE5OdpTfP3aFeKRWEwdIZ4vprztvp+AoD+RhF7uGOBs1yBDWZFadxnjcUV4KCoI3vB9A7gdFO98hEXA90w=="; + url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz"; + sha512 = "eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w=="; }; }; "hast-util-whitespace-1.0.4" = { @@ -20725,6 +21058,15 @@ let sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="; }; }; + "hastscript-5.1.2" = { + name = "hastscript"; + packageName = "hastscript"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz"; + sha512 = "WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ=="; + }; + }; "hat-0.0.3" = { name = "hat"; packageName = "hat"; @@ -20761,13 +21103,13 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; - "header-case-1.0.1" = { + "header-case-2.0.3" = { name = "header-case"; packageName = "header-case"; - version = "1.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz"; - sha1 = "9535973197c144b09613cd65d317ef19963bd02d"; + url = "https://registry.npmjs.org/header-case/-/header-case-2.0.3.tgz"; + sha512 = "LChe/V32mnUQnTwTxd3aAlNMk8ia9tjCDb/LjYtoMrdAPApxLB+azejUk5ERZIZdIqvinwv6BAUuFXH/tQPdZA=="; }; }; "headless-0.1.7" = { @@ -20833,6 +21175,15 @@ let sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653"; }; }; + "highlight.js-10.1.1" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "10.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz"; + sha512 = "b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="; + }; + }; "highlight.js-8.2.0" = { name = "highlight.js"; packageName = "highlight.js"; @@ -20932,13 +21283,13 @@ let sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; }; - "hosted-git-info-3.0.4" = { + "hosted-git-info-3.0.5" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz"; - sha512 = "4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz"; + sha512 = "i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ=="; }; }; "hot-shots-6.8.7" = { @@ -21049,13 +21400,13 @@ let sha512 = "uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w=="; }; }; - "html-whitespace-sensitive-tag-names-1.0.2" = { + "html-whitespace-sensitive-tag-names-1.0.3" = { name = "html-whitespace-sensitive-tag-names"; packageName = "html-whitespace-sensitive-tag-names"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.2.tgz"; - sha512 = "9jCcAq9ZsjUkZjNFDvxalDPhktOijpfzLyzBcqMLOFSbtcDNrPlKDvZeH7KdEbP7C6OjPpIdDMMPm0oq2Dpk0A=="; + url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.3.tgz"; + sha512 = "GX1UguduCBEAEo1hjFxc2Bz04/sDq0ACNyT7LsuoDcPfXYI3nS0NRPp3dyazLJyVUMp3GPBB56i/0Zr6CqD2PQ=="; }; }; "htmlescape-1.1.1" = { @@ -21193,6 +21544,15 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; + "http-errors-1.8.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz"; + sha512 = "4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A=="; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -21329,6 +21689,15 @@ let sha512 = "nUxLymWQ9pzkzTmir24p2RtsgruLmhje7lH3hLX1IpwvyTg77fW+1brenPPP3USAR+rQ36p5sTA/x7sjCJVkAA=="; }; }; + "http2-wrapper-1.0.0-beta.5.2" = { + name = "http2-wrapper"; + packageName = "http2-wrapper"; + version = "1.0.0-beta.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz"; + sha512 = "xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ=="; + }; + }; "http_ece-1.1.0" = { name = "http_ece"; packageName = "http_ece"; @@ -21545,13 +21914,13 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; - "iconv-lite-0.5.1" = { + "iconv-lite-0.6.2" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.5.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz"; - sha512 = "ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q=="; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; }; }; "icss-replace-symbols-1.1.0" = { @@ -21986,13 +22355,13 @@ let sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; }; }; - "ink-text-input-3.2.2" = { + "ink-text-input-3.3.0" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.2.2.tgz"; - sha512 = "h4EEJYOO88uK16U1mhgmJBMYeEy8ZmkrdV6gybyluCbAOQtAyND/WuRQVIKhe7D2dtYd2wwYTC648nuAxwltPQ=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.3.0.tgz"; + sha512 = "gO4wrOf2ie3YuEARTIwGlw37lMjFn3Gk6CKIDrMlHb46WFMagZU7DplohjM24zynlqfnXA5UDEIfC2NBcvD8kg=="; }; }; "inline-source-map-0.6.2" = { @@ -22112,6 +22481,15 @@ let sha512 = "E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ=="; }; }; + "inquirer-7.3.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "7.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.2.tgz"; + sha512 = "DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w=="; + }; + }; "inquirer-autocomplete-prompt-1.0.2" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -23003,15 +23381,6 @@ let sha1 = "3d9877899e6a53efc0160504cde15f82e6f061d5"; }; }; - "is-lower-case-1.1.3" = { - name = "is-lower-case"; - packageName = "is-lower-case"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz"; - sha1 = "7e147be4768dc466db3bfb21cc60b31e6ad69393"; - }; - }; "is-map-2.0.1" = { name = "is-map"; packageName = "is-map"; @@ -23048,13 +23417,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.20.0" = { + "is-my-json-valid-2.20.4" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.20.0"; + version = "2.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; - sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.4.tgz"; + sha512 = "Ym0D5NOxJ+f+zzQHkLfu5n9B1134ra+KwskpDD86200xYQBsAb9OKX81eSsI4oKN9GNAhDAReS7t8Mxtih/l+A=="; }; }; "is-natural-number-4.0.1" = { @@ -23246,6 +23615,15 @@ let sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; }; }; + "is-plain-obj-2.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; + }; + }; "is-plain-object-2.0.4" = { name = "is-plain-object"; packageName = "is-plain-object"; @@ -23255,13 +23633,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-plain-object-3.0.0" = { + "is-plain-object-3.0.1" = { name = "is-plain-object"; packageName = "is-plain-object"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz"; - sha512 = "tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg=="; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz"; + sha512 = "Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g=="; }; }; "is-posix-bracket-0.1.1" = { @@ -23309,13 +23687,13 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; - "is-reference-1.2.0" = { + "is-reference-1.2.1" = { name = "is-reference"; packageName = "is-reference"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.0.tgz"; - sha512 = "ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ=="; + url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"; + sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; }; }; "is-regex-1.0.5" = { @@ -23552,15 +23930,6 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; - "is-upper-case-1.1.2" = { - name = "is-upper-case"; - packageName = "is-upper-case"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz"; - sha1 = "8d0b1fa7e7933a1e58483600ec7d9661cbaf756f"; - }; - }; "is-url-1.2.4" = { name = "is-url"; packageName = "is-url"; @@ -23795,15 +24164,6 @@ let sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; - "isobject-4.0.0" = { - name = "isobject"; - packageName = "isobject"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz"; - sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; - }; - }; "isomorphic-fetch-2.2.1" = { name = "isomorphic-fetch"; packageName = "isomorphic-fetch"; @@ -23966,6 +24326,15 @@ let sha512 = "xZ9WvZDWLkZFq7SObpLwu1asMCKCgBRNcDxxGSvK+ZQ7OZyJC5xPlU+rJa4+s/P6autPBVwHpqMGbOERFxWuuA=="; }; }; + "jake-10.8.2" = { + name = "jake"; + packageName = "jake"; + version = "10.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + }; + }; "java-properties-1.0.2" = { name = "java-properties"; packageName = "java-properties"; @@ -23975,15 +24344,6 @@ let sha512 = "qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ=="; }; }; - "javascript-natural-sort-0.7.1" = { - name = "javascript-natural-sort"; - packageName = "javascript-natural-sort"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz"; - sha1 = "f9e2303d4507f6d74355a73664d1440fb5a0ef59"; - }; - }; "javascript-stringify-1.6.0" = { name = "javascript-stringify"; packageName = "javascript-stringify"; @@ -24137,22 +24497,22 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.17.2" = { + "jquery.terminal-2.17.6" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.17.2"; + version = "2.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.17.2.tgz"; - sha512 = "FHs9cS0phsXFXI1waqK/kY9TnyiWmQp65NFu/vMZky1Tef4zIYD3D5qZcBhBkXhAbIFA+fPfmMUUgGKBQWtKlQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.17.6.tgz"; + sha512 = "NPAxHodxrs6hLXNW9VAfijYkBFtoL/pyzpDDu2vX2slUyLekkUD9JBM4V0NcAuOvhB2eW4hLFChoYD5B2uu9Sg=="; }; }; - "js-base64-2.6.0" = { + "js-base64-2.6.3" = { name = "js-base64"; packageName = "js-base64"; - version = "2.6.0"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.0.tgz"; - sha512 = "jmCv6u76N7XtpXoF+aS5tNUQLRAJe1DgN9JXO5csoCkEIAPPLwWy93OQo/RoydkD6vyTf1oKKgto8SH7LM+Ong=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz"; + sha512 = "fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg=="; }; }; "js-beautify-1.11.0" = { @@ -24281,13 +24641,13 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; - "jscodeshift-0.9.0" = { + "jscodeshift-0.10.0" = { name = "jscodeshift"; packageName = "jscodeshift"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.9.0.tgz"; - sha512 = "SUeXq8dJzj5LR8uy71axgG3bmiHoC0IdHy7n89SqKzkzBWpAds5F9IIGE+lqUSZX9J0ZfEzN8fXWIqQV0dIp2w=="; + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.10.0.tgz"; + sha512 = "xpH2FVSEepXoNr6+cPlPHzPzBY1W9bPulufhCHOShzk8+CTCzAOQKytuOXT0b/9PvmO4biRi0g/ZIylVew815w=="; }; }; "jsdom-11.12.0" = { @@ -24389,6 +24749,15 @@ let sha512 = "FD/SedD78LCdSvJaOUQAXseT8oQBb5z6IVYaQaCrVUlu9zOAr1BDdKyVYQaSD/GDsAMrXpKcOyBD4LIl8nfjHw=="; }; }; + "json-file-plus-3.3.1" = { + name = "json-file-plus"; + packageName = "json-file-plus"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-file-plus/-/json-file-plus-3.3.1.tgz"; + sha512 = "wo0q1UuiV5NsDPQDup1Km8IwEeqe+olr8tkWxeJq9Bjtcp7DZ0l+yrg28fSC3DEtrE311mhTZ54QGS6oiqnZEA=="; + }; + }; "json-merge-patch-0.2.3" = { name = "json-merge-patch"; packageName = "json-merge-patch"; @@ -24605,13 +24974,13 @@ let sha512 = "hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g=="; }; }; - "jsonc-parser-2.2.1" = { + "jsonc-parser-2.3.0" = { name = "jsonc-parser"; packageName = "jsonc-parser"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz"; - sha512 = "o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w=="; + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.0.tgz"; + sha512 = "b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA=="; }; }; "jsonfile-1.0.1" = { @@ -24632,15 +25001,6 @@ let sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; - "jsonfile-3.0.1" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; - sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; - }; - }; "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -24704,13 +25064,13 @@ let sha512 = "WQwgWEBgn+SJU1tlDa/GiY5/ngRpa9yrSj8n4BYPHcwoxTDaMEaYCHMOn42hIHHDd3CrUoRr3+HpsK0hCKoxzA=="; }; }; - "jsonpointer-4.0.1" = { + "jsonpointer-4.1.0" = { name = "jsonpointer"; packageName = "jsonpointer"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz"; + sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; }; }; "jsonwebtoken-8.5.1" = { @@ -25047,6 +25407,15 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; + "keytar-5.6.0" = { + name = "keytar"; + packageName = "keytar"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keytar/-/keytar-5.6.0.tgz"; + sha512 = "ueulhshHSGoryfRXaIvTj0BV1yB0KddBGhGoqCxSN9LR1Ks1GKuuCdVhF+2/YOs5fMl6MlTI9On1a4DHDXoTow=="; + }; + }; "keyv-3.0.0" = { name = "keyv"; packageName = "keyv"; @@ -25200,6 +25569,15 @@ let sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; }; }; + "kuler-2.0.0" = { + name = "kuler"; + packageName = "kuler"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"; + sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; + }; + }; "kvgraph-0.1.0" = { name = "kvgraph"; packageName = "kvgraph"; @@ -25470,13 +25848,13 @@ let sha1 = "a4b5244bb6a4c2f723d68a1d64e980c53627d9d4"; }; }; - "level-codec-9.0.1" = { + "level-codec-9.0.2" = { name = "level-codec"; packageName = "level-codec"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/level-codec/-/level-codec-9.0.1.tgz"; - sha512 = "ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q=="; + url = "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz"; + sha512 = "UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ=="; }; }; "level-concat-iterator-2.0.1" = { @@ -25686,15 +26064,6 @@ let sha512 = "OUO2CWW5bHdLr6hkKLHIKI4raEkZrf3QHkhXsJ1yCh6MZ3JDA7jFD3kCATNquuGSG6MjjPHQIQms0y0gBDzjQg=="; }; }; - "libspiro-js-0.3.1" = { - name = "libspiro-js"; - packageName = "libspiro-js"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz"; - sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439"; - }; - }; "lie-3.3.0" = { name = "lie"; packageName = "lie"; @@ -25794,6 +26163,15 @@ let sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw=="; }; }; + "linkify-it-3.0.2" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.2.tgz"; + sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ=="; + }; + }; "listr-0.14.3" = { name = "listr"; packageName = "listr"; @@ -25848,15 +26226,6 @@ let sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; }; }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - }; "load-json-file-4.0.0" = { name = "load-json-file"; packageName = "load-json-file"; @@ -26019,6 +26388,15 @@ let sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; + "lodash-4.17.19" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz"; + sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -26478,6 +26856,15 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; + "lodash.flatmap-4.5.0" = { + name = "lodash.flatmap"; + packageName = "lodash.flatmap"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz"; + sha1 = "ef8cbf408f6e48268663345305c6acc0b778702e"; + }; + }; "lodash.flatten-4.4.0" = { name = "lodash.flatten"; packageName = "lodash.flatten"; @@ -26604,6 +26991,15 @@ let sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; }; }; + "lodash.isempty-4.4.0" = { + name = "lodash.isempty"; + packageName = "lodash.isempty"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"; + sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"; + }; + }; "lodash.isequal-4.5.0" = { name = "lodash.isequal"; packageName = "lodash.isequal"; @@ -26946,6 +27342,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.topairs-4.3.0" = { + name = "lodash.topairs"; + packageName = "lodash.topairs"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz"; + sha1 = "3b6deaa37d60fb116713c46c5f17ea190ec48d64"; + }; + }; "lodash.unescape-4.0.1" = { name = "lodash.unescape"; packageName = "lodash.unescape"; @@ -27072,13 +27477,22 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "logform-2.1.2" = { + "logform-2.2.0" = { name = "logform"; packageName = "logform"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz"; - sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; + url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; + sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; + }; + }; + "logic-solver-2.0.1" = { + name = "logic-solver"; + packageName = "logic-solver"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/logic-solver/-/logic-solver-2.0.1.tgz"; + sha1 = "e9fa47002eb5d8cda7616d41639b97552eb674be"; }; }; "loglevel-1.6.8" = { @@ -27261,15 +27675,6 @@ let sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ=="; }; }; - "lower-case-first-1.0.2" = { - name = "lower-case-first"; - packageName = "lower-case-first"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz"; - sha1 = "e5da7c26f29a7073be02d52bac9980e5922adfa1"; - }; - }; "lowercase-keys-1.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -27333,6 +27738,15 @@ let sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }; }; + "lru-cache-2.5.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; + sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; + }; + }; "lru-cache-2.7.3" = { name = "lru-cache"; packageName = "lru-cache"; @@ -27360,6 +27774,15 @@ let sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; "lru-queue-0.1.0" = { name = "lru-queue"; packageName = "lru-queue"; @@ -27459,13 +27882,13 @@ let sha1 = "d25e32e97c3c2cb89568ba8c98d229d5c305e391"; }; }; - "macos-release-2.3.0" = { + "macos-release-2.4.0" = { name = "macos-release"; packageName = "macos-release"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz"; - sha512 = "OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.4.0.tgz"; + sha512 = "ko6deozZYiAkqa/0gmcsz+p4jSy3gY7/ZsCEokPaYd8k+6/aXGkiTgr61+Owup7Sf+xjqW8u2ElhoM9SEcEfuA=="; }; }; "magic-string-0.22.5" = { @@ -27585,13 +28008,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.7" = { + "make-fetch-happen-8.0.8" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.7"; + version = "8.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.7.tgz"; - sha512 = "rkDA4c1nMXVqLkfOaM5RK2dxkUndjLOCrPycTDZgbkFDzhmaCO3P1dmCW//yt1I/G1EcedJqMsSjWkV79Hh4hQ=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.8.tgz"; + sha512 = "kILd4WtBFqylc65LRq9sTx/GG0r9yMoomjz9ZMGxzZKWXhnidDhROhnjtZEQDHSWbwQJ5ojI4XZk46DdHwslGg=="; }; }; "make-iterator-1.0.1" = { @@ -27747,6 +28170,15 @@ let sha512 = "YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg=="; }; }; + "markdown-it-11.0.0" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.0.tgz"; + sha512 = "+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg=="; + }; + }; "markdown-it-8.4.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -27837,13 +28269,13 @@ let sha512 = "HqMWeKfMMOu4zBO0emmxsoMWmbf2cPKZY1wP6FsTbKmicFfp5y4L3KXAsNeO1rM6NTJVOrNlLKMPjWzriBGspw=="; }; }; - "markdown-it-multimd-table-4.0.2" = { + "markdown-it-multimd-table-4.0.3" = { name = "markdown-it-multimd-table"; packageName = "markdown-it-multimd-table"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.0.2.tgz"; - sha512 = "SlcssTj7FoYstVQ7MsM8A46/lhbN1K6/q0e9v56o/5kaWmTheXZXQX3nuZgw7WQocn+3nyQGcoO7ovcqeFxaAw=="; + url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.0.3.tgz"; + sha512 = "uVLriNj6doq1dGyJppQdwbaGcK6uSzbrk7osxRHjOmZBeShgMtPS6/d+pnIKkohOjaRyP9e5kwTAlAIe/lEaIQ=="; }; }; "markdown-it-sub-1.0.0" = { @@ -27963,6 +28395,15 @@ let sha512 = "md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ=="; }; }; + "mastodon-api-1.3.0" = { + name = "mastodon-api"; + packageName = "mastodon-api"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mastodon-api/-/mastodon-api-1.3.0.tgz"; + sha1 = "b3bcffcf51e005f754b7e86e44c2023d8e2c63d1"; + }; + }; "match-casing-1.0.3" = { name = "match-casing"; packageName = "match-casing"; @@ -28026,15 +28467,6 @@ let sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; }; }; - "mathjs-5.10.3" = { - name = "mathjs"; - packageName = "mathjs"; - version = "5.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz"; - sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw=="; - }; - }; "mathml-tag-names-2.1.3" = { name = "mathml-tag-names"; packageName = "mathml-tag-names"; @@ -28107,13 +28539,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.15" = { + "mdn-browser-compat-data-1.0.25" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.15"; + version = "1.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.15.tgz"; - sha512 = "0jxT4ZqqCzJJfktX9d4NKgfRENy60kFzhVNV0mXNHvlnw8KrMe2cKOlEKs/Bz+odlgO0rRZAxU0OKiptqVhAXg=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.25.tgz"; + sha512 = "4klqILpitRnmWRai5Ols/GXP1eGDYMluAcBRoNZnGNkV2OnkDmpA9hUlM+9pTFym5FGDO5TAm3HweVSVc7ziiQ=="; }; }; "mdn-data-2.0.4" = { @@ -28206,33 +28638,6 @@ let sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g=="; }; }; - "megaminx-0.3.3" = { - name = "megaminx"; - packageName = "megaminx"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz"; - sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw=="; - }; - }; - "megaminx-0.9.0" = { - name = "megaminx"; - packageName = "megaminx"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz"; - sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw=="; - }; - }; - "mem-1.1.0" = { - name = "mem"; - packageName = "mem"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; - }; - }; "mem-4.3.0" = { name = "mem"; packageName = "mem"; @@ -28278,6 +28683,15 @@ let sha512 = "e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg=="; }; }; + "mem-fs-editor-7.0.1" = { + name = "mem-fs-editor"; + packageName = "mem-fs-editor"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-7.0.1.tgz"; + sha512 = "eD8r4/d2ayp9HHIgBPHB6Ds0ggA8F9cf9HxcNtbqrwqJXfIDrOSMG5K4fV3+Ib3B+HIdrWqkeDDDvrO7i9EbvQ=="; + }; + }; "memfs-3.2.0" = { name = "memfs"; packageName = "memfs"; @@ -28287,6 +28701,15 @@ let sha512 = "f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A=="; }; }; + "memoizeasync-1.1.0" = { + name = "memoizeasync"; + packageName = "memoizeasync"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memoizeasync/-/memoizeasync-1.1.0.tgz"; + sha1 = "9d7028a6f266deb733510bb7dbba5f51878c561e"; + }; + }; "memoizee-0.4.14" = { name = "memoizee"; packageName = "memoizee"; @@ -28494,13 +28917,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.2.2" = { + "metals-languageclient-0.2.7" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.2.2"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.2.2.tgz"; - sha512 = "ib0Wjxa6EOqHuamtrN8GwobTc08Q4MLuT57hDsGyfQBClJOxyvgg4Q1ZwMDNB9DDyZzewQu4OTUpPbG57DXHZw=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.2.7.tgz"; + sha512 = "iZfEI/gAzAmzuc8M+ALBbWGHgk3VjwWaEKkgJChHdl2Ase/DSkNvnCkJwfG3JD4aksS9YA1C0nSf+pLIU7r6kA=="; }; }; "metalsmith-2.3.0" = { @@ -28656,15 +29079,6 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-2.4.4" = { - name = "mime"; - packageName = "mime"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; - sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; - }; - }; "mime-2.4.6" = { name = "mime"; packageName = "mime"; @@ -29115,15 +29529,6 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-1.0.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz"; - sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="; - }; - }; "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; @@ -29169,13 +29574,13 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; - "mocha-7.2.0" = { + "mocha-8.0.1" = { name = "mocha"; packageName = "mocha"; - version = "7.2.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; - sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.0.1.tgz"; + sha512 = "vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg=="; }; }; "mock-require-3.0.3" = { @@ -29250,24 +29655,6 @@ let sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="; }; }; - "moment-2.25.3" = { - name = "moment"; - packageName = "moment"; - version = "2.25.3"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; - sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="; - }; - }; - "moment-2.26.0" = { - name = "moment"; - packageName = "moment"; - version = "2.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz"; - sha512 = "oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw=="; - }; - }; "moment-2.27.0" = { name = "moment"; packageName = "moment"; @@ -29817,6 +30204,15 @@ let sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; }; }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; "nan-2.14.1" = { name = "nan"; packageName = "nan"; @@ -29925,15 +30321,6 @@ let sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; }; - "napi-macros-1.8.2" = { - name = "napi-macros"; - packageName = "napi-macros"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/napi-macros/-/napi-macros-1.8.2.tgz"; - sha512 = "Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg=="; - }; - }; "napi-macros-2.0.0" = { name = "napi-macros"; packageName = "napi-macros"; @@ -29952,6 +30339,15 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; + "native-request-1.0.5" = { + name = "native-request"; + packageName = "native-request"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/native-request/-/native-request-1.0.5.tgz"; + sha512 = "7wU3DvBGAJQxWuMR3F62zrhB7hxNj2DdlC/eBVrCgavc6+ZpFZOqS/PsR7QyUPLMkFk0GvvzoeeOAZGLLnObnA=="; + }; + }; "natives-1.1.6" = { name = "natives"; packageName = "natives"; @@ -30187,13 +30583,13 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; - "neo-async-2.6.1" = { + "neo-async-2.6.2" = { name = "neo-async"; packageName = "neo-async"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; - sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; "nested-error-stacks-2.0.1" = { @@ -30421,13 +30817,13 @@ let sha1 = "180eac7003e0c707618ef31368f62f84b2a69091"; }; }; - "node-cache-5.1.1" = { + "node-cache-5.1.2" = { name = "node-cache"; packageName = "node-cache"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-cache/-/node-cache-5.1.1.tgz"; - sha512 = "bJ9nH25Z51HG2QIu66K4dMVyMs6o8bNQpviDnXzG+O/gfNxPU9IpIig0j4pzlO707GcGZ6QA4rWhlRxjJsjnZw=="; + url = "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz"; + sha512 = "t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg=="; }; }; "node-color-readline-1.0.1" = { @@ -30467,15 +30863,6 @@ let sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; - "node-environment-flags-1.0.6" = { - name = "node-environment-flags"; - packageName = "node-environment-flags"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; - sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; - }; - }; "node-fetch-1.7.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -30548,13 +30935,13 @@ let sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; }; }; - "node-gyp-3.8.0" = { + "node-gyp-4.0.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "3.8.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; - sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; + sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; }; }; "node-gyp-5.1.1" = { @@ -30701,6 +31088,15 @@ let sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A=="; }; }; + "node-pre-gyp-0.14.0" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; + sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; + }; + }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -30719,6 +31115,15 @@ let sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d"; }; }; + "node-red-admin-0.2.6" = { + name = "node-red-admin"; + packageName = "node-red-admin"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.6.tgz"; + sha512 = "s3TlPwl9VbhsCTg9w2nUCdyBwqyRGqnaohy9iPJPmHPnvT+YudVt9VCoJVol5lPlWbDC9QlBQMyHQDdXIxoLkw=="; + }; + }; "node-red-node-rbe-0.2.9" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; @@ -30737,13 +31142,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.58" = { + "node-releases-1.1.59" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.58"; + version = "1.1.59"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz"; - sha512 = "NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz"; + sha512 = "H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="; }; }; "node-source-walk-4.2.0" = { @@ -31151,15 +31556,6 @@ let sha512 = "wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw=="; }; }; - "npm-pick-manifest-6.0.0" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.0.0.tgz"; - sha512 = "PdJpXMvjqt4nftNEDpCgjBUF8yI3Q3MyuAmVB9nemnnCg32F4BPL/JFBfdj8DubgHCYUFQhtLWmBPvdsFtjWMg=="; - }; - }; "npm-pick-manifest-6.1.0" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; @@ -31196,22 +31592,22 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.4" = { + "npm-registry-fetch-4.0.5" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz"; - sha512 = "6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz"; + sha512 = "yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q=="; }; }; - "npm-registry-fetch-8.1.0" = { + "npm-registry-fetch-8.1.2" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "8.1.0"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.0.tgz"; - sha512 = "RkcugRDye2j6yEiHGMyAdKQoipgp8VToSIjm+TFLhVraXOkC/WU2kjE2URcYBpcJ4hs++VFBKo6+Zg4wmrS+Qw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.2.tgz"; + sha512 = "/m5W4t5xSAO0vwI+nDMh/msTimROztmrQcMxWRoWqWQsNYUavE4zSQCvpfDZb+V6CVs4J2tHvCP0g3me2nNU7w=="; }; }; "npm-run-path-2.0.2" = { @@ -31385,22 +31781,22 @@ let sha512 = "pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ=="; }; }; - "oas-linter-3.1.2" = { + "oas-linter-3.1.3" = { name = "oas-linter"; packageName = "oas-linter"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.1.2.tgz"; - sha512 = "mv3HBG9aQz8PLGvonewIN9Y2Ra8QL6jvotRvf7NCdZ20n5vg4dO4y61UZh6s+KRDfJaU1PO+9Oxrn3EUN4Xygw=="; + url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.1.3.tgz"; + sha512 = "jFWBHjSoqODGo7cKA/VWqqWSLbHNtnyCEpa2nMMS64SzCUbZDk63Oe7LqQZ2qJA0K2VRreYLt6cVkYy6MqNRDg=="; }; }; - "oas-resolver-2.3.2" = { + "oas-resolver-2.4.1" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.3.2.tgz"; - sha512 = "toGCUv8wyZZmUAAsw4jn+511xNpUFW2ZLp4sAZ7xpERIeosrbxBxtkVxot9kXvdUHtPjRafi5+bkJ56TwQeYSQ=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.1.tgz"; + sha512 = "rRmUv9mDTKPtsB2OGaoNMK4BC1Q/pL+tWRPKRjXJEBoLmfegJhecOZPBtIR0gKEVQb9iAA0MqulkgY43EiCFDg=="; }; }; "oas-schema-walker-1.1.4" = { @@ -31611,13 +32007,13 @@ let sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w=="; }; }; - "object-treeify-1.1.25" = { + "object-treeify-1.1.26" = { name = "object-treeify"; packageName = "object-treeify"; - version = "1.1.25"; + version = "1.1.26"; src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.25.tgz"; - sha512 = "6Abx0xlXDnYd50JkQefvoIly3jWOu8/PqH4lh8p2/aMFEx5TjsUGHt0H9NHfzt+pCwOhpPgNYofD8e2YywIXig=="; + url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.26.tgz"; + sha512 = "0WTfU7SGM8umY4YPpOg+oHXL66E6dPVCr+sMR6KitPmvg8CkVrHUUZYEFtx0+5Wb0HjFEsBwBYXyGRNeX7c/oQ=="; }; }; "object-visit-1.0.1" = { @@ -31881,6 +32277,15 @@ let sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; }; }; + "one-time-1.0.0" = { + name = "one-time"; + packageName = "one-time"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"; + sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; + }; + }; "onetime-1.1.0" = { name = "onetime"; packageName = "onetime"; @@ -31953,15 +32358,6 @@ let sha512 = "K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ=="; }; }; - "open-7.0.3" = { - name = "open"; - packageName = "open"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.0.3.tgz"; - sha512 = "sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA=="; - }; - }; "open-7.0.4" = { name = "open"; packageName = "open"; @@ -32259,15 +32655,6 @@ let sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; - "os-locale-2.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; - sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; - }; - }; "os-locale-3.1.0" = { name = "os-locale"; packageName = "os-locale"; @@ -32331,13 +32718,13 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "otfcc-ttcize-0.8.0" = { + "otfcc-ttcize-0.10.2" = { name = "otfcc-ttcize"; packageName = "otfcc-ttcize"; - version = "0.8.0"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz"; - sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ=="; + url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.10.2.tgz"; + sha512 = "CLMMw6r97AvmK5nOIGpnG4xHVU40gyTzpvn55RPyxZQ3E/UMXG4HnykyTYHlVL7Y46ISr1isPiSN0CvjYpZtgg=="; }; }; "p-all-2.1.0" = { @@ -32502,6 +32889,15 @@ let sha512 = "mw/p92EyOzl2MhauKodw54Rx5ZK4624rNfgNaBguFZkHzyUG9WsDzFF5/yQVEJinbJDdP4jEfMN+uBquiGnaLg=="; }; }; + "p-limit-3.0.2" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz"; + sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg=="; + }; + }; "p-locate-2.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -32583,13 +32979,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.4.0" = { + "p-queue-6.5.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; - sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.5.0.tgz"; + sha512 = "FLaTTD9Am6TeDfNuN0d+INeyVJoICoBS+OVP5K1S84v4w51LN3nRkCT+WC7xLBepV2s+N4LibM7Ys7xcSc0+1A=="; }; }; "p-reduce-1.0.0" = { @@ -32835,6 +33231,15 @@ let sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; }; + "param-case-3.0.3" = { + name = "param-case"; + packageName = "param-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz"; + sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA=="; + }; + }; "paredit.js-0.3.6" = { name = "paredit.js"; packageName = "paredit.js"; @@ -32997,6 +33402,15 @@ let sha512 = "7T9g6mIsFFpLlo0Zzb2jLWdCt+H9Qtf/hRmMYFi/Mq6Ovi+YKo+AyDFX3OhFfu0vXX5Nid9FKJGKSSzNcTkWiA=="; }; }; + "parse-link-header-1.0.1" = { + name = "parse-link-header"; + packageName = "parse-link-header"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-link-header/-/parse-link-header-1.0.1.tgz"; + sha1 = "bedfe0d2118aeb84be75e7b025419ec8a61140a7"; + }; + }; "parse-node-version-1.0.1" = { name = "parse-node-version"; packageName = "parse-node-version"; @@ -33123,6 +33537,15 @@ let sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; }; }; + "parse5-5.1.1" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; + sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; + }; + }; "parsejson-0.0.1" = { name = "parsejson"; packageName = "parsejson"; @@ -33186,15 +33609,6 @@ let sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; - "pascal-case-2.0.1" = { - name = "pascal-case"; - packageName = "pascal-case"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz"; - sha1 = "2d578d3455f660da65eca18ef95b4e0de912761e"; - }; - }; "pascal-case-3.1.1" = { name = "pascal-case"; packageName = "pascal-case"; @@ -33213,6 +33627,15 @@ let sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; + "passerror-1.1.1" = { + name = "passerror"; + packageName = "passerror"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/passerror/-/passerror-1.1.1.tgz"; + sha1 = "a25b88dbdd910a29603aec7dcb96e9a7a97687b4"; + }; + }; "passive-voice-0.1.0" = { name = "passive-voice"; packageName = "passive-voice"; @@ -33339,13 +33762,13 @@ let sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; - "path-case-2.1.1" = { + "path-case-3.0.3" = { name = "path-case"; packageName = "path-case"; - version = "2.1.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz"; - sha1 = "94b8037c372d3fe2906e465bb45e25d226e8eea5"; + url = "https://registry.npmjs.org/path-case/-/path-case-3.0.3.tgz"; + sha512 = "UMFU6UETFpCNWbIWNczshPrnK/7JAXBP2NYw80ojElbQ2+JYxdqWDBkvvqM93u4u6oLmuJ/tPOf2tM8KtXv4eg=="; }; }; "path-dirname-1.0.2" = { @@ -33510,15 +33933,6 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - }; "path-type-3.0.0" = { name = "path-type"; packageName = "path-type"; @@ -33807,6 +34221,15 @@ let sha512 = "3RfX2L76o7v230FP1fZ3Fo/WX7Su+P1Ld+pvBm2j+MyUjtA/KqDYxMkzBqzcX3R00zbC7Gf/HqIzyuu3tgvi9Q=="; }; }; + "pino-6.3.2" = { + name = "pino"; + packageName = "pino"; + version = "6.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-6.3.2.tgz"; + sha512 = "EiP3L1hoFw19KPocWimjnfXeysld0ne89ZRQ+bf8nAeA2TyuLoggNlibAi+Kla67GvQBopLdIZOsh1z/Lruo5Q=="; + }; + }; "pino-std-serializers-2.4.2" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; @@ -34123,15 +34546,6 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.27" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.27"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; - sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; - }; - }; "postcss-7.0.32" = { name = "postcss"; packageName = "postcss"; @@ -34663,13 +35077,13 @@ let sha512 = "MbIXTWwAfJ9qET6Zl29UNwJcDJEEz9Zkr5oDhiujitJa7YBJwEpbkX2cmuklCDxubTMoRWpid3q8DrSyGnUUzQ=="; }; }; - "prebuild-install-5.3.4" = { + "prebuild-install-5.3.3" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "5.3.4"; + version = "5.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.4.tgz"; - sha512 = "AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz"; + sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g=="; }; }; "precinct-6.3.1" = { @@ -34870,15 +35284,6 @@ let sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug=="; }; }; - "primitive-quadify-off-curves-0.4.1" = { - name = "primitive-quadify-off-curves"; - packageName = "primitive-quadify-off-curves"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.4.1.tgz"; - sha512 = "Kmn+IfF+hcARb1NX+XtoSQIxHS+WeOqqQ3YDihRe3KkvGkFxMrDQFFsDTXxwUOt9KmvD7FgWG6cO2ajZp4lEQg=="; - }; - }; "printf-0.2.5" = { name = "printf"; packageName = "printf"; @@ -35059,6 +35464,15 @@ let sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; }; }; + "promise-deferred-2.0.3" = { + name = "promise-deferred"; + packageName = "promise-deferred"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-deferred/-/promise-deferred-2.0.3.tgz"; + sha512 = "n10XaoznCzLfyPFOlEE8iurezHpxrYzyjgq/1eW9Wk1gJwur/N7BdBmjJYJpqMeMcXK4wEbzo2EvZQcqjYcKUQ=="; + }; + }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -35113,6 +35527,15 @@ let sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; }; }; + "promiseback-2.0.3" = { + name = "promiseback"; + packageName = "promiseback"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/promiseback/-/promiseback-2.0.3.tgz"; + sha512 = "VZXdCwS0ppVNTIRfNsCvVwJAaP2b+pxQF7lM8DMWfmpNWyTxB6O5YNbzs+8z0ki/KIBHKHk308NTIl4kJUem3w=="; + }; + }; "promised-temp-0.1.0" = { name = "promised-temp"; packageName = "promised-temp"; @@ -35122,13 +35545,13 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; - "promisify-child-process-3.1.4" = { + "promisify-child-process-4.1.1" = { name = "promisify-child-process"; packageName = "promisify-child-process"; - version = "3.1.4"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-3.1.4.tgz"; - sha512 = "tLifJs99E4oOXUz/dKQjRgdchfiepmYQzBVrcVX9BtUWi9aGJeGSf2KgXOWBW1JFsSYgLkl1Z9HRm8i0sf4cTg=="; + url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-4.1.1.tgz"; + sha512 = "/sRjHZwoXf1rJ+8s4oWjYjGRVKNK1DUnqfRC1Zek18pl0cN6k3yJ1cCbqd0tWNe4h0Gr+SY4vR42N33+T82WkA=="; }; }; "promisize-1.1.2" = { @@ -35221,13 +35644,13 @@ let sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; }; }; - "protobufjs-6.9.0" = { + "protobufjs-6.10.0" = { name = "protobufjs"; packageName = "protobufjs"; - version = "6.9.0"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.9.0.tgz"; - sha512 = "LlGVfEWDXoI/STstRDdZZKb/qusoAWUnmLg9R8OLSO473mBLWHowx8clbX5/+mKDEI+v7GzjoK9tRPZMMcoTrg=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.0.tgz"; + sha512 = "Hdz1+CXkrlmGDKkP6DczxysdnUyUuhM1mjeaydnBxOcjxQPbJldLZ8eGE1gX0UTsgv+0QkFfn6dioo5yt9XORw=="; }; }; "protocol-buffers-encodings-1.1.0" = { @@ -35347,13 +35770,13 @@ let sha512 = "v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ=="; }; }; - "ps-tree-0.0.3" = { + "ps-tree-1.2.0" = { name = "ps-tree"; packageName = "ps-tree"; - version = "0.0.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; - sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz"; + sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; "pseudomap-1.0.2" = { @@ -36364,6 +36787,15 @@ let sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; }; }; + "quick-lru-5.1.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + }; + }; "quicktask-1.1.0" = { name = "quicktask"; packageName = "quicktask"; @@ -36760,15 +37192,6 @@ let sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; }; }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - }; "read-pkg-3.0.0" = { name = "read-pkg"; packageName = "read-pkg"; @@ -36796,15 +37219,6 @@ let sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; }; }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; "read-pkg-up-3.0.0" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -36940,15 +37354,6 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "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=="; - }; - }; "readdirp-3.3.0" = { name = "readdirp"; packageName = "readdirp"; @@ -36967,6 +37372,15 @@ let sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; + "readline-1.3.0" = { + name = "readline"; + packageName = "readline"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz"; + sha1 = "c580d77ef2cfc8752b132498060dc9793a7ac01c"; + }; + }; "readline2-0.1.1" = { name = "readline2"; packageName = "readline2"; @@ -37120,13 +37534,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.1" = { + "reftools-1.1.3" = { name = "reftools"; packageName = "reftools"; - version = "1.1.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.1.tgz"; - sha512 = "7ySkzK7YpUeJP16rzJqEXTZ7IrAq/AL/p+wWejD9wdKQOe+mYYVAOB3w5ZTs2eoHfmAidwr/6PcC+q+LzPF/DQ=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.3.tgz"; + sha512 = "JTlhKmSzqE/gt5Z5RX25yZDq67MlRRtTz1gLy/NY+wPDx1e1vEJsv1PoNrpKZBwitcEMXs2k7pzmbmraP1ZMAQ=="; }; }; "regenerate-1.4.1" = { @@ -37165,13 +37579,13 @@ let sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; }; - "regenerator-transform-0.14.4" = { + "regenerator-transform-0.14.5" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; - sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; }; }; "regex-cache-0.4.4" = { @@ -37255,13 +37669,13 @@ let sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; - "registry-auth-token-4.1.1" = { + "registry-auth-token-4.2.0" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz"; - sha512 = "9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz"; + sha512 = "P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w=="; }; }; "registry-url-3.1.0" = { @@ -37300,6 +37714,24 @@ let sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; }; }; + "rehype-parse-6.0.2" = { + name = "rehype-parse"; + packageName = "rehype-parse"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz"; + sha512 = "0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug=="; + }; + }; + "rehype-retext-2.0.4" = { + name = "rehype-retext"; + packageName = "rehype-retext"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rehype-retext/-/rehype-retext-2.0.4.tgz"; + sha512 = "OnGX5RE8WyEs/Snz+Bs8DM9uGdrNUXMhCC7CW3S1cIZVOC90VdewdE+71kpG6LOzS0xwgZyItwrhjGv+oQgwkQ=="; + }; + }; "rehype-sort-attribute-values-2.0.1" = { name = "rehype-sort-attribute-values"; packageName = "rehype-sort-attribute-values"; @@ -37408,13 +37840,13 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; - "remark-message-control-4.2.0" = { + "remark-message-control-5.0.0" = { name = "remark-message-control"; packageName = "remark-message-control"; - version = "4.2.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.2.0.tgz"; - sha512 = "WXH2t5ljTyhsXlK1zPBLF3iPHbXl58R94phPMreS1xcHWBZJt6Oiu8RtNjy1poZFb3PqKnbYLJeR/CWcZ1bTFw=="; + url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-5.0.0.tgz"; + sha512 = "JQYGtMoMP2gUWzoR1rFU4GEr4HAieoDlD1jmwEYP82bnmHFPv2AK6ImVwFcrB4DcCFCM6bFBTOWMLzt06cz5vA=="; }; }; "remark-parse-1.1.0" = { @@ -37453,6 +37885,15 @@ let sha512 = "QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg=="; }; }; + "remark-parse-7.0.2" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-7.0.2.tgz"; + sha512 = "9+my0lQS80IQkYXsMA8Sg6m9QfXYJBnXjWYN5U+kFc5/n69t+XZVXU/ZBYr3cYH8FheEGf1v87rkFDhJ8bVgMA=="; + }; + }; "remark-retext-3.1.3" = { name = "remark-retext"; packageName = "remark-retext"; @@ -37525,6 +37966,15 @@ let sha1 = "cf8b66e9e6fcb4acc9721048adeee7a357698ba9"; }; }; + "remove-markdown-0.3.0" = { + name = "remove-markdown"; + packageName = "remove-markdown"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.3.0.tgz"; + sha1 = "5e4b667493a93579728f3d52ecc1db9ca505dc98"; + }; + }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -37831,6 +38281,15 @@ let sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; }; }; + "resolve-alpn-1.0.0" = { + name = "resolve-alpn"; + packageName = "resolve-alpn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz"; + sha512 = "rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA=="; + }; + }; "resolve-cwd-2.0.0" = { name = "resolve-cwd"; packageName = "resolve-cwd"; @@ -38038,22 +38497,22 @@ let sha512 = "yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw=="; }; }; - "retext-equality-3.2.0" = { + "retext-equality-4.3.0" = { name = "retext-equality"; packageName = "retext-equality"; - version = "3.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/retext-equality/-/retext-equality-3.2.0.tgz"; - sha512 = "dzcpZmEQ99ECZs1Y8WhfvJ4kEq+zfrI3ONMUFlSu8DmRJJY3p97v/2ZfVrufhrKlDr/wa902NJiIwupRnZy3/w=="; + url = "https://registry.npmjs.org/retext-equality/-/retext-equality-4.3.0.tgz"; + sha512 = "jW+6X5BrxVEaZ71qLIaqK6/Y+jqlxijVOcPH2SdHtNaMIHJWvBf5fd1IgHmEp0UREth0YQSI7KNtJurrSPQyMA=="; }; }; - "retext-profanities-4.4.0" = { + "retext-profanities-5.0.0" = { name = "retext-profanities"; packageName = "retext-profanities"; - version = "4.4.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-4.4.0.tgz"; - sha512 = "Gesb0Act9oeJ5N0KztREitP2E0zo7euzgTu2X4HLP6IJmcrRbRnqNwV11tzNy5JFJzKB1JTJFc7KseojTeGwOA=="; + url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-5.0.0.tgz"; + sha512 = "zaPCKtrMDLs0U/2yN3V3rpYn1VZ3hW+AsEZdovWIRlEYZPCaUmkChOSob45LOQYJUnM+YZIahXuU9zHPm+aTKQ=="; }; }; "rethinkdb-2.4.2" = { @@ -38299,13 +38758,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.17.1" = { + "rollup-2.21.0" = { name = "rollup"; packageName = "rollup"; - version = "2.17.1"; + version = "2.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.17.1.tgz"; - sha512 = "lVrtCXJ+08Eapa0SfApLmRNWNWm2FsYFnLPIJZJvZz2uI2Gv+dfPyu1zgF7KKF/HYFJDvjxbdCbI8lUVMnG7Sg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.21.0.tgz"; + sha512 = "BEGgy+wSzux7Ycq58pRiWEOBZaXRXTuvzl1gsm7gqmsAHxkWf9nyA5V2LN9fGSHhhDQd0/C13iRzSh4bbIpWZQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -38389,6 +38848,15 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; + "rss-parser-3.7.1" = { + name = "rss-parser"; + packageName = "rss-parser"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.1.tgz"; + sha512 = "1JKFzLHeteNandmlVBUWgLPmipFEllhdUQlmNvkXd6ju4VFOlGr0VmtlQaxzZoVysG2nbGb8eAtzNqQTxzQ+AQ=="; + }; + }; "rss-parser-3.8.0" = { name = "rss-parser"; packageName = "rss-parser"; @@ -38578,6 +39046,15 @@ let sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; }; }; + "rxjs-6.6.0" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz"; + sha512 = "3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg=="; + }; + }; "s.color-0.0.13" = { name = "s.color"; packageName = "s.color"; @@ -38722,13 +39199,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.9" = { + "sass-formatter-0.4.10" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.9.tgz"; - sha512 = "cLhpDfJA7H/2RNui7lt7Ndz/LqPYKY7TulCYJWSC2UJW3CuMs76Zr8pusN0zxbd9Rgb5uBiSBMMLlfN2OhftUg=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.10.tgz"; + sha512 = "PGLPkmVH5D88rglknE+safJvtOG4uYhcNVD4opSDX4Ho5l5fkKmEMU526TPOXgfmpOGxi54lb42gzXfRiT6sZw=="; }; }; "sass-lookup-3.0.0" = { @@ -38866,15 +39343,6 @@ let sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; }; }; - "seed-random-2.2.0" = { - name = "seed-random"; - packageName = "seed-random"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz"; - sha1 = "2a9b19e250a817099231a5b99a4daf80b7fbed54"; - }; - }; "seek-bzip-1.0.5" = { name = "seek-bzip"; packageName = "seek-bzip"; @@ -39163,13 +39631,13 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "sentence-case-2.1.1" = { + "sentence-case-3.0.3" = { name = "sentence-case"; packageName = "sentence-case"; - version = "2.1.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz"; - sha1 = "1f6e2dda39c168bf92d13f86d4a918933f667ed4"; + url = "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.3.tgz"; + sha512 = "ZPr4dgTcNkEfcGOMFQyDdJrTU9uQO1nb1cjf+nuzb6FxgMDgKddZOM29qEsB7jvsZSMruLRcL2KfM4ypKpa0LA=="; }; }; "sentence-splitter-2.3.2" = { @@ -39199,6 +39667,15 @@ let sha1 = "e433676932020454e3c14870c517ea1de56c2fa4"; }; }; + "seq-0.3.5" = { + name = "seq"; + packageName = "seq"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/seq/-/seq-0.3.5.tgz"; + sha1 = "ae02af3a424793d8ccbf212d69174e0c54dffe38"; + }; + }; "sequencify-0.0.7" = { name = "sequencify"; packageName = "sequencify"; @@ -39235,6 +39712,15 @@ let sha512 = "JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg=="; }; }; + "serialize-javascript-4.0.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; + }; + }; "serialize-to-js-3.1.1" = { name = "serialize-to-js"; packageName = "serialize-to-js"; @@ -39370,6 +39856,15 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; + "setprototypeof-1.2.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; + }; + }; "seventh-0.7.35" = { name = "seventh"; packageName = "seventh"; @@ -40009,13 +40504,13 @@ let sha512 = "g0w2Ft4RJl+F/1/tQvA4BUsH09s+RNd0RRa+So24Inv5yzce5xUnPzxlEWNUBG5TwQjfKDZSFWrf2rXz+e1Q2g=="; }; }; - "snake-case-2.1.0" = { + "snake-case-3.0.3" = { name = "snake-case"; packageName = "snake-case"; - version = "2.1.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz"; - sha1 = "41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"; + url = "https://registry.npmjs.org/snake-case/-/snake-case-3.0.3.tgz"; + sha512 = "WM1sIXEO+rsAHBKjGf/6R1HBBcgbncKS08d2Aqec/mrDSpU80SiOU41hO7ny6DToHSyrlwTYzQBIK1FPSx4Y3Q=="; }; }; "snapdragon-0.8.2" = { @@ -40081,13 +40576,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-3.12.3" = { + "snyk-docker-plugin-3.13.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.12.3"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.12.3.tgz"; - sha512 = "Ysv7ZDvXFt6K11f1m6wJaqYS3yM7c8YhzOIPoEmrYZW+4tL+Al5DiyKaAQBudbfYEA7xa6S6qGqE3QRitHZ5nQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.13.1.tgz"; + sha512 = "4GEZ8Rx+1K33i0SuMRO03T+n8jAosLae4iuo1TZu9ugkxdQzbBStzVFz2N6x1s0GI/psWQNOWSLKfzFJYMOctw=="; }; }; "snyk-go-parser-1.4.1" = { @@ -40108,13 +40603,13 @@ let sha512 = "r/uaM3gk/RF7m/VGYswxlnA6I+kMgK3eVPsPyf7400BhqF8noh8K7v10CEg67mHA4JM0l7dZASqejr/5kKw9ZQ=="; }; }; - "snyk-gradle-plugin-3.5.0" = { + "snyk-gradle-plugin-3.5.1" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.5.0.tgz"; - sha512 = "zOHr3802bDKCcSAFfoEvt/wGSaOSGRm6yQjikdo1RTz7jTeQnSMJxCFYTOhfpu9Tka4d5q0TsdI/2VLFAvPKhA=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.5.1.tgz"; + sha512 = "8tZwQCqRbjp1azvc+bBRXSbn2AjbUpFAM6qoSpM/IZpfGl1RaOtz4/JTkGFxj+iBhTFoAkGxEunT66eO0pHZZw=="; }; }; "snyk-module-1.9.1" = { @@ -40162,6 +40657,15 @@ let sha512 = "l6jLoJxqcIIkQopSdQuAstXdMw5AIgLu+uGc5CYpHyw8fYqOwna8rawwofNeGuwJAAv4nEiNiexeYaR88OCq6Q=="; }; }; + "snyk-nodejs-lockfile-parser-1.26.3" = { + name = "snyk-nodejs-lockfile-parser"; + packageName = "snyk-nodejs-lockfile-parser"; + version = "1.26.3"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.26.3.tgz"; + sha512 = "mBQ6vhnXAeyMxlnl9amjJWpA+/3qqXwM8Sj/P+9uH2TByOFLxdGzMNQFcl3q/H2yUdcs/epVdXJp09A2dK2glA=="; + }; + }; "snyk-nuget-plugin-1.18.1" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; @@ -40369,6 +40873,15 @@ let sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; + "socks-2.4.1" = { + name = "socks"; + packageName = "socks"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.4.1.tgz"; + sha512 = "8mWHeYC1OA0500qzb+sqwm0Hzi8oBpeuI1JugoBVMEJtJvxSgco8xFSK+NRnZcHeeWjTbF82KUDo5sXH22TY5A=="; + }; + }; "socks-proxy-agent-4.0.2" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -40855,6 +41368,15 @@ let sha512 = "0rfBDPVLzvDbMUKrFWvF6kvtXxllXGZRkFL0aCWJ5y8uXlEfZDo6IEPACZwJbKt/fGqFjJLJRHnG62vJmLLpRA=="; }; }; + "spiro-2.0.0" = { + name = "spiro"; + packageName = "spiro"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spiro/-/spiro-2.0.0.tgz"; + sha512 = "KPWXN+OmQdjZPCMGRkE2hsbcY4Y4UJxjn+qTw4rsJ49n8VN6EqPk0UOOkNihXEl3JEqPQxcrDQebu9YPn9Ad4w=="; + }; + }; "split-0.2.10" = { name = "split"; packageName = "split"; @@ -41080,13 +41602,13 @@ let sha512 = "J3fsWb5nS6PqObZLW2tclEz/bkRQ5pcF9goXanYGVsoH71F6W4f5sOnck9szeubI8srNaiL9pa0kPRv/lojHiw=="; }; }; - "ssb-db-20.1.0" = { + "ssb-db-20.2.0" = { name = "ssb-db"; packageName = "ssb-db"; - version = "20.1.0"; + version = "20.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.1.0.tgz"; - sha512 = "oN5bBdnuOv6ZA6DRBeB5iH08VvGEHq5yfHNdtvaOv3IDj6RYSJMd0Z6qOwR9qlNgxtaD/fDo21nxaNcs5Hn/WQ=="; + url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.2.0.tgz"; + sha512 = "1JMUGGmxfoDNuFG56dfAZnzxtzKDtME/SITE3nlVX684n7zHih46NTFAF721PttQVkS1wcXJXmb3fbY2Rpvy1g=="; }; }; "ssb-ebt-5.6.7" = { @@ -41098,13 +41620,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.1.4" = { + "ssb-friends-4.2.0" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.1.4"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.1.4.tgz"; - sha512 = "rjQP2rLocqnUoiI+SSUehLQwMB4H5TKD13hfnweGVIgAWw4mylbl9bPOuXtTU23ubPkdbSNadlp3uivsCkWLxw=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.0.tgz"; + sha512 = "X8UewxMCZImUoYX9eNHdym6oFcfEA610iuyn2cGcHtYZre1J2WiKtCLBB2KIjwWZqlOs1mARE+mkVPYnduZy4Q=="; }; }; "ssb-git-0.5.0" = { @@ -41134,13 +41656,13 @@ let sha512 = "lbizlDBCtOOnbnz7zS81NOtnAyHnXu9E3gxrAJHZe7oyxINRI7IpQ8J79to9aXzkb8+2M32R8K4whmsAHGvJAg=="; }; }; - "ssb-invite-2.1.4" = { + "ssb-invite-2.1.5" = { name = "ssb-invite"; packageName = "ssb-invite"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.4.tgz"; - sha512 = "bq4Iow4DOfsfWKE6otgD2+sWd59PcLW/WUbwZdJlukaT2m0nazPu2s8k9xX/95p+pJS7xkLyywHxMzytiKRqTg=="; + url = "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.5.tgz"; + sha512 = "nihgFMmw+OVz8X/ES47wcfY2at0E9MdSPjHm1yUpG8E5sgORLcdrtOXSRKs6Nd2EXk7FcP49EUr0trUt3G9cFw=="; }; }; "ssb-issues-1.0.0" = { @@ -41332,13 +41854,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-validate-4.1.0" = { + "ssb-validate-4.1.1" = { name = "ssb-validate"; packageName = "ssb-validate"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.0.tgz"; - sha512 = "GszJGLXZdnWSAP5f1evXwRct7qY0T/LFXR41eHIh/N63Z7kKBfBcIMd6mbQ5DgpU+sVHwdhXXloYXoMPZHiJDA=="; + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.1.tgz"; + sha512 = "3OsB6qTYlOMUqy4S1i0NuBtiqRW0s9z1Uf+Yqhjcqt7Zu8LTZk59HyhB1gfYmC3xzR/UnHeI7LkJZOt2+r//gA=="; }; }; "ssb-ws-6.2.3" = { @@ -41647,6 +42169,15 @@ let sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; + "stream-buffers-3.0.2" = { + name = "stream-buffers"; + packageName = "stream-buffers"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz"; + sha512 = "DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ=="; + }; + }; "stream-collector-1.0.1" = { name = "stream-collector"; packageName = "stream-collector"; @@ -42268,15 +42799,6 @@ let sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca"; }; }; - "strip-bom-stream-3.0.0" = { - name = "strip-bom-stream"; - packageName = "strip-bom-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz"; - sha1 = "956bcc5d84430f69256a90ed823765cd858e159c"; - }; - }; "strip-bom-stream-4.0.0" = { name = "strip-bom-stream"; packageName = "strip-bom-stream"; @@ -42394,6 +42916,15 @@ let sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; }; }; + "strip-json-comments-3.1.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; + }; + }; "strip-outer-1.0.1" = { name = "strip-outer"; packageName = "strip-outer"; @@ -42565,6 +43096,15 @@ let sha512 = "pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw=="; }; }; + "subscriptions-transport-ws-0.9.17" = { + name = "subscriptions-transport-ws"; + packageName = "subscriptions-transport-ws"; + version = "0.9.17"; + src = fetchurl { + url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.17.tgz"; + sha512 = "hNHi2N80PBz4T0V0QhnnsMGvG3XDFDS9mS6BhZ3R12T6EBywC8d/uJscsga0cVO4DKtXCkCRrWm2sOYrbOdhEA=="; + }; + }; "sudo-block-1.2.0" = { name = "sudo-block"; packageName = "sudo-block"; @@ -42700,15 +43240,6 @@ let sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; - "supports-color-4.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; - }; - }; "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; @@ -42718,15 +43249,6 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-6.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; - sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; - }; - }; "supports-color-6.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -42880,15 +43402,6 @@ let sha512 = "f5QqfXawiVijhjMtYqWZ55ESHPZFqrPC8L9idhIiuSX8O2qsa1i4MVGtCM3TQF+Smzr/6WfT/7zBuzG3aTgPAA=="; }; }; - "swap-case-1.1.2" = { - name = "swap-case"; - packageName = "swap-case"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz"; - sha1 = "c39203a4587385fad3c850a0bd1bcafa081974e3"; - }; - }; "sway-1.0.0" = { name = "sway"; packageName = "sway"; @@ -43070,13 +43583,13 @@ let sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; }; }; - "tail-2.0.3" = { + "tail-2.0.4" = { name = "tail"; packageName = "tail"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/tail/-/tail-2.0.3.tgz"; - sha512 = "s9NOGkLqqiDEtBttQZI7acLS8ycYK5sTlDwNjGnpXG9c8AWj0cfAtwEIzo/hVRMMiC5EYz+bXaJWC1u1u0GPpQ=="; + url = "https://registry.npmjs.org/tail/-/tail-2.0.4.tgz"; + sha512 = "xHkZdNWIzO++g+V/rHGqVoHd2LRxz+8t8bj6FGelfb8FHBjg5yjkX7Su/8sQSBo5alIspYkRp/fU0A2SM5h+5A=="; }; }; "taketalk-1.0.0" = { @@ -43196,13 +43709,13 @@ let sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; }; }; - "tar-stream-2.1.2" = { + "tar-stream-2.1.3" = { name = "tar-stream"; packageName = "tar-stream"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz"; - sha512 = "UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q=="; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz"; + sha512 = "Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA=="; }; }; "taskkill-3.1.0" = { @@ -43367,13 +43880,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.35.7" = { + "terminal-kit-1.36.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.35.7"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.7.tgz"; - sha512 = "VrDIbdOb7eXjYoNd9UAm4Q2xKpQcbdi8DbQnCardR4EtcxbptonvVrnBrWKuQUKvV7IvfUgZhekT+kYzbQ3C+Q=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.36.0.tgz"; + sha512 = "RZqiGd9Ykh+CDcXuVWt3jwSr5WNjo9jKdIajWxdLS+PknnfwZebois0Qd5kY7H/d/mal1S51ILaNX3nBOM/xog=="; }; }; "terser-3.17.0" = { @@ -43610,13 +44123,13 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.1" = { + "through2-3.0.2" = { name = "through2"; packageName = "through2"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; - sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; + url = "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz"; + sha512 = "enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ=="; }; }; "through2-filter-3.0.0" = { @@ -43772,15 +44285,6 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; - "title-case-2.1.1" = { - name = "title-case"; - packageName = "title-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz"; - sha1 = "3e127216da58d2bc5becf137ab91dae3a7cd8faa"; - }; - }; "titleize-1.0.1" = { name = "titleize"; packageName = "titleize"; @@ -44051,15 +44555,6 @@ let sha1 = "88defecd43adb2ef598625f0e3d59f7f342941ba"; }; }; - "to-vfile-2.2.0" = { - name = "to-vfile"; - packageName = "to-vfile"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-vfile/-/to-vfile-2.2.0.tgz"; - sha512 = "saGC8/lWdGrEoBMLUtgzhRHWAkQMP8gdldA3MOAUhBwTGEb1RSMVcflHGSx4ZJsdEZ9o1qDBCPp47LCPrbZWow=="; - }; - }; "to-vfile-4.0.0" = { name = "to-vfile"; packageName = "to-vfile"; @@ -44303,6 +44798,15 @@ let sha1 = "8a7e8ab3044ad19f233f50c15894cbf69e5d205e"; }; }; + "traverse-0.3.9" = { + name = "traverse"; + packageName = "traverse"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; + sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + }; + }; "traverse-0.4.6" = { name = "traverse"; packageName = "traverse"; @@ -44537,15 +45041,6 @@ let sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; }; }; - "tslib-1.11.2" = { - name = "tslib"; - packageName = "tslib"; - version = "1.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz"; - sha512 = "tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg=="; - }; - }; "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; @@ -44555,15 +45050,6 @@ let sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; - "tslib-1.9.3" = { - name = "tslib"; - packageName = "tslib"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz"; - sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; - }; - }; "tslib-2.0.0" = { name = "tslib"; packageName = "tslib"; @@ -44618,13 +45104,13 @@ let sha512 = "X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA=="; }; }; - "ttf2woff2-2.0.3" = { + "ttf2woff2-3.0.0" = { name = "ttf2woff2"; packageName = "ttf2woff2"; - version = "2.0.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-2.0.3.tgz"; - sha1 = "5e020afe6e643287f3ad7687abed20fe654eb329"; + url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-3.0.0.tgz"; + sha512 = "5/Web6B0lF/STNAQ0d5vAlRRquuWsNj8wOmKQ9ql9Bsgbx8MsLnNzaBG9vBcSE4s4Ry1QOr/MyUrDUIVgVPEfw=="; }; }; "ttl-1.3.1" = { @@ -44663,6 +45149,15 @@ let sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; }; }; + "tumblr-0.4.1" = { + name = "tumblr"; + packageName = "tumblr"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tumblr/-/tumblr-0.4.1.tgz"; + sha1 = "ac9f4ba7bd04525d6bd8b087f85553c8ef19dc9e"; + }; + }; "tunnel-0.0.4" = { name = "tunnel"; packageName = "tunnel"; @@ -44744,6 +45239,15 @@ let sha512 = "SPGkUM0p7hjgo+y5Dlm/XCSuZe0G3kfcgRPrxkMFln5e8bvQbxDOsia8QEo8xqXfjLR1Emp9FGkVYHya2b8qdA=="; }; }; + "twitter-1.7.1" = { + name = "twitter"; + packageName = "twitter"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/twitter/-/twitter-1.7.1.tgz"; + sha1 = "0762378f1dc1c050e48f666aca904e24b1a962f4"; + }; + }; "txt-to-ast-3.0.3" = { name = "txt-to-ast"; packageName = "txt-to-ast"; @@ -44861,15 +45365,6 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-function-1.1.0" = { - name = "typed-function"; - packageName = "typed-function"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz"; - sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA=="; - }; - }; "typed-rest-client-1.2.0" = { name = "typed-rest-client"; packageName = "typed-rest-client"; @@ -44915,15 +45410,6 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.8.3" = { - name = "typescript"; - packageName = "typescript"; - version = "3.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz"; - sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w=="; - }; - }; "typescript-3.9.5" = { name = "typescript"; packageName = "typescript"; @@ -44933,6 +45419,15 @@ let sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ=="; }; }; + "typescript-3.9.6" = { + name = "typescript"; + packageName = "typescript"; + version = "3.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz"; + sha512 = "Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -44996,13 +45491,13 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; - "typo-geom-0.5.1" = { + "typo-geom-0.8.4" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.5.1"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz"; - sha512 = "nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.8.4.tgz"; + sha512 = "n0P1RQidLnjLI2iSUDENiugkABaR+tr/kSIpl040XLKmrfsBZ/weS1OvQ9Mq98CsJlcJDemKdPqldoyYSsVgmQ=="; }; }; "ua-parser-js-0.7.21" = { @@ -45032,6 +45527,15 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; + "uglify-js-3.10.0" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; + sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -45041,24 +45545,6 @@ let sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; }; }; - "uglify-js-3.8.1" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.1.tgz"; - sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw=="; - }; - }; - "uglify-js-3.9.4" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.9.4"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz"; - sha512 = "8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA=="; - }; - }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -45302,6 +45788,15 @@ let sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; }; }; + "unicode-13.0.0-0.8.0" = { + name = "unicode-13.0.0"; + packageName = "unicode-13.0.0"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-13.0.0/-/unicode-13.0.0-0.8.0.tgz"; + sha512 = "Ekct2eo5hBIp/29ERCj1ABIBNnrFOAisNHFv8l2KksHJg4PurIN/nGPFItaIpBJHVzlBYuJaVx/bAvmJnFFL/w=="; + }; + }; "unicode-canonical-property-names-ecmascript-1.0.4" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; @@ -45356,6 +45851,15 @@ let sha1 = "d671dddd89101a08bac37b6a5161010602052085"; }; }; + "unicoderegexp-0.4.1" = { + name = "unicoderegexp"; + packageName = "unicoderegexp"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unicoderegexp/-/unicoderegexp-0.4.1.tgz"; + sha1 = "afb10e4ef1eeddc711417bbb652bc885da9d4171"; + }; + }; "unified-2.1.4" = { name = "unified"; packageName = "unified"; @@ -45392,22 +45896,22 @@ let sha512 = "lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw=="; }; }; - "unified-diff-1.0.2" = { - name = "unified-diff"; - packageName = "unified-diff"; - version = "1.0.2"; + "unified-8.4.2" = { + name = "unified"; + packageName = "unified"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified-diff/-/unified-diff-1.0.2.tgz"; - sha1 = "920b33da9abae087dd444904372e7c3fbd367d85"; + url = "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz"; + sha512 = "JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA=="; }; }; - "unified-engine-4.0.1" = { - name = "unified-engine"; - packageName = "unified-engine"; - version = "4.0.1"; + "unified-diff-3.0.1" = { + name = "unified-diff"; + packageName = "unified-diff"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-4.0.1.tgz"; - sha1 = "9692aa97fd5c4ec36889779e12514bef8e863fc3"; + url = "https://registry.npmjs.org/unified-diff/-/unified-diff-3.0.1.tgz"; + sha512 = "oDngdkrYYNRUYi19GqyvWNZmOGGsdu1GEOKYy+6iXGphvaoDDidVj3frOC7SumQ2SCWixaHELiXQe7fwcLrMAA=="; }; }; "unified-engine-6.0.1" = { @@ -45419,13 +45923,22 @@ let sha512 = "iDJYH82TgcezQA4IZzhCNJQx7vBsGk4h9s4Q7Fscrb3qcPsxBqVrVNYez2W3sBVTxuU1bFAhyRpA6ba/R4j93A=="; }; }; - "unified-message-control-1.0.4" = { + "unified-engine-7.0.0" = { + name = "unified-engine"; + packageName = "unified-engine"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-7.0.0.tgz"; + sha512 = "zH/MvcISpWg3JZtCoY/GYBw1WnVHkhnPoMBWpmuvAifCPSS9mzT9EbtimesJp6t2nnr/ojI0mg3TmkO1CjIwVA=="; + }; + }; + "unified-message-control-2.0.0" = { name = "unified-message-control"; packageName = "unified-message-control"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-1.0.4.tgz"; - sha512 = "e1dEtN4Z/TvLn/qHm+xeZpzqhJTtfZusFErk336kkZVpqrJYiV9ptxq+SbRPFMlN0OkjDYHmVJ929KYjsMTo3g=="; + url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-2.0.0.tgz"; + sha512 = "6TE36M/YIQhUr+XlG+YKXDCCTC2FPtCgXIwtdJcHLnrRGR1ZjYwZMH2pnp7a4OaE7sST9GUqQPjVHM7TRTTlyQ=="; }; }; "union-0.5.0" = { @@ -45590,6 +46103,15 @@ let sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; }; }; + "unist-util-is-4.0.2" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz"; + sha512 = "Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="; + }; + }; "unist-util-map-1.0.5" = { name = "unist-util-map"; packageName = "unist-util-map"; @@ -45653,6 +46175,15 @@ let sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw=="; }; }; + "unist-util-visit-2.0.3" = { + name = "unist-util-visit"; + packageName = "unist-util-visit"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz"; + sha512 = "iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q=="; + }; + }; "unist-util-visit-children-1.1.4" = { name = "unist-util-visit-children"; packageName = "unist-util-visit-children"; @@ -45671,6 +46202,15 @@ let sha512 = "DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g=="; }; }; + "unist-util-visit-parents-3.1.0" = { + name = "unist-util-visit-parents"; + packageName = "unist-util-visit-parents"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz"; + sha512 = "0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw=="; + }; + }; "universal-analytics-0.4.20" = { name = "universal-analytics"; packageName = "universal-analytics"; @@ -45941,13 +46481,22 @@ let sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; }; }; - "upper-case-first-1.1.2" = { + "upper-case-2.0.1" = { + name = "upper-case"; + packageName = "upper-case"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/upper-case/-/upper-case-2.0.1.tgz"; + sha512 = "laAsbea9SY5osxrv7S99vH9xAaJKrw5Qpdh4ENRLcaxipjKsiaBwiAsxfa8X5mObKNTQPsupSq0J/VIxsSJe3A=="; + }; + }; + "upper-case-first-2.0.1" = { name = "upper-case-first"; packageName = "upper-case-first"; - version = "1.1.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz"; - sha1 = "5d79bedcff14419518fd2edb0a0507c9b6859115"; + url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.1.tgz"; + sha512 = "105J8XqQ+9RxW3l9gHZtgve5oaiR9TIwvmZAMAIZWRHe00T21cdvewKORTlOJf/zXW6VukuTshM+HXZNWz7N5w=="; }; }; "uri-js-3.0.2" = { @@ -46310,13 +46859,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.1.10" = { + "utp-native-2.2.1" = { name = "utp-native"; packageName = "utp-native"; - version = "2.1.10"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.10.tgz"; - sha512 = "VTjBvb/uE9gYqx2NGVPtAWhqv9itieW+wJceJg5G6Cl/2kBCnHDaFafw3fNgCvii7meTpC4AoZfy6OG0pnuQ/Q=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.2.1.tgz"; + sha512 = "7GvD4gjGyL1GaNtZAaBVHn8SeWgx9/xIVE1LufMR0m2pWUs1EVx5WiOCXrCHyt7e15+5SquBMoQfj888pJySxA=="; }; }; "uuid-3.3.2" = { @@ -46355,24 +46904,6 @@ let sha512 = "yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA=="; }; }; - "uuid-7.0.2" = { - name = "uuid"; - packageName = "uuid"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz"; - sha512 = "vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw=="; - }; - }; - "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=="; - }; - }; "uuid-8.1.0" = { name = "uuid"; packageName = "uuid"; @@ -46382,6 +46913,15 @@ let sha512 = "CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="; }; }; + "uuid-8.2.0" = { + name = "uuid"; + packageName = "uuid"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-8.2.0.tgz"; + sha512 = "CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q=="; + }; + }; "v8-compile-cache-2.1.1" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -46715,13 +47255,13 @@ let sha1 = "5604da6fe453b34350637984eb5fe4909e280390"; }; }; - "vfile-find-up-2.0.2" = { + "vfile-find-up-5.0.1" = { name = "vfile-find-up"; packageName = "vfile-find-up"; - version = "2.0.2"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-2.0.2.tgz"; - sha512 = "kYGgsSNpYjPxcEoud1aHNFfchsV0Z6Pyc8M5LfD1wX/tV0/bn32MKHDfv4fqV9DBLVuw2YSGOs31nRY/42DfUA=="; + url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-5.0.1.tgz"; + sha512 = "YWx8fhWQNYpHxFkR5fDO4lCdvPcY4jfCG7qUMHVvSp14vRfkEYxFG/vUEV0eJuXoKFfiAmMkAS8dekOYnpAJ+A=="; }; }; "vfile-location-2.0.6" = { @@ -46760,15 +47300,6 @@ let sha1 = "21a7009bfe55e24df8ff432aa5bf6f6efa74e418"; }; }; - "vfile-reporter-4.0.0" = { - name = "vfile-reporter"; - packageName = "vfile-reporter"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-4.0.0.tgz"; - sha1 = "ea6f0ae1342f4841573985e05f941736f27de9da"; - }; - }; "vfile-reporter-5.1.2" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -46967,13 +47498,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.2.0" = { + "vscode-css-languageservice-4.3.0" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.2.0.tgz"; - sha512 = "HIjl5bofrrxMMF05K/nq83270EdvteuAIio44FWd6tDdfhgg4vbofiAuXRSpXFi335f5+ekKdrzvPZm9ahqzsg=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.0.tgz"; + sha512 = "BkQAMz4oVHjr0oOAz5PdeE72txlLQK7NIwzmclfr+b6fj6I8POwB+VoXvrZLTbWt9hWRgfvgiQRkh5JwrjPJ5A=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -47183,13 +47714,13 @@ let sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; }; }; - "vscode-languageserver-types-3.6.0" = { + "vscode-languageserver-types-3.16.0-next.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.6.0"; + version = "3.16.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0.tgz"; - sha512 = "GSgQtGmtza4PoNH0+iHWylWg/1sw2DODezqYWRxbN910dPchI3CQaSJN76csKcQGv55wsWgX82T6n74q8mFSpw=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz"; + sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; "vscode-nls-3.2.5" = { @@ -47489,6 +48020,15 @@ let sha1 = "7137946585c73fe44882013853bd000c5d687a4e"; }; }; + "web-namespaces-1.1.4" = { + name = "web-namespaces"; + packageName = "web-namespaces"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz"; + sha512 = "wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw=="; + }; + }; "web-push-3.4.3" = { name = "web-push"; packageName = "web-push"; @@ -47606,6 +48146,15 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; + "websocket-1.0.31" = { + name = "websocket"; + packageName = "websocket"; + version = "1.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz"; + sha512 = "VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ=="; + }; + }; "websocket-driver-0.6.5" = { name = "websocket-driver"; packageName = "websocket-driver"; @@ -47669,6 +48218,15 @@ let sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; }; }; + "whatwg-fetch-3.2.0" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz"; + sha512 = "SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w=="; + }; + }; "whatwg-mimetype-2.3.0" = { name = "whatwg-mimetype"; packageName = "whatwg-mimetype"; @@ -47696,13 +48254,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.0.0" = { + "whatwg-url-8.1.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.0.0.tgz"; - sha512 = "41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz"; + sha512 = "vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -47993,13 +48551,13 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "winston-2.4.4" = { + "winston-2.4.5" = { name = "winston"; packageName = "winston"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz"; - sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz"; + sha512 = "TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A=="; }; }; "winston-3.2.1" = { @@ -48011,13 +48569,22 @@ let sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw=="; }; }; - "winston-transport-4.3.0" = { + "winston-3.3.3" = { + name = "winston"; + packageName = "winston"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; + sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; + }; + }; + "winston-transport-4.4.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz"; - sha512 = "B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; + sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; }; }; "with-5.1.1" = { @@ -48146,6 +48713,15 @@ let sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; "wrap-fn-0.1.5" = { name = "wrap-fn"; packageName = "wrap-fn"; @@ -48308,13 +48884,13 @@ let sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="; }; }; - "ws-7.3.0" = { + "ws-7.3.1" = { name = "ws"; packageName = "ws"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz"; - sha512 = "iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w=="; + url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz"; + sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="; }; }; "x-default-browser-0.3.1" = { @@ -48335,15 +48911,6 @@ let sha1 = "de520171d47b3f416f5587d629b89d26b12dc29d"; }; }; - "x-is-function-1.0.4" = { - name = "x-is-function"; - packageName = "x-is-function"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz"; - sha1 = "5d294dc3d268cbdd062580e0c5df77a391d1fa1e"; - }; - }; "x-is-string-0.1.0" = { name = "x-is-string"; packageName = "x-is-string"; @@ -48596,6 +49163,15 @@ let sha512 = "yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="; }; }; + "xmldom-0.3.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz"; + sha512 = "z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="; + }; + }; "xmlhttprequest-1.8.0" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -48633,6 +49209,15 @@ let sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a"; }; }; + "xpath-0.0.27" = { + name = "xpath"; + packageName = "xpath"; + version = "0.0.27"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz"; + sha512 = "fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ=="; + }; + }; "xpath-0.0.5" = { name = "xpath"; packageName = "xpath"; @@ -48750,6 +49335,15 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; + "yaeti-0.0.6" = { + name = "yaeti"; + packageName = "yaeti"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz"; + sha1 = "f26f484d72684cf42bedfb76970aa1608fbf9577"; + }; + }; "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; @@ -48894,15 +49488,6 @@ let sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg=="; }; }; - "yargs-15.1.0" = { - name = "yargs"; - packageName = "yargs"; - version = "15.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz"; - sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg=="; - }; - }; "yargs-15.3.1" = { name = "yargs"; packageName = "yargs"; @@ -48912,6 +49497,15 @@ let sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; }; }; + "yargs-15.4.1" = { + name = "yargs"; + packageName = "yargs"; + version = "15.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; + sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -48957,15 +49551,6 @@ let sha512 = "huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g=="; }; }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; - }; - }; "yargs-parser-10.1.0" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -49002,15 +49587,6 @@ let sha512 = "0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw=="; }; }; - "yargs-parser-16.1.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "16.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz"; - sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg=="; - }; - }; "yargs-parser-18.1.3" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -49146,13 +49722,13 @@ let sha512 = "pLIhhU9z/G+kjOXmJ2bPFm3nejfbH+f1fjYRSOteEXDBrv1EoJE/e+kuHixSXfCYfTkxjYsvRaDX+1QykLCnpQ=="; }; }; - "yeoman-generator-4.10.1" = { + "yeoman-generator-4.11.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.10.1.tgz"; - sha512 = "QgbtHSaqBAkyJJM0heQUhT63ubCt34NBFMEBydOBUdAuy8RBvGSzeqVBSZOjdh1tSLrwWXlU3Ck6y14awinF6Q=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.11.0.tgz"; + sha512 = "++t6t2Z6HjL5F1/UM7+uNvGknKmQdF8tstJx8WKzsUSEpB+19kLVtapSfQIh9uWqm0L59fLWDzUui//WXoynPw=="; }; }; "yn-3.1.1" = { @@ -49287,23 +49863,23 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.9"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.9.tgz"; - sha512 = "k8C0OY3oHoixd3buCgF8+VFe8YZGSGiprnbVMEF2WJHUUw87lPCu/d7dbID3AtVwdKdAB275rAt6IZEIzXInbw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.2.tgz"; + sha512 = "L/uLUrZNIwbYzIeU9R3SC2hblDgtxP57msmRjoOQBpSzwlOME+z0wlCXPv+h9NOzNPvVVbEtLtjBgZxUw0IHzg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.9" - sources."@angular-devkit/core-9.1.9" - sources."@angular-devkit/schematics-9.1.9" - sources."@schematics/angular-9.1.9" - sources."@schematics/update-0.901.9" + sources."@angular-devkit/architect-0.1000.2" + sources."@angular-devkit/core-10.0.2" + sources."@angular-devkit/schematics-10.0.2" + sources."@schematics/angular-10.0.2" + sources."@schematics/update-0.1000.2" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -49323,7 +49899,9 @@ in sources."builtins-1.0.3" (sources."cacache-12.0.4" // { dependencies = [ + sources."lru-cache-5.1.1" sources."rimraf-2.7.1" + sources."yallist-3.1.1" ]; }) sources."caseless-0.12.0" @@ -49356,7 +49934,11 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" - sources."encoding-0.1.12" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) sources."end-of-stream-1.4.4" sources."err-code-1.1.2" sources."es-abstract-1.17.6" @@ -49389,7 +49971,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" - sources."hosted-git-info-3.0.4" + sources."hosted-git-info-3.0.5" sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-2.1.0" // { dependencies = [ @@ -49433,7 +50015,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" (sources."log-symbols-3.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -49444,15 +50026,24 @@ in sources."supports-color-5.5.0" ]; }) - sources."lru-cache-5.1.1" + sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - sources."make-fetch-happen-5.0.2" + (sources."make-fetch-happen-5.0.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" + (sources."minipass-2.9.0" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) sources."minizlib-1.3.3" sources."mississippi-3.0.0" sources."mkdirp-0.5.5" @@ -49475,12 +50066,14 @@ in sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.0.1" sources."npm-packlist-1.4.8" - sources."npm-pick-manifest-6.0.0" - (sources."npm-registry-fetch-4.0.4" // { + sources."npm-pick-manifest-6.1.0" + (sources."npm-registry-fetch-4.0.5" // { dependencies = [ sources."hosted-git-info-2.8.8" + sources."lru-cache-5.1.1" sources."npm-package-arg-6.1.1" sources."semver-5.7.1" + sources."yallist-3.1.1" ]; }) sources."oauth-sign-0.9.0" @@ -49490,18 +50083,20 @@ in sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."onetime-5.1.0" - sources."open-7.0.3" - sources."ora-4.0.3" + sources."open-7.0.4" + sources."ora-4.0.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" (sources."pacote-9.5.12" // { dependencies = [ sources."hosted-git-info-2.8.8" + sources."lru-cache-5.1.1" sources."npm-package-arg-6.1.1" sources."npm-pick-manifest-3.0.2" sources."rimraf-2.7.1" sources."semver-5.7.1" + sources."yallist-3.1.1" ]; }) sources."parallel-transform-1.2.0" @@ -49540,10 +50135,10 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.1.3" + sources."semver-7.3.2" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" @@ -49578,7 +50173,11 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.1.0" sources."symbol-observable-1.2.0" - sources."tar-4.4.13" + (sources."tar-4.4.13" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) sources."through-2.3.8" sources."through2-2.0.5" sources."tmp-0.0.33" @@ -49599,7 +50198,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."util-promisify-2.1.0" - sources."uuid-7.0.2" + sources."uuid-8.1.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -49608,7 +50207,7 @@ in sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-4.0.0" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -49724,7 +50323,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."commander-2.20.3" sources."concat-map-0.0.1" (sources."convert-source-map-1.7.0" // { dependencies = [ @@ -49852,7 +50450,7 @@ in sources."minimist-1.2.5" sources."minimisted-2.0.0" sources."multi-progress-2.0.0" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."now-and-later-2.0.1" @@ -49913,7 +50511,7 @@ in sources."stream-shift-1.0.1" sources."string_decoder-1.3.0" sources."through-2.3.8" - sources."through2-3.0.1" + sources."through2-3.0.2" (sources."through2-filter-3.0.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -49934,7 +50532,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -49974,10 +50572,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.10.0.tgz"; - sha512 = "EXO0Uvng3jrTDe/EtqjemKIH2vj8gc4Pe1+xi2L9gPWEM5Pi1o9YsqCu6SqlCzLCWqfY7LLILwhFuXnU0Acb8g=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.11.0.tgz"; + sha512 = "H/i+fpbf/W9c446Ud+bDSeoUv5pW03orTm3hwVs9TtCt6332He8PK/CHydFnY/uvMKAmWPG5m2DruWIe7f1XMg=="; }; dependencies = [ sources."abab-2.0.3" @@ -49985,7 +50583,7 @@ in sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" sources."agent-base-5.1.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -50019,7 +50617,7 @@ in sources."domexception-1.0.1" sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -50053,7 +50651,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" @@ -50083,7 +50681,7 @@ in sources."request-promise-native-1.0.8" sources."restore-cursor-2.0.0" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-3.1.11" @@ -50137,10 +50735,10 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.4.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.4.0.tgz"; - sha512 = "SMA9k8DWGeMXUhIJAtitG+l2a9IIH0mnsJX5kGhnI890G4yn3d1mFbUCA9rJ9qKc8MpSOEeSDsHzTykr1kUG1w=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.4.1.tgz"; + sha512 = "90IWWqDIPX3M0vwkmnZ0Ct/EY2b75DYbsw2ZbVxaj57ASdbajhS7Pxhc7MC/L+07nBge+xMRHvQRoKdcfWHd0w=="; }; dependencies = [ sources."@angular-devkit/core-9.1.9" @@ -50154,9 +50752,9 @@ in sources."inquirer-7.1.0" ]; }) - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -50172,11 +50770,11 @@ in sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" sources."@types/json5-0.0.29" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.9.2" // { + (sources."@types/uglify-js-3.9.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -50210,7 +50808,7 @@ in sources."acorn-6.4.1" sources."ajv-6.12.0" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.0" + sources."ajv-keywords-3.5.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -50243,7 +50841,7 @@ in }) sources."base64-js-1.3.1" sources."big.js-5.2.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.1.2" @@ -50419,7 +51017,7 @@ in sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-5.0.1" // { + (sources."fork-ts-checker-webpack-plugin-5.0.4" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -50496,7 +51094,7 @@ in sources."loader-runner-2.4.0" sources."loader-utils-1.4.0" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.toarray-4.4.0" (sources."log-symbols-3.0.0" // { dependencies = [ @@ -50504,7 +51102,7 @@ in ]; }) sources."lru-cache-5.1.1" - sources."macos-release-2.3.0" + sources."macos-release-2.4.0" sources."magic-string-0.25.7" sources."make-dir-2.1.0" sources."map-cache-0.2.2" @@ -50558,7 +51156,7 @@ in sources."mute-stream-0.0.8" sources."nan-2.14.1" sources."nanomatch-1.2.13" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-emoji-1.10.0" (sources."node-libs-browser-2.2.1" // { @@ -50770,7 +51368,7 @@ in sources."tty-browserify-0.0.0" sources."type-fest-0.11.0" sources."typedarray-0.0.6" - sources."typescript-3.9.5" + sources."typescript-3.9.6" sources."union-value-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -50855,17 +51453,17 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.4.tgz"; - sha512 = "52pXlikVdBiPlZqEBx+vFQCrTmPrP3aLLxE0Wue00yJacPXt8ph6cb1PhCwYQAY1N9ROQstVJlsrm3GOXpCfyw=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.6.tgz"; + sha512 = "IaLrnZ80BrBLPAkBup8bn363S1NHfNf8jfCJLWoXad598cUm6byMqntWtDFeTq0c3KohXcsIbT+nqLc5S9vz0w=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.16.2" + sources."@apollo/federation-0.17.0" (sources."@apollo/protobufjs-1.0.4" // { dependencies = [ - sources."@types/node-10.17.26" + sources."@types/node-10.17.27" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -50874,59 +51472,116 @@ in sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" - sources."@babel/code-frame-7.10.1" - (sources."@babel/core-7.10.2" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."@babel/generator-7.10.2" - sources."@babel/helper-create-class-features-plugin-7.10.2" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" - sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-plugin-utils-7.10.1" - sources."@babel/helper-replace-supers-7.10.1" - sources."@babel/helper-simple-access-7.10.1" - sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/plugin-proposal-class-properties-7.10.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" - sources."@babel/plugin-proposal-optional-chaining-7.10.1" - sources."@babel/plugin-syntax-flow-7.10.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/compat-data-7.10.4" + sources."@babel/core-7.10.4" + sources."@babel/generator-7.10.4" + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" + sources."@babel/helper-compilation-targets-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.10.4" + sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-define-map-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-hoist-variables-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-regex-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helpers-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.10.4" + sources."@babel/plugin-proposal-async-generator-functions-7.10.4" + sources."@babel/plugin-proposal-class-properties-7.10.4" + sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" + sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-private-methods-7.10.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-flow-7.10.4" + sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-typescript-7.10.1" - sources."@babel/plugin-transform-flow-strip-types-7.10.1" - sources."@babel/plugin-transform-modules-commonjs-7.10.1" - sources."@babel/plugin-transform-typescript-7.10.1" - sources."@babel/preset-flow-7.10.1" - sources."@babel/preset-typescript-7.10.1" - (sources."@babel/register-7.10.1" // { + sources."@babel/plugin-syntax-top-level-await-7.10.4" + sources."@babel/plugin-syntax-typescript-7.10.4" + sources."@babel/plugin-transform-arrow-functions-7.10.4" + sources."@babel/plugin-transform-async-to-generator-7.10.4" + sources."@babel/plugin-transform-block-scoped-functions-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.10.4" + sources."@babel/plugin-transform-classes-7.10.4" + sources."@babel/plugin-transform-computed-properties-7.10.4" + sources."@babel/plugin-transform-destructuring-7.10.4" + sources."@babel/plugin-transform-dotall-regex-7.10.4" + sources."@babel/plugin-transform-duplicate-keys-7.10.4" + sources."@babel/plugin-transform-exponentiation-operator-7.10.4" + sources."@babel/plugin-transform-flow-strip-types-7.10.4" + sources."@babel/plugin-transform-for-of-7.10.4" + sources."@babel/plugin-transform-function-name-7.10.4" + sources."@babel/plugin-transform-literals-7.10.4" + sources."@babel/plugin-transform-member-expression-literals-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.4" + sources."@babel/plugin-transform-modules-commonjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.4" + sources."@babel/plugin-transform-modules-umd-7.10.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" + sources."@babel/plugin-transform-new-target-7.10.4" + sources."@babel/plugin-transform-object-super-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.4" + sources."@babel/plugin-transform-property-literals-7.10.4" + sources."@babel/plugin-transform-regenerator-7.10.4" + sources."@babel/plugin-transform-reserved-words-7.10.4" + sources."@babel/plugin-transform-shorthand-properties-7.10.4" + sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-sticky-regex-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.4" + sources."@babel/plugin-transform-typeof-symbol-7.10.4" + sources."@babel/plugin-transform-typescript-7.10.4" + sources."@babel/plugin-transform-unicode-escapes-7.10.4" + sources."@babel/plugin-transform-unicode-regex-7.10.4" + sources."@babel/preset-env-7.10.4" + sources."@babel/preset-flow-7.10.4" + sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-typescript-7.10.4" + (sources."@babel/register-7.10.4" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" - sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" - sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" + sources."@babel/runtime-7.10.4" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.10.4" + sources."@babel/types-7.10.4" + sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" (sources."@oclif/color-0.1.2" // { dependencies = [ (sources."chalk-3.0.0" // { @@ -50941,19 +51596,30 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/command-1.6.1" // { + (sources."@oclif/command-1.7.0" // { dependencies = [ sources."@oclif/plugin-help-3.1.0" - sources."semver-5.7.1" sources."strip-ansi-5.2.0" ]; }) - sources."@oclif/config-1.15.1" - (sources."@oclif/errors-1.2.2" // { + (sources."@oclif/config-1.16.0" // { dependencies = [ - sources."clean-stack-1.3.0" - sources."indent-string-3.2.0" - sources."strip-ansi-5.2.0" + sources."globby-11.0.1" + sources."is-wsl-2.2.0" + ]; + }) + (sources."@oclif/errors-1.3.3" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."clean-stack-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."escape-string-regexp-4.0.0" + sources."fs-extra-9.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -50968,23 +51634,18 @@ in dependencies = [ sources."cli-ux-4.9.3" sources."indent-string-3.2.0" - sources."semver-5.7.1" sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/plugin-plugins-1.7.9" // { + (sources."@oclif/plugin-plugins-1.9.0" // { dependencies = [ - sources."@oclif/color-0.0.0" sources."npm-run-path-3.1.0" sources."path-key-3.1.1" - sources."semver-5.7.1" - ]; - }) - (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { - dependencies = [ - sources."semver-5.7.1" + sources."semver-7.3.2" + sources."tslib-2.0.0" ]; }) + sources."@oclif/plugin-warn-if-update-available-1.7.0" sources."@oclif/screen-1.0.4" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -51006,9 +51667,9 @@ in sources."@types/cookies-0.7.4" sources."@types/cors-2.8.6" sources."@types/express-4.17.4" - sources."@types/express-serve-static-core-4.17.7" + sources."@types/express-serve-static-core-4.17.8" sources."@types/fs-capacitor-2.0.0" - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/graphql-upload-8.0.3" sources."@types/http-assert-1.5.1" sources."@types/keygrip-1.0.2" @@ -51017,7 +51678,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -51027,22 +51688,26 @@ in sources."@types/qs-6.9.3" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.4" - sources."@types/ws-7.2.5" + sources."@types/ws-7.2.6" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.4.4" - (sources."@vue/cli-ui-4.4.4" // { + (sources."@vue/cli-shared-utils-4.4.6" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."@vue/cli-ui-4.4.6" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.4.4" - sources."@vue/cli-ui-addon-widgets-4.4.4" + sources."@vue/cli-ui-addon-webpack-4.4.6" + sources."@vue/cli-ui-addon-widgets-4.4.6" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.0.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -51057,38 +51722,63 @@ in sources."any-observable-0.3.0" (sources."anymatch-2.0.0" // { dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-extendable-1.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" sources."normalize-path-2.1.1" + sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.28.3" // { + (sources."apollo-2.29.1" // { dependencies = [ + sources."apollo-graphql-0.5.0" + sources."graphql-tag-2.10.3" sources."strip-ansi-5.2.0" ]; }) sources."apollo-cache-1.3.5" - sources."apollo-cache-control-0.11.0" + sources."apollo-cache-control-0.11.1" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.37.3" // { + (sources."apollo-codegen-core-0.37.5" // { dependencies = [ sources."recast-0.19.1" sources."source-map-0.6.1" ]; }) - sources."apollo-codegen-flow-0.35.3" - sources."apollo-codegen-scala-0.36.3" - sources."apollo-codegen-swift-0.37.3" - sources."apollo-codegen-typescript-0.37.3" - sources."apollo-datasource-0.7.1" - (sources."apollo-engine-reporting-2.2.0" // { + sources."apollo-codegen-flow-0.35.5" + sources."apollo-codegen-scala-0.36.5" + sources."apollo-codegen-swift-0.37.5" + sources."apollo-codegen-typescript-0.37.5" + sources."apollo-datasource-0.7.2" + (sources."apollo-engine-reporting-2.2.1" // { dependencies = [ - sources."uuid-8.1.0" + sources."uuid-8.2.0" ]; }) - sources."apollo-engine-reporting-protobuf-0.5.1" + sources."apollo-engine-reporting-protobuf-0.5.2" sources."apollo-env-0.6.5" sources."apollo-graphql-0.4.5" - sources."apollo-language-server-1.22.3" + (sources."apollo-language-server-1.23.1" // { + dependencies = [ + sources."apollo-graphql-0.5.0" + ]; + }) sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -51097,14 +51787,14 @@ in sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" - sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.15.0" - sources."apollo-server-env-2.4.4" - sources."apollo-server-errors-2.4.1" - sources."apollo-server-express-2.15.0" - sources."apollo-server-plugin-base-0.9.0" - sources."apollo-server-types-0.5.0" - sources."apollo-tracing-0.11.0" + sources."apollo-server-caching-0.5.2" + sources."apollo-server-core-2.15.1" + sources."apollo-server-env-2.4.5" + sources."apollo-server-errors-2.4.2" + sources."apollo-server-express-2.15.1" + sources."apollo-server-plugin-base-0.9.1" + sources."apollo-server-types-0.5.1" + sources."apollo-tracing-0.11.1" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -51118,7 +51808,7 @@ in sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-flatten-1.1.1" - sources."array-union-1.0.2" + sources."array-union-2.1.0" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-2.0.1" @@ -51132,6 +51822,7 @@ in sources."async-limiter-1.0.1" sources."async-retry-1.3.1" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."await-to-js-2.1.1" sources."aws-sign2-0.7.0" @@ -51156,6 +51847,7 @@ in sources."http-errors-1.7.2" sources."inherits-2.0.3" sources."qs-6.7.0" + sources."setprototypeof-1.1.1" ]; }) sources."boolbase-1.0.0" @@ -51189,7 +51881,8 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."braces-2.3.2" + sources."braces-3.0.2" + sources."browserslist-4.13.0" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -51214,17 +51907,32 @@ in sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" - sources."camel-case-3.0.0" + sources."camel-case-4.1.1" sources."camelcase-4.1.0" + sources."caniuse-lite-1.0.30001099" + sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" - sources."change-case-3.1.0" + sources."change-case-4.1.1" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" - sources."chokidar-2.1.8" + (sources."chokidar-2.1.8" // { + dependencies = [ + sources."braces-2.3.2" + sources."fill-range-4.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."to-regex-range-2.1.1" + ]; + }) sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -51262,18 +51970,38 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."cli-ux-5.4.6" // { + (sources."cli-ux-5.4.9" // { dependencies = [ sources."ansi-escapes-4.3.1" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."clean-stack-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."semver-5.7.1" - sources."strip-ansi-5.2.0" + sources."emoji-regex-8.0.0" + sources."escape-string-regexp-4.0.0" + sources."extract-stack-2.0.0" + sources."fs-extra-9.0.1" + sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."is-wsl-2.2.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + sources."supports-color-7.1.0" + sources."tslib-2.0.0" sources."type-fest-0.11.0" ]; }) - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."clipboard-2.0.6" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -51291,7 +52019,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."configstore-3.1.2" - sources."constant-case-2.0.0" + sources."constant-case-3.0.3" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -51307,6 +52035,11 @@ in sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" sources."core-js-3.6.5" + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cosmiconfig-5.2.1" // { @@ -51315,11 +52048,7 @@ in ]; }) sources."create-error-class-3.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -51375,12 +52104,12 @@ in sources."detect-indent-6.0.0" sources."dicer-0.3.0" sources."diff-4.0.2" - sources."dir-glob-2.2.2" + sources."dir-glob-3.0.1" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."dot-case-2.1.1" + sources."dot-case-3.0.3" sources."dot-prop-4.2.0" sources."dotenv-8.2.0" (sources."download-7.1.0" // { @@ -51398,6 +52127,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" + sources."electron-to-chromium-1.3.497" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -51408,10 +52138,12 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" + sources."escalade-3.0.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" sources."esprima-4.0.1" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-pubsub-4.3.0" sources."eventemitter3-3.1.2" @@ -51441,6 +52173,7 @@ in sources."debug-2.6.9" sources."qs-6.7.0" sources."safe-buffer-5.1.2" + sources."setprototypeof-1.1.1" ]; }) sources."express-history-api-fallback-2.2.1" @@ -51458,16 +52191,17 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-2.2.7" + sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.8.0" sources."fd-slicer-1.1.0" sources."figures-1.7.0" sources."file-type-8.1.0" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" - sources."fill-range-4.0.0" + sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -51477,12 +52211,11 @@ in dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" - sources."semver-5.7.1" ]; }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.127.0" + sources."flow-parser-0.129.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -51493,7 +52226,12 @@ in sources."fs-capacitor-2.0.4" sources."fs-constants-1.0.0" sources."fs-exists-sync-0.1.0" - sources."fs-extra-7.0.1" + (sources."fs-extra-7.0.1" // { + dependencies = [ + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."fswin-2.17.1227" @@ -51517,18 +52255,42 @@ in sources."git-up-4.0.1" sources."git-url-parse-11.1.2" sources."glob-7.1.5" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" sources."globals-11.12.0" (sources."globby-9.2.0" // { dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."dir-glob-2.2.2" + sources."extend-shallow-3.0.2" + sources."fast-glob-2.2.7" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."glob-parent-3.1.0" + sources."ignore-4.0.6" + sources."is-extendable-1.0.1" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."pify-4.0.1" sources."slash-2.0.0" + sources."to-regex-range-2.1.1" ]; }) sources."globule-1.3.2" @@ -51540,15 +52302,15 @@ in }) sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" - sources."graphql-14.6.0" + sources."graphql-14.7.0" (sources."graphql-anywhere-4.2.7" // { dependencies = [ sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.12.3" + sources."graphql-extensions-0.12.4" sources."graphql-subscriptions-1.1.0" - sources."graphql-tag-2.10.3" + sources."graphql-tag-2.10.4" sources."graphql-tools-4.0.8" sources."graphql-type-json-0.3.2" sources."graphql-upload-8.1.0" @@ -51568,12 +52330,17 @@ in sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."kind-of-4.0.0" ]; }) sources."hash.js-1.1.7" sources."he-1.2.0" - sources."header-case-1.0.1" + sources."header-case-2.0.3" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.8" (sources."htmlparser2-3.10.1" // { @@ -51588,13 +52355,13 @@ in sources."parse-json-4.0.0" ]; }) - sources."http-errors-1.7.3" + sources."http-errors-1.8.0" sources."http-signature-1.2.0" sources."human-signals-1.1.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."ignore-4.0.6" + sources."ignore-5.1.8" sources."ignore-by-default-1.0.1" sources."import-fresh-2.0.0" sources."import-global-0.1.0" @@ -51605,11 +52372,11 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.2.0" // { + (sources."inquirer-7.3.2" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -51627,6 +52394,7 @@ in }) sources."interpret-1.4.0" sources."into-stream-2.0.1" + sources."invariant-2.2.4" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -51644,14 +52412,9 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" - sources."is-lower-case-1.1.3" sources."is-natural-number-4.0.1" sources."is-npm-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-obj-1.0.1" sources."is-object-1.0.1" sources."is-observable-1.1.0" @@ -51667,7 +52430,6 @@ in sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" - sources."is-upper-case-1.1.2" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" @@ -51684,7 +52446,26 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jscodeshift-0.9.0" + (sources."jscodeshift-0.10.0" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-extendable-1.0.1" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" @@ -51692,13 +52473,14 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-2.1.3" - sources."jsonfile-4.0.0" + sources."jsonfile-6.0.1" sources."jsprim-1.4.1" sources."keyv-3.0.0" sources."kind-of-6.0.3" sources."latest-version-3.1.0" sources."launch-editor-2.2.1" sources."leven-3.1.0" + sources."levenary-1.1.1" sources."lines-and-columns-1.1.6" sources."listr-0.14.3" sources."listr-silent-renderer-1.1.1" @@ -51726,7 +52508,7 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" @@ -51749,9 +52531,9 @@ in }) sources."loglevel-1.6.8" sources."long-4.0.0" + sources."loose-envify-1.4.0" sources."lowdb-1.0.0" - sources."lower-case-1.1.4" - sources."lower-case-first-1.0.2" + sources."lower-case-2.0.1" sources."lowercase-keys-1.0.1" (sources."lru-cache-5.1.1" // { dependencies = [ @@ -51768,12 +52550,7 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - (sources."micromatch-3.1.10" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) + sources."micromatch-4.0.2" sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" @@ -51788,7 +52565,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-2.14.1" @@ -51807,9 +52584,9 @@ in ]; }) sources."negotiator-0.6.2" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."no-case-2.3.2" + sources."no-case-3.0.3" sources."node-dir-0.1.17" sources."node-fetch-2.6.0" sources."node-ipc-9.1.1" @@ -51817,21 +52594,18 @@ in (sources."node-notifier-6.0.0" // { dependencies = [ sources."is-wsl-2.2.0" + sources."semver-6.3.0" ]; }) + sources."node-releases-1.1.59" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."semver-5.7.1" ]; }) sources."nopt-1.0.10" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."npm-conf-1.1.3" @@ -51856,7 +52630,7 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-path-0.11.4" - sources."object-treeify-1.1.25" + sources."object-treeify-1.1.26" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" @@ -51881,12 +52655,8 @@ in sources."p-map-2.1.0" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - (sources."package-json-4.0.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."param-case-2.1.1" + sources."package-json-4.0.1" + sources."param-case-3.0.3" sources."parse-git-config-2.0.3" sources."parse-json-5.0.0" sources."parse-passwd-1.0.0" @@ -51894,10 +52664,10 @@ in sources."parse-url-5.0.1" sources."parse5-3.0.3" sources."parseurl-1.3.3" - sources."pascal-case-2.0.1" + sources."pascal-case-3.1.1" sources."pascalcase-0.1.1" sources."password-prompt-1.1.2" - sources."path-case-2.1.1" + sources."path-case-3.0.3" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -51905,9 +52675,10 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" - sources."path-type-3.0.0" + sources."path-type-4.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" + sources."picomatch-2.2.2" (sources."pid-from-port-1.1.3" // { dependencies = [ sources."cross-spawn-5.1.0" @@ -51949,6 +52720,7 @@ in dependencies = [ sources."http-errors-1.7.2" sources."inherits-2.0.3" + sources."setprototypeof-1.1.1" ]; }) sources."rc-1.2.8" @@ -51958,7 +52730,26 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."readdirp-2.2.1" + (sources."readdirp-2.2.1" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-extendable-1.0.1" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) (sources."recast-0.18.10" // { dependencies = [ sources."source-map-0.6.1" @@ -51966,21 +52757,29 @@ in }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" + sources."regenerate-1.4.1" + sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" + sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" sources."is-extendable-1.0.1" ]; }) + sources."regexpu-core-4.7.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.2" - sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -51988,10 +52787,12 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" + sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."rss-parser-3.8.0" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."run-parallel-1.1.9" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -52003,12 +52804,8 @@ in ]; }) sources."select-1.1.2" - sources."semver-6.3.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."semver-5.7.1" + sources."semver-diff-2.1.0" (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { @@ -52016,13 +52813,15 @@ in sources."ms-2.0.0" ]; }) + sources."http-errors-1.7.3" sources."ms-2.1.1" + sources."setprototypeof-1.1.1" ]; }) - sources."sentence-case-2.1.1" + sources."sentence-case-3.0.3" sources."serve-static-1.14.1" sources."set-value-2.0.1" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -52033,7 +52832,7 @@ in sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."slice-ansi-0.0.4" - sources."snake-case-2.1.0" + sources."snake-case-3.0.3" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -52103,7 +52902,6 @@ in ]; }) sources."statuses-1.5.0" - sources."stealthy-require-1.1.1" sources."steno-0.4.4" sources."streamsearch-0.1.2" sources."strict-uri-encode-1.1.0" @@ -52130,7 +52928,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - (sources."subscriptions-transport-ws-0.9.16" // { + (sources."subscriptions-transport-ws-0.9.17" // { dependencies = [ sources."ws-5.2.2" ]; @@ -52141,7 +52939,6 @@ in sources."has-flag-2.0.0" ]; }) - sources."swap-case-1.1.2" sources."symbol-observable-1.2.0" (sources."table-5.4.6" // { dependencies = [ @@ -52187,7 +52984,6 @@ in sources."through2-2.0.5" sources."timed-out-4.0.1" sources."tiny-emitter-2.1.0" - sources."title-case-2.1.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."to-fast-properties-2.0.0" @@ -52202,7 +52998,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."to-regex-range-2.1.1" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."touch-3.1.0" sources."tough-cookie-2.5.0" @@ -52216,16 +53012,20 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.6.0" sources."type-is-1.6.18" - sources."typescript-3.9.5" + sources."typescript-3.9.6" sources."unbzip2-stream-1.4.3" (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" ]; }) + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" sources."unique-string-1.0.0" - sources."universalify-0.1.2" + sources."universalify-1.0.0" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -52247,8 +53047,8 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."upper-case-1.1.3" - sources."upper-case-first-1.1.2" + sources."upper-case-2.0.1" + sources."upper-case-first-2.0.1" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" @@ -52275,6 +53075,7 @@ in sources."fs-extra-8.1.0" sources."get-stream-5.1.0" sources."is-stream-2.0.0" + sources."jsonfile-4.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" sources."onetime-5.1.0" @@ -52282,6 +53083,7 @@ in sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."universalify-0.1.2" sources."which-2.0.2" ]; }) @@ -52463,13 +53265,13 @@ in sha512 = "O+nGHNGmkxo6g0X8BgsN5pSTi+iaYJ0noo28Vwwqgugdelcy6FNZmGWXR68KDQdnMXSjwD3eQVJTz21PCN9Qng=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/generator-7.10.2" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/code-frame-7.10.4" + sources."@babel/generator-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.10.4" + sources."@babel/template-7.10.4" + sources."@babel/types-7.10.4" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -52494,7 +53296,7 @@ in sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."source-map-0.5.7" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" @@ -52548,33 +53350,33 @@ in sha512 = "M+DxWKG35yfUrJj58i6ohTrf8EaRkk9mFj/QSXxUvmqsyYrBmpQT1RnITzk7HY0QVxW1Oiw9zjxGVrQeozJL/w=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - (sources."@babel/core-7.10.2" // { + sources."@babel/code-frame-7.10.4" + (sources."@babel/core-7.10.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.2" // { + (sources."@babel/generator-7.10.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" - sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-replace-supers-7.10.1" - sources."@babel/helper-simple-access-7.10.1" - sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helpers-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.10.4" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.10.4" + sources."@babel/types-7.10.4" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -52622,7 +53424,7 @@ in sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."matcher-collection-1.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -52673,9 +53475,9 @@ in sha512 = "k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw=="; }; dependencies = [ - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -52717,7 +53519,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -52745,7 +53547,7 @@ in sources."delayed-stream-1.0.0" sources."domexception-1.0.1" sources."ecc-jsbn-0.1.2" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -52777,7 +53579,7 @@ in sources."jsprim-1.4.1" sources."left-pad-1.3.0" sources."levn-0.3.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.sortby-4.7.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" @@ -53218,10 +54020,10 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.12" + sources."@types/node-13.13.14" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -53459,7 +54261,7 @@ in sources."plist-3.0.1" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" - sources."protobufjs-6.9.0" + sources."protobufjs-6.10.0" sources."psl-1.8.0" (sources."pump-0.3.5" // { dependencies = [ @@ -53649,10 +54451,10 @@ in coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.3.tgz"; - sha512 = "6/JhWv31agvUvcUVKewpJ0z+A8ZMrRXPNNy+YohNausiw7nqKnBSnLIO0II0hXgjdAryoSGnBC/NjH7Q5P0IDw=="; + url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.4.tgz"; + sha512 = "SvYsSjLJHHESTORGLsPI/QPiA5zB2z+cC9eaJ638yhh6qTZIwFHM0p5v1ZfflK+FUdJgiDz87oyWnUKVP1wZ7Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -53666,10 +54468,10 @@ in coc-emmet = nodeEnv.buildNodePackage { name = "coc-emmet"; packageName = "coc-emmet"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-emmet/-/coc-emmet-1.1.4.tgz"; - sha512 = "hxpldh4WYgq7JOQeAynEy+uM2M12RnxTlmY3cCDpZrkCJGZwz4BRYseXhuwieaFiut0OzqBEtWIcZLLrzROKMA=="; + url = "https://registry.npmjs.org/coc-emmet/-/coc-emmet-1.1.6.tgz"; + sha512 = "lvHA9iSgU/46Iw7E14tSP+Hh1e6STYUegqTBGDPQ/9L9JOicE2USqwuo2y5cbslc2RQqv3EdUIr9nQf0T725mQ=="; }; dependencies = [ sources."@emmetio/extract-abbreviation-0.1.6" @@ -53706,10 +54508,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.7.15"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.15.tgz"; - sha512 = "R2h5x0j9FLlGZLEMlEnvoIors0b10yC2eBYkyYlwEFavWZn9DXwpnL3r2p6VUKNY02pwEyTGY0L5ffnPFZsUWA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.8.0.tgz"; + sha512 = "uEoTWDBXyNROUbVVxHOwedAGrN7Liy8VUgLZnU52BH6h15bFA9XwcwW7o+gAbRhH5u+Vg29npQSJkXJKNC1C0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -53724,10 +54526,10 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.8.0"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.8.0.tgz"; - sha512 = "PMMybjPvAT+gGZDRaTmq1rIe59JsG9WRWWzVlT3gRo/Zp5Xwg2ho424m65ubGgre/UU23D9LVH9FLZDU4NH2Gg=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.9.1.tgz"; + sha512 = "4a7LdxkDtSHXrH41jKJ8ENePXQCuKclrUoiPDe9uuOmj00jbGYSLnksGJxBLHl2cOPslfq5JooTrakp8AGrwfg=="; }; dependencies = [ sources."isexe-2.0.0" @@ -53770,7 +54572,7 @@ in sha512 = "gr0GBKeew88n8hcn4fkzIcBruhih7YAqBd7ldsYjoG2qZhjPEj/arYESFOYgooX1jYuxCpQYH526EXXzs4BGRQ=="; }; dependencies = [ - sources."typescript-3.9.5" + sources."typescript-3.9.6" ]; buildInputs = globalBuildInputs; meta = { @@ -53873,13 +54675,12 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.8.3"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.8.3.tgz"; - sha512 = "DfDQbgbnau8CvTa1uEkYuZnMSaOqnQDvNxbwRi24q3t8z/DwMwEubon/lITGM02CkQH5PnfhE5fJYxt6/Q1wvA=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.0.tgz"; + sha512 = "rQPCK+x+/Aij/YqjGTIS5c5WA3dPba2RwubGouXSRkl8+F1I4NyAXiXtHAx2V4W1LYvmjd990i6Dtzr3JLx+5A=="; }; dependencies = [ - sources."@babel/runtime-7.10.2" sources."@chemzqm/neovim-5.1.9" sources."async-2.6.3" sources."await-semaphore-0.1.3" @@ -53898,7 +54699,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.12.1" - sources."fp-ts-2.6.6" + sources."fp-ts-2.7.0" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" @@ -53912,16 +54713,16 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isuri-2.0.3" - sources."jsonc-parser-2.2.1" + sources."jsonc-parser-2.3.0" sources."jsonfile-4.0.0" (sources."locate-java-home-1.1.2" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."log4js-5.3.0" - (sources."metals-languageclient-0.2.2" // { + (sources."metals-languageclient-0.2.7" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.2" @@ -53945,9 +54746,8 @@ in sources."node-int64-0.4.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."promisify-child-process-3.1.4" + sources."promisify-child-process-4.1.1" sources."rc-1.2.8" - sources."regenerator-runtime-0.13.5" sources."rfc-3986-1.0.1" sources."rfdc-1.1.4" sources."rimraf-3.0.2" @@ -53999,27 +54799,29 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.14"; + version = "1.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.14.tgz"; - sha512 = "NMc/nWUPigKq4rLAvgEOKxTDFkLbp6waK0K3M2V+oZfsJxUrJ4LPEA6yP/DY1RO7trnVCHsTtjYWT+1PauGqkQ=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.17.tgz"; + sha512 = "KwHA9HvRs4W6OKd+aVa7/R2YzyVSogWpPUVX8wJ8vBEp5U2VHqfjwhyvN9BFEo1FEkyigXG6DI44jtq47eE5YQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/json-schema-7.0.5" - sources."@typescript-eslint/experimental-utils-3.3.0" - sources."@typescript-eslint/parser-3.3.0" - sources."@typescript-eslint/typescript-estree-3.3.0" + sources."@typescript-eslint/experimental-utils-3.6.1" + sources."@typescript-eslint/parser-3.6.1" + sources."@typescript-eslint/types-3.6.1" + sources."@typescript-eslint/typescript-estree-3.6.1" + sources."@typescript-eslint/visitor-keys-3.6.1" sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.2" - sources."ajv-keywords-3.5.0" + sources."ajv-6.12.3" + sources."ajv-keywords-3.5.1" (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -54078,7 +54880,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001084" + sources."caniuse-lite-1.0.30001099" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -54109,7 +54911,7 @@ in }) sources."cli-boxes-1.0.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" (sources."cliui-4.1.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -54135,6 +54937,7 @@ in ]; }) sources."copy-descriptor-0.1.1" + sources."core-js-3.6.5" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -54174,7 +54977,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.478" + sources."electron-to-chromium-1.3.497" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54188,7 +54991,7 @@ in }) sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -54352,10 +55155,10 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.2.0" // { + (sources."inquirer-7.3.2" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -54420,7 +55223,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-base64-2.6.0" + sources."js-base64-2.6.3" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-parse-better-errors-1.0.2" @@ -54438,7 +55241,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.merge-4.6.2" sources."log-symbols-2.2.0" sources."loglevel-1.6.8" @@ -54690,7 +55493,7 @@ in sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -54790,7 +55593,7 @@ in sources."get-stdin-4.0.1" ]; }) - sources."strip-json-comments-3.1.0" + sources."strip-json-comments-3.1.1" sources."style-search-0.1.0" (sources."stylelint-8.4.0" // { dependencies = [ @@ -54861,7 +55664,7 @@ in sources."tsutils-3.17.1" sources."type-check-0.3.2" sources."type-fest-0.8.1" - sources."typescript-3.9.5" + sources."typescript-3.9.6" sources."unherit-1.1.3" sources."unified-6.2.0" sources."union-value-1.0.1" @@ -55004,10 +55807,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.4"; + version = "0.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.4.tgz"; - sha512 = "3ApE/UFqUBLW0bhS2dTLp2tBkbGtEByCDrS9Orz1Aaz22QD7mXoeo/ihbByo8HvLp+QOevYrrWbN5dQZ2OJB9A=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.12.tgz"; + sha512 = "J+NXI2biHfi3EXAYLxi35bSMdZl7C11BUs5ur3jS5ToycxkpJeN+LQZ2VPgEQgMJswcWsL/pKC3n3hsQkF+46A=="; }; buildInputs = globalBuildInputs; meta = { @@ -55080,34 +55883,34 @@ in sha512 = "+dVV5p9OBXyBGKFPQAS5a1SFvikSbYtYXyzPCkvYqYAqDiJlmFVEyi1aP+FI17Y/094u7mFeDQJlSd7IXVgO7w=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/core-7.10.2" - sources."@babel/generator-7.10.2" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" - sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-replace-supers-7.10.1" - sources."@babel/helper-simple-access-7.10.1" - sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/code-frame-7.10.4" + sources."@babel/core-7.10.4" + sources."@babel/generator-7.10.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helpers-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.10.4" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.10.4" + sources."@babel/types-7.10.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -55128,7 +55931,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."atob-2.1.2" - (sources."autoprefixer-9.8.0" // { + (sources."autoprefixer-9.8.5" // { dependencies = [ sources."postcss-value-parser-4.1.0" ]; @@ -55146,7 +55949,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.12.0" + sources."browserslist-4.13.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -55154,7 +55957,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001084" + sources."caniuse-lite-1.0.30001099" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -55183,6 +55986,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colorette-1.2.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."convert-source-map-1.7.0" // { @@ -55213,10 +56017,11 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.478" + sources."electron-to-chromium-1.3.497" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" + sources."escalade-3.0.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."execall-2.0.0" @@ -55362,7 +56167,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."log-symbols-3.0.0" sources."longest-streak-2.0.4" sources."loud-rejection-1.6.0" @@ -55394,7 +56199,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."nanomatch-1.2.13" - sources."node-releases-1.1.58" + sources."node-releases-1.1.59" sources."normalize-package-data-2.5.0" sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" @@ -55432,7 +56237,6 @@ in }) sources."picomatch-2.2.2" sources."pify-4.0.1" - sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { dependencies = [ @@ -55673,9 +56477,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" @@ -55709,7 +56513,7 @@ in sources."tslib-1.13.0" sources."tslint-5.20.1" sources."tsutils-2.29.0" - sources."typescript-3.9.5" + sources."typescript-3.9.6" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -55758,13 +56562,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.1.tgz"; - sha512 = "33mkWOHgvB7hS/mfhCt4PfHAepnLQaTMvvsCWN3daks7yYnOdeMFplD5UORRRvvcJoOEdQBtXXu960I/Xe4MCg=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.3.tgz"; + sha512 = "8izLeNvlIted2ilje94KmEh/yGX4pTHajWuPBjP9GeM4JZI0RK7VS+SlkRSJB6IjJkubs7VvTnp3ahVYJecZvw=="; }; dependencies = [ - sources."typescript-3.8.3" + sources."typescript-3.9.5" ]; buildInputs = globalBuildInputs; meta = { @@ -55779,15 +56583,15 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.10"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.10.tgz"; - sha512 = "dMTBF4NbJ2Rqnh2Lj2Jafi9Fl6gJjHH20fNyztA6DvJ9qEOZgpiXIE2yGznszAHBvJyvoVDE4+qE6Qz5sm3FpA=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.11.tgz"; + sha512 = "a1yV0MtIe6uV0hIhIVUonFTqrykV5wmio8NRlIPYxYgmYq05t0glBK1P8AOPkHi9o4K0kJB4XGLiOJXnTOBNig=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" (sources."@nodelib/fs.scandir-2.1.3" // { @@ -55812,11 +56616,11 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -55840,7 +56644,7 @@ in sources."indent-string-4.0.0" ]; }) - sources."ajv-6.12.2" + sources."ajv-6.12.3" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -55877,7 +56681,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bootstrap-vue-helper-json-1.1.1" (sources."boxen-3.2.0" // { dependencies = [ @@ -55944,7 +56748,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."cliui-4.1.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -55978,9 +56782,9 @@ in ]; }) sources."css-parse-2.0.0" - sources."csstype-2.6.10" + sources."csstype-2.6.11" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-3.2.6" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -56049,16 +56853,17 @@ in sources."semver-5.7.1" ]; }) + sources."debug-4.2.0" sources."ignore-4.0.6" sources."semver-6.3.0" sources."strip-ansi-5.2.0" - sources."strip-json-comments-3.1.0" + sources."strip-json-comments-3.1.1" ]; }) sources."eslint-plugin-vue-6.2.2" sources."eslint-scope-5.1.0" sources."eslint-utils-1.4.3" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -56174,14 +56979,14 @@ in sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.3" + sources."hast-util-is-body-ok-link-1.0.4" sources."hast-util-is-element-1.0.4" sources."hast-util-parse-selector-2.2.4" - sources."hast-util-to-string-1.0.3" + sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" sources."hosted-git-info-2.8.8" sources."html-void-elements-1.0.5" - sources."html-whitespace-sensitive-tag-names-1.0.2" + sources."html-whitespace-sensitive-tag-names-1.0.3" sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" @@ -56196,11 +57001,11 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.2.0" // { + (sources."inquirer-7.3.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" @@ -56272,7 +57077,7 @@ in sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.iteratee-4.7.0" @@ -56417,8 +57222,9 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."cli-cursor-2.1.0" + sources."cli-width-2.2.1" sources."cross-spawn-6.0.5" - sources."debug-3.2.6" + sources."debug-4.2.0" sources."eslint-5.16.0" sources."eslint-scope-4.0.3" sources."espree-5.0.1" @@ -56435,6 +57241,7 @@ in (sources."vue-eslint-parser-2.0.3" // { dependencies = [ sources."acorn-5.7.4" + sources."debug-3.2.6" sources."eslint-scope-3.7.3" sources."espree-3.5.4" ]; @@ -56475,7 +57282,7 @@ in sources."redent-2.0.0" sources."regex-not-1.0.2" sources."regexpp-2.0.1" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."rehype-sort-attribute-values-2.0.1" (sources."remark-5.1.0" // { @@ -56506,12 +57313,12 @@ in sources."rimraf-2.6.3" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."s.color-0.0.13" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.9" + sources."sass-formatter-0.4.10" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -56671,7 +57478,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-3.9.5" + sources."typescript-3.9.6" sources."unherit-1.1.3" (sources."unified-7.1.0" // { dependencies = [ @@ -56682,7 +57489,6 @@ in }) (sources."unified-engine-6.0.1" // { dependencies = [ - sources."debug-3.2.6" sources."to-vfile-4.0.0" sources."unist-util-stringify-position-1.1.2" sources."vfile-3.0.1" @@ -56744,8 +57550,9 @@ in sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" sources."vls-0.2.0" - (sources."vscode-css-languageservice-4.2.0" // { + (sources."vscode-css-languageservice-4.3.0" // { dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" ]; }) @@ -56758,7 +57565,11 @@ in sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" sources."vscode-web-custom-data-0.1.4" - sources."vue-eslint-parser-7.1.0" + (sources."vue-eslint-parser-7.1.0" // { + dependencies = [ + sources."debug-4.2.0" + ]; + }) sources."vue-onsenui-helper-json-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -56852,7 +57663,7 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.0" - sources."jsonc-parser-2.2.1" + sources."jsonc-parser-2.3.0" sources."ms-2.0.0" sources."prettier-1.19.1" sources."request-light-0.2.5" @@ -56992,7 +57803,7 @@ in sources."env-variable-0.0.6" sources."eventemitter3-4.0.4" sources."fast-safe-stringify-2.0.7" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."follow-redirects-1.12.1" sources."http-proxy-1.18.1" sources."inherits-2.0.4" @@ -57000,8 +57811,8 @@ in sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.15" - sources."logform-2.1.2" + sources."lodash-4.17.19" + sources."logform-2.2.0" sources."lynx-0.2.0" sources."mersenne-0.0.4" sources."ms-2.1.2" @@ -57019,7 +57830,7 @@ in sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" sources."winston-3.2.1" - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -57048,12 +57859,12 @@ in dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -57346,12 +58157,12 @@ in sources."kind-of-6.0.3" sources."latest-version-3.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.debounce-4.0.8" sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.3.0" + sources."macos-release-2.4.0" sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -57473,7 +58284,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -57654,15 +58465,15 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" sources."ansi-styles-3.2.1" @@ -58030,7 +58841,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -58093,7 +58904,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -58232,7 +59043,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."jsonfile-4.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -58249,7 +59060,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -58306,10 +59117,10 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.4.0.tgz"; - sha512 = "3a1QgXSl9sCpfgDCHX12ydRQHYMoAd6nYL1rRupeWglbj3YWEWui/unjJBFgpyQPwKvS8w4Hon871mSCcXtGOQ=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.0.tgz"; + sha512 = "Q/V11lyflnkhWEkMImgTvG0iRx9q2K2c1Ko/NnP7XOl63JvQ/hlvaoyxYE85vM0fIJyWXO8qTSf2Uen+8oUTTA=="; }; buildInputs = globalBuildInputs; meta = { @@ -58353,7 +59164,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -58560,9 +59371,9 @@ in sources."fast-bitfield-1.2.2" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - (sources."fd-lock-1.0.2" // { + (sources."fd-lock-1.1.1" // { dependencies = [ - sources."napi-macros-1.8.2" + sources."node-gyp-build-4.2.2" ]; }) sources."fd-read-stream-1.1.0" @@ -58961,7 +59772,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.1.10" // { + (sources."utp-native-2.2.1" // { dependencies = [ sources."node-gyp-build-4.2.2" sources."readable-stream-3.6.0" @@ -59022,26 +59833,17 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.0.24"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.24.tgz"; - sha512 = "tG0cE6yIyj80eKHMbDBMNPHc1l40GW8v7b8jeDRs0Jv42boG0s6DEsM/eDFQw92mwAtBry07mB1tM+jSwqGzJw=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.1.1.tgz"; + sha512 = "oGWWKH7UzTulQDqvbONC4cGw8Zw43PnBXN2r3msXacV61n9YnrnbnqIJavl5zCrKEPLcu30rogMkNmrRBNNfJQ=="; }; dependencies = [ - sources."dockerfile-ast-0.0.25" - (sources."dockerfile-language-service-0.0.12" // { + sources."dockerfile-ast-0.0.27" + sources."dockerfile-language-service-0.1.0" + (sources."dockerfile-utils-0.1.0" // { dependencies = [ - (sources."dockerfile-utils-0.0.16" // { - dependencies = [ - sources."vscode-languageserver-types-3.6.0" - ]; - }) - ]; - }) - (sources."dockerfile-utils-0.0.11" // { - dependencies = [ - sources."dockerfile-ast-0.0.12" - sources."vscode-languageserver-types-3.6.0" + sources."dockerfile-ast-0.0.28" ]; }) sources."vscode-jsonrpc-5.0.1" @@ -59062,19 +59864,19 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.31.4"; + version = "6.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.31.4.tgz"; - sha512 = "hEndfeU/OBabQMVqexOU/1vwYM5gYu5U0FyEe17WgQdcOMQMcVHQIVEwm73BD9eB6fPPZt/7cQdaqm7fOSHzdA=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.32.0.tgz"; + sha512 = "l+9f1cBOZs1YZgApKXTOEIpIHJu+htPTGJmnHEquwPCQjjlPKE324iyl7GN0QvbJa/8NosX4XnLgWK4H9/7jWw=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.700.0" + sources."aws-sdk-2.713.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -59090,7 +59892,6 @@ in sources."delay-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."end-of-stream-1.4.4" sources."eventemitter3-4.0.4" sources."events-1.1.1" sources."extend-3.0.2" @@ -59122,20 +59923,18 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lossless-json-1.0.4" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" - sources."once-1.4.0" sources."p-finally-1.0.0" - sources."p-queue-6.4.0" + sources."p-queue-6.5.0" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" - sources."pump-3.0.0" sources."punycode-1.3.2" sources."qs-6.5.2" sources."querystring-0.2.0" @@ -59180,7 +59979,6 @@ in sources."uuid-3.3.2" sources."verror-1.10.0" sources."when-3.7.8" - sources."wrappy-1.0.2" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" ]; @@ -59221,35 +60019,35 @@ in sha512 = "ZZfCT5/+XXomHI7O+frUJfKeqEnxXYq8SL45s0uR6KMRZpFlckzMlLpyBFKVUNd+VWjgVwmc9d/fe/YhU1N5Ng=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/core-7.10.2" - sources."@babel/generator-7.10.2" - sources."@babel/helper-annotate-as-pure-7.10.1" - sources."@babel/helper-builder-react-jsx-7.10.1" - sources."@babel/helper-builder-react-jsx-experimental-7.10.1" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" - sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-plugin-utils-7.10.1" - sources."@babel/helper-replace-supers-7.10.1" - sources."@babel/helper-simple-access-7.10.1" - sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/plugin-proposal-object-rest-spread-7.10.1" - sources."@babel/plugin-syntax-jsx-7.10.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/core-7.10.4" + sources."@babel/generator-7.10.4" + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-builder-react-jsx-7.10.4" + sources."@babel/helper-builder-react-jsx-experimental-7.10.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helpers-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-syntax-jsx-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.10.1" - sources."@babel/plugin-transform-parameters-7.10.1" - sources."@babel/plugin-transform-react-jsx-7.10.1" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/plugin-transform-destructuring-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.4" + sources."@babel/plugin-transform-react-jsx-7.10.4" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.10.4" + sources."@babel/types-7.10.4" sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -59257,11 +60055,11 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" - sources."ajv-6.12.2" + sources."ajv-6.12.3" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -59350,7 +60148,7 @@ in sources."supports-color-7.1.0" ]; }) - (sources."ink-text-input-3.2.2" // { + (sources."ink-text-input-3.3.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -59381,7 +60179,7 @@ in sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.debounce-4.0.8" sources."lodash.throttle-4.1.1" (sources."log-update-3.4.0" // { @@ -59575,15 +60373,15 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.2.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.2.0.tgz"; - sha512 = "B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.4.0.tgz"; + sha512 = "gU+lxhlPHu45H3JkEGgYhWhkR9wLHHEXC9FbWFnTlEkbKyZKWgWRLgf61E8zWmBuI6g5xKBph9ltg3NtZMVF8g=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -59591,12 +60389,8 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.2" - (sources."ansi-escapes-4.3.1" // { - dependencies = [ - sources."type-fest-0.11.0" - ]; - }) + sources."ajv-6.12.3" + sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -59613,9 +60407,6 @@ in sources."supports-color-7.1.0" ]; }) - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -59623,11 +60414,12 @@ in sources."debug-4.2.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" + sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-7.1.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -59638,11 +60430,9 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.2" @@ -59652,24 +60442,13 @@ in sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.2.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -59677,18 +60456,14 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.15" - sources."mimic-fn-2.1.0" + sources."lodash-4.17.19" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" sources."once-1.4.0" - sources."onetime-5.1.0" sources."optionator-0.9.1" - sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -59697,38 +60472,23 @@ in sources."punycode-2.1.1" sources."regexpp-3.1.0" sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.1" - sources."rxjs-6.5.5" - sources."safer-buffer-2.1.2" sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" - (sources."slice-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."slice-ansi-2.1.0" sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" - sources."supports-color-5.5.0" - (sources."table-5.4.6" // { + (sources."string-width-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) + sources."strip-ansi-6.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-5.5.0" + sources."table-5.4.6" sources."text-table-0.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."tslib-1.13.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."uri-js-4.2.2" @@ -59751,15 +60511,15 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "9.0.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.0.0.tgz"; - sha512 = "yWXSiBvn6u4pLpGrLuebCtSQ8fJ8jUkUdfD6QqqYp7fSuY4+YW6mW1UusY/gCgfByrgU518o6DCeBmPg6HLkcw=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.1.1.tgz"; + sha512 = "+y3ULQemuvoxWgfV/VGzlYJS84V9GmvyzIxZFGUA3kgUpaJkuqXn/nm21Z/nYYNmfiySXy6RU1ery0A8cztZRw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -59767,12 +60527,8 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.2" - (sources."ansi-escapes-4.3.1" // { - dependencies = [ - sources."type-fest-0.11.0" - ]; - }) + sources."ajv-6.12.3" + sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -59789,23 +60545,21 @@ in sources."supports-color-7.1.0" ]; }) - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."core_d-1.0.1" + sources."core_d-2.0.0" sources."cross-spawn-7.0.3" sources."debug-4.2.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" + sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.2.0" + sources."eslint-7.4.0" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-7.1.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -59816,11 +60570,9 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.2" @@ -59830,24 +60582,13 @@ in sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.2.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -59855,61 +60596,40 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.15" - sources."mimic-fn-2.1.0" + sources."lodash-4.17.19" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."mute-stream-0.0.8" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" sources."once-1.4.0" - sources."onetime-5.1.0" sources."optionator-0.9.1" - sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" sources."prelude-ls-1.2.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" - sources."resolve-1.17.0" sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.1" - sources."rxjs-6.5.5" - sources."safer-buffer-2.1.2" sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" - (sources."slice-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."slice-ansi-2.1.0" sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" - sources."supports-color-5.5.0" - (sources."table-5.4.6" // { + (sources."string-width-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) + sources."strip-ansi-6.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-5.5.0" + sources."table-5.4.6" sources."text-table-0.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."tslib-1.13.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."uri-js-4.2.2" @@ -59938,7 +60658,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -60120,9 +60840,9 @@ in sha512 = "eJdNdyHofekXmSGI76E2A4GBJ7FAvuAgLV7rAgL6uZXV9+ZKwNoBjt/2hxHWmDZZ9x0EEWM3wHb2b0J7UNGbBw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -60148,7 +60868,7 @@ in sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" @@ -60163,7 +60883,7 @@ in sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."execa-4.0.2" + sources."execa-4.0.3" sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" @@ -60179,7 +60899,11 @@ in sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."indent-string-4.0.0" - sources."inquirer-7.2.0" + (sources."inquirer-7.3.2" // { + dependencies = [ + sources."chalk-4.1.0" + ]; + }) (sources."inquirer-autocomplete-prompt-1.0.2" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -60202,7 +60926,7 @@ in sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lru-cache-4.1.5" sources."map-obj-4.1.0" (sources."meow-6.1.1" // { @@ -60266,7 +60990,7 @@ in sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-2.0.0" @@ -60401,13 +61125,10 @@ in sources."define-property-2.0.2" sources."defined-0.0.0" sources."director-1.2.7" + sources."duplexer-0.1.1" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" - (sources."event-stream-0.5.3" // { - dependencies = [ - sources."optimist-0.2.8" - ]; - }) + sources."event-stream-3.3.4" sources."eventemitter2-0.4.14" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -60450,8 +61171,9 @@ in ]; }) sources."for-in-1.0.2" - sources."forever-monitor-3.0.0" + sources."forever-monitor-3.0.1" sources."fragment-cache-0.2.1" + sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" @@ -60505,6 +61227,7 @@ in sources."lazy-1.0.11" sources."lcid-1.0.0" sources."map-cache-0.2.2" + sources."map-stream-0.1.0" sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."minimatch-3.0.4" @@ -60550,6 +61273,7 @@ in sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" + sources."pause-stream-0.0.11" sources."pkginfo-0.3.1" sources."posix-character-classes-0.1.1" (sources."prettyjson-1.2.1" // { @@ -60565,7 +61289,7 @@ in sources."utile-0.2.1" ]; }) - sources."ps-tree-0.0.3" + sources."ps-tree-1.2.0" sources."read-1.0.7" sources."readable-stream-2.3.7" sources."readdirp-2.2.1" @@ -60621,6 +61345,7 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" + sources."split-0.3.3" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -60640,6 +61365,7 @@ in sources."kind-of-5.1.0" ]; }) + sources."stream-combiner-0.0.4" sources."string-width-1.0.2" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" @@ -60718,7 +61444,7 @@ in dependencies = [ sources."async-2.6.3" sources."debug-4.2.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" @@ -60770,11 +61496,11 @@ in sources."is-canonical-base64-1.1.1" sources."is-electron-2.2.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.0" + sources."is-my-json-valid-2.20.4" sources."is-property-1.0.2" sources."is-valid-domain-0.0.14" sources."json-buffer-2.0.11" - sources."jsonpointer-4.0.1" + sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" sources."kvset-1.0.0" sources."libsodium-0.7.6" @@ -60862,7 +61588,7 @@ in sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" - sources."socks-2.3.3" + sources."socks-2.4.1" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -60949,9 +61675,9 @@ in sha512 = "Mzb3SGlcrFSwVu4R8Y2sGxK+d7VP6CRC6rw3S4mOPbxfW3qNrOLYEPDJM7h1GNUjOL22JQHx1qsn8sRODqAygQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -60966,7 +61692,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.2" + sources."ajv-6.12.3" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -60999,7 +61725,7 @@ in sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.3.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."color-convert-2.0.1" @@ -61027,7 +61753,7 @@ in sources."error-ex-1.3.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."execa-4.0.2" + sources."execa-4.0.3" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -61053,11 +61779,7 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."ini-1.3.5" - (sources."inquirer-7.2.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) + sources."inquirer-7.3.2" (sources."inquirer-autocomplete-prompt-1.0.2" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -61093,7 +61815,7 @@ in sources."latest-version-5.1.0" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" (sources."log-symbols-3.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -61166,13 +61888,13 @@ in ]; }) sources."redent-3.0.0" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."resolve-1.17.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."semver-diff-3.1.1" @@ -61233,9 +61955,10 @@ in sha512 = "O3UHyNJ3nYBNfgC+R5hvJPADiZztZHgWoYfdX0vAtXf0yWyqNgtJQzkcY3RufW1Yi+Bq2Yo8ptyYr2i573GPTQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@ardatan/aggregate-error-0.0.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -61245,41 +61968,35 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.10.2" + sources."@babel/runtime-7.10.4" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-toolkit/common-0.10.7" - (sources."@graphql-toolkit/core-0.10.7" // { + sources."@graphql-tools/delegate-6.0.12" + (sources."@graphql-tools/graphql-file-loader-6.0.12" // { dependencies = [ - sources."globby-11.0.0" - sources."p-limit-2.3.0" - sources."tslib-1.11.2" + sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-toolkit/graphql-file-loader-0.10.7" // { + (sources."@graphql-tools/import-6.0.12" // { dependencies = [ - sources."tslib-1.11.2" + sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-toolkit/json-file-loader-0.10.7" // { + (sources."@graphql-tools/json-file-loader-6.0.12" // { dependencies = [ - sources."tslib-1.11.2" + sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-toolkit/schema-merging-0.10.7" // { + sources."@graphql-tools/load-6.0.12" + sources."@graphql-tools/merge-6.0.12" + sources."@graphql-tools/schema-6.0.12" + (sources."@graphql-tools/url-loader-6.0.12" // { dependencies = [ - sources."tslib-1.11.2" + sources."cross-fetch-3.0.5" ]; }) - (sources."@graphql-toolkit/url-loader-0.10.7" // { - dependencies = [ - sources."tslib-1.11.2" - ]; - }) - sources."@graphql-tools/load-6.0.10" - sources."@graphql-tools/merge-6.0.10" - sources."@graphql-tools/schema-6.0.10" - sources."@graphql-tools/utils-6.0.10" + sources."@graphql-tools/utils-6.0.12" + sources."@graphql-tools/wrap-6.0.12" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -61287,12 +62004,9 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" + sources."@types/node-14.0.23" sources."@types/parse-json-4.0.0" - (sources."@wry/equality-0.1.11" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."@types/websocket-1.0.0" sources."aggregate-error-3.0.1" sources."ajv-5.5.2" (sources."ansi-escapes-4.3.1" // { @@ -61302,32 +62016,18 @@ in }) sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" - (sources."apollo-link-1.2.14" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) - (sources."apollo-link-http-common-0.2.16" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) - sources."apollo-upload-client-13.0.0" - (sources."apollo-utilities-1.3.4" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) sources."argparse-1.0.10" sources."array-filter-1.0.0" sources."array-union-2.1.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" + sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" (sources."better-ajv-errors-0.6.7" // { @@ -61385,18 +62085,17 @@ in sources."cosmiconfig-6.0.0" sources."cross-fetch-3.0.4" sources."cross-spawn-6.0.5" + sources."d-1.0.1" sources."dashdash-1.14.1" sources."debug-4.2.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-equal-2.0.3" sources."deep-extend-0.6.0" - sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" - sources."deprecated-decorator-0.1.6" sources."dir-glob-3.0.1" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" @@ -61406,17 +62105,25 @@ in sources."es-abstract-1.17.6" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" sources."es6-promise-3.3.1" + sources."es6-symbol-3.1.3" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."eventemitter3-3.1.2" sources."execa-1.0.0" + (sources."ext-1.4.0" // { + dependencies = [ + sources."type-2.0.0" + ]; + }) sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ sources."tmp-0.0.33" ]; }) - sources."extract-files-8.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-glob-3.2.4" @@ -61448,25 +62155,14 @@ in }) sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" - sources."graphql-15.1.0" - (sources."graphql-config-3.0.2" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."graphql-15.3.0" + sources."graphql-config-3.0.3" sources."graphql-subscriptions-1.1.0" - (sources."graphql-tools-5.0.0" // { - dependencies = [ - sources."form-data-3.0.0" - sources."tslib-1.13.0" - sources."uuid-7.0.3" - ]; - }) sources."graphql-type-json-0.2.4" sources."har-schema-2.0.0" (sources."har-validator-5.1.3" // { dependencies = [ - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-0.4.1" ]; @@ -61534,7 +62230,7 @@ in sources."json-to-ast-2.1.0" sources."jsonfile-6.0.1" sources."jsonpath-plus-3.0.0" - sources."jsonpointer-4.0.1" + sources."jsonpointer-4.1.0" sources."jsprim-1.4.1" sources."keyv-3.1.0" sources."latest-version-5.1.0" @@ -61542,7 +62238,7 @@ in sources."leven-3.1.0" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" (sources."log-symbols-3.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -61571,6 +62267,8 @@ in sources."minimist-1.2.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" + sources."nan-2.14.1" + sources."next-tick-1.0.0" sources."nice-try-1.0.5" (sources."no-case-3.0.3" // { dependencies = [ @@ -61585,8 +62283,8 @@ in sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.1.2" - sources."oas-resolver-2.3.2" + sources."oas-linter-3.1.3" + sources."oas-resolver-2.4.1" sources."oas-schema-walker-1.1.4" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" @@ -61648,10 +62346,10 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."reftools-1.1.1" + sources."reftools-1.1.3" sources."regenerator-runtime-0.13.5" sources."regexp.prototype.flags-1.3.0" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" sources."request-2.88.2" @@ -61664,7 +62362,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - (sources."rxjs-6.5.5" // { + (sources."rxjs-6.6.0" // { dependencies = [ sources."tslib-1.13.0" ]; @@ -61694,6 +62392,7 @@ in sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" + sources."subscriptions-transport-ws-0.9.16" sources."supports-color-7.1.0" (sources."swagger2openapi-5.4.0" // { dependencies = [ @@ -61704,20 +62403,18 @@ in sources."yargs-12.0.5" ]; }) + sources."symbol-observable-1.2.0" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" - (sources."ts-invariant-0.4.4" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) sources."tslib-2.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-1.2.0" sources."type-fest-0.3.1" + sources."typedarray-to-buffer-3.1.5" sources."universalify-1.0.0" sources."unixify-1.0.0" sources."uri-js-4.2.2" @@ -61726,6 +62423,12 @@ in sources."valid-url-1.0.9" sources."verror-1.10.0" sources."wcwidth-1.0.1" + (sources."websocket-1.0.31" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."whatwg-fetch-3.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.1" @@ -61741,9 +62444,11 @@ in ]; }) sources."wrappy-1.0.2" + sources."ws-5.2.2" sources."y18n-4.0.0" + sources."yaeti-0.0.6" sources."yaml-1.10.0" - (sources."yargs-15.3.1" // { + (sources."yargs-15.4.1" // { dependencies = [ sources."cliui-6.0.0" sources."find-up-4.1.0" @@ -61758,12 +62463,6 @@ in ]; }) sources."yargs-parser-11.1.1" - sources."zen-observable-0.8.15" - (sources."zen-observable-ts-0.8.21" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { @@ -62084,7 +62783,7 @@ in sources."here-0.0.2" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-0.7.0" @@ -62978,7 +63677,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -62994,14 +63693,14 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.14.0.tgz"; - sha512 = "vP5tWbFQ2G8j42NxDa9Pklxzxp0GGC31/tZacnJWYYsygZj4zbrwLIT4vzsafN8/lsV77rDTn+3CaixpZGOB8w=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.14.1.tgz"; + sha512 = "VWKrljlwF8tEKH48YPfC30zYKhrsMqm70d7vXswivEqd3DSva8ZlIzfeCa3YWFEFRIIhiXKgKurlqEpCtYMCAA=="; }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -63105,7 +63804,7 @@ in sources."follow-redirects-1.12.1" sources."he-1.2.0" sources."http-proxy-1.18.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."mime-1.6.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -63196,7 +63895,7 @@ in sources."async-0.2.10" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."bunyan-1.8.12" + sources."bunyan-1.8.14" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -63283,7 +63982,7 @@ in sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg=="; }; dependencies = [ - sources."@types/jquery-3.3.38" + sources."@types/jquery-3.5.0" sources."@types/sizzle-2.3.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -63302,7 +64001,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.1" - sources."jquery.terminal-2.17.2" + sources."jquery.terminal-2.17.6" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -63369,7 +64068,7 @@ in sources."chardet-0.7.0" sources."chownr-1.1.4" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."co-4.6.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -63399,7 +64098,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.14.2" // { + (sources."escodegen-1.14.3" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -63463,10 +64162,14 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.2.0" // { + (sources."inquirer-7.3.2" // { dependencies = [ sources."ansi-escapes-4.3.1" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."mimic-fn-2.1.0" sources."onetime-5.1.0" sources."restore-cursor-3.1.0" @@ -63488,7 +64191,7 @@ in ]; }) sources."levn-0.3.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -63508,7 +64211,7 @@ in ]; }) sources."lru-cache-5.1.1" - sources."macos-release-2.3.0" + sources."macos-release-2.4.0" sources."methods-1.1.2" sources."mime-2.4.6" sources."mime-db-1.44.0" @@ -63551,7 +64254,7 @@ in sources."rimraf-3.0.2" sources."rsvp-3.6.2" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -63608,7 +64311,7 @@ in sources."supports-color-7.1.0" sources."tar-4.4.13" sources."through-2.3.8" - sources."through2-3.0.1" + sources."through2-3.0.2" sources."thunkify-2.1.2" sources."tmp-0.0.33" sources."toidentifier-1.0.0" @@ -63634,7 +64337,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -63669,21 +64372,24 @@ in "iosevka-build-deps-../../data/fonts/iosevka" = nodeEnv.buildNodePackage { name = "iosevka-build-deps"; packageName = "iosevka-build-deps"; - version = "2.3.3"; + version = "3.2.2"; src = ../../data/fonts/iosevka; dependencies = [ + sources."@iarna/toml-2.2.5" + sources."@josh-brown/vector-3.4.0" sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."amdefine-1.0.1" - sources."ansi-regex-2.1.1" - sources."ansi-styles-4.2.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."async-0.9.2" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" @@ -63691,51 +64397,48 @@ in sources."aws4-1.10.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bezier-js-2.6.1" sources."bindings-1.5.0" - sources."block-stream-0.0.9" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."bufferstreams-1.1.3" - sources."camelcase-4.1.0" - sources."caryll-shapeops-0.3.1" + sources."bufferstreams-2.0.1" + sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-4.1.0" + sources."chainsaw-0.0.9" + sources."chalk-2.4.2" sources."child-process-promise-2.2.1" + sources."chownr-1.1.4" + sources."cldr-5.6.0" sources."cli-cursor-3.1.0" - sources."clipper-lib-1.0.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - sources."clone-2.1.2" + sources."clipper-lib-6.4.2" + sources."cliui-6.0.0" sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colors-1.4.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."complex.js-2.0.11" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cross-spawn-4.0.2" + (sources."cross-spawn-4.0.2" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."which-1.3.1" + ]; + }) sources."css-2.2.4" sources."css-parse-2.0.0" - sources."cubic2quad-1.1.1" sources."dashdash-1.14.1" sources."debug-3.1.0" sources."decamelize-1.2.0" - sources."decimal.js-10.2.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.2" + sources."ejs-3.1.3" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."escape-latex-1.2.0" - sources."escodegen-1.14.2" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.14.3" (sources."escope-1.0.3" // { dependencies = [ sources."estraverse-2.0.0" @@ -63761,163 +64464,156 @@ in }) sources."estraverse-4.3.0" sources."esutils-2.0.3" - (sources."execa-0.7.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - ]; - }) sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."file-uri-to-path-1.0.0" - sources."find-up-2.1.0" - sources."first-chunk-stream-2.0.0" + sources."filelist-1.0.1" + sources."find-up-4.1.0" + sources."first-chunk-stream-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fraction.js-4.0.12" - sources."fs-extra-3.0.1" + sources."fs-extra-9.0.1" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fstream-1.0.12" (sources."gauge-2.7.4" // { dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" ]; }) - sources."get-caller-file-1.0.3" - sources."get-stream-3.0.0" + sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-unicode-2.0.1" + sources."hashish-0.0.4" sources."hosted-git-info-2.8.8" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-1.0.0" sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-1.0.0" - sources."is-stream-1.1.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."javascript-natural-sort-0.7.1" + sources."jake-10.8.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-3.0.1" + sources."jsonfile-6.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lcid-1.0.0" sources."levn-0.3.0" - sources."libspiro-js-0.3.1" - sources."load-json-file-2.0.0" - sources."locate-path-2.0.0" - sources."lru-cache-4.1.5" - sources."mathjs-5.10.3" - sources."megaminx-0.9.0" - sources."mem-1.1.0" + sources."load-json-file-1.1.0" + sources."locate-path-5.0.0" + sources."lru-cache-2.5.0" + sources."memoizeasync-1.1.0" sources."microbuffer-1.0.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" + (sources."minipass-2.9.0" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) + sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."nan-2.14.1" - (sources."node-gyp-3.8.0" // { + (sources."node-gyp-4.0.0" // { dependencies = [ sources."semver-5.3.0" + sources."which-1.3.1" ]; }) sources."node-version-1.2.0" sources."nopt-3.0.6" - sources."normalize-package-data-2.5.0" - sources."npm-run-path-2.0.2" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" - (sources."onetime-5.1.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) + sources."onetime-5.1.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" - sources."os-locale-2.1.0" + sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - (sources."otfcc-ttcize-0.8.0" // { - dependencies = [ - sources."fs-extra-4.0.3" - sources."jsonfile-4.0.0" - (sources."megaminx-0.3.3" // { - dependencies = [ - sources."fs-extra-3.0.1" - sources."jsonfile-3.0.1" - ]; - }) - sources."yargs-8.0.2" - ]; - }) - sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."otfcc-ttcize-0.10.2" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."pako-1.0.11" sources."parse-json-2.2.0" + sources."passerror-1.1.1" (sources."patel-0.33.1" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."camelcase-3.0.0" - sources."find-up-1.1.2" - sources."load-json-file-1.1.0" - sources."os-locale-1.4.0" - sources."path-exists-2.1.0" - sources."path-type-1.1.0" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" + sources."cliui-3.2.0" + sources."get-caller-file-1.0.3" + sources."is-fullwidth-code-point-1.0.0" + sources."require-main-filename-1.0.1" sources."string-width-1.0.2" - sources."strip-bom-2.0.0" + sources."strip-ansi-3.0.1" sources."which-module-1.0.0" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.1" sources."yargs-6.6.0" sources."yargs-parser-4.2.1" ]; }) - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."path-type-2.0.0" + sources."path-type-1.1.0" sources."patrisika-0.21.0" sources."patrisika-scopes-0.11.1" + sources."pegjs-0.10.0" sources."performance-now-2.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."primitive-quadify-off-curves-0.4.1" + sources."prettier-2.0.5" sources."process-nextick-args-2.0.1" sources."promise-polyfill-6.1.0" sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" + sources."read-pkg-1.1.0" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + ]; + }) sources."readable-stream-2.3.7" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" + sources."require-main-filename-2.0.0" sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" @@ -63926,12 +64622,10 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."seed-random-2.2.0" sources."semaphore-async-await-1.5.1" - sources."semver-5.7.1" + sources."semver-7.3.2" + sources."seq-0.3.5" sources."set-blocking-2.0.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" @@ -63940,47 +64634,45 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.5" + sources."spiro-2.0.0" sources."split-1.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stack-trace-0.0.9" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-4.2.0" sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-3.0.0" - sources."strip-bom-buf-1.0.0" - sources."strip-bom-stream-3.0.0" - sources."strip-eof-1.0.0" + sources."strip-ansi-6.0.0" + sources."strip-bom-2.0.0" + sources."strip-bom-buf-2.0.0" + sources."strip-bom-stream-4.0.0" (sources."stylus-0.54.7" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.7.3" ]; }) - sources."supports-color-7.1.0" - sources."tar-2.2.2" - sources."temp-0.8.4" + sources."supports-color-5.5.0" + (sources."tar-4.4.13" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) + sources."temp-0.9.1" sources."through-2.3.8" - sources."tiny-emitter-2.1.0" - sources."toml-3.0.0" sources."topsort-0.0.2" sources."tough-cookie-2.5.0" + sources."traverse-0.3.9" sources."ts-process-promises-1.0.2" - sources."tslib-1.9.3" + sources."tslib-1.13.0" sources."ttf2woff-2.0.2" - sources."ttf2woff2-2.0.3" + sources."ttf2woff2-3.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."typed-function-1.1.0" - sources."typo-geom-0.5.1" - sources."universalify-0.1.2" + sources."typo-geom-0.8.4" + sources."unicode-13.0.0-0.8.0" + sources."unicoderegexp-0.4.1" + sources."universalify-1.0.0" sources."unorm-1.6.0" sources."uri-js-4.2.2" sources."urix-0.1.0" @@ -63989,70 +64681,41 @@ in sources."validate-npm-package-license-3.0.4" (sources."verda-1.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."camelcase-5.3.1" - sources."cliui-6.0.0" - sources."find-up-4.1.0" - sources."fs-extra-9.0.1" - sources."get-caller-file-2.0.5" - sources."is-fullwidth-code-point-3.0.0" - sources."jsonfile-6.0.1" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - sources."require-main-filename-2.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."tslib-1.13.0" - sources."universalify-1.0.0" - sources."which-2.0.2" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" - sources."yargs-15.3.1" - sources."yargs-parser-18.1.3" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" ]; }) sources."verror-1.10.0" - sources."which-1.3.1" + sources."which-2.0.2" sources."which-module-2.0.0" - sources."wide-align-1.1.3" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" - (sources."wrap-ansi-2.1.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."string-width-1.0.2" + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" - sources."y18n-3.2.1" + sources."xmldom-0.3.0" + sources."xpath-0.0.27" + sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-14.2.3" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - sources."camelcase-5.3.1" - sources."cliui-5.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."emoji-regex-7.0.3" - sources."find-up-3.0.0" - sources."get-caller-file-2.0.5" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."require-main-filename-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" - sources."y18n-4.0.0" - sources."yargs-parser-15.0.1" - ]; - }) - sources."yargs-parser-7.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -64132,7 +64795,7 @@ in sources."inherits-2.0.4" sources."iterare-1.2.1" sources."jaeger-client-3.18.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."long-2.4.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -64183,10 +64846,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.164"; + version = "1.0.165"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.164.tgz"; - sha512 = "MoTbd8p03e/TKLz6EAlkMQY4g2gfVDoTarePwKXslGbSP/ppgnO7MJ7jy1B7lTlr5ryhhyPhOpz2z//zTcG0Aw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.165.tgz"; + sha512 = "vWe6i72bToKp8246rOD3iZ5PG+roAzIuGCcK8I20sYTFrakJVRteuODNq65WN7K/txi69VPQYoxHcLsaUoYziQ=="; }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" @@ -64200,7 +64863,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.2" + sources."ajv-6.12.3" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -64358,12 +65021,16 @@ in sources."supports-color-2.0.0" ]; }) - sources."encoding-0.1.12" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -64454,7 +65121,7 @@ in ]; }) sources."he-1.2.0" - sources."highlight.js-9.18.1" + sources."highlight.js-10.1.1" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.3.1" sources."html-minifier-3.5.21" @@ -64555,6 +65222,7 @@ in sources."commander-2.20.3" ]; }) + sources."keytar-5.6.0" sources."kind-of-6.0.3" sources."klaw-1.3.1" sources."klaw-sync-6.0.0" @@ -64563,7 +65231,7 @@ in sources."levn-0.3.0" sources."linkify-it-2.2.0" sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash-es-4.17.15" sources."lodash.padend-4.6.1" sources."lodash.repeat-4.1.0" @@ -64592,9 +65260,11 @@ in sources."markdown-it-footnote-3.0.2" sources."markdown-it-ins-3.0.0" sources."markdown-it-mark-3.0.0" - (sources."markdown-it-multimd-table-4.0.2" // { + (sources."markdown-it-multimd-table-4.0.3" // { dependencies = [ - sources."markdown-it-8.4.2" + sources."entities-2.0.3" + sources."linkify-it-3.0.2" + sources."markdown-it-11.0.0" ]; }) sources."markdown-it-sub-1.0.0" @@ -64709,7 +65379,7 @@ in sources."pn-1.1.0" sources."pngjs-2.3.1" sources."posix-character-classes-0.1.1" - sources."prebuild-install-5.3.4" + sources."prebuild-install-5.3.3" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -64734,6 +65404,7 @@ in sources."isobject-2.1.0" ]; }) + sources."remove-markdown-0.3.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" (sources."request-2.88.2" // { @@ -64884,14 +65555,14 @@ in ]; }) sources."tar-fs-2.1.0" - sources."tar-stream-2.1.2" + sources."tar-stream-2.1.3" (sources."tcp-port-used-0.1.2" // { dependencies = [ sources."debug-0.7.4" sources."q-0.9.7" ]; }) - sources."terminal-kit-1.35.7" + sources."terminal-kit-1.36.0" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -64966,7 +65637,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -65063,7 +65734,7 @@ in sha512 = "3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA=="; }; dependencies = [ - sources."@babel/parser-7.10.2" + sources."@babel/parser-7.10.4" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -65073,7 +65744,7 @@ in sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" sources."marked-0.8.2" @@ -65081,7 +65752,7 @@ in sources."mkdirp-1.0.4" sources."requizzle-0.2.3" sources."sprintf-js-1.0.3" - sources."strip-json-comments-3.1.0" + sources."strip-json-comments-3.1.1" sources."taffydb-2.6.2" sources."uc.micro-1.0.6" sources."underscore-1.10.2" @@ -65130,7 +65801,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -65218,7 +65889,7 @@ in sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.44.0" @@ -65261,7 +65932,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.2" + sources."ajv-6.12.3" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -65393,7 +66064,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" @@ -65447,7 +66118,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" (sources."request-2.88.2" // { dependencies = [ @@ -65516,7 +66187,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."y18n-4.0.0" - sources."yargs-15.3.1" + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; @@ -65577,7 +66248,7 @@ in sources."base64-arraybuffer-0.1.5" sources."base64id-2.0.0" sources."better-assert-1.0.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."blob-0.0.5" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" @@ -65655,7 +66326,7 @@ in sources."isbinaryfile-4.0.6" sources."jsonfile-4.0.0" sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" (sources."log4js-6.3.0" // { dependencies = [ sources."debug-4.2.0" @@ -65744,10 +66415,10 @@ in sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" - sources."yargs-15.3.1" + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" sources."yeast-0.1.2" ]; @@ -65867,7 +66538,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -65915,7 +66586,7 @@ in sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -65964,7 +66635,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" (sources."mem-4.3.0" // { @@ -66121,9 +66792,9 @@ in sha512 = "vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" (sources."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ sources."aproba-2.0.0" @@ -66221,8 +66892,7 @@ in sources."@octokit/auth-token-2.4.2" (sources."@octokit/endpoint-6.0.3" // { dependencies = [ - sources."is-plain-object-3.0.0" - sources."isobject-4.0.0" + sources."is-plain-object-3.0.1" sources."universal-user-agent-5.0.0" ]; }) @@ -66241,8 +66911,7 @@ in (sources."@octokit/request-5.4.5" // { dependencies = [ sources."@octokit/request-error-2.0.2" - sources."is-plain-object-3.0.0" - sources."isobject-4.0.0" + sources."is-plain-object-3.0.1" sources."universal-user-agent-5.0.0" ]; }) @@ -66251,19 +66920,19 @@ in sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/rest-16.43.1" + sources."@octokit/rest-16.43.2" sources."@octokit/types-5.0.1" - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -66357,10 +67026,10 @@ in sources."color-name-1.1.3" sources."columnify-1.5.4" sources."combined-stream-1.0.8" - sources."commander-2.20.3" - (sources."compare-func-1.3.4" // { + (sources."compare-func-2.0.0" // { dependencies = [ - sources."dot-prop-3.0.0" + sources."dot-prop-5.2.0" + sources."is-obj-2.0.0" ]; }) sources."component-emitter-1.3.0" @@ -66368,22 +67037,22 @@ in sources."concat-stream-1.6.2" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-5.0.10" + sources."conventional-changelog-angular-5.0.11" (sources."conventional-changelog-core-3.2.3" // { dependencies = [ - sources."through2-3.0.1" + sources."through2-3.0.2" ]; }) sources."conventional-changelog-preset-loader-2.3.4" - (sources."conventional-changelog-writer-4.0.16" // { + (sources."conventional-changelog-writer-4.0.17" // { dependencies = [ - sources."through2-3.0.1" + sources."through2-3.0.2" ]; }) sources."conventional-commits-filter-2.0.6" (sources."conventional-commits-parser-3.1.0" // { dependencies = [ - sources."through2-3.0.1" + sources."through2-3.0.2" ]; }) (sources."conventional-recommended-bump-5.0.1" // { @@ -66444,7 +67113,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" - sources."encoding-0.1.12" + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" sources."envinfo-7.5.1" @@ -66484,7 +67153,11 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.1.0" + (sources."external-editor-3.1.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -66625,7 +67298,7 @@ in sources."http-signature-1.2.0" sources."https-proxy-agent-2.2.4" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.2" sources."iferr-0.1.5" sources."ignore-4.0.6" sources."ignore-walk-3.0.3" @@ -66705,7 +67378,7 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" sources."lodash.get-4.4.2" @@ -66717,7 +67390,7 @@ in sources."lodash.uniq-4.5.0" sources."loud-rejection-1.6.0" sources."lru-cache-5.1.1" - sources."macos-release-2.3.0" + sources."macos-release-2.4.0" sources."make-dir-1.3.0" sources."make-fetch-happen-5.0.2" sources."map-cache-0.2.2" @@ -66776,7 +67449,7 @@ in sources."mute-stream-0.0.7" sources."mz-2.7.0" sources."nanomatch-1.2.13" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-fetch-2.6.0" sources."node-fetch-npm-2.0.4" @@ -66929,7 +67602,7 @@ in sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -67060,7 +67733,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -67142,72 +67815,23 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.11.3"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.11.3.tgz"; - sha512 = "VkZiTDdtNEzXA3LgjQiC3D7/ejleBPFVvq+aRI9mIj+Zhmif5TvFPM244bT4rzkvOCvJ9q4zAztok1M7Nygagw=="; + url = "https://registry.npmjs.org/less/-/less-3.12.0.tgz"; + sha512 = "3mmSHFRP9hGxxQgAKgChfau1LO3ksV/zyZf1qd2ENyBV778NA9Ids99wFRA20jE+5prT7oScKod8PoGlxSe1gg=="; }; dependencies = [ - sources."ajv-6.12.2" - sources."asap-2.0.6" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" - sources."bcrypt-pbkdf-1.0.2" - sources."caseless-0.12.0" - sources."clone-2.1.2" - sources."combined-stream-1.0.8" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" sources."errno-0.1.7" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."getpass-0.1.7" sources."graceful-fs-4.2.4" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."http-signature-1.2.0" sources."image-size-0.5.5" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" sources."make-dir-2.1.0" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" - sources."oauth-sign-0.9.0" - sources."performance-now-2.1.0" + sources."native-request-1.0.5" sources."pify-4.0.1" - sources."promise-7.3.1" sources."prr-1.0.1" - sources."psl-1.8.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."request-2.88.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."source-map-0.6.1" - sources."sshpk-1.16.1" - sources."tough-cookie-2.5.0" sources."tslib-1.13.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" - sources."uuid-3.4.0" - sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -67585,7 +68209,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -68070,7 +68694,7 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -68090,116 +68714,107 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/compat-data-7.10.1" - sources."@babel/core-7.10.2" - sources."@babel/generator-7.10.2" - sources."@babel/helper-annotate-as-pure-7.10.1" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.1" - sources."@babel/helper-compilation-targets-7.10.2" - sources."@babel/helper-create-class-features-plugin-7.10.2" - sources."@babel/helper-create-regexp-features-plugin-7.10.1" - sources."@babel/helper-define-map-7.10.1" - sources."@babel/helper-explode-assignable-expression-7.10.1" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-hoist-variables-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" - sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-plugin-utils-7.10.1" - sources."@babel/helper-regex-7.10.1" - sources."@babel/helper-remap-async-to-generator-7.10.1" - sources."@babel/helper-replace-supers-7.10.1" - sources."@babel/helper-simple-access-7.10.1" - sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/helper-wrap-function-7.10.1" - sources."@babel/helpers-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/compat-data-7.10.4" + sources."@babel/core-7.10.4" + sources."@babel/generator-7.10.4" + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" + sources."@babel/helper-compilation-targets-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.10.4" + sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-define-map-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-hoist-variables-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-regex-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helpers-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.10.2" + sources."@babel/parser-7.10.4" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.10.1" - sources."@babel/plugin-proposal-class-properties-7.10.1" - sources."@babel/plugin-proposal-dynamic-import-7.10.1" - sources."@babel/plugin-proposal-json-strings-7.10.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" - sources."@babel/plugin-proposal-numeric-separator-7.10.1" - sources."@babel/plugin-proposal-object-rest-spread-7.10.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.1" - sources."@babel/plugin-proposal-optional-chaining-7.10.1" - sources."@babel/plugin-proposal-private-methods-7.10.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.1" + sources."@babel/plugin-proposal-async-generator-functions-7.10.4" + sources."@babel/plugin-proposal-class-properties-7.10.4" + sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" + sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-private-methods-7.10.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" - sources."@babel/plugin-syntax-class-properties-7.10.1" + sources."@babel/plugin-syntax-class-properties-7.10.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-import-meta-7.10.1" + sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.1" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.1" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.1" - sources."@babel/plugin-transform-arrow-functions-7.10.1" - sources."@babel/plugin-transform-async-to-generator-7.10.1" - sources."@babel/plugin-transform-block-scoped-functions-7.10.1" - sources."@babel/plugin-transform-block-scoping-7.10.1" - sources."@babel/plugin-transform-classes-7.10.1" - sources."@babel/plugin-transform-computed-properties-7.10.1" - sources."@babel/plugin-transform-destructuring-7.10.1" - sources."@babel/plugin-transform-dotall-regex-7.10.1" - sources."@babel/plugin-transform-duplicate-keys-7.10.1" - sources."@babel/plugin-transform-exponentiation-operator-7.10.1" - sources."@babel/plugin-transform-for-of-7.10.1" - sources."@babel/plugin-transform-function-name-7.10.1" - sources."@babel/plugin-transform-literals-7.10.1" - sources."@babel/plugin-transform-member-expression-literals-7.10.1" - sources."@babel/plugin-transform-modules-amd-7.10.1" - sources."@babel/plugin-transform-modules-commonjs-7.10.1" - sources."@babel/plugin-transform-modules-systemjs-7.10.1" - sources."@babel/plugin-transform-modules-umd-7.10.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" - sources."@babel/plugin-transform-new-target-7.10.1" - sources."@babel/plugin-transform-object-super-7.10.1" - sources."@babel/plugin-transform-parameters-7.10.1" - sources."@babel/plugin-transform-property-literals-7.10.1" - sources."@babel/plugin-transform-regenerator-7.10.1" - sources."@babel/plugin-transform-reserved-words-7.10.1" - sources."@babel/plugin-transform-runtime-7.10.1" - sources."@babel/plugin-transform-shorthand-properties-7.10.1" - sources."@babel/plugin-transform-spread-7.10.1" - sources."@babel/plugin-transform-sticky-regex-7.10.1" - sources."@babel/plugin-transform-template-literals-7.10.1" - sources."@babel/plugin-transform-typeof-symbol-7.10.1" - sources."@babel/plugin-transform-unicode-escapes-7.10.1" - sources."@babel/plugin-transform-unicode-regex-7.10.1" - sources."@babel/preset-env-7.10.2" + sources."@babel/plugin-syntax-top-level-await-7.10.4" + sources."@babel/plugin-transform-arrow-functions-7.10.4" + sources."@babel/plugin-transform-async-to-generator-7.10.4" + sources."@babel/plugin-transform-block-scoped-functions-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.10.4" + sources."@babel/plugin-transform-classes-7.10.4" + sources."@babel/plugin-transform-computed-properties-7.10.4" + sources."@babel/plugin-transform-destructuring-7.10.4" + sources."@babel/plugin-transform-dotall-regex-7.10.4" + sources."@babel/plugin-transform-duplicate-keys-7.10.4" + sources."@babel/plugin-transform-exponentiation-operator-7.10.4" + sources."@babel/plugin-transform-for-of-7.10.4" + sources."@babel/plugin-transform-function-name-7.10.4" + sources."@babel/plugin-transform-literals-7.10.4" + sources."@babel/plugin-transform-member-expression-literals-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.4" + sources."@babel/plugin-transform-modules-commonjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.4" + sources."@babel/plugin-transform-modules-umd-7.10.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" + sources."@babel/plugin-transform-new-target-7.10.4" + sources."@babel/plugin-transform-object-super-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.4" + sources."@babel/plugin-transform-property-literals-7.10.4" + sources."@babel/plugin-transform-regenerator-7.10.4" + sources."@babel/plugin-transform-reserved-words-7.10.4" + sources."@babel/plugin-transform-runtime-7.10.4" + sources."@babel/plugin-transform-shorthand-properties-7.10.4" + sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-sticky-regex-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.4" + sources."@babel/plugin-transform-typeof-symbol-7.10.4" + sources."@babel/plugin-transform-unicode-escapes-7.10.4" + sources."@babel/plugin-transform-unicode-regex-7.10.4" + sources."@babel/preset-env-7.10.4" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/runtime-7.10.4" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.10.4" + sources."@babel/types-7.10.4" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" - (sources."@istanbuljs/load-nyc-config-1.1.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - ]; - }) + sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" (sources."@jest/transform-25.5.1" // { dependencies = [ @@ -68207,18 +68822,18 @@ in ]; }) sources."@jest/types-25.5.0" - sources."@types/babel__core-7.1.8" + sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.12" + sources."@types/babel__traverse-7.0.13" sources."@types/color-name-1.1.1" - sources."@types/estree-0.0.44" + sources."@types/estree-0.0.45" sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -68248,9 +68863,9 @@ in sources."acorn-7.3.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.0" + sources."ajv-keywords-3.5.1" sources."amdefine-1.0.1" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -68341,7 +68956,7 @@ in sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bindings-1.5.0" (sources."bl-4.0.2" // { dependencies = [ @@ -68384,7 +68999,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.12.0" + sources."browserslist-4.13.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -68399,7 +69014,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001084" + sources."caniuse-lite-1.0.30001099" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68521,7 +69136,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.478" + sources."electron-to-chromium-1.3.497" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -68537,9 +69152,10 @@ in }) sources."errno-0.1.7" sources."error-ex-1.3.2" + sources."escalade-3.0.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" @@ -68599,7 +69215,7 @@ in sources."make-dir-2.1.0" ]; }) - sources."find-up-2.1.0" + sources."find-up-4.1.0" (sources."findup-sync-3.0.0" // { dependencies = [ sources."micromatch-3.1.10" @@ -68702,7 +69318,7 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-reference-1.2.0" + sources."is-reference-1.2.1" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" @@ -68752,8 +69368,8 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."locate-path-5.0.0" + sources."lodash-4.17.19" sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" @@ -68806,7 +69422,7 @@ in sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."ncp-2.0.0" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-fetch-2.6.0" sources."node-int64-0.4.0" @@ -68823,7 +69439,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.58" + sources."node-releases-1.1.59" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -68849,9 +69465,9 @@ in sources."once-1.4.0" sources."os-browserify-0.3.0" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" sources."paredit.js-0.3.6" @@ -68862,7 +69478,7 @@ in sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -68879,16 +69495,13 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.3.0" sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."path-exists-3.0.0" ]; }) - sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" sources."prettier-1.19.1" - sources."private-0.1.8" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -68924,7 +69537,7 @@ in sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - sources."regenerator-transform-0.14.4" + sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpu-core-4.7.0" sources."regjsgen-0.5.2" @@ -69082,7 +69695,7 @@ in sources."supports-color-5.5.0" sources."syntax-error-1.4.0" sources."tapable-1.1.3" - (sources."tar-stream-2.1.2" // { + (sources."tar-stream-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -69224,9 +69837,8 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.3.0" sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."path-exists-3.0.0" ]; }) sources."yargs-parser-13.1.2" @@ -69282,7 +69894,7 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -69323,7 +69935,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."link-check-4.5.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."markdown-link-extractor-1.2.3" sources."marked-0.8.2" sources."mime-db-1.44.0" @@ -69357,6 +69969,293 @@ in bypassCache = true; reconstructLock = true; }; + mastodon-bot = nodeEnv.buildNodePackage { + name = "mastodon-bot"; + packageName = "mastodon-bot"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.0.2.tgz"; + sha512 = "vez108o65/wnYCRtkqkdqZTeY44rwPEezRZBZG7tZ8x9CCCni21ugu6s1LkEhEer2HVmWmLw/EGuCXS8ip45eQ=="; + }; + dependencies = [ + sources."acorn-5.7.4" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) + sources."ajv-4.11.8" + sources."ajv-keywords-1.5.1" + sources."ansi-escapes-1.4.0" + sources."ansi-gray-0.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."ansi-wrap-0.1.0" + sources."argparse-1.0.10" + sources."array-differ-1.0.0" + sources."array-uniq-1.0.3" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.10.0" + sources."babel-code-frame-6.26.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."beeper-1.1.1" + sources."bindings-1.2.1" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.1" + sources."bufferstreams-1.1.3" + sources."caller-path-0.1.0" + sources."callsites-0.2.0" + sources."caseless-0.12.0" + sources."chalk-1.1.3" + sources."circular-json-0.3.3" + sources."cli-cursor-1.0.2" + sources."cli-width-2.2.1" + sources."clone-1.0.4" + sources."clone-stats-0.0.1" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."color-support-1.1.3" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + sources."d-1.0.1" + sources."dashdash-1.14.1" + sources."dateformat-2.2.0" + sources."deasync-0.1.15" + sources."debug-2.6.9" + sources."deep-extend-0.5.1" + sources."deep-is-0.1.3" + sources."delayed-stream-1.0.0" + sources."doctrine-2.1.0" + (sources."duplexer2-0.0.2" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."ecc-jsbn-0.1.2" + sources."entities-1.1.2" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-map-0.1.5" + (sources."es6-set-0.1.5" // { + dependencies = [ + sources."es6-symbol-3.1.1" + ]; + }) + sources."es6-symbol-3.1.3" + sources."es6-weak-map-2.0.3" + sources."escape-string-regexp-1.0.5" + sources."escope-3.6.0" + sources."eslint-3.19.0" + sources."espree-3.5.4" + sources."esprima-4.0.1" + (sources."esquery-1.3.1" // { + dependencies = [ + sources."estraverse-5.1.0" + ]; + }) + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."event-emitter-0.3.5" + sources."exit-hook-1.1.1" + (sources."ext-1.4.0" // { + dependencies = [ + sources."type-2.0.0" + ]; + }) + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fancy-log-1.3.3" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."figures-1.7.0" + sources."file-entry-cache-2.0.0" + sources."flat-cache-1.3.4" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs.realpath-1.0.0" + sources."generate-function-2.3.1" + sources."generate-object-property-1.2.0" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."globals-9.18.0" + sources."glogg-1.0.2" + sources."graceful-fs-4.2.4" + sources."gulp-eslint-3.0.1" + (sources."gulp-util-3.0.8" // { + dependencies = [ + sources."object-assign-3.0.0" + ]; + }) + sources."gulplog-1.0.0" + sources."har-schema-2.0.0" + (sources."har-validator-5.1.3" // { + dependencies = [ + sources."ajv-6.12.3" + ]; + }) + sources."has-ansi-2.0.0" + sources."has-gulplog-0.1.0" + sources."http-signature-1.2.0" + sources."ignore-3.3.10" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."inquirer-0.12.0" + sources."interpret-1.4.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.20.4" + sources."is-property-1.0.2" + sources."is-resolvable-1.1.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."js-tokens-3.0.2" + sources."js-yaml-3.14.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + sources."jsonpointer-4.1.0" + sources."jsprim-1.4.1" + sources."levn-0.3.0" + sources."lodash-4.17.19" + sources."lodash._basecopy-3.0.1" + sources."lodash._basetostring-3.0.1" + sources."lodash._basevalues-3.0.0" + sources."lodash._getnative-3.9.1" + sources."lodash._isiterateecall-3.0.9" + sources."lodash._reescape-3.0.0" + sources."lodash._reevaluate-3.0.0" + sources."lodash._reinterpolate-3.0.0" + sources."lodash._root-3.0.1" + sources."lodash.escape-3.2.0" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + sources."lodash.keys-3.1.2" + sources."lodash.restparam-3.6.1" + sources."lodash.template-3.6.2" + sources."lodash.templatesettings-3.1.1" + sources."mastodon-api-1.3.0" + sources."mime-1.6.0" + 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.5" + sources."ms-2.0.0" + sources."multipipe-0.1.2" + sources."mute-stream-0.0.5" + sources."natural-compare-1.4.0" + sources."next-tick-1.0.0" + sources."node-addon-api-1.7.2" + sources."number-is-nan-1.0.1" + sources."oauth-0.9.15" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."optionator-0.8.3" + sources."os-homedir-1.0.2" + sources."parse-node-version-1.0.1" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-parse-1.0.6" + sources."performance-now-2.1.0" + sources."pluralize-1.2.1" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.1" + sources."progress-1.1.8" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."readable-stream-2.3.7" + sources."readline-1.3.0" + sources."readline2-1.0.1" + sources."rechoir-0.6.2" + sources."replace-ext-0.0.1" + sources."request-2.88.0" + sources."require-uncached-1.0.3" + sources."resolve-1.17.0" + sources."resolve-from-1.0.1" + sources."restore-cursor-1.0.1" + sources."rimraf-2.6.3" + sources."rss-parser-3.7.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."shelljs-0.7.8" + sources."slice-ansi-0.0.4" + sources."sparkles-1.0.1" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-3.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + (sources."table-3.8.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."time-stamp-1.1.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tumblr-0.4.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."twitter-1.7.1" + sources."type-1.2.0" + sources."type-check-0.3.2" + sources."typedarray-0.0.6" + sources."uri-js-4.2.2" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."vinyl-0.5.3" + sources."word-wrap-1.2.3" + sources."wrappy-1.0.2" + sources."write-0.2.1" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xtend-4.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Bot to publish twitter, tumblr or rss posts to an mastodon account."; + homepage = https://github.com/yogthos/mastodon-bot; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; @@ -69534,7 +70433,6 @@ in sources."collection-visit-1.0.0" sources."color-support-1.1.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" @@ -70070,8 +70968,8 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" - sources."typescript-3.9.5" - sources."uglify-js-3.9.4" + sources."typescript-3.9.6" + sources."uglify-js-3.10.0" sources."uglify-to-browserify-1.0.2" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -70147,7 +71045,7 @@ in sources."argparse-1.0.10" sources."array.prototype.map-1.0.2" sources."balanced-match-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" @@ -70215,7 +71113,7 @@ in sources."iterate-value-1.0.2" sources."js-yaml-3.13.1" sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."log-symbols-3.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" @@ -70316,7 +71214,7 @@ in sources."commander-4.1.1" ]; }) - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.44.0" @@ -70368,16 +71266,16 @@ in sources."enabled-1.0.2" sources."env-variable-0.0.6" sources."fast-safe-stringify-2.0.7" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.defaults-4.2.0" sources."lodash.omit-4.5.0" - sources."logform-2.1.2" + sources."logform-2.2.0" sources."ms-2.1.2" sources."one-time-0.0.4" sources."process-nextick-args-2.0.1" @@ -70391,7 +71289,7 @@ in sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" sources."winston-3.2.1" - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -70441,7 +71339,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -70950,19 +71848,20 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.0.6"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.0.6.tgz"; - sha512 = "5K7LKdy232xLSHMo3ZprAEHbLilszSD/qQkt+9PxByJnEMACeHJ7SH4Gpt/1FX+K75gHHNtlnHsWwpQ53lggEA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.1.2.tgz"; + sha512 = "In2GzDLER2Bm5SkuEQVrekrSFtPljpkMaEYcZxNkbTomYixI63PrCm1IJEZjEBjSkFaK5zY1t3sfEHKdAla+MQ=="; }; dependencies = [ - sources."@babel/runtime-7.10.2" - sources."@node-red/editor-api-1.0.6" - sources."@node-red/editor-client-1.0.6" - (sources."@node-red/nodes-1.0.6" // { + sources."@babel/runtime-7.10.4" + sources."@node-red/editor-api-1.1.2" + sources."@node-red/editor-client-1.1.2" + (sources."@node-red/nodes-1.1.2" // { dependencies = [ + sources."cookie-0.4.1" sources."http-errors-1.7.3" - sources."iconv-lite-0.5.1" + sources."iconv-lite-0.6.2" sources."inherits-2.0.4" sources."media-typer-1.1.0" (sources."raw-body-2.4.1" // { @@ -70972,18 +71871,18 @@ in }) ]; }) - sources."@node-red/registry-1.0.6" - sources."@node-red/runtime-1.0.6" - sources."@node-red/util-1.0.6" + sources."@node-red/registry-1.1.2" + sources."@node-red/runtime-1.1.2" + sources."@node-red/util-1.1.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" - (sources."agent-base-6.0.0" // { + (sources."agent-base-6.0.1" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.3" sources."ansi-regex-2.1.1" sources."append-field-1.0.0" sources."aproba-1.2.0" @@ -71003,13 +71902,20 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" + sources."axios-0.19.2" sources."balanced-match-1.0.0" (sources."basic-auth-2.0.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."bcrypt-3.0.6" + (sources."bcrypt-3.0.6" // { + dependencies = [ + sources."nan-2.13.2" + sources."node-pre-gyp-0.12.0" + sources."semver-5.7.1" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" (sources."bl-1.2.2" // { @@ -71048,10 +71954,11 @@ in sources."caseless-0.12.0" sources."cheerio-0.22.0" sources."chownr-1.1.4" + sources."cli-table-0.3.1" sources."clone-2.1.2" sources."code-point-at-1.1.0" + sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" sources."commist-1.1.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -71127,7 +72034,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."express-session-1.17.0" // { + (sources."express-session-1.17.1" // { dependencies = [ sources."depd-2.0.0" ]; @@ -71142,6 +72049,11 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" @@ -71195,7 +72107,7 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -71207,6 +72119,7 @@ in sources."leven-2.1.0" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" + sources."lodash.clonedeep-4.5.0" sources."lodash.defaults-4.2.0" sources."lodash.filter-4.6.0" sources."lodash.flatten-4.4.0" @@ -71226,7 +72139,7 @@ in }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-2.4.4" + sources."mime-2.4.6" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimatch-3.0.4" @@ -71251,7 +72164,8 @@ in sources."ms-2.0.0" sources."multer-1.4.2" sources."mustache-4.0.1" - sources."nan-2.13.2" + sources."mute-stream-0.0.8" + sources."nan-2.14.0" (sources."needle-2.5.0" // { dependencies = [ sources."debug-3.2.6" @@ -71260,11 +72174,16 @@ in }) sources."negotiator-0.6.2" sources."next-tick-1.0.0" - (sources."node-pre-gyp-0.12.0" // { + (sources."node-pre-gyp-0.14.0" // { dependencies = [ sources."semver-5.7.1" ]; }) + (sources."node-red-admin-0.2.6" // { + dependencies = [ + sources."bcrypt-3.0.8" + ]; + }) sources."node-red-node-rbe-0.2.9" sources."node-red-node-tail-0.1.1" sources."nopt-4.0.3" @@ -71316,6 +72235,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" + sources."read-1.0.7" sources."readable-stream-3.6.0" sources."regenerator-runtime-0.13.5" sources."reinterval-1.1.0" @@ -71341,7 +72261,6 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."signal-exit-3.0.3" - sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -71352,7 +72271,7 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tail-2.0.3" + sources."tail-2.0.4" (sources."tar-4.4.13" // { dependencies = [ sources."yallist-3.1.1" @@ -71378,7 +72297,7 @@ in sources."type-1.2.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.8.1" + sources."uglify-js-3.10.0" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."ultron-1.1.1" @@ -71440,7 +72359,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -71642,7 +72561,7 @@ in sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."balanced-match-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."boxen-4.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -71733,7 +72652,7 @@ in sources."pupa-2.0.1" sources."rc-1.2.8" sources."readdirp-3.4.0" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."semver-5.7.1" @@ -71787,10 +72706,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.5"; + version = "6.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz"; - sha512 = "CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.6.tgz"; + sha512 = "axnz6iHFK6WPE0js/+mRp+4IOwpHn5tJEw5KB6FiCU764zmffrhsYHbSHi2kKqNkRBt53XasXjngZfBD3FQzrQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -71812,7 +72731,7 @@ in }; dependencies = [ sources."@npmcli/ci-detect-1.2.0" - sources."@npmcli/git-2.0.2" + sources."@npmcli/git-2.0.3" sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/move-file-1.0.1" sources."@npmcli/promise-spawn-1.2.0" @@ -71822,10 +72741,10 @@ in sources."@tootallnate/once-1.1.2" sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" - sources."agent-base-6.0.0" + sources."agent-base-6.0.1" sources."agentkeepalive-4.1.3" sources."aggregate-error-3.0.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -71859,7 +72778,7 @@ in }) sources."brace-expansion-1.1.11" sources."builtins-1.0.3" - sources."cacache-15.0.4" + sources."cacache-15.0.5" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.1.0" @@ -71901,7 +72820,7 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" - sources."encoding-0.1.12" + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" sources."err-code-1.1.2" @@ -71930,13 +72849,13 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.4" + sources."hosted-git-info-3.0.5" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.2" sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -71982,30 +72901,25 @@ in ]; }) sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.7" + sources."make-fetch-happen-8.0.8" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minipass-3.1.3" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-3.1.3" sources."minipass-collect-1.0.2" (sources."minipass-fetch-1.2.1" // { dependencies = [ sources."minizlib-2.1.0" - sources."yallist-4.0.0" ]; }) sources."minipass-flush-1.0.5" @@ -72015,6 +72929,7 @@ in (sources."minizlib-1.3.3" // { dependencies = [ sources."minipass-2.9.0" + sources."yallist-3.1.1" ]; }) sources."mkdirp-1.0.4" @@ -72030,6 +72945,7 @@ in sources."semver-5.7.1" sources."tar-4.4.13" sources."which-1.3.1" + sources."yallist-3.1.1" ]; }) sources."nopt-4.0.3" @@ -72040,10 +72956,9 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-2.1.2" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-8.1.0" // { + (sources."npm-registry-fetch-8.1.2" // { dependencies = [ sources."minizlib-2.1.0" - sources."yallist-4.0.0" ]; }) sources."npmlog-4.1.2" @@ -72085,7 +73000,7 @@ in sources."read-package-json-fast-1.1.3" sources."readable-stream-2.3.7" sources."readdir-scoped-modules-1.1.0" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."request-2.88.2" sources."require-from-string-2.0.2" @@ -72107,7 +73022,7 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" - sources."socks-2.3.3" + sources."socks-2.4.1" sources."socks-proxy-agent-5.0.0" sources."spawn-please-0.3.0" sources."sprintf-js-1.0.3" @@ -72121,7 +73036,6 @@ in (sources."tar-6.0.2" // { dependencies = [ sources."minizlib-2.1.0" - sources."yallist-4.0.0" ]; }) sources."term-size-2.2.0" @@ -72159,7 +73073,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -72182,7 +73096,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -72395,109 +73309,109 @@ in sha512 = "G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/compat-data-7.10.1" - (sources."@babel/core-7.10.2" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/compat-data-7.10.4" + (sources."@babel/core-7.10.4" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.2" // { + (sources."@babel/generator-7.10.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.10.1" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.1" - sources."@babel/helper-builder-react-jsx-7.10.1" - sources."@babel/helper-builder-react-jsx-experimental-7.10.1" - sources."@babel/helper-compilation-targets-7.10.2" - sources."@babel/helper-create-class-features-plugin-7.10.2" - sources."@babel/helper-create-regexp-features-plugin-7.10.1" - sources."@babel/helper-define-map-7.10.1" - sources."@babel/helper-explode-assignable-expression-7.10.1" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-hoist-variables-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" - sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-plugin-utils-7.10.1" - sources."@babel/helper-regex-7.10.1" - sources."@babel/helper-remap-async-to-generator-7.10.1" - sources."@babel/helper-replace-supers-7.10.1" - sources."@babel/helper-simple-access-7.10.1" - sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/helper-wrap-function-7.10.1" - sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/plugin-proposal-async-generator-functions-7.10.1" - sources."@babel/plugin-proposal-class-properties-7.10.1" - sources."@babel/plugin-proposal-dynamic-import-7.10.1" - sources."@babel/plugin-proposal-json-strings-7.10.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" - sources."@babel/plugin-proposal-numeric-separator-7.10.1" - sources."@babel/plugin-proposal-object-rest-spread-7.10.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.1" - sources."@babel/plugin-proposal-optional-chaining-7.10.1" - sources."@babel/plugin-proposal-private-methods-7.10.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.1" + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" + sources."@babel/helper-builder-react-jsx-7.10.4" + sources."@babel/helper-builder-react-jsx-experimental-7.10.4" + sources."@babel/helper-compilation-targets-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.10.4" + sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-define-map-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-hoist-variables-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-regex-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helpers-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.10.4" + sources."@babel/plugin-proposal-async-generator-functions-7.10.4" + sources."@babel/plugin-proposal-class-properties-7.10.4" + sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" + sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-private-methods-7.10.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.10.1" + sources."@babel/plugin-syntax-class-properties-7.10.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-flow-7.10.1" + sources."@babel/plugin-syntax-flow-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.10.1" + sources."@babel/plugin-syntax-jsx-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.1" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.1" - sources."@babel/plugin-transform-arrow-functions-7.10.1" - sources."@babel/plugin-transform-async-to-generator-7.10.1" - sources."@babel/plugin-transform-block-scoped-functions-7.10.1" - sources."@babel/plugin-transform-block-scoping-7.10.1" - sources."@babel/plugin-transform-classes-7.10.1" - sources."@babel/plugin-transform-computed-properties-7.10.1" - sources."@babel/plugin-transform-destructuring-7.10.1" - sources."@babel/plugin-transform-dotall-regex-7.10.1" - sources."@babel/plugin-transform-duplicate-keys-7.10.1" - sources."@babel/plugin-transform-exponentiation-operator-7.10.1" - sources."@babel/plugin-transform-flow-strip-types-7.10.1" - sources."@babel/plugin-transform-for-of-7.10.1" - sources."@babel/plugin-transform-function-name-7.10.1" - sources."@babel/plugin-transform-literals-7.10.1" - sources."@babel/plugin-transform-member-expression-literals-7.10.1" - sources."@babel/plugin-transform-modules-amd-7.10.1" - sources."@babel/plugin-transform-modules-commonjs-7.10.1" - sources."@babel/plugin-transform-modules-systemjs-7.10.1" - sources."@babel/plugin-transform-modules-umd-7.10.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" - sources."@babel/plugin-transform-new-target-7.10.1" - sources."@babel/plugin-transform-object-super-7.10.1" - sources."@babel/plugin-transform-parameters-7.10.1" - sources."@babel/plugin-transform-property-literals-7.10.1" - sources."@babel/plugin-transform-react-jsx-7.10.1" - sources."@babel/plugin-transform-regenerator-7.10.1" - sources."@babel/plugin-transform-reserved-words-7.10.1" - sources."@babel/plugin-transform-shorthand-properties-7.10.1" - sources."@babel/plugin-transform-spread-7.10.1" - sources."@babel/plugin-transform-sticky-regex-7.10.1" - sources."@babel/plugin-transform-template-literals-7.10.1" - sources."@babel/plugin-transform-typeof-symbol-7.10.1" - sources."@babel/plugin-transform-unicode-escapes-7.10.1" - sources."@babel/plugin-transform-unicode-regex-7.10.1" - sources."@babel/preset-env-7.10.2" + sources."@babel/plugin-syntax-top-level-await-7.10.4" + sources."@babel/plugin-transform-arrow-functions-7.10.4" + sources."@babel/plugin-transform-async-to-generator-7.10.4" + sources."@babel/plugin-transform-block-scoped-functions-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.10.4" + sources."@babel/plugin-transform-classes-7.10.4" + sources."@babel/plugin-transform-computed-properties-7.10.4" + sources."@babel/plugin-transform-destructuring-7.10.4" + sources."@babel/plugin-transform-dotall-regex-7.10.4" + sources."@babel/plugin-transform-duplicate-keys-7.10.4" + sources."@babel/plugin-transform-exponentiation-operator-7.10.4" + sources."@babel/plugin-transform-flow-strip-types-7.10.4" + sources."@babel/plugin-transform-for-of-7.10.4" + sources."@babel/plugin-transform-function-name-7.10.4" + sources."@babel/plugin-transform-literals-7.10.4" + sources."@babel/plugin-transform-member-expression-literals-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.4" + sources."@babel/plugin-transform-modules-commonjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.4" + sources."@babel/plugin-transform-modules-umd-7.10.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" + sources."@babel/plugin-transform-new-target-7.10.4" + sources."@babel/plugin-transform-object-super-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.4" + sources."@babel/plugin-transform-property-literals-7.10.4" + sources."@babel/plugin-transform-react-jsx-7.10.4" + sources."@babel/plugin-transform-regenerator-7.10.4" + sources."@babel/plugin-transform-reserved-words-7.10.4" + sources."@babel/plugin-transform-shorthand-properties-7.10.4" + sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-sticky-regex-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.4" + sources."@babel/plugin-transform-typeof-symbol-7.10.4" + sources."@babel/plugin-transform-unicode-escapes-7.10.4" + sources."@babel/plugin-transform-unicode-regex-7.10.4" + sources."@babel/preset-env-7.10.4" sources."@babel/preset-modules-0.1.3" - sources."@babel/runtime-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/runtime-7.10.4" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.10.4" + sources."@babel/types-7.10.4" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -72515,7 +73429,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -72599,7 +73513,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.12.0" + sources."browserslist-4.13.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -72616,7 +73530,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001084" + sources."caniuse-lite-1.0.30001099" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72757,7 +73671,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.478" + sources."electron-to-chromium-1.3.497" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72774,6 +73688,7 @@ in ]; }) sources."es-to-primitive-1.2.1" + sources."escalade-3.0.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" @@ -72806,7 +73721,7 @@ in sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" sources."fill-range-4.0.0" - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -72936,7 +73851,7 @@ in (sources."jsdom-14.1.0" // { dependencies = [ sources."acorn-6.4.1" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."ws-6.2.1" ]; @@ -72952,8 +73867,8 @@ in sources."leven-3.1.0" sources."levenary-1.1.1" sources."levn-0.3.0" - sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."locate-path-3.0.0" + sources."lodash-4.17.19" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" @@ -73016,7 +73931,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.58" + sources."node-releases-1.1.59" sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -73039,9 +73954,9 @@ in sources."optionator-0.8.3" sources."ora-2.1.0" sources."os-browserify-0.3.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" sources."pako-0.2.9" sources."parse-asn1-5.1.5" sources."parse-json-4.0.0" @@ -73057,7 +73972,6 @@ in sources."pbkdf2-3.1.1" sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" - sources."pkg-up-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { @@ -73130,7 +74044,6 @@ in sources."posthtml-parser-0.4.2" sources."posthtml-render-1.2.2" sources."prelude-ls-1.1.2" - sources."private-0.1.8" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" @@ -73158,7 +74071,7 @@ in sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - sources."regenerator-transform-0.14.4" + sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -73249,7 +74162,7 @@ in sources."stable-0.1.8" (sources."static-eval-2.1.0" // { dependencies = [ - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" ]; }) @@ -73370,15 +74283,7 @@ in sources."xmlchars-2.2.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-14.2.3" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - ]; - }) + sources."yargs-14.2.3" sources."yargs-parser-15.0.1" ]; buildInputs = globalBuildInputs; @@ -73405,7 +74310,7 @@ in sources."negotiator-0.6.2" ]; }) - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -73430,7 +74335,7 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."bunyan-1.8.12" + sources."bunyan-1.8.14" sources."bunyan-syslog-udp-0.2.0" sources."busboy-0.3.1" sources."bytes-3.0.0" @@ -73442,7 +74347,6 @@ in sources."color-name-1.1.3" sources."colors-1.4.0" sources."combined-stream-1.0.8" - sources."commander-2.20.3" sources."compressible-2.0.18" sources."compression-1.7.4" sources."concat-map-0.0.1" @@ -73534,7 +74438,7 @@ in sources."kad-memstore-0.0.1" sources."limitation-0.2.1" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.clone-4.5.0" sources."media-typer-0.3.0" sources."mediawiki-title-0.6.5" @@ -73554,7 +74458,7 @@ in sources."nan-2.14.1" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" sources."oauth-sign-0.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" @@ -73635,7 +74539,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" @@ -73790,7 +74694,7 @@ in sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -73997,7 +74901,7 @@ in sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -74173,7 +75077,7 @@ in sources."readable-stream-2.3.7" ]; }) - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -74310,7 +75214,7 @@ in sources."statuses-1.5.0" sources."string2compact-1.3.0" sources."string_decoder-1.1.1" - sources."tar-stream-2.1.2" + sources."tar-stream-2.1.3" sources."thirty-two-0.0.2" sources."thunky-1.1.0" sources."to-array-0.1.4" @@ -74341,7 +75245,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -74360,10 +75264,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.2.2"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.2.2.tgz"; - sha512 = "8SumQnJM4qMSZa17Z8Tj4q/z3Lsa2+ETIf0EK4rtGi+Xrw8Y7zFKpimVWX6imQs9XSNANabs8h+thpb+n0PPDA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.4.0.tgz"; + sha512 = "qdNKfChd8TfSje29oDsYzVRg1eWhKbvgQR82QL9gc3d4abNRc4Z4EKsGVblezSCu8RUdVXsT2h/AQgJ5DZpBgQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -74394,7 +75298,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."at-least-node-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."braces-3.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -74440,7 +75344,7 @@ in sources."json-parse-better-errors-1.0.2" sources."jsonfile-6.0.1" sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" (sources."log-symbols-2.2.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -74507,7 +75411,7 @@ in sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."y18n-4.0.0" - sources."yargs-15.3.1" + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; @@ -74558,7 +75462,7 @@ in sources."inherits-2.0.4" sources."isexe-2.0.0" sources."keypress-0.2.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -74718,7 +75622,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { @@ -74846,6 +75750,34 @@ in bypassCache = true; reconstructLock = true; }; + purescript-language-server = nodeEnv.buildNodePackage { + name = "purescript-language-server"; + packageName = "purescript-language-server"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.2.tgz"; + sha512 = "m8Jb+PfODoyi8fzz50ckK+gYCxNIDuG0URe98lp1v4SkR5cxt9FHVEJayy75d3E4rhsghB+TxJ90ngjZWOGp5w=="; + }; + dependencies = [ + sources."isexe-2.0.0" + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" + sources."vscode-uri-2.1.2" + sources."which-2.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Language Server Protocol server for PureScript wrapping purs ide server functionality"; + homepage = https://github.com/nwolverson/purescript-language-server; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; purescript-psa = nodeEnv.buildNodePackage { name = "purescript-psa"; packageName = "purescript-psa"; @@ -74864,6 +75796,24 @@ in bypassCache = true; reconstructLock = true; }; + purty = nodeEnv.buildNodePackage { + name = "purty"; + packageName = "purty"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/purty/-/purty-6.2.0.tgz"; + sha512 = "JfT8kJHSyxuOFQtRiH2x55SiPxXZsSdedQlZap8JehQ7KzB49B5C9cWwVybtSB36BdADQcxPvtw8D52z4EPnBw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "PureScript pretty printer"; + homepage = "https://gitlab.com/joneshf/purty#README"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; react-native-cli = nodeEnv.buildNodePackage { name = "react-native-cli"; packageName = "react-native-cli"; @@ -75037,10 +75987,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.17.1"; + version = "2.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.17.1.tgz"; - sha512 = "lVrtCXJ+08Eapa0SfApLmRNWNWm2FsYFnLPIJZJvZz2uI2Gv+dfPyu1zgF7KKF/HYFJDvjxbdCbI8lUVMnG7Sg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.21.0.tgz"; + sha512 = "BEGgy+wSzux7Ycq58pRiWEOBZaXRXTuvzl1gsm7gqmsAHxkWf9nyA5V2LN9fGSHhhDQd0/C13iRzSh4bbIpWZQ=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -75061,58 +76011,56 @@ in version = "0.4.0-dev"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@rollup/plugin-commonjs-12.0.0" - sources."@rollup/plugin-node-resolve-8.0.1" + sources."@rollup/plugin-commonjs-13.0.2" + sources."@rollup/plugin-node-resolve-8.4.0" sources."@rollup/pluginutils-3.1.0" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/mocha-7.0.2" - sources."@types/node-14.0.13" + sources."@types/node-12.7.12" sources."@types/node-fetch-2.5.7" - sources."@types/resolve-0.0.8" - sources."@types/vscode-1.45.0" - (sources."@typescript-eslint/eslint-plugin-3.3.0" // { + sources."@types/resolve-1.17.1" + sources."@types/vscode-1.47.0" + (sources."@typescript-eslint/eslint-plugin-3.6.1" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.3.0" - sources."@typescript-eslint/parser-3.3.0" - (sources."@typescript-eslint/typescript-estree-3.3.0" // { + sources."@typescript-eslint/experimental-utils-3.6.1" + sources."@typescript-eslint/parser-3.6.1" + sources."@typescript-eslint/types-3.6.1" + (sources."@typescript-eslint/typescript-estree-3.6.1" // { dependencies = [ sources."semver-7.3.2" ]; }) + sources."@typescript-eslint/visitor-keys-3.6.1" sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."agent-base-4.3.0" - sources."ajv-6.12.2" - sources."ansi-colors-3.2.3" - (sources."ansi-escapes-4.3.1" // { - dependencies = [ - sources."type-fest-0.11.0" - ]; - }) + sources."ajv-6.12.3" + sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" + sources."array.prototype.map-1.0.2" sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."azure-devops-node-api-7.2.0" sources."balanced-match-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -75130,17 +76078,11 @@ in sources."supports-color-7.1.0" ]; }) - sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" - sources."chokidar-3.3.0" - sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" + sources."chokidar-3.3.1" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) @@ -75162,7 +76104,7 @@ in sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" - sources."diff-3.5.0" + sources."diff-4.0.2" sources."doctrine-3.0.0" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" @@ -75173,21 +76115,24 @@ in sources."semver-5.7.1" ]; }) - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" + sources."enquirer-2.3.6" sources."entities-1.1.2" sources."es-abstract-1.17.6" + sources."es-array-method-boxes-properly-1.0.0" + sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.2.0" // { + (sources."eslint-7.4.0" // { dependencies = [ sources."semver-7.3.2" ]; }) sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-7.1.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -75199,15 +76144,13 @@ in sources."estraverse-4.3.0" sources."estree-walker-1.0.1" sources."esutils-2.0.3" - sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.1.0" - sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" - sources."find-up-3.0.0" + sources."find-up-4.1.0" sources."flat-4.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.2" @@ -75237,39 +76180,31 @@ in sources."debug-3.2.6" ]; }) - sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.2.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) + sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" + sources."is-map-2.0.1" sources."is-module-1.0.0" sources."is-number-7.0.0" - (sources."is-reference-1.2.0" // { - dependencies = [ - sources."@types/estree-0.0.44" - ]; - }) + sources."is-reference-1.2.1" sources."is-regex-1.1.0" + sources."is-set-2.0.1" + sources."is-string-1.0.5" sources."is-symbol-1.0.3" + sources."isarray-2.0.5" sources."isexe-2.0.0" + sources."iterate-iterator-1.0.1" + sources."iterate-value-1.0.2" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-schema-traverse-0.4.1" @@ -75277,8 +76212,8 @@ in sources."leven-3.1.0" sources."levn-0.4.1" sources."linkify-it-2.2.0" - sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."locate-path-5.0.0" + sources."lodash-4.17.19" (sources."log-symbols-3.0.0" // { dependencies = [ sources."chalk-2.4.2" @@ -75295,45 +76230,35 @@ in sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-7.2.0" // { + (sources."mocha-8.0.1" // { dependencies = [ sources."debug-3.2.6" - sources."glob-7.1.3" + sources."has-flag-4.0.0" sources."js-yaml-3.13.1" - sources."ms-2.1.1" - sources."strip-json-comments-2.0.1" - sources."supports-color-6.0.0" - sources."which-1.3.1" + sources."strip-json-comments-3.0.1" + sources."supports-color-7.1.0" ]; }) sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" - (sources."node-environment-flags-1.0.6" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) sources."node-fetch-2.6.0" sources."normalize-path-3.0.0" sources."nth-check-1.0.2" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" - sources."onetime-5.1.0" sources."optionator-0.9.1" sources."os-0.1.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { @@ -75342,7 +76267,7 @@ in ]; }) sources."parse5-3.0.3" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -75350,59 +76275,44 @@ in sources."picomatch-2.2.2" sources."prelude-ls-1.2.1" sources."progress-2.0.3" + sources."promise.allsettled-1.0.2" sources."pseudomap-1.0.2" sources."punycode-2.1.1" sources."read-1.0.7" sources."readable-stream-3.6.0" - sources."readdirp-3.2.0" + sources."readdirp-3.3.0" sources."regexpp-3.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-1.17.0" sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.17.1" - sources."run-async-2.4.1" - (sources."rxjs-6.5.5" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."rollup-2.21.0" sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."semver-6.3.0" + sources."serialize-javascript-3.0.0" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sigmund-1.0.1" - sources."signal-exit-3.0.3" - (sources."slice-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."slice-ansi-2.1.0" sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" + sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-5.4.6" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."table-5.4.6" sources."text-table-0.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" + sources."tmp-0.0.29" sources."to-regex-range-5.0.1" sources."tslib-2.0.0" (sources."tsutils-3.17.1" // { @@ -75414,7 +76324,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."typed-rest-client-1.2.0" - sources."typescript-3.9.5" + sources."typescript-3.9.6" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" @@ -75426,7 +76336,6 @@ in dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" - sources."tmp-0.0.29" ]; }) sources."vscode-jsonrpc-5.1.0-next.1" @@ -75439,18 +76348,15 @@ in (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; }) sources."word-wrap-1.2.3" + sources."workerpool-6.0.0" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) @@ -75460,11 +76366,10 @@ in sources."yallist-2.1.2" (sources."yargs-13.3.2" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" ]; }) sources."yargs-parser-13.1.2" @@ -75488,7 +76393,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -75738,14 +76643,14 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.73.1"; + version = "1.74.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.73.1.tgz"; - sha512 = "8cBSUS8uGzI9/mYJqWfLsx/byIfUlpZS2gXpUP5yXu6rRuBpLAsg1V02rzjK+48t+3Sv5+qZCk1XRGbzoUTVGg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.74.1.tgz"; + sha512 = "j/IlaoAb20/RADC3+WE95Elk/1UW88FzXCPsj8DX8YHXNWe+V+mMJpHP33xdCwPjEIH/0dt/YbT4+yVCoGzrqg=="; }; dependencies = [ sources."2-thenable-1.0.0" - sources."@babel/parser-7.10.2" + sources."@babel/parser-7.10.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -75762,7 +76667,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.5.1" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.30.20" // { + (sources."@serverless/components-2.31.12" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -75773,48 +76678,57 @@ in sources."fs-extra-7.0.1" ]; }) - sources."@serverless/enterprise-plugin-3.6.13" + (sources."@serverless/enterprise-plugin-3.6.15" // { + dependencies = [ + sources."@serverless/platform-client-0.25.14" + ]; + }) sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-0.25.14" - (sources."@serverless/platform-client-china-1.0.18" // { + sources."@serverless/platform-client-1.0.9" + (sources."@serverless/platform-client-china-1.0.25" // { dependencies = [ - sources."archiver-4.0.1" - sources."async-2.6.3" + sources."archiver-4.0.2" + sources."async-3.2.0" ]; }) (sources."@serverless/platform-sdk-2.3.1" // { dependencies = [ + sources."debug-4.2.0" sources."https-proxy-agent-4.0.0" + sources."ms-2.1.2" sources."ramda-0.25.0" sources."ws-6.2.1" ]; }) sources."@serverless/template-1.1.3" - sources."@serverless/utils-1.1.0" - sources."@serverless/utils-china-0.1.15" + sources."@serverless/utils-1.2.0" + sources."@serverless/utils-china-0.1.17" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - (sources."@tencent-sdk/capi-0.2.15-alpha.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) - sources."@types/color-name-1.1.1" - sources."@types/glob-7.1.2" - sources."@types/lodash-4.14.155" + sources."@tencent-sdk/capi-0.2.17" + sources."@types/caseless-0.12.2" + sources."@types/chalk-2.2.0" + sources."@types/glob-7.1.3" + sources."@types/lodash-4.14.157" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.12" + sources."@types/node-14.0.23" + sources."@types/object-assign-4.0.30" + sources."@types/request-2.48.5" + sources."@types/request-promise-native-1.0.17" + sources."@types/tough-cookie-4.0.0" (sources."@typescript-eslint/typescript-estree-2.34.0" // { dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" sources."semver-7.3.2" ]; }) - sources."adm-zip-0.4.14" + sources."adm-zip-0.4.16" sources."after-0.8.2" sources."agent-base-5.1.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -75822,7 +76736,7 @@ in }) sources."ansi-escapes-4.3.1" sources."ansi-regex-4.1.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."app-module-path-2.2.0" (sources."archive-type-4.0.0" // { @@ -75868,7 +76782,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.700.0" // { + (sources."aws-sdk-2.713.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -75889,7 +76803,7 @@ in sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bl-4.0.2" sources."blob-0.0.5" sources."bluebird-3.7.2" @@ -75924,10 +76838,6 @@ in sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) @@ -75968,14 +76878,9 @@ in sources."cli-width-2.2.1" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" - (sources."color-3.0.0" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-1.5.3" sources."colornames-1.1.1" sources."colors-1.3.3" @@ -76020,8 +76925,8 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.28" - sources."debug-4.1.1" + sources."dayjs-1.8.29" + sources."debug-3.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."decomment-0.9.2" @@ -76066,14 +76971,39 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - sources."dependency-tree-7.2.1" + (sources."dependency-tree-7.2.1" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) sources."detective-amd-3.0.0" sources."detective-cjs-3.1.1" - sources."detective-es6-2.1.0" - sources."detective-less-1.0.2" - sources."detective-postcss-3.0.1" - sources."detective-sass-3.0.1" - sources."detective-scss-2.0.1" + sources."detective-es6-2.2.0" + (sources."detective-less-1.0.2" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + (sources."detective-postcss-3.0.1" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + (sources."detective-sass-3.0.1" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + (sources."detective-scss-2.0.1" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) sources."detective-stylus-1.0.0" sources."detective-typescript-5.8.0" sources."diagnostics-1.1.1" @@ -76105,11 +77035,17 @@ in sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."enabled-1.0.2" - sources."encoding-0.1.12" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) sources."end-of-stream-1.4.4" (sources."engine.io-client-3.4.3" // { dependencies = [ sources."component-emitter-1.3.0" + sources."debug-4.1.1" + sources."ms-2.1.2" sources."ws-6.1.4" ]; }) @@ -76128,8 +77064,8 @@ in sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" - sources."eslint-visitor-keys-1.2.0" + sources."escodegen-1.14.3" + sources."eslint-visitor-keys-1.3.0" sources."esniff-1.1.0" sources."esprima-4.0.1" sources."essentials-1.1.1" @@ -76160,7 +77096,6 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) sources."ext-1.4.0" @@ -76187,34 +77122,33 @@ in sources."fast-safe-stringify-2.0.7" sources."fastq-1.8.0" sources."fd-slicer-1.1.0" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."figures-3.2.0" sources."file-exists-dazinatorfork-1.0.2" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."filesize-3.6.1" - sources."filing-cabinet-2.5.1" + (sources."filing-cabinet-2.5.1" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) sources."fill-range-7.0.1" sources."find-0.3.0" (sources."find-process-1.4.3" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" ]; }) sources."find-requires-1.0.0" sources."flat-5.0.0" sources."flatten-1.0.3" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."follow-redirects-1.5.10" sources."for-in-1.0.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-2.5.1" sources."formidable-1.2.2" sources."fragment-cache-0.2.1" (sources."from2-2.3.0" // { @@ -76287,7 +77221,7 @@ in sources."har-validator-5.1.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" @@ -76306,7 +77240,9 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."agent-base-6.0.0" + sources."agent-base-6.0.1" + sources."debug-4.2.0" + sources."ms-2.1.2" ]; }) sources."iconv-lite-0.4.24" @@ -76424,7 +77360,7 @@ in }) sources."levn-0.3.0" sources."lie-3.3.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -76435,7 +77371,11 @@ in sources."type-1.2.0" ]; }) - sources."logform-2.1.2" + (sources."logform-2.2.0" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" @@ -76474,9 +77414,14 @@ in }) sources."mkdirp-0.5.5" sources."module-definition-3.3.0" - sources."module-lookup-amd-6.2.0" + (sources."module-lookup-amd-6.2.0" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) sources."moment-2.27.0" - sources."ms-2.1.2" + sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nanoid-2.1.11" sources."nanomatch-1.2.13" @@ -76557,16 +77502,13 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { - dependencies = [ - sources."has-flag-3.0.0" - sources."supports-color-6.1.0" - ]; - }) + sources."postcss-7.0.32" sources."postcss-values-parser-1.5.0" (sources."precinct-6.3.1" // { dependencies = [ sources."commander-2.20.3" + sources."debug-4.2.0" + sources."ms-2.1.2" ]; }) sources."prelude-ls-1.1.2" @@ -76575,7 +77517,11 @@ in sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" sources."proto-list-1.2.4" - sources."protobufjs-6.9.0" + (sources."protobufjs-6.10.0" // { + dependencies = [ + sources."@types/node-13.13.14" + ]; + }) sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."psl-1.8.0" @@ -76590,12 +77536,16 @@ in sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.5" sources."regex-not-1.0.2" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replaceall-0.1.6" - sources."request-2.88.2" + (sources."request-2.88.2" // { + dependencies = [ + sources."form-data-2.3.3" + ]; + }) sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."requirejs-2.3.6" @@ -76609,7 +77559,7 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -76637,7 +77587,12 @@ in sources."shebang-regex-1.0.0" sources."shortid-2.2.15" sources."signal-exit-3.0.3" - sources."simple-git-1.132.0" + (sources."simple-git-1.132.0" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -76658,7 +77613,6 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" - sources."ms-2.0.0" sources."source-map-0.5.7" ]; }) @@ -76673,13 +77627,13 @@ in sources."kind-of-3.2.2" ]; }) - sources."socket.io-client-2.3.0" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-client-2.3.0" // { dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" + sources."debug-4.1.1" + sources."ms-2.1.2" ]; }) + sources."socket.io-parser-3.3.0" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" @@ -76729,20 +77683,29 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."stylus-lookup-3.0.2" + (sources."stylus-lookup-3.0.2" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) (sources."superagent-3.8.3" // { dependencies = [ - sources."debug-3.2.6" sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) - sources."supports-color-7.1.0" - sources."tabtab-3.0.2" + sources."supports-color-6.1.0" + (sources."tabtab-3.0.2" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) sources."tapable-1.1.3" - sources."tar-stream-2.1.2" + sources."tar-stream-2.1.3" sources."term-size-1.2.0" sources."text-hex-1.0.0" sources."through-2.3.8" @@ -76772,7 +77735,7 @@ in sources."type-2.0.0" sources."type-check-0.3.2" sources."type-fest-0.11.0" - sources."typescript-3.9.5" + sources."typescript-3.9.6" sources."unbzip2-stream-1.4.3" sources."union-value-1.0.1" sources."uniq-1.0.1" @@ -76813,7 +77776,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."whatwg-fetch-3.0.0" + sources."whatwg-fetch-3.2.0" sources."which-1.3.1" sources."widest-line-2.0.1" (sources."winston-3.2.1" // { @@ -76821,7 +77784,7 @@ in sources."async-2.6.3" ]; }) - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -76832,7 +77795,7 @@ in sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -76869,7 +77832,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -77203,7 +78166,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.3" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."micromatch-3.1.10" @@ -77483,13 +78446,17 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.346.0"; + version = "1.361.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.346.0.tgz"; - sha512 = "uwJDC0CRefppngm1J1M+Sja5CVfdmzLYkxGYp3ZYXrzvd912pgzrdYm8ciUL5a8x1/C+2L0iZ09W68daSuObhA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.361.3.tgz"; + sha512 = "93SxV9WD+pN/9bGRizfoiYwfKHy5mDyTCdOYtWcVbTFMi7Gf+I4Q5YprunHBTeJLLh0+qsD6l77QBo9GiYyiaA=="; }; dependencies = [ - sources."@sindresorhus/is-0.14.0" + sources."@arcanis/slice-ansi-1.0.2" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@sindresorhus/is-3.0.0" (sources."@snyk/cli-interface-2.8.0" // { dependencies = [ (sources."@snyk/dep-graph-1.19.0" // { @@ -77511,6 +78478,7 @@ in sources."semver-7.3.2" ]; }) + sources."@snyk/docker-registry-v2-client-1.13.5" sources."@snyk/gemfile-1.2.0" sources."@snyk/graphlib-2.1.9-patch" sources."@snyk/inquirer-6.2.2-patch" @@ -77532,15 +78500,58 @@ in sources."tslib-2.0.0" ]; }) - sources."@szmarczak/http-timer-1.1.2" + (sources."@snyk/snyk-docker-pull-3.2.0" // { + dependencies = [ + sources."tmp-0.1.0" + ]; + }) + sources."@szmarczak/http-timer-4.0.5" + sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" + sources."@types/emscripten-1.39.4" + sources."@types/glob-7.1.3" sources."@types/hosted-git-info-2.7.0" - sources."@types/js-yaml-3.12.4" - sources."@types/node-14.0.13" + sources."@types/http-cache-semantics-4.0.0" + sources."@types/js-yaml-3.12.5" + sources."@types/keyv-3.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.13.14" + sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" + (sources."@yarnpkg/core-2.1.1" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."camelcase-5.3.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" + sources."has-flag-4.0.0" + sources."path-key-3.1.1" + sources."semver-7.3.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."supports-color-7.1.0" + sources."which-2.0.2" + ]; + }) + sources."@yarnpkg/fslib-2.1.0" + sources."@yarnpkg/json-proxy-2.1.0" + sources."@yarnpkg/libzip-2.1.0" sources."@yarnpkg/lockfile-1.1.0" + sources."@yarnpkg/parsers-2.1.0" + sources."@yarnpkg/pnp-2.1.0" + (sources."@yarnpkg/shell-2.1.0" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."abbrev-1.1.1" sources."agent-base-4.3.0" (sources."ansi-align-3.0.0" // { @@ -77552,8 +78563,10 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" + sources."any-promise-1.3.0" sources."archy-1.0.0" sources."argparse-1.0.10" + sources."array-union-2.1.0" sources."asap-2.0.6" sources."asn1-0.2.4" sources."ast-types-0.13.3" @@ -77585,24 +78598,28 @@ in ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."browserify-zlib-0.1.4" sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."bytes-3.1.0" - (sources."cacheable-request-6.1.0" // { + sources."cacheable-lookup-5.0.3" + (sources."cacheable-request-7.0.1" // { dependencies = [ sources."get-stream-5.1.0" - sources."lowercase-keys-2.0.0" ]; }) sources."camelcase-2.1.1" sources."chalk-2.4.2" sources."chardet-0.7.0" + sources."child-process-1.0.2" + sources."chownr-1.1.4" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" sources."cli-spinner-0.2.10" sources."cli-width-2.2.1" + sources."clipanion-2.4.2" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -77629,10 +78646,15 @@ in sources."data-uri-to-buffer-1.2.0" sources."debug-4.2.0" sources."decamelize-1.2.0" - sources."decompress-response-3.3.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" sources."deep-is-0.1.3" - sources."defer-to-connect-1.1.3" + sources."defer-to-connect-2.0.0" + sources."define-properties-1.1.3" (sources."degenerator-1.0.4" // { dependencies = [ sources."esprima-3.1.3" @@ -77640,6 +78662,7 @@ in }) sources."depd-1.1.2" sources."diff-4.0.2" + sources."dir-glob-3.0.1" (sources."docker-modem-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" @@ -77659,7 +78682,7 @@ in sources."es6-promisify-5.0.0" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -77667,16 +78690,21 @@ in sources."execa-1.0.0" sources."extend-3.0.2" sources."external-editor-3.1.0" + sources."fast-glob-3.2.4" sources."fast-levenshtein-2.0.6" + sources."fastq-1.8.0" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" sources."fs-constants-1.0.0" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ sources."readable-stream-1.1.14" ]; }) + sources."function-bind-1.1.1" sources."get-stream-4.1.0" (sources."get-uri-2.0.4" // { dependencies = [ @@ -77685,13 +78713,23 @@ in ]; }) sources."glob-7.1.6" + sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" - sources."got-9.6.0" + sources."globby-10.0.2" + sources."got-11.5.0" sources."graceful-fs-4.2.4" + sources."grapheme-splitter-1.0.4" sources."gunzip-maybe-1.4.2" + sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.4" + (sources."hosted-git-info-3.0.5" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -77700,6 +78738,7 @@ in sources."ms-2.0.0" ]; }) + sources."http2-wrapper-1.0.0-beta.5.2" (sources."https-proxy-agent-3.0.1" // { dependencies = [ sources."debug-3.2.6" @@ -77707,6 +78746,7 @@ in }) sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" + sources."ignore-5.1.8" sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -77715,14 +78755,18 @@ in sources."ini-1.3.5" sources."invert-kv-1.0.0" sources."ip-1.1.5" - sources."ipaddr.js-1.9.1" + sources."is-3.3.0" + sources."is-callable-1.2.0" sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.0.0" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" sources."is-gzip-1.0.0" sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" + sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-stream-1.1.0" @@ -77732,13 +78776,14 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-yaml-3.14.0" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" + sources."json-file-plus-3.3.1" (sources."jszip-3.5.0" // { dependencies = [ sources."pako-1.0.11" ]; }) - sources."keyv-3.1.0" + sources."keyv-4.0.1" sources."latest-version-5.1.0" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -77747,18 +78792,27 @@ in sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" + sources."lodash.flatmap-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" + sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" sources."lodash.set-4.3.2" - sources."lowercase-keys-1.0.1" + sources."lodash.topairs-4.3.0" + sources."logic-solver-2.0.1" + sources."lowercase-keys-2.0.0" sources."lru-cache-5.1.1" - sources."macos-release-2.3.0" + sources."macos-release-2.4.0" sources."make-dir-3.1.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.2" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nconf-0.10.0" @@ -77769,10 +78823,13 @@ in }) sources."netmask-1.0.6" sources."nice-try-1.0.5" + sources."node.extend-2.0.2" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-hash-2.0.3" + sources."object-keys-1.1.1" + sources."object.assign-4.1.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.0.4" @@ -77780,21 +78837,49 @@ in sources."os-locale-1.4.0" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" + sources."p-cancelable-2.0.0" sources."p-finally-1.0.0" + sources."p-limit-2.3.0" sources."p-map-2.1.0" + sources."p-try-2.2.0" sources."pac-proxy-agent-3.0.1" sources."pac-resolver-3.0.0" - sources."package-json-6.5.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.1.3" + sources."get-stream-5.1.0" + sources."got-9.6.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."lowercase-keys-1.0.1" + sources."p-cancelable-1.1.0" + sources."responselike-1.0.2" + ]; + }) sources."pako-0.2.9" + sources."parse-link-header-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" + sources."path-type-4.0.0" sources."peek-stream-1.1.3" + sources."picomatch-2.2.2" + sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" + sources."pretty-bytes-5.3.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" + sources."promise-deferred-2.0.3" + sources."promiseback-2.0.3" sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" @@ -77805,6 +78890,7 @@ in ]; }) sources."pupa-2.0.1" + sources."quick-lru-5.1.1" sources."raw-body-2.4.1" sources."rc-1.2.8" (sources."readable-stream-2.3.7" // { @@ -77813,13 +78899,16 @@ in sources."string_decoder-1.1.1" ]; }) - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" - sources."responselike-1.0.2" + sources."resolve-alpn-1.0.0" + sources."responselike-2.0.0" sources."restore-cursor-2.0.0" + sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."run-parallel-1.1.9" + sources."rxjs-6.6.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -77831,16 +78920,23 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" + sources."slash-3.0.0" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.0" - sources."snyk-docker-plugin-3.12.3" + (sources."snyk-docker-plugin-3.13.1" // { + dependencies = [ + sources."rimraf-3.0.2" + sources."snyk-nodejs-lockfile-parser-1.22.0" + sources."tmp-0.2.1" + ]; + }) sources."snyk-go-parser-1.4.1" (sources."snyk-go-plugin-1.14.2" // { dependencies = [ sources."tmp-0.1.0" ]; }) - (sources."snyk-gradle-plugin-3.5.0" // { + (sources."snyk-gradle-plugin-3.5.1" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -77861,7 +78957,11 @@ in sources."tslib-1.11.1" ]; }) - sources."snyk-nodejs-lockfile-parser-1.22.0" + (sources."snyk-nodejs-lockfile-parser-1.26.3" // { + dependencies = [ + sources."event-loop-spinner-2.0.0" + ]; + }) (sources."snyk-nuget-plugin-1.18.1" // { dependencies = [ sources."jszip-3.3.0" @@ -77929,7 +79029,15 @@ in sources."ssh2-0.8.9" sources."ssh2-streams-0.4.10" sources."statuses-1.5.0" + sources."stream-buffers-3.0.2" sources."stream-shift-1.0.1" + sources."stream-to-array-2.3.0" + (sources."stream-to-promise-2.2.0" // { + dependencies = [ + sources."end-of-stream-1.1.0" + sources."once-1.3.3" + ]; + }) sources."streamsearch-0.1.2" (sources."string-width-2.1.1" // { dependencies = [ @@ -77945,7 +79053,8 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."tar-stream-2.1.2" // { + sources."tar-4.4.13" + (sources."tar-stream-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -77965,14 +79074,17 @@ in sources."thunkify-2.1.2" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."toml-3.0.0" sources."tree-kill-1.2.2" sources."tslib-1.13.0" + sources."tunnel-0.0.6" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" + sources."underscore-1.10.2" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-4.1.0" // { @@ -78016,6 +79128,7 @@ in sources."xtend-4.0.2" sources."y18n-3.2.1" sources."yallist-3.1.1" + sources."yaml-1.10.0" (sources."yargs-3.32.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -78091,7 +79204,7 @@ in }) sources."socket.io-parser-3.4.1" sources."to-array-0.1.4" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -78605,7 +79718,7 @@ in sources."kind-of-3.2.2" sources."layered-graph-1.1.3" sources."level-5.0.1" - sources."level-codec-9.0.1" + sources."level-codec-9.0.2" sources."level-concat-iterator-2.0.1" sources."level-errors-2.0.1" (sources."level-iterator-stream-4.0.2" // { @@ -78956,7 +80069,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.3.3" + sources."socks-2.4.1" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -78975,20 +80088,27 @@ in sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.4" - (sources."ssb-db-20.1.0" // { + (sources."ssb-db-20.2.0" // { dependencies = [ sources."glob-7.1.6" + sources."mkdirp-1.0.4" sources."rimraf-3.0.2" ]; }) sources."ssb-ebt-5.6.7" - sources."ssb-friends-4.1.4" + sources."ssb-friends-4.2.0" (sources."ssb-gossip-1.1.1" // { dependencies = [ sources."atomic-file-1.1.5" ]; }) - sources."ssb-invite-2.1.4" + (sources."ssb-invite-2.1.5" // { + dependencies = [ + sources."abstract-leveldown-6.2.3" + sources."level-6.0.1" + sources."level-js-5.0.2" + ]; + }) sources."ssb-keys-7.2.2" sources."ssb-links-3.0.9" sources."ssb-local-1.0.0" @@ -79009,7 +80129,7 @@ in sources."ssb-ref-2.14.0" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" - sources."ssb-validate-4.1.0" + sources."ssb-validate-4.1.1" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -79161,7 +80281,7 @@ in sources."ws-1.1.5" ]; }) - sources."@types/babel-types-7.0.7" + sources."@types/babel-types-7.0.8" sources."@types/babylon-6.16.5" sources."accepts-1.3.7" sources."acorn-3.3.0" @@ -79194,7 +80314,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -79211,7 +80331,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.700.0" // { + (sources."aws-sdk-2.713.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -79252,7 +80372,7 @@ in sources."buffer-from-1.1.1" sources."bufferutil-1.3.0" sources."bufferview-1.0.1" - sources."bunyan-1.8.12" + sources."bunyan-1.8.14" sources."busboy-0.2.14" sources."bytebuffer-3.5.5" sources."bytes-3.1.0" @@ -79351,7 +80471,7 @@ in dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" - sources."ws-7.3.0" + sources."ws-7.3.1" ]; }) (sources."engine.io-client-3.4.3" // { @@ -79468,7 +80588,7 @@ in }) sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.0" + sources."is-my-json-valid-2.20.4" sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-regex-1.1.0" @@ -79480,7 +80600,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-turbo-0.4.0" - sources."js-base64-2.6.0" + sources."js-base64-2.6.3" sources."js-stringify-1.0.2" sources."js-yaml-3.2.7" sources."jsbn-0.1.1" @@ -79497,7 +80617,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-1.0.1" - sources."jsonpointer-4.0.1" + sources."jsonpointer-4.1.0" sources."jspath-0.3.4" (sources."jsprim-1.4.1" // { dependencies = [ @@ -79524,7 +80644,7 @@ in }) sources."load-json-file-1.1.0" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.get-4.4.2" sources."lodash.isequal-4.5.0" sources."long-2.4.0" @@ -79898,7 +81018,7 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."window-size-0.1.0" - (sources."winston-2.4.4" // { + (sources."winston-2.4.5" // { dependencies = [ sources."async-1.0.0" ]; @@ -80264,7 +81384,7 @@ in sources."graceful-fs-4.2.4" (sources."graphlib-2.1.8" // { dependencies = [ - sources."lodash-4.17.15" + sources."lodash-4.17.19" ]; }) sources."growl-1.9.2" @@ -80336,7 +81456,7 @@ in sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.6.0" // { dependencies = [ - sources."lodash-4.17.15" + sources."lodash-4.17.19" ]; }) sources."jsonfile-2.4.0" @@ -80408,7 +81528,7 @@ in sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -80603,7 +81723,7 @@ in sources."swagger-editor-2.10.5" (sources."swagger-test-templates-1.6.0" // { dependencies = [ - sources."lodash-4.17.15" + sources."lodash-4.17.19" ]; }) (sources."swagger-tools-0.9.16" // { @@ -80628,7 +81748,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -80695,7 +81815,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -80963,7 +82083,7 @@ in sources."levn-0.3.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."log-symbols-1.0.2" sources."map-like-2.0.0" sources."markdown-escapes-1.0.4" @@ -81151,67 +82271,84 @@ in textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; packageName = "textlint-rule-alex"; - version = "1.3.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-1.3.1.tgz"; - sha512 = "TP+dtJcCe0+ZR7Gp1E3iJdf3XtOImrEIcUdaQnok4QJJEutZ1dTiP4rCfnyOxz70NZ+2RdBJgZeZZWGhuJzSwA=="; + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-2.0.0.tgz"; + sha512 = "qyQsrKkSsBTk4PvQlRDDWW+A4mogoctjVAJjIDyQBVcyTqjJtkYfUNCrCXSLawnVTCgf+9ST+LuH44PoCxx2qA=="; }; dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.2.5" sources."@textlint/types-1.3.1" - sources."alex-5.1.0" - sources."ansi-align-2.0.0" - sources."ansi-regex-3.0.0" + sources."@types/unist-2.0.3" + sources."alex-8.1.1" + sources."ansi-align-3.0.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-find-index-1.0.2" sources."array-iterate-1.1.4" + sources."arrify-1.0.1" sources."bail-1.0.5" sources."balanced-match-1.0.0" sources."boundary-1.0.1" - (sources."boxen-1.3.0" // { + (sources."boxen-3.2.0" // { dependencies = [ - sources."camelcase-4.1.0" + sources."camelcase-5.3.1" ]; }) sources."brace-expansion-1.1.11" sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.1" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" - sources."capture-stack-trace-1.0.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + sources."pump-3.0.0" + ]; + }) + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" - sources."ci-info-1.6.0" - sources."cli-boxes-1.0.0" - sources."code-point-at-1.1.0" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.0" + sources."clone-response-1.0.2" sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."comma-separated-tokens-1.0.8" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { + (sources."concat-stream-2.0.0" // { dependencies = [ - sources."isarray-1.0.0" - sources."process-nextick-args-2.0.1" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" ]; }) - sources."configstore-3.1.2" + sources."configstore-4.0.0" sources."core-util-is-1.0.2" - sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."cuss-1.19.0" + sources."cuss-1.20.0" sources."debug-4.2.0" sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."defer-to-connect-1.1.3" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" sources."duplexer3-0.1.4" + sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" @@ -81220,132 +82357,165 @@ in sources."execa-0.7.0" sources."extend-3.0.2" sources."fault-1.0.4" - sources."find-up-1.1.2" + sources."figures-3.2.0" + sources."find-up-2.1.0" sources."fn-name-2.0.1" sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" - sources."get-stdin-4.0.1" sources."get-stream-3.0.0" sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" sources."glob-7.1.6" sources."global-dirs-0.1.1" - sources."got-6.7.1" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + sources."pump-3.0.0" + ]; + }) sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" + sources."has-yarn-2.1.0" + sources."hast-util-embedded-1.0.5" + sources."hast-util-from-parse5-5.0.3" + sources."hast-util-has-property-1.0.4" + sources."hast-util-is-body-ok-link-1.0.4" + sources."hast-util-is-element-1.0.4" + sources."hast-util-parse-selector-2.2.4" + sources."hast-util-phrasing-1.0.5" + sources."hast-util-to-nlcst-1.2.7" + sources."hast-util-to-string-1.0.4" + sources."hast-util-whitespace-1.0.4" + sources."hastscript-5.1.2" sources."hosted-git-info-2.8.8" - sources."ignore-3.3.10" + sources."http-cache-semantics-4.1.0" + sources."ignore-5.1.8" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indent-string-2.1.0" + sources."indent-string-3.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-ci-1.2.1" + sources."is-buffer-2.0.4" + sources."is-ci-2.0.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" - sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-hexadecimal-1.0.4" sources."is-hidden-1.1.3" sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" + sources."is-npm-3.0.0" sources."is-obj-1.0.1" sources."is-object-1.0.1" sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-utf8-0.2.1" sources."is-whitespace-character-1.0.4" sources."is-word-character-1.0.4" + sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-yaml-3.14.0" - sources."latest-version-3.1.0" + sources."json-buffer-3.0.0" + sources."json-parse-better-errors-1.0.2" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" sources."limit-spawn-0.0.3" - sources."load-json-file-1.1.0" + sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" + sources."locate-path-2.0.0" sources."lodash.difference-4.5.0" sources."lodash.intersection-4.4.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."map-obj-1.0.1" + sources."make-dir-1.3.0" + sources."map-obj-2.0.0" sources."map-stream-0.1.0" sources."markdown-escapes-1.0.4" sources."mdast-comment-marker-1.1.2" sources."mdast-util-to-nlcst-3.2.3" - sources."meow-3.7.0" + sources."meow-5.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" + sources."minimist-options-3.0.2" sources."ms-2.1.2" sources."nlcst-is-literal-1.2.1" sources."nlcst-normalize-2.1.4" sources."nlcst-search-1.5.1" sources."nlcst-to-string-2.0.4" sources."normalize-package-data-2.5.0" + sources."normalize-url-4.5.0" sources."npm-prefix-1.2.0" sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" sources."object-keys-1.1.1" sources."once-1.4.0" sources."os-homedir-1.0.2" + sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."package-json-4.0.1" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."parse-english-4.1.3" sources."parse-entities-1.2.2" - sources."parse-json-2.2.0" + sources."parse-json-4.0.0" sources."parse-latin-4.2.1" - sources."path-exists-2.1.0" + sources."parse5-5.1.1" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."path-type-1.1.0" + sources."path-type-3.0.0" sources."pause-stream-0.0.11" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."pluralize-7.0.0" - sources."prepend-http-1.0.4" + sources."pify-3.0.0" + sources."pluralize-8.0.0" + sources."prepend-http-2.0.0" sources."process-nextick-args-1.0.7" + sources."property-information-5.5.0" sources."pseudomap-1.0.2" sources."pump-1.0.3" sources."pump-chain-1.0.0" + sources."quick-lru-1.1.0" sources."quotation-1.1.3" sources."rc-1.2.8" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" sources."readable-stream-1.0.34" - sources."redent-1.0.0" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" + sources."redent-2.0.0" + sources."registry-auth-token-4.2.0" + sources."registry-url-5.1.0" + sources."rehype-parse-6.0.2" + sources."rehype-retext-2.0.4" sources."remark-frontmatter-1.3.3" - sources."remark-message-control-4.2.0" - sources."remark-parse-4.0.0" + sources."remark-message-control-5.0.0" + sources."remark-parse-7.0.2" sources."remark-retext-3.1.3" sources."repeat-string-1.6.1" - sources."repeating-2.0.1" sources."replace-ext-1.0.0" sources."resolve-1.17.0" sources."resolve-from-5.0.0" + sources."responselike-1.0.2" sources."retext-english-3.0.4" - sources."retext-equality-3.2.0" - sources."retext-profanities-4.4.0" - sources."safe-buffer-5.1.2" + (sources."retext-equality-4.3.0" // { + dependencies = [ + sources."unist-util-is-4.0.2" + sources."unist-util-visit-2.0.3" + sources."unist-util-visit-parents-3.1.0" + ]; + }) + sources."retext-profanities-5.0.0" + sources."safe-buffer-5.2.1" sources."semver-5.7.1" sources."semver-diff-2.1.0" sources."shebang-command-1.2.0" @@ -81353,6 +82523,7 @@ in sources."shellsubstitute-1.2.0" sources."signal-exit-3.0.3" sources."sliced-1.0.1" + sources."space-separated-tokens-1.1.5" (sources."spawn-to-readstream-0.1.3" // { dependencies = [ sources."object-keys-0.4.0" @@ -81376,12 +82547,12 @@ in sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - sources."string-width-2.1.1" + sources."string-width-3.1.0" sources."string_decoder-0.10.31" - sources."strip-ansi-4.0.0" - sources."strip-bom-2.0.0" + sources."strip-ansi-5.2.0" + sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."strip-indent-1.0.1" + sources."strip-indent-2.0.0" sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-5.5.0" @@ -81394,63 +82565,70 @@ in sources."readable-stream-2.0.6" ]; }) - sources."timed-out-4.0.1" - sources."to-vfile-2.2.0" + sources."to-readable-stream-1.0.0" + sources."to-vfile-6.1.0" sources."trim-0.0.1" - sources."trim-newlines-1.0.0" + sources."trim-newlines-2.0.0" sources."trim-trailing-lines-1.1.3" sources."trough-1.0.5" + sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."unherit-1.1.3" - sources."unified-6.2.0" - sources."unified-diff-1.0.2" - (sources."unified-engine-4.0.1" // { + (sources."unified-8.4.2" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."is-plain-obj-2.1.0" ]; }) - sources."unified-message-control-1.0.4" + sources."unified-diff-3.0.1" + sources."unified-engine-7.0.0" + sources."unified-message-control-2.0.0" sources."unique-string-1.0.0" + sources."unist-util-inspect-4.1.4" sources."unist-util-is-3.0.0" sources."unist-util-modify-children-1.1.6" sources."unist-util-position-3.1.0" sources."unist-util-remove-position-1.1.4" - sources."unist-util-stringify-position-1.1.2" + sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-1.4.1" sources."unist-util-visit-children-1.1.4" sources."unist-util-visit-parents-2.1.2" sources."untildify-2.1.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" - sources."url-parse-lax-1.0.0" + sources."update-notifier-3.0.1" + sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vfile-2.3.0" - sources."vfile-find-up-2.0.2" + sources."vfile-4.1.1" + sources."vfile-find-up-5.0.1" sources."vfile-location-2.0.6" - sources."vfile-message-1.1.1" - (sources."vfile-reporter-4.0.0" // { + sources."vfile-message-2.0.4" + (sources."vfile-reporter-6.0.1" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."has-flag-2.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-4.5.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-6.1.0" ]; }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" + sources."web-namespaces-1.1.4" sources."which-1.3.1" - sources."widest-line-2.0.1" + (sources."widest-line-2.0.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."x-is-function-1.0.4" sources."x-is-string-0.1.0" sources."xdg-basedir-3.0.0" sources."xtend-4.0.2" sources."yallist-2.1.2" + sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -81497,7 +82675,7 @@ in }; dependencies = [ sources."match-casing-1.0.3" - sources."strip-json-comments-3.1.0" + sources."strip-json-comments-3.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -81679,16 +82857,16 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.4.tgz"; - sha512 = "5J5Ehs1yH2CrW7TMAaTSN5GKwMItCg8TcILRYF3/mZfy9s84SEA17MN5cqwhIv3ftV+mU7GoEc63yJsjZYR+Kw=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.5.tgz"; + sha512 = "2oEtKX3xLpV+/K3vYiqMVeoCa5XcIylBRVV9swAXz2xTC9sg4qcJTbn4Ts0P1wZ0TZ4GPnaDj4Eb9PLFx7Ypyw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" sources."@textlint/types-1.3.1" sources."boundary-1.0.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."split-lines-2.0.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -81718,8 +82896,8 @@ in sources."@textlint/ast-node-types-4.2.5" sources."@textlint/types-1.3.1" sources."boundary-1.0.1" - sources."lodash-4.17.15" - sources."strip-json-comments-3.1.0" + sources."lodash-4.17.19" + sources."strip-json-comments-3.1.1" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."unist-util-is-3.0.0" @@ -81831,14 +83009,14 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" sources."accepts-1.3.7" sources."after-0.8.2" sources."agent-base-4.3.0" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" @@ -82135,7 +83313,7 @@ in sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-2.0.0" sources."regenerator-runtime-0.13.5" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" (sources."request-2.88.2" // { dependencies = [ @@ -82234,7 +83412,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.0" @@ -82253,10 +83431,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.117.1"; + version = "0.118.3"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.117.1.tgz"; - sha512 = "t4zeJhlNzUIj9+ub0l6nICVimSuRTZJOqvk3Rmlu+YGdTOJ49Wna8p7aumpkXJakJfITiybfpYE1XN1o1Z34UQ=="; + url = "https://registry.npmjs.org/three/-/three-0.118.3.tgz"; + sha512 = "ijECXrNzDkHieoeh2H69kgawTGH8DiamhR4uBN8jEM7VHSKvfTdEvOoHsA8Aq7dh7PHAxhlqBsN5arBI3KixSw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82296,7 +83474,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" @@ -82349,7 +83527,7 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimatch-3.0.4" @@ -82414,10 +83592,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.9.0"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.9.0.tgz"; - sha512 = "PCZVVbdI90e07avgNyBJiw32Q0YIFwqgIW/HFbU5g3Hh/+P5VBJP8TBlkXM27VCM7L3hyCC3z9K8uq9mI8aIVQ=="; + url = "https://registry.npmjs.org/triton/-/triton-7.10.0.tgz"; + sha512 = "IcnXbISVdJtwhTDpbO+LAfOF37G4uflrZMSnf4VPX1aMygOutXvFQcLz3ST0/1EmaZuPOHHyUxnaDuPGSU93pA=="; }; dependencies = [ sources."asn1-0.2.4" @@ -82473,7 +83651,7 @@ in ]; }) sources."keep-alive-agent-0.0.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" (sources."lomstream-1.1.0" // { dependencies = [ sources."assert-plus-0.1.5" @@ -82684,10 +83862,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.9.5"; + version = "3.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz"; - sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz"; + sha512 = "Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82738,14 +83916,11 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.9.4"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz"; - sha512 = "8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; + sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; - dependencies = [ - sources."commander-2.20.3" - ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; @@ -82759,17 +83934,18 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.7"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.7.tgz"; - sha512 = "EQAeMXAuWZYpOsSZSEcqxqKShLcGWuCTVExcdyKNvwmw2GR8I/qKg6l8dQENeYB4DC+wzxKJTX054iun+RrvqQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.9.tgz"; + sha512 = "H+CLr9LrO0xZ0UbDz8K3KK//oBc3XDuj4he86Xnw/zjIPJlknOuiHdmPRYTlgo7/0zGEmvVgxZ+m3aqUMIpIhQ=="; }; dependencies = [ - sources."@primer/octicons-9.6.0" + sources."@dabh/diagnostics-2.0.2" + sources."@primer/octicons-10.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.13.12" + sources."@types/node-14.0.23" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -82782,7 +83958,7 @@ in }) sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.7" - sources."async-2.6.3" + sources."async-3.2.0" sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" @@ -82790,8 +83966,7 @@ in sources."base64id-2.0.0" sources."better-assert-1.0.2" sources."blob-0.0.5" - sources."bluebird-3.7.2" - sources."blueimp-md5-2.14.0" + sources."blueimp-md5-2.16.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."bytes-3.1.0" @@ -82810,7 +83985,6 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" - sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."component-bind-1.0.0" @@ -82831,14 +84005,13 @@ in sources."defer-to-connect-1.1.3" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diagnostics-1.1.1" sources."diff-4.0.2" - sources."diff2html-3.1.8" + sources."diff2html-3.1.9" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" - sources."enabled-1.0.2" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" (sources."engine.io-3.4.2" // { @@ -82857,7 +84030,6 @@ in ]; }) sources."engine.io-parser-2.2.0" - sources."env-variable-0.0.6" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" @@ -82869,15 +84041,16 @@ in ]; }) sources."fast-safe-stringify-2.0.7" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."finalhandler-1.1.2" sources."find-up-4.1.0" + sources."fn.name-1.1.0" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."getmac-5.2.0" + sources."getmac-5.11.0" sources."glob-7.1.6" sources."got-9.6.0" sources."has-binary2-1.0.3" @@ -82900,7 +84073,7 @@ in sources."is-arrayish-0.3.2" sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."is-wsl-2.2.0" sources."isarray-2.0.1" sources."jquery-3.5.1" @@ -82909,12 +84082,12 @@ in sources."just-detect-adblock-1.0.0" sources."keyv-3.1.0" sources."knockout-3.5.1" - sources."kuler-1.0.1" + sources."kuler-2.0.0" sources."latest-version-5.1.0" sources."locate-path-5.0.0" sources."locks-0.2.2" - sources."lodash-4.17.15" - (sources."logform-2.1.2" // { + sources."lodash-4.17.19" + (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -82936,10 +84109,10 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."moment-2.25.3" + sources."moment-2.27.0" sources."ms-2.0.0" sources."negotiator-0.6.2" - sources."node-cache-5.1.1" + sources."node-cache-5.1.2" sources."nopt-1.0.10" sources."normalize-url-4.5.0" sources."nprogress-0.2.0" @@ -82948,7 +84121,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."one-time-0.0.4" + sources."one-time-1.0.0" sources."open-7.0.4" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -82981,7 +84154,7 @@ in sources."raw-body-2.4.0" sources."rc-1.2.8" sources."readable-stream-3.6.0" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -83054,8 +84227,8 @@ in sources."utils-merge-1.0.1" sources."vary-1.1.2" sources."which-module-2.0.0" - sources."winston-3.2.1" - (sources."winston-transport-4.3.0" // { + sources."winston-3.3.3" + (sources."winston-transport-4.4.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -83064,7 +84237,7 @@ in }) sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" @@ -83158,7 +84331,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -83299,7 +84472,7 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."log-symbols-2.2.0" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { @@ -83324,7 +84497,7 @@ in sources."mkdirp-0.5.5" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" @@ -83360,7 +84533,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -83406,7 +84579,7 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -83447,9 +84620,9 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -83465,14 +84638,14 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -83517,7 +84690,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bootstrap-vue-helper-json-1.1.1" (sources."boxen-3.2.0" // { dependencies = [ @@ -83670,7 +84843,7 @@ in }) sources."eslint-scope-4.0.3" sources."eslint-utils-1.4.3" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-5.0.1" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -83776,14 +84949,14 @@ in sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.3" + sources."hast-util-is-body-ok-link-1.0.4" sources."hast-util-is-element-1.0.4" sources."hast-util-parse-selector-2.2.4" - sources."hast-util-to-string-1.0.3" + sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" sources."hosted-git-info-2.8.8" sources."html-void-elements-1.0.5" - sources."html-whitespace-sensitive-tag-names-1.0.2" + sources."html-whitespace-sensitive-tag-names-1.0.3" sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" @@ -83864,7 +85037,7 @@ in sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.iteratee-4.7.0" @@ -84055,7 +85228,7 @@ in sources."regenerator-runtime-0.11.1" sources."regex-not-1.0.2" sources."regexpp-2.0.1" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."rehype-sort-attribute-values-2.0.1" (sources."remark-5.1.0" // { @@ -84091,7 +85264,7 @@ in sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -84251,7 +85424,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-3.9.5" + sources."typescript-3.9.6" (sources."typescript-eslint-parser-16.0.1" // { dependencies = [ sources."semver-5.5.0" @@ -84326,8 +85499,9 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.2.0" // { + (sources."vscode-css-languageservice-4.3.0" // { dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" ]; }) @@ -84389,15 +85563,15 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-4.2.0.tgz"; - sha512 = "WM03BEeC7CVw4PV8lwXKO6ag00MYdwMMe1SAJJfxz0uNMbTu7cYoH6Ia+e2DnAzpeOJLKCeL1IXvgxZSwVp4/Q=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-4.3.0.tgz"; + sha512 = "1BCFeXuMY3QHnlkiUqgCV4ODNN84X3mX4GJk+Gb8tFv0Z8Grj4LneYa4A/0txoxpsz5E05THnKtb31t0XPJ8EQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -84409,36 +85583,31 @@ in }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs3-7.10.2" + sources."@babel/runtime-corejs3-7.10.4" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.23.0" // { + (sources."addons-linter-1.26.0" // { dependencies = [ - sources."@babel/runtime-7.9.2" - sources."decamelize-1.2.0" - sources."yargs-15.3.1" + sources."@babel/runtime-7.10.2" ]; }) - sources."adm-zip-0.4.14" - sources."ajv-6.12.0" - sources."ajv-keywords-1.5.1" + sources."adm-zip-0.4.16" + sources."ajv-6.12.2" sources."ajv-merge-patch-4.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -84485,14 +85654,6 @@ in sources."atomic-sleep-1.0.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - sources."supports-color-2.0.0" - ]; - }) sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -84519,7 +85680,16 @@ in }) sources."bluebird-2.9.34" sources."boolbase-1.0.0" - sources."boxen-4.2.0" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."chalk-3.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -84541,11 +85711,10 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."caller-path-0.1.0" - sources."callsites-0.2.0" + sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" (sources."chokidar-2.1.8" // { @@ -84554,14 +85723,13 @@ in sources."normalize-path-3.0.0" ]; }) - (sources."chrome-launcher-0.13.1" // { + (sources."chrome-launcher-0.13.3" // { dependencies = [ sources."mkdirp-0.5.5" sources."rimraf-3.0.2" ]; }) sources."ci-info-2.0.0" - sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -84585,13 +85753,14 @@ in (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) sources."clone-1.0.4" sources."clone-response-1.0.2" - sources."co-4.6.0" - sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -84637,7 +85806,6 @@ in sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."d-1.0.1" sources."dashdash-1.14.1" sources."debounce-1.2.0" sources."debug-2.6.9" @@ -84657,8 +85825,7 @@ in (sources."dispensary-0.51.2" // { dependencies = [ sources."async-3.2.0" - sources."decamelize-1.2.0" - sources."yargs-15.3.1" + sources."pino-6.0.0" ]; }) sources."doctrine-3.0.0" @@ -84671,27 +85838,16 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" - sources."es5-ext-0.10.53" sources."es6-error-4.1.1" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" sources."es6-promise-2.3.0" - sources."es6-promisify-6.1.0" - (sources."es6-set-0.1.5" // { - dependencies = [ - sources."es6-symbol-3.1.1" - ]; - }) - sources."es6-symbol-3.1.3" - sources."es6-weak-map-2.0.3" + sources."es6-promisify-6.1.1" sources."escape-string-regexp-1.0.5" - sources."escope-3.6.0" (sources."eslint-5.16.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -84710,53 +85866,10 @@ in sources."supports-color-5.5.0" ]; }) - (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { - dependencies = [ - sources."acorn-5.7.4" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - sources."ajv-4.11.8" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."cli-cursor-1.0.2" - sources."doctrine-2.1.0" - sources."eslint-3.19.0" - sources."espree-3.5.4" - sources."figures-1.7.0" - sources."file-entry-cache-2.0.0" - sources."flat-cache-1.3.4" - sources."globals-9.18.0" - sources."ignore-3.3.10" - sources."inquirer-0.12.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mkdirp-0.5.5" - sources."onetime-1.1.0" - sources."progress-1.1.8" - sources."restore-cursor-1.0.1" - sources."run-async-0.1.0" - sources."slice-ansi-0.0.4" - sources."string-width-1.0.2" - sources."strip-ansi-4.0.0" - sources."strip-bom-3.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" - (sources."table-3.8.3" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - ]; - }) - sources."write-0.2.1" - ]; - }) + sources."eslint-plugin-no-unsanitized-3.1.2" sources."eslint-scope-4.0.3" sources."eslint-utils-1.4.3" - sources."eslint-visitor-keys-1.1.0" + sources."eslint-visitor-keys-1.2.0" (sources."espree-6.2.1" // { dependencies = [ sources."acorn-7.3.1" @@ -84771,9 +85884,8 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - (sources."execa-4.0.2" // { + (sources."execa-4.0.3" // { dependencies = [ sources."cross-spawn-7.0.3" sources."mimic-fn-2.1.0" @@ -84784,7 +85896,6 @@ in sources."which-2.0.2" ]; }) - sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -84804,11 +85915,6 @@ in sources."kind-of-5.1.0" ]; }) - (sources."ext-1.4.0" // { - dependencies = [ - sources."type-2.0.0" - ]; - }) sources."extend-3.0.2" sources."extend-shallow-3.0.2" (sources."external-editor-3.1.0" // { @@ -84862,18 +85968,16 @@ in sources."fs-constants-1.0.0" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.11" // { + (sources."fx-runner-1.0.12" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" sources."which-1.2.4" ]; }) - sources."generate-function-2.3.1" - sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-stream-5.1.0" sources."get-value-2.0.6" @@ -84881,7 +85985,6 @@ in (sources."git-rev-sync-2.0.0" // { dependencies = [ sources."graceful-fs-4.1.15" - sources."shelljs-0.7.7" ]; }) sources."glob-7.1.6" @@ -84903,7 +86006,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" - sources."has-ansi-2.0.0" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" sources."has-value-1.0.0" @@ -84920,11 +86022,7 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" - (sources."import-fresh-3.2.1" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) + sources."import-fresh-3.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -84932,23 +86030,13 @@ in sources."ini-1.3.5" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" ]; }) @@ -84968,12 +86056,10 @@ in sources."is-docker-2.0.0" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" - sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.0" sources."is-npm-4.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -84983,10 +86069,8 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" - sources."is-property-1.0.2" sources."is-regex-1.1.0" sources."is-relative-0.1.3" - sources."is-resolvable-1.1.0" sources."is-stream-2.0.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -85009,12 +86093,10 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-1.0.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - sources."jsonpointer-4.0.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."ms-2.1.2" @@ -85040,7 +86122,7 @@ in sources."lighthouse-logger-1.2.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" sources."lodash.isinteger-4.0.4" @@ -85059,7 +86141,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.15" + sources."mdn-browser-compat-data-1.0.25" (sources."mem-5.1.1" // { dependencies = [ sources."mimic-fn-2.1.0" @@ -85074,7 +86156,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - sources."mkdirp-1.0.3" + sources."mkdirp-1.0.4" sources."moment-2.27.0" sources."ms-2.0.0" sources."multimatch-4.0.0" @@ -85092,8 +86174,8 @@ in sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" - sources."neo-async-2.6.1" - sources."next-tick-1.0.0" + sources."neo-async-2.6.2" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" (sources."node-notifier-6.0.0" // { @@ -85109,7 +86191,6 @@ in ]; }) sources."nth-check-1.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -85135,7 +86216,6 @@ in sources."onetime-2.0.1" sources."open-7.0.0" sources."optionator-0.8.3" - sources."os-homedir-1.0.2" sources."os-locale-5.0.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" @@ -85151,11 +86231,7 @@ in ]; }) sources."pako-1.0.11" - (sources."parent-module-1.0.1" // { - dependencies = [ - sources."callsites-3.1.0" - ]; - }) + sources."parent-module-1.0.1" sources."parse-json-5.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" @@ -85167,11 +86243,10 @@ in sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-6.0.0" + sources."pino-6.3.2" sources."pino-std-serializers-2.4.2" - sources."pluralize-1.2.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.32" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -85208,18 +86283,12 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."readline2-1.0.1" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" - ]; - }) sources."rechoir-0.6.2" sources."regenerator-runtime-0.13.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.0" sources."regexpp-2.0.1" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" (sources."relaxed-json-1.0.3" // { dependencies = [ @@ -85237,23 +86306,21 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."require-uncached-1.0.3" sources."resolve-1.17.0" - sources."resolve-from-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.4.1" - sources."rx-lite-3.1.2" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.1.3" + sources."semver-7.3.2" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -85270,7 +86337,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.7.8" + sources."shelljs-0.7.7" sources."shellwords-0.1.1" (sources."sign-addon-2.0.5" // { dependencies = [ @@ -85278,6 +86345,7 @@ in sources."es6-promisify-6.0.2" sources."punycode-1.4.1" sources."request-2.88.0" + sources."source-map-support-0.5.16" sources."tough-cookie-2.4.3" ]; }) @@ -85287,7 +86355,6 @@ in sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" ]; }) (sources."snapdragon-0.8.2" // { @@ -85323,7 +86390,7 @@ in sources."sonic-boom-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."split-0.3.3" @@ -85355,10 +86422,10 @@ in sources."once-1.3.3" ]; }) - (sources."string-width-4.2.0" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) sources."string.prototype.trimend-1.0.1" @@ -85374,8 +86441,6 @@ in (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -85409,7 +86474,6 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.2.0" sources."type-check-0.3.2" sources."type-detect-4.0.8" sources."type-fest-0.8.1" @@ -85433,28 +86497,42 @@ in ]; }) sources."upath-1.2.0" - sources."update-notifier-4.0.0" + (sources."update-notifier-4.0.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" - sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" sources."watchpack-1.6.1" sources."wcwidth-1.0.1" sources."webidl-conversions-5.0.0" - sources."whatwg-url-8.0.0" + sources."whatwg-url-8.1.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" - sources."widest-line-3.1.0" + (sources."widest-line-3.1.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."winreg-0.0.12" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) @@ -85472,10 +86550,14 @@ in sources."xregexp-4.3.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-15.1.0" // { + (sources."yargs-15.3.1" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."decamelize-1.2.0" - sources."yargs-parser-16.1.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) (sources."yargs-parser-18.1.3" // { @@ -85537,9 +86619,9 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.0" + sources."ajv-keywords-3.5.1" sources."anymatch-3.1.1" sources."aproba-1.2.0" sources."arr-diff-4.0.0" @@ -85568,7 +86650,7 @@ in }) sources."base64-js-1.3.1" sources."big.js-5.2.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.1.2" @@ -85801,7 +86883,7 @@ in sources."ms-2.0.0" sources."nan-2.14.1" sources."nanomatch-1.2.13" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" @@ -86353,13 +87435,13 @@ in sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; }; dependencies = [ - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."accepts-1.3.7" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.0" + sources."ajv-keywords-3.5.1" sources."ansi-colors-3.2.4" sources."ansi-html-0.0.7" sources."ansi-regex-2.1.1" @@ -86627,7 +87709,7 @@ in sources."killable-1.0.1" sources."kind-of-6.0.3" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."loglevel-1.6.8" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -86934,10 +88016,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.2.tgz"; - sha512 = "9Gm8X0c6eXlKnmltMPFCBeGOKjtcRIyTt4VaO3k1TkNgVTe5Ov2lYsYVuyLp0kp8DItO3apewflM+1GYgh6V2Q=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz"; + sha512 = "q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -86946,14 +88028,14 @@ in sources."@npmcli/move-file-1.0.1" sources."@types/json-schema-7.0.5" sources."aggregate-error-3.0.1" - sources."ajv-6.12.2" - sources."ajv-keywords-3.5.0" + sources."ajv-6.12.3" + sources."ajv-keywords-3.5.1" sources."array-union-2.1.0" sources."balanced-match-1.0.0" sources."big.js-5.2.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."cacache-15.0.4" + sources."cacache-15.0.5" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."commondir-1.0.1" @@ -86985,30 +88067,26 @@ in sources."json5-2.1.3" sources."loader-utils-2.0.0" sources."locate-path-5.0.0" - sources."lru-cache-5.1.1" + sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minipass-3.1.3" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-3.1.3" sources."minipass-collect-1.0.2" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.3" - (sources."minizlib-2.1.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minizlib-2.1.0" sources."mkdirp-1.0.4" sources."normalize-path-3.0.0" sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.0.2" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."p-map-4.0.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" @@ -87025,23 +88103,19 @@ in sources."safe-buffer-5.2.1" sources."schema-utils-2.7.0" sources."semver-6.3.0" - sources."serialize-javascript-3.1.0" + sources."serialize-javascript-4.0.0" sources."slash-3.0.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."ssri-8.0.0" - (sources."tar-6.0.2" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."tar-6.0.2" sources."to-regex-range-5.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."uri-js-4.2.2" sources."webpack-sources-1.4.3" sources."wrappy-1.0.2" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -87073,7 +88147,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.12" + sources."@types/node-13.13.14" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -87246,7 +88320,7 @@ in }) sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.1" - sources."protobufjs-6.9.0" + sources."protobufjs-6.10.0" sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.1.3" @@ -87335,7 +88409,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -87398,10 +88472,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.8.0.tgz"; - sha512 = "+mvpHHPyQo/cNnEdrydH7h13FC393FQ9Uj88W/BbTdAANDy7eTHlmqPDzvv6X5HKl5fi5RLWCWsO4SdAx0WEMw=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.9.0.tgz"; + sha512 = "nRExM5NfJXzxTKlFmHKr/ZtoxZCddH1kuuWNfHRvTLCEHzexIn/YvI/DBZHxKLh/ym9f4Q4j4zW76vB6J18lUQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -87413,7 +88487,7 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.0" - sources."jsonc-parser-2.2.1" + sources."jsonc-parser-2.3.0" sources."ms-2.0.0" sources."prettier-1.19.1" sources."request-light-0.2.5" @@ -87473,21 +88547,21 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/runtime-7.10.2" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/runtime-7.10.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/color-name-1.1.1" - sources."@types/glob-7.1.2" + sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.23" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -87690,6 +88764,7 @@ in sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" sources."figures-2.0.0" + sources."filelist-1.0.1" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -87831,6 +88906,11 @@ in sources."isstream-0.1.2" sources."istextorbinary-2.6.0" sources."isurl-1.0.0" + (sources."jake-10.8.2" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) sources."js-tokens-4.0.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" @@ -87860,7 +88940,7 @@ in }) sources."locate-path-2.0.0" sources."locutus-2.0.11" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" @@ -87869,7 +88949,7 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.3.0" + sources."macos-release-2.4.0" sources."make-dir-1.3.0" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" @@ -88075,7 +89155,7 @@ in sources."root-check-1.0.0" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-6.5.5" + sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -88230,7 +89310,7 @@ in sources."text-table-0.2.0" sources."textextensions-2.6.0" sources."through-2.3.8" - sources."through2-3.0.1" + sources."through2-3.0.2" sources."timed-out-4.0.1" sources."titleize-1.0.1" sources."tmp-0.0.33" @@ -88316,17 +89396,18 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."cli-cursor-3.1.0" + sources."cli-width-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" sources."debug-3.2.6" - sources."execa-4.0.2" + sources."execa-4.0.3" sources."figures-3.2.0" sources."get-stream-5.1.0" sources."has-flag-4.0.0" - (sources."inquirer-7.2.0" // { + (sources."inquirer-7.3.2" // { dependencies = [ - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."strip-ansi-6.0.0" ]; }) @@ -88356,25 +89437,42 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.10.1" // { + (sources."yeoman-generator-4.11.0" // { dependencies = [ sources."debug-4.2.0" sources."diff-4.0.2" + sources."dir-glob-2.2.2" + sources."ejs-3.1.3" sources."find-up-3.0.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" sources."locate-path-3.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) + (sources."mem-fs-editor-7.0.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-json-5.0.0" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-4.0.1" sources."read-pkg-5.2.0" sources."read-pkg-up-5.0.0" sources."semver-7.3.2" + sources."slash-2.0.0" sources."type-fest-0.6.0" ]; }) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix index b05190ed49..3aecfde8a7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "angstrom"; - version = "0.13.0"; + version = "0.14.1"; minimumOCamlVersion = "4.04"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0vzbwd8j34iv7n6gwqq2mf25q7rqpnpxnifb9ssxhq55p5dd1kp4"; + sha256 = "1l69y0qspgi7kgrphyh7718hjb2sml1a9lljkp65bkqmmmi6ybly"; }; checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix deleted file mode 100644 index a49e0e8a77..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: - -let version = "2.0.0"; in - -stdenv.mkDerivation { - pname = "ocaml-base64"; - inherit version; - - src = fetchzip { - url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; - sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; - }; - - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; - - meta = { - homepage = "https://github.com/mirage/ocaml-base64"; - platforms = ocaml.meta.platforms or []; - description = "Base64 encoding and decoding in OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix new file mode 100644 index 0000000000..e02b1159a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl +, bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config +}: + +buildDunePackage rec { + pname = "bigarray-overlap"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-v${version}.tbz"; + sha256 = "1v86avafsbyxjccy0y9gny31s2jzb0kd42v3mhcalklx5f044lcy"; + }; + + minimumOCamlVersion = "4.07"; + useDune2 = true; + + propagatedBuildInputs = [ bigarray-compat ]; + + checkInputs = [ alcotest astring fpath bos findlib pkg-config ]; + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/dinosaure/overlap"; + description = "A minimal library to know that 2 bigarray share physically the same memory or not"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix index 22a4e6371a..386afe33d7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,27 +1,25 @@ -{ lib, fetchFromGitHub, buildDunePackage -, ppx_fields_conv, ppx_sexp_conv +{ lib, fetchurl, buildDunePackage +, ppx_fields_conv, ppx_sexp_conv, stdlib-shims , base64, fieldslib, jsonm, re, stringext, uri-sexp }: buildDunePackage rec { - pname = "cohttp"; - version = "2.1.3"; + pname = "cohttp"; + version = "2.5.1"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cohttp"; - rev = "v${version}"; - sha256 = "16k4ldmz6ljryhr139adlma130frb5wh13qswkrwc5gxx6d2wh8d"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz"; + sha256 = "0im91mi3nxzqfd7fs5r0zg5gsparfnf5zaz13mpw247hkd3y3396"; }; buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; - propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp ]; + propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ]; meta = { description = "HTTP(S) library for Lwt, Async and Mirage"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/mirage/ocaml-cohttp"; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 588ba6711c..3a99ed9536 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -11,6 +11,8 @@ buildDunePackage { pname = "cohttp-lwt-unix"; inherit (cohttp-lwt) version src meta; + useDune2 = true; + buildInputs = [ cmdliner ppx_sexp_conv ]; propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix index 748b970477..1f261be620 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -2,6 +2,8 @@ if !stdenv.lib.versionAtLeast cohttp.version "0.99" then cohttp +else if !stdenv.lib.versionAtLeast ppx_sexp_conv.version "0.13" +then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}" else buildDunePackage { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix index 22538b87f6..7fbeefb392 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, ppx_sexp_conv, sexplib -, astring, ipaddr, macaddr, uri, +{ stdenv, fetchurl, buildDunePackage +, ppx_sexp_conv, sexplib, astring, uri, logs +, ipaddr, ipaddr-sexp }: buildDunePackage rec { pname = "conduit"; - version = "1.4.0"; + version = "2.2.2"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-conduit"; - rev = "v${version}"; - sha256 = "1qzamqcmf9ywz04bkwrv17mz9j6zq2w9h1xmnjvp11pnwrs2xq8l"; + minimumOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"; + sha256 = "1zb83w2pq9c8xrappfxa6y5q93772f5dj22x78camsm77a2c2z55"; }; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ astring ipaddr macaddr sexplib uri ]; + propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ]; meta = { description = "Network connection library for TCP and SSL"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/mirage/ocaml-conduit"; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 51fb369e66..b3c7e7fa86 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,16 +1,20 @@ -{ stdenv, buildDunePackage, conduit-lwt -, logs, ppx_sexp_conv, lwt_ssl +{ stdenv, buildDunePackage +, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp +, lwt_ssl, tls }: -if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0" -then conduit-lwt -else - buildDunePackage { pname = "conduit-lwt-unix"; - inherit (conduit-lwt) version src meta; + inherit (conduit-lwt) version src minimumOCamlVersion; + + useDune2 = true; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ]; + propagatedBuildInputs = + [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ]; + + meta = conduit-lwt.meta // { + description = "A network connection establishment library for Lwt_unix"; + }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix index 2eb225d88b..9bcd98e06a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,14 +1,14 @@ -{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt }: - -if !stdenv.lib.versionAtLeast conduit.version "1.0" -then conduit -else +{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: buildDunePackage { pname = "conduit-lwt"; - inherit (conduit) version src meta; + inherit (conduit) version src minimumOCamlVersion; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit ocaml_lwt ]; + propagatedBuildInputs = [ conduit ocaml_lwt sexplib ]; + + meta = conduit.meta // { + description = "A network connection establishment library for Lwt"; + }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix index 1d455582b3..a17ea72140 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; + useDune2 = true; + src = fetchFromGitHub { owner = "rgrinberg"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix index 68a8ad8da4..6075f4e7fb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "dns"; - version = "4.6.0"; + version = "4.6.1"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "1gkswpc91j4ps60bp52ggg4qwj5g88f49x6p6d619p4x8vmhjylv"; + sha256 = "0nsx98r2i1siz0yghnh87f2sq8w79if7ih9259yay1bp39crd6gd"; }; propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix index ab91117ac0..dd05982c3c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix @@ -1,15 +1,21 @@ -{ lib, buildDunePackage, fetchurl, ocaml, alcotest, angstrom, ke }: +{ lib, buildDunePackage, fetchurl, ocaml +, fmt, bigstringaf, bigarray-compat +, bigarray-overlap, angstrom, ke, alcotest }: buildDunePackage rec { pname = "encore"; - version = "0.3"; + version = "0.5"; + src = fetchurl { url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz"; - sha256 = "05nv6yms5axsmq9cspr7884rz5kirj50izx3vdm89q4yl186qykl"; + sha256 = "15n0dla149k9h7migs76wap08z5402qcvxyqxzl887ha6isj3p9n"; }; - propagatedBuildInputs = [ angstrom ke ]; - checkInputs = lib.optional doCheck alcotest; - doCheck = lib.versions.majorMinor ocaml.version != "4.07"; + + useDune2 = true; + + propagatedBuildInputs = [ angstrom ke fmt bigstringaf bigarray-compat bigarray-overlap ]; + checkInputs = [ alcotest ]; + doCheck = true; meta = { homepage = "https://github.com/mirage/encore"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix index 89a1803b52..3b127c6500 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,12 +1,12 @@ -{ buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }: +{ buildDunePackage, git, cohttp, cohttp-lwt }: buildDunePackage { pname = "git-http"; - inherit (git) version src; + inherit (git) version src minimumOCamlVersion; - buildInputs = [ alcotest mtime nocrypto ]; - propagatedBuildInputs = [ git cohttp-lwt ]; - doCheck = true; + useDune2 = true; + + propagatedBuildInputs = [ git cohttp cohttp-lwt ]; meta = { description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix index 50e6f1d3bc..0633b8af8f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,11 +1,17 @@ -{ buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }: +{ stdenv, buildDunePackage, git-http, cohttp, cohttp-lwt-unix +, mmap, cmdliner, mtime, alcotest, mirage-crypto-rng, tls +, io-page, git-binary +}: buildDunePackage { pname = "git-unix"; - inherit (git-http) version src; + inherit (git-http) version src minimumOCamlVersion; - buildInputs = [ cmdliner mtime ]; - propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ]; + useDune2 = true; + + propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ]; + checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ]; + doCheck = !stdenv.isAarch64; meta = { description = "Unix backend for the Git protocol(s)"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index 741e004979..d28e8ef2e7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -1,23 +1,30 @@ -{ lib, fetchurl, buildDunePackage -, alcotest, git, mtime, nocrypto -, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt +{ stdenv, fetchurl, buildDunePackage +, alcotest, mtime, mirage-crypto-rng, tls, git-binary +, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum , fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult +, stdlib-shims }: buildDunePackage rec { - pname = "git"; - version = "2.1.2"; + pname = "git"; + version = "2.1.3"; + + minimumOCamlVersion = "4.07"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "0yyclsh255k7pvc2fcsdi8k2fcrr0by2nz6g3sqnwlimjyp7mz5j"; + sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax"; }; - propagatedBuildInputs = [ angstrom astring cstruct decompress digestif encore duff fmt fpath hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult ]; - checkInputs = lib.optionals doCheck [ alcotest git mtime nocrypto ]; - doCheck = true; + propagatedBuildInputs = [ + angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath + hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims + ]; + checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; + doCheck = !stdenv.isAarch64; - meta = { + meta = with stdenv; { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix index c6e85da77f..09f4757041 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -8,6 +8,8 @@ buildDunePackage rec { inherit (graphql) version src; + useDune2 = true; + nativeBuildInputs = [ ocaml-crunch ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix index d0857f7ef0..f4b1844d68 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl, buildDunePackage, fmt, logs, stdlib-shims }: +{ lib, fetchurl, buildDunePackage, fmt, logs, mtime, stdlib-shims }: buildDunePackage rec { pname = "index"; - version = "1.2.0"; + version = "1.2.1"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "0d44s1d2mpxvpg0zh57c928wf1w1wd33l1fw5r62al5zmi710ff6"; + sha256 = "1a9b6rsazrjy07syxl9ix5002i95mlvx5vk7nl2x9cs6s0zw906d"; }; buildInputs = [ stdlib-shims ]; - propagatedBuildInputs = [ fmt logs ]; + propagatedBuildInputs = [ fmt logs mtime ]; meta = { homepage = "https://github.com/mirage/index"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix index e299307752..44b34beb79 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild , ocaml_lwt # optional lwt support -, doCheck ? stdenv.lib.versionAtLeast ocaml.version "4.03" , ounit, fileutils # only for tests }: @@ -15,13 +14,22 @@ stdenv.mkDerivation rec { sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y"; }; - buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ] - ++ stdenv.lib.optionals doCheck [ ounit fileutils ]; + patches = [ (fetchpatch { + url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch"; + sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; + }) ]; + + buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ]; + checkInputs = [ ounit fileutils ]; configureFlags = [ "--enable-lwt" (stdenv.lib.optionalString doCheck "--enable-tests") ]; - inherit doCheck; + postConfigure = stdenv.lib.optionalString doCheck '' + echo ': pkg_threads' | tee -a _tags + ''; + + doCheck = true; checkTarget = "test"; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix new file mode 100644 index 0000000000..b6240d39eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage +, ipaddr, cstruct +}: + +buildDunePackage rec { + pname = "ipaddr-cstruct"; + + inherit (ipaddr) version src minimumOCamlVersion; + + propagatedBuildInputs = [ ipaddr cstruct ]; + + doCheck = true; + + meta = ipaddr.meta // { + description = "A library for manipulation of IP address representations using Cstructs"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix index d7009fdf55..a4a6f9fc7a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,22 +1,20 @@ { lib, buildDunePackage -, macaddr, ounit +, macaddr, domain-name, stdlib-shims +, ounit, ppx_sexp_conv }: buildDunePackage rec { pname = "ipaddr"; - inherit (macaddr) version src; + inherit (macaddr) version src minimumOCamlVersion; - buildInputs = [ ounit ]; - - propagatedBuildInputs = [ macaddr ]; + propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; + checkInputs = [ ppx_sexp_conv ounit ]; doCheck = true; - meta = with lib; { - homepage = "https://github.com/mirage/ocaml-ipaddr"; + meta = macaddr.meta // { description = "A library for manipulation of IP (and MAC) address representations "; - license = licenses.isc; - maintainers = with maintainers; [ alexfmpe ericbmerritt ]; + maintainers = with lib.maintainers; [ alexfmpe ericbmerritt ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix new file mode 100644 index 0000000000..8d6186d633 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage +, ipaddr, ipaddr-cstruct, ounit, ppx_sexp_conv +}: + +buildDunePackage rec { + pname = "ipaddr-sexp"; + + inherit (ipaddr) version src minimumOCamlVersion; + + propagatedBuildInputs = [ ipaddr ]; + + checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; + doCheck = true; + + meta = ipaddr.meta // { + description = "A library for manipulation of IP address representations usnig sexp"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix index cba6775916..2e3e27df7f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix @@ -1,31 +1,22 @@ { lib, fetchurl, buildDunePackage , astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri -, alcotest, hex +, alcotest, hex, ppx_irmin }: -buildDunePackage rec { - +buildDunePackage { pname = "irmin"; - version = "2.1.0"; + inherit (ppx_irmin) src version; + + useDune2 = true; minimumOCamlVersion = "4.07"; - src = fetchurl { - url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "1ji8r7zbdmhbk8r8w2hskd9z7pnvirzbhincfxndxgdaxbfkff5g"; - }; - propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ]; - checkInputs = lib.optionals doCheck [ alcotest hex ]; - + checkInputs = [ alcotest hex ppx_irmin ]; doCheck = true; - meta = { - homepage = "https://irmin.org/"; + meta = ppx_irmin.meta // { description = "A distributed database built on the same principles as Git"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix index b1987aa7cb..0e9596751b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix @@ -8,6 +8,8 @@ buildDunePackage rec { propagatedBuildInputs = [ irmin ]; + useDune2 = true; + checkInputs = lib.optional doCheck irmin-test; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix index bb28042a1f..b222bc53e3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ git irmin ]; checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix index abcdc3d58d..6e4598dd98 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -6,9 +6,12 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; - doCheck = true; + # test requires network + doCheck = false; meta = irmin.meta // { description = "GraphQL server for Irmin"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix index c8db6d563c..24e9f52aa0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix @@ -8,6 +8,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ cohttp-lwt irmin webmachine ]; checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix index b7040b9db0..1b8947849a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ irmin ]; checkInputs = lib.optional doCheck irmin-test; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix index c374b1a227..b0081eb366 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ index irmin ocaml_lwt ]; checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index c28532b49a..35aa659fbc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -1,14 +1,29 @@ -{ lib, buildDunePackage, ppxlib, ocaml-syntax-shims, irmin }: +{ lib, fetchurl, buildDunePackage, ppxlib, ocaml-syntax-shims }: -buildDunePackage { +buildDunePackage rec { pname = "ppx_irmin"; + version = "2.2.0"; - inherit (irmin) version src minimumOCamlVersion; + src = fetchurl { + url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; + sha256 = "0gzw918b661qkvd140hilww9jsc49rxsxz1k4iihyvikjn202km4"; + }; + + minimumOCamlVersion = "4.06"; + + useDune2 = true; buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ ppxlib ]; - meta = irmin.meta // { + # tests depend on irmin, would create mutual dependency + # opt to test irmin instead of ppx_irmin + doCheck = false; + + meta = { + homepage = "https://irmin.org/"; description = "PPX deriver for Irmin generics"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix index 57e33e2db8..b8a3f3ae24 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix @@ -6,6 +6,8 @@ buildDunePackage { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ]; meta = irmin.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix index 5793678bfc..7a09eaabd3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix @@ -10,6 +10,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ checkseum cmdliner git-unix yaml irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index ff93d65357..69f4e6f61d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -533,6 +533,7 @@ rec { pname = "email_message"; hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg"; propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ]; + patches = [ ./email-message-angstrom-0.14.patch ]; meta.description = "E-mail message parser"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch new file mode 100644 index 0000000000..624a3e5334 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch @@ -0,0 +1,22 @@ +diff --git a/email_address/src/email_address.ml b/email_address/src/email_address.ml +index 7470273..d070465 100644 +--- a/email_address/src/email_address.ml ++++ b/email_address/src/email_address.ml +@@ -38,7 +38,7 @@ module Stable = struct + let of_string ?default_domain input_str = + let open Core_kernel in + let open! Int.Replace_polymorphic_compare in +- match Angstrom.parse_string Email_address_parser_stable_v1.email_only input_str with ++ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_only input_str with + | Error error -> + Or_error.error_s [%message + "Failed to parse email address" +@@ -104,7 +104,7 @@ module T = Stable.V1.With_comparator + include T + + let list_of_string ?default_domain input_str = +- match Angstrom.parse_string Email_address_parser_stable_v1.email_list_only input_str with ++ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_list_only input_str with + | Error error -> + Or_error.error_s [%message + "Failed to parse email address(es)" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix index b4980240c9..f535ee78fe 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "lambdasoup"; - version = "0.6.3"; # NB: double-check the license when updating + version = "0.7.1"; src = fetchFromGitHub { owner = "aantron"; repo = pname; rev = version; - sha256 = "1w4zp3vswijzvrx0c3fv269ncqwnvvrzc46629nnwm9shwv07vmv"; + sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks"; }; propagatedBuildInputs = [ markup ]; @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; homepage = "https://aantron.github.io/lambdasoup/"; - license = lib.licenses.bsd2; + license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix rename to third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix index a809e68000..759f0deedf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix @@ -7,11 +7,11 @@ let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "4.5.0"; + version = "5.3.0"; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "0l836z5zr38969bi77aga7ismj4wb01i3ffxf5v59jsgd3g44r2w"; + sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix deleted file mode 100644 index 795baa0467..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/legacy.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, react, ssl, libev, pkgconfig, ncurses, glib -, ppx_tools, result, cppo -, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" -, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" -}: - -if !stdenv.lib.versionAtLeast ocaml.version "4" - || stdenv.lib.versionAtLeast ocaml.version "4.06" -then throw "lwt is not available for OCaml ${ocaml.version}" -else - -let sha256 = { - "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88"; - "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; - "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; -}.${version}; in - -let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in - -buildOcaml { - name = "lwt"; - inherit version; - - src = fetchzip { - url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] - ++ stdenv.lib.optional ppxSupport ppx_tools; - - propagatedBuildInputs = [ result ] - ++ optionals [ react ssl ] - ++ [ libev ]; - - configureScript = "ocaml setup.ml -configure"; - prefixKey = "--prefix "; - configureFlags = - optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ] - ++ [ "--enable-camlp4" ] - ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ]; - - createFindlibDestdir = true; - - hasSharedObjects = true; - - meta = with stdenv.lib; { - homepage = "http://ocsigen.org/lwt"; - description = "Lightweight thread library for Objective Caml"; - license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ - maggesi vbgl gal_bolle - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix index 3cf4541aa0..f2707064f2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "lwt_ppx"; - version = "1.2.4"; + version = "2.0.1"; src = fetchzip { # `lwt_ppx` has a different release cycle than Lwt, but it's included in @@ -12,8 +12,8 @@ buildDunePackage { # # This is particularly useful for overriding Lwt without breaking `lwt_ppx`, # as new Lwt releases may contain broken `lwt_ppx` code. - url = "https://github.com/ocsigen/lwt/archive/4.4.0.tar.gz"; - sha256 = "1l97zdcql7y13fhaq0m9n9xvxf712jg0w70r72fvv6j49xm4nlhi"; + url = "https://github.com/ocsigen/lwt/archive/5.2.0.tar.gz"; + sha256 = "1znw8ckwdmqsnrcgar4g33zgr659l4l904bllrz69bbwdnfmz2x3"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix index 49c2b7de39..ade51b7da7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "lwt_ssl"; - version = "1.1.2"; + version = "1.1.3"; minimumOCamlVersion = "4.02"; src = fetchzip { url = "https://github.com/aantron/${pname}/archive/${version}.tar.gz"; - sha256 = "1q0an3djqjxv83v3iswi7m81braqx93kcrcwrxwmf6jzhdm4pn15"; + sha256 = "0v417ch5zn0yknj156awa5mrq3mal08pbrvsyribbn63ix6f9y3p"; }; propagatedBuildInputs = [ ssl lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix new file mode 100644 index 0000000000..991a77a6ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage +, macaddr, cstruct +}: + +buildDunePackage { + pname = "macaddr-cstruct"; + + inherit (macaddr) version src minimumOCamlVersion; + + propagatedBuildInputs = [ macaddr cstruct ]; + + doCheck = true; + + meta = macaddr.meta // { + description = "A library for manipulation of MAC address representations using Cstructs"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix index 1332c54135..76ced1d753 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix @@ -1,21 +1,20 @@ { lib, fetchurl, buildDunePackage -, ppx_sexp_conv +, ppx_sexp_conv, ounit }: buildDunePackage rec { pname = "macaddr"; - version = "3.1.0"; + version = "5.0.0"; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz"; - sha256 = "1hi3v5dzg6h4qb268ch3h6v61gsc8bv21ajhb35z37v5nsdmyzbh"; + sha256 = "1j2m2v64g3d81sixxq3g57j1iyk6042ivsszml18akrqvwfpxy66"; }; - propagatedBuildInputs = [ ppx_sexp_conv ]; - - doCheck = false; # ipaddr and macaddr tests are together, which requires mutual dependency + checkInputs = [ ppx_sexp_conv ounit ]; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-ipaddr"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix new file mode 100644 index 0000000000..3d0305c4be --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage +, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit +}: + +buildDunePackage { + pname = "macaddr-sexp"; + + inherit (macaddr) version src minimumOCamlVersion; + + propagatedBuildInputs = [ ppx_sexp_conv ]; + + checkInputs = [ macaddr-cstruct ounit ]; + doCheck = true; + + meta = macaddr.meta // { + description = "A library for manipulation of MAC address representations using sexp"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index d778a7eb48..74bf3ce73a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, pkg-config }: +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config }: buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "1wb2923v17z179v866ragil0r601w5b3kvpnbkmkwlijp4i5grih"; + sha256 = "13qjisijayviw1s77s74f7klkrjj470vhj4b21cpif7jj2i4ljgk"; }; useDune2 = true; @@ -17,7 +17,7 @@ buildDunePackage rec { checkInputs = [ ounit ]; nativeBuildInputs = [ dune-configurator pkg-config ]; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ cstruct eqaf ]; meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix index c7d7cf35e2..ea346479a0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,13 +3,13 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.7.7"; + version = "3.8.0"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "1ds5zfwb0g340kbdlsjayyw4n25nj7skdl1mwyvpzmkv4qcsmdiv"; + sha256 = "18v37arzy7gkz5qcy34k0l8g69146nysjv0h1jcym0h4xxy0bxir"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 547fa77ae6..ba571b3208 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchurl, buildDunePackage, gettext, fileutils, ounit }: +{ lib, fetchurl, buildDunePackage, cppo, gettext, fileutils, ounit }: buildDunePackage rec { pname = "gettext"; - version = "0.4.1"; + version = "0.4.2"; minimumOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; - sha256 = "0pwy6ym5fd77mdbgyas8x86vbrri9cgk79g8wxdjplhyi7zhh158"; + sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; }; + buildInputs = [ cppo ]; + propagatedBuildInputs = [ gettext fileutils ]; doCheck = true; - checkInputs = lib.optional doCheck ounit; + checkInputs = [ ounit ]; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix index af3341e7e5..8db892f325 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "ocplib-json-typed-browser"; inherit (ocplib-json-typed) version src; + useDune2 = true; propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix index 3e8ac82add..8dde7ba56f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "odoc"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "ocaml"; repo = pname; rev = version; - sha256 = "14ilq2glcvda8mfhj27jqqwx3392q8ssp9bq9agz7k1k6ilp9dai"; + sha256 = "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2"; }; buildInputs = [ astring cmdliner cppo fpath result tyxml ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix new file mode 100644 index 0000000000..22c1ecdf70 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, unzip +, opam, ocamlgraph, re, cppo }: + +buildDunePackage rec { + pname = "opam-core"; + + inherit (opam) src version; + + nativeBuildInputs = [ unzip cppo ]; + propagatedBuildInputs = [ ocamlgraph re ]; + + # get rid of check for curl at configure time + # opam-core does not call curl at run time + configureFlags = [ "--disable-checks" ]; + + meta = opam.meta // { + description = "Small standard library extensions, and generic system interaction modules used by opam"; + maintainers = with lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix new file mode 100644 index 0000000000..422729e6d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, unzip, opam-core, opam-file-format }: + +buildDunePackage rec { + pname = "opam-format"; + + inherit (opam-core) src version; + + minimumOCamlVersion = "4.02.3"; + + # get rid of check for curl at configure time + # opam-format does not call curl at run time + configureFlags = [ "--disable-checks" ]; + + nativeBuildInputs = [ unzip ]; + propagatedBuildInputs = [ opam-core opam-file-format ]; + + meta = opam-core.meta // { + description = "Definition of opam datastructures and its file interface"; + maintainers = with lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix new file mode 100644 index 0000000000..1801a9e1c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, unzip, opam-format, curl }: + +buildDunePackage rec { + pname = "opam-repository"; + + minimumOCamlVersion = "4.02"; + + inherit (opam-format) src version; + + patches = [ ./download-tool.patch ]; + postPatch = '' + substituteInPlace src/repository/opamRepositoryConfig.ml \ + --replace "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\"" + ''; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ curl ]; + propagatedBuildInputs = [ opam-format ]; + + meta = opam-format.meta // { + description = "OPAM repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends"; + maintainers = with lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/download-tool.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/download-tool.patch new file mode 100644 index 0000000000..5af720adca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/download-tool.patch @@ -0,0 +1,29 @@ +diff --git a/src/repository/opamRepositoryConfig.ml b/src/repository/opamRepositoryConfig.ml +index c2954c1d..528fc621 100644 +--- a/src/repository/opamRepositoryConfig.ml ++++ b/src/repository/opamRepositoryConfig.ml +@@ -27,23 +27,7 @@ type 'a options_fun = + 'a + + let default = { +- download_tool = lazy ( +- try +- let tools = +- if OpamStd.Sys.(os () = Darwin) +- then ["wget", `Default; "curl", `Curl] +- else ["curl", `Curl; "wget", `Default] +- in +- let cmd, kind = +- List.find (fun (c,_) -> OpamSystem.resolve_command c <> None) tools +- in +- [ CIdent cmd, None ], kind +- with Not_found -> +- OpamConsole.error_and_exit `Configuration_error +- "Could not find a suitable download command. Please make sure you \ +- have either \"curl\" or \"wget\" installed, or specify a custom \ +- command through variable OPAMFETCH." +- ); ++ download_tool = lazy ([ CIdent SUBSTITUTE_NIXOS_CURL_PATH, None ], `Curl); + validation_hook = None; + retries = 3; + force_checksums = None; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix new file mode 100644 index 0000000000..156976a4a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, unzip, opam, opam-repository }: + +buildDunePackage rec { + pname = "opam-state"; + + inherit (opam) src version; + + # get rid of check for curl at configure time + # opam-state does not call curl at run time + configureFlags = [ "--disable-checks" ]; + + nativeBuildInputs = [ unzip ]; + propagatedBuildInputs = [ opam-repository ]; + + meta = opam.meta // { + description = "OPAM development library handling the ~/.opam hierarchy, repository and switch states"; + maintainers = with lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix index cbd3a14541..2681cc609d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix @@ -17,6 +17,8 @@ buildDunePackage { pname = "opium"; inherit (opium_kernel) version src meta minimumOCamlVersion; + useDune2 = true; + doCheck = true; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix index a8d438d373..5f3f091617 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,6 +1,11 @@ { stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }: -let param = { +let param = + let v6_2 = { + version = "6.2"; + sha256 = "0qf4fwnn4hhk52kjw9frv21v23azqnn4mjvwf1hs0nxf7q4kacb5"; + }; in +{ "4.02" = { version = "5.0+4.02.0"; sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; }; @@ -20,15 +25,10 @@ let param = { "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; - "4.08" = { - version = "5.3+4.08.0"; - sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; }; - "4.09" = { - version = "6.0+4.08.0"; - sha256 = "056cmdajap8mbb8k0raj0cq0y4jf7pf5x0hlivm92w2v7xxf59ns"; }; - "4.10" = { - version = "6.1+4.10.0"; - sha256 = "0ccx2g4zpwnv52bbzhgxji1nvzmn80jwiqalwwc4s60i9qg51llw"; }; + "4.08" = v6_2; + "4.09" = v6_2; + "4.10" = v6_2; + "4.11" = v6_2; }.${ocaml.meta.branch}; in diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix new file mode 100644 index 0000000000..442a4126a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fetchFromGitHub, yojson }: + +buildDunePackage rec { + pname = "ppx_yojson_conv_lib"; + version = "0.14.0"; + + minimumOCamlVersion = "4.02.3"; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = "12s3xshayy1f8cp9lk6zqwnw60n7cdap55gkksz5w65gdd8bfxmf"; + }; + + propagatedBuildInputs = [ yojson ]; + + meta = with lib; { + description = "Runtime lib for ppx_yojson_conv"; + homepage = "https://github.com/janestreet/ppx_yojson_conv_lib"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index 0c3eaf33e7..5a208801d4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -4,14 +4,14 @@ , hacl_x25519, fiat-p256, hkdf, logs, alcotest }: buildDunePackage rec { - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; - version = "0.12.1"; + version = "0.12.3"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "09jhzjhni3il5bmy2c6gylmg9s45ppckjc7nm5nyg5dbm699cwxg"; + sha256 = "1kfkxsy0nkqi0gbsqn1ssh4x0xhy0p07ijclm42806rxlqr3x405"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix index 457259bb1b..3ae9b44eba 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildDunePackage , fetchFromGitHub , cmdliner @@ -15,17 +15,15 @@ buildDunePackage rec { pname = "torch"; - version = "0.8"; - - owner = "LaurentMazare"; + version = "0.9b"; minimumOCamlVersion = "4.07"; src = fetchFromGitHub { - inherit owner; + owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "19w31paj24pns2ahk9j9rgpkb5hpcd41kfaarxrlddww5dl6pxvi"; + sha256 = "1xn8zfs3viz80agckcpl9a4vjbq6j5g280i95jyy5s0zbcnajpnm"; }; propagatedBuildInputs = [ @@ -47,7 +45,7 @@ buildDunePackage rec { doCheck = true; checkPhase = "dune runtest"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Ocaml bindings to Pytorch"; maintainers = [ maintainers.bcdarwin ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix index 8e8eaf5fd5..a4536316ba 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ipaddr }: +{ lib, buildDunePackage, fetchurl +, ipaddr, macaddr, cmdliner +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; +buildDunePackage rec { + pname = "tuntap"; + version = "2.0.0"; -stdenv.mkDerivation { - name = "ocaml-tuntap-1.3.0"; + minimumOCamlVersion = "4.04.2"; - src = fetchzip { - url = "https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz"; - sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-tuntap/releases/download/v${version}/tuntap-v${version}.tbz"; + sha256 = "12wmls28h3jzikwyfw08d5f7ycsc9njwzbhd3qk2l8jnf5rakfsa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ ipaddr ]; + propagatedBuildInputs = [ ipaddr macaddr cmdliner ]; - createFindlibDestdir = true; + # tests manipulate network devices and use network + # also depend on LWT 5 + doCheck = false; meta = { description = "Bindings to the UNIX tuntap facility"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://github.com/mirage/ocaml-tuntap"; - inherit (ocaml.meta) platforms; }; - } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix index 79e36b66d1..3bf163607c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "webmachine"; - version = "0.6.1"; + version = "0.6.2"; minimumOCamlVersion = "4.04"; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = "ocaml-webmachine"; rev = "${version}"; - sha256 = "0kpbxsvjzylbxmxag77k1c8m8mwn4f4xscqk2i7fc591llgq9fp3"; + sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk"; }; propagatedBuildInputs = [ cohttp dispatch ptime ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix index 2c4cf4928d..2264f0dedb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { patches = [ ./jsoo.patch ]; + postPatch = '' + substituteInPlace Makefile --replace js_of_ocaml.ppx js_of_ocaml-ppx + ''; + buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-ppx ]; propagatedBuildInputs = [ iri re ]; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 58ccd2bc8b..b2c5437e38 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,20 +1,32 @@ -{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey }: +{ stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang +, DBDmysql, DBI, IOSocketSSL, TermReadKey +}: -buildPerlPackage { +buildPerlPackage rec { pname = "Percona-Toolkit"; - version = "3.0.12"; + version = "3.2.0"; + src = fetchFromGitHub { owner = "percona"; repo = "percona-toolkit"; - rev = "3.0.12"; - sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y"; + rev = "v${version}"; + sha256 = "084ldpskvlfm32lfss5qqzm5y9b8hf029aa4i5pcnzgb53xaxkqx"; }; + outputs = [ "out" ]; + + nativeBuildInputs = [ shortenPerlShebang ]; + buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; - meta = { + + postInstall = '' + shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) + ''; + + meta = with stdenv.lib; { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; - homepage = "http://www.percona.com/software/percona-toolkit"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ izorkin ]; + homepage = "https://www.percona.com/software/database-tools/percona-toolkit"; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ izorkin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch b/third_party/nixpkgs/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch deleted file mode 100644 index 34221c0d20..0000000000 --- a/third_party/nixpkgs/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 12 Sep 2016 14:40:44 +0200 -Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -CURL_STRICTER leaked into curl-constants.c when building against -curl-7.50.2. This is a preprocessor only macro without a value. - -CPAN RT#117793 - -Signed-off-by: Petr Písař ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index f9170bb..ad2bd3d 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -127,7 +127,7 @@ if (!defined($curl_h)) { - close H; - - for my $e (sort @syms) { -- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { -+ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { - next; - } - my ($group) = $e =~ m/^([^_]+_)/; --- -2.7.4 - diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch b/third_party/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch deleted file mode 100644 index e2f604985b..0000000000 --- a/third_party/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 6d985026 -Author: Michael Brantley -Date: Tue Feb 20 07:12:06 2018 -0500 - - Update broken Pod links in lib/POE/Filter/HTTPD.pm - - Update Pod links to refer only to the utf8 module and not its methods, - fix a mis-capitalized internal reference, and convert the dangling - "MaxContent" link into a code reference. - - Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124496 - -diff --git a/lib/POE/Filter/HTTPD.pm b/lib/POE/Filter/HTTPD.pm -index 9d4898e3..517be691 100644 ---- a/lib/POE/Filter/HTTPD.pm -+++ b/lib/POE/Filter/HTTPD.pm -@@ -621,10 +621,10 @@ how to use these objects. - - HTTP headers are not allowed to have UTF-8 characters; they must be - ISO-8859-1. POE::Filter::HTTPD will convert all UTF-8 into the MIME encoded --equivalent. It uses L for detection-8 and -+equivalent. It uses C for detection-8 and - L for convertion. If L is not - installed, no conversion happens. If L is --not installed, L is used instead. In this last case, you will -+not installed, C is used instead. In this last case, you will - see a warning if you try to send UTF-8 headers. - - -@@ -651,8 +651,8 @@ streaming mode this filter will return either an HTTP::Request object or a - block of content. The HTTP::Request object's content will return empty. - The blocks of content will be parts of the request's body, up to - Content-Length in size. You distinguish between request objects and content --blocks using C (See L below). This --option supersedes L. -+blocks using C (See L below). This -+option supersedes C. - - =head1 CAVEATS - diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch b/third_party/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch deleted file mode 100644 index 097a7677e5..0000000000 --- a/third_party/nixpkgs/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 32571a21 -Author: Michael Brantley -Date: Tue Feb 20 07:07:22 2018 -0500 - - Update old URLs referenced in Pod - - Remove mention of old URLs, replace mention of canonical SVN repo with - the new git-based one at github.com. - - Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124495 - -diff --git a/lib/POE.pm b/lib/POE.pm -index 80e7feac..0554ff70 100644 ---- a/lib/POE.pm -+++ b/lib/POE.pm -@@ -465,7 +465,7 @@ code snippets there as well. - The following command will fetch the most current version of POE into - the "poe" subdirectory: - -- svn co https://poe.svn.sourceforge.net/svnroot/poe poe -+ git clone https://github.com/rcaputo/poe.git - - =head2 SourceForge - -@@ -535,18 +535,9 @@ https://rt.cpan.org/Dist/Display.html?Status=Active&Queue=POE - - =head2 Repositories and Changes - --Thanks to the magic of distributed version control, POE is hosted at --three locations for redundancy. You can browse the source at any one --of: -- --https://github.com/rcaputo/poe -- --https://gitorious.org/poe -- --http://poe.git.sourceforge.net/git/gitweb-index.cgi -- --Complete change logs can also be browsed at those sites. They all --provide RSS news feeds for those who want to follow development in -+You can browse the POE source and complete change logs at -+https://github.com/rcaputo/poe. It also provides an RSS -+news feed for those who want to follow development in - near-realtime. - - =head2 Other Resources diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/third_party/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch index add6d9df3b..f66ed0dfe0 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch +++ b/third_party/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch @@ -16,28 +16,30 @@ diff --git a/Makefile.PL b/Makefile.PL index 505d1df..fc38b76 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -29,12 +29,17 @@ foreach (@ARGV) { +@@ -28,12 +28,18 @@ foreach (@ARGV) { @ARGV = @replacement_args; unless ( -- check_lib( # fill in what you prompted the user for here -- lib => [qw(expat)], -- header => ['expat.h'], -- incpath => $expat_incpath, -- ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), -- ) -+ #check_lib( # fill in what you prompted the user for here -+ # lib => [qw(expat)], -+ # header => ['expat.h'], -+ # incpath => $expat_incpath, -+ # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), -+ #) -+ # The check_lib implementation fails horribly with cross-compilation. -+ # We are giving known good paths to expat. -+ # And in all cases, the previous behaviour of not actually failing -+ # seemed to work just fine :/. -+ false - ) { +- check_lib( # fill in what you prompted the user for here +- lib => [qw(expat)], +- header => ['expat.h'], +- incpath => $expat_incpath, +- ($expat_libpath? +- (libpath => $expat_libpath):()), +- )) { ++ #check_lib( # fill in what you prompted the user for here ++ # lib => [qw(expat)], ++ # header => ['expat.h'], ++ # incpath => $expat_incpath, ++ # ($expat_libpath? ++ # (libpath => $expat_libpath):()), ++ #) ++ # The check_lib implementation fails horribly with cross-compilation. ++ # We are giving known good paths to expat. ++ # And in all cases, the previous behaviour of not actually failing ++ # seemed to work just fine :/. ++ false ++ ) { warn <<'Expat_Not_Installed;'; -- diff --git a/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix new file mode 100644 index 0000000000..1624a5fda2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix @@ -0,0 +1,48 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, flit +, lxml, aiohttp +, pytest, pytestcov, pytest-asyncio, pytest-mock, pytest-aiohttp, aresponses +, pythonOlder +}: + +buildPythonPackage rec { + pname = "PyRMVtransport"; + version = "0.2.9"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "cgtobi"; + repo = pname; + rev = "v${version}"; + sha256 = "1h3d0yxzrfi47zil5gr086v0780q768z8v5psvcikqw852f93vxb"; + }; + + nativeBuildInputs = [ + flit + ]; + + propagatedBuildInputs = [ + aiohttp + lxml + ]; + + checkInputs = [ + pytest + pytestcov + pytest-asyncio + pytest-mock + pytest-aiohttp + aresponses + ]; + checkPhase = '' + pytest --cov=RMVtransport tests + ''; + + meta = with lib; { + homepage = "https://github.com/cgtobi/PyRMVtransport"; + description = "Get transport information from opendata.rmv.de"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix index e71d072428..535a21e545 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "1wg7dlz6mhjp7mkqm5f8a2ak87p1zn46b6i754ys8f29nnqq01yz"; + sha256 = "0jm1jdrlmm0gkvaxhbwwqic48vfgv8d0j99y90calnjrid3hwi35"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix index e2828b1860..15bd1ee35f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.2.8"; + version = "1.2.9"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "18q5sxm9jw5sfavdjy5z0yamknwj5fl359jziqllkbj5k2i16lnr"; + sha256 = "08pdca5ssi50bx2xz52gkmjix2ybv5i4bjw7yd6yfiph0y0qsbsb"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aadict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aadict/default.nix new file mode 100644 index 0000000000..2587260748 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aadict/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, nose +, coverage +}: + +buildPythonPackage rec { + pname = "aadict"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "013pn9ii6mkql6khgdvsd1gi7zmya418fhclm5fp7dfvann2hwx7"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ nose coverage ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/metagriffin/aadict"; + description = "An auto-attribute dict (and a couple of other useful dict functions)."; + maintainers = with maintainers; [ glittershark ]; + license = licenses.gpl3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix index 6e867d0b0f..5ee7b32951 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.16"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0yk4ghvg47drfvdrrcw7nk14pg4shccmyhln9d8hy1lyafcqmnd5"; + sha256 = "1l61zv6qq94ybqz7s8ag3h08dsh7jds6n2mgd43s7m8gbiy00ggn"; }; # hardcodes a test dependency on an old version of pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix index 8eda59a9ab..a0a3d74e57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 +, pygments , pytest , pytestcov , uvloop @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2020.2.1"; + version = "2020.6.1"; format = "flit"; disabled = isPy27; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "cjrh"; repo = pname; rev = "v${version}"; - sha256 = "0wcj8prkijb889ic8n6varms7xkwy028hhw0imgkd1i0p64lm3m4"; + sha256 = "00mq5ylhhdfdqrh7zdqabf3wy85jrkqvgfb1421ll46fsjim2d14"; }; + propagatedBuildInputs = [ + pygments + ]; + checkInputs = [ pytest pytestcov diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix index 20dc0d3971..f9b1e62caa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, case, vine, pytest-sugar }: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: buildPythonPackage rec { pname = "amqp"; @@ -9,11 +9,12 @@ buildPythonPackage rec { sha256 = "24dbaff8ce4f30566bb88976b398e8c4e77637171af3af6f1b9650f48890e60b"; }; - checkInputs = [ pytest case pytest-sugar ]; propagatedBuildInputs = [ vine ]; - # Disable because pytest-sugar requires an old version of pytest - doCheck = false; + checkInputs = [ pytestCheckHook case ]; + disabledTests = [ + "test_rmq.py" # requires network access + ]; meta = with stdenv.lib; { homepage = "https://github.com/celery/py-amqp"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix index f8ef6b9492..ca2cb03f96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix @@ -46,7 +46,6 @@ , thrift , tzlocal , unicodecsv -, werkzeug , zope_deprecation , enum34 , typing @@ -127,7 +126,6 @@ buildPythonPackage rec { thrift tzlocal unicodecsv - werkzeug zope_deprecation ]; @@ -143,24 +141,25 @@ buildPythonPackage rec { --replace "pandas>=0.17.1, <1.0.0" "pandas" \ --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \ --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ + --replace "flask-admin==1.5.3" "flask-admin" \ + --replace "flask-login>=0.3, <0.5" "flask-login" \ --replace "pendulum==1.4.4" "pendulum" \ --replace "cached_property~=1.5" "cached_property" \ --replace "dill>=0.2.2, <0.3" "dill" \ --replace "configparser>=3.5.0, <3.6.0" "configparser" \ - --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \ + --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ --replace "colorlog==4.0.2" "colorlog" \ --replace "funcsigs==1.0.0" "funcsigs" \ --replace "flask-swagger==0.2.13" "flask-swagger" \ --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \ - --replace "alembic>=0.9, <1.0" "alembic" \ + --replace "alembic>=1.0, <2.0" "alembic" \ --replace "markdown>=2.5.2, <3.0" "markdown" \ --replace "future>=0.16.0, <0.17" "future" \ --replace "tenacity==4.12.0" "tenacity" \ --replace "text-unidecode==1.2" "text-unidecode" \ --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \ --replace "sqlalchemy~=1.3" "sqlalchemy" \ - --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \ - --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug" + --replace "gunicorn>=19.5.0, <20.0" "gunicorn" # dumb-init is only needed for CI and Docker, not relevant for NixOS. substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix index 56c69bb97e..3537736f77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.2.7"; + version = "3.2.10"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "1qf29blzhh6sljaj1adc0p8cnyxh9ar6hky9ccdfbgmrk4rw5kwc"; + sha256 = "1sj4yy2injaskwfi5pkb542jl8s6ljijnyra81gpw0pgd3d0bgxv"; }; propagatedBuildInputs = [ async-timeout ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index 5f124cc094..57e54d24ae 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.15.9"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "c6a3125ee68ecf4d11947497c1f891b6436df9d8453f8865cabf595813504cc1"; + sha256 = "1sp036192vdl5nqifcswg2j838vf8i9k8bfd0w4qh1vz4f0pjz7y"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix index f477cbfc0a..1adee4403b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "bidict>=0.17,<0.18" "bidict" \ - --replace "more-itertools>=4.0,<8.0" "more-itertools" + --replace "more-itertools>=4.0,<8.0" "more-itertools" \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index 9979ccdd3c..fdce47b259 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -2,22 +2,24 @@ , buildPythonPackage , fetchFromGitHub , six +, pathlib , pytest , mock , parameterized +, isPy27 , isPy35 }: buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "0.8.0"; + version = "0.9.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1akiv92cd7ciky0aay94lh9azr73jajn0x0x6ywaf3qm5c4hyvys"; + sha256 = "0cgb0hwf4xg5dmm32wwlxqy7a77jw6gpnj7v8rq5948hsy2sfrcp"; }; # Package is not compatible with Python 3.5 @@ -25,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six - ]; + ] ++ lib.optionals isPy27 [ pathlib ]; checkInputs = [ pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 8e4fa9666e..a2b3394282 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.7.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d10b74e783cff90d56360e61162afdd22276d62dc9467e657ae866449eae7648"; + sha256 = "0p6pzpgfxr0c95gqr8ryq779an13x84vlm3zhvwlgx47l90a4vd6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 75c912dfe4..e5879bd4e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; + sha256 = "211527511d7616a383cc196956eaf2b7ee016f2367d367924b3715f2a41106da"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index e78d93fb7b..a89a28bb26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "12.0.0"; + version = "12.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0vzq93g2fpnij4rykkk3391xq2knhlbz87vhim4zvj8s45sx6z8q"; + sha256 = "54416e6fa4584bb986e8985f510486a36b4fdf47af012a4982a0960c7b11e89c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 5bf67fc678..2dfff00dfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "1.5.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1kd8lxm5kzk0wxbw1f3vin10hlhb4sygrxqd5c8k715s0ipkhmdh"; + sha256 = "5ad247d186c3c040da7a1d40ad39c9881e99afc58271f673abb602abb0b6b85b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index d77d28479a..8e186da6d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.0.1"; + version = "9.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7e4459679bdba4aa67a4b5848e63d94e965a304a7418ef7607eb7a9ce295d886"; + sha256 = "e7904b60c42a153b64b1604f3c698602686b38787bebdaed6e808cd43b6e5967"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 61bc17df01..8578800e56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "692544dd2fa6276a7a4b4e094e2a5e0915d29b7829e266c6ade2b17a5fdcc2a9"; + sha256 = "03ysr8kx0gavjrxsi9wqrgxpg3g17nvii7z68qfm0k2mv6ryj3z7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index e7da7541dd..8dd91f8455 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "48b1ec81f30f4b5f38dd17f68f0dfc968db96e0a04fdcfc99f43f80ca041f14b"; + sha256 = "35d7c737054a7e6fc7c88d8c437fc012904c4568809487cac443eb3b13e6655b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index 1057322a8e..78e30841c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "3.1.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c823a0ed879230a3ec9f15c32c9788610af1db56e6aeae6b2725476ddbe0d138"; + sha256 = "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 8ca128dad8..6713f24ca5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.1"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d13088bb506700a7aecf59faf042cb48dc82c423082482b2f50cc2403ac43e55"; + sha256 = "76b94f3e43fdc6698023d79be731937dc645dc3178dc134854768528ecc0aea3"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index 5ba25e11a8..963d794d55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f6dacf442ccae2f18f1082e80bcbdcaa8c0efa2ba92b48c5db6ee01d37240047"; + sha256 = "c175f6642be514ad0efd3dc03d09e50d923596fd9e634381793dcc46bb8a57c7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix index f3dfaba6d9..018d7140a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; + sha256 = "0adeee9e654a9011f5107def06fea6838864a3514a1e5a9ed495f3a56a687cc7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 36124ff6ba..edd7abd11a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; + sha256 = "0r3l55mhd00zx8sw13d7i9l7r214946s1y3wxcswxad7q5660zfm"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index 24f7165281..a140c779ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.2.0"; + version = "11.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d50c74cdc1c9be6861ddef9adffd3b05afc5a5092baf0209eea30f4439cba2d9"; + sha256 = "7fdfc631c660cb173eee88abbb7b8be7742f91b522be6017867f217409cd69bc"; }; postInstall = if isPy3k then "" else '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index ece93025b5..75781dab8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6355d9234d87422d57bf2ea8d1cc242463c203e4bb79b8930f22f29f4e025fa1"; + sha256 = "a0ee89691b21945cc4b892a9194320f50c1cd242d98f00a82d7e3848c28517a5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 45fabcb88a..ee1149f6ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "10.0.0"; + version = "10.1.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bd9a3938f5423741329436d2da09693845c2fad96c35fadbd7c5ae5213208345"; + sha256 = "9be7fcdf586f24acb799a799cf5e9363e9323ca0ce54cca63ab505f69fa0fddd"; }; postInstall = if isPy3k then "" else '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix index 5a9d8849f8..90a64ff098 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.1"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0z766424783a6y5dp5ybxssb0bfzqb8kpa6zra8ccnbfg4fn478v"; + sha256 = "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 1b6649a36f..f481d93970 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.18.0"; + version = "0.19.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "99ca085eb523a5c27933060ccb04d7a6b60864f98d87bf5b63ac17d419b43445"; + sha256 = "694649d4c9c5f89e543f23ec10e450b6382b2f1bc5843ef266cfc302276038c6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index e3ac096154..8e101ef051 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.0.0"; + version = "11.1.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d1edead1ad36e957c9f9b605f547ad1ff7152f8f785fa03d3c7891bb428a68ef"; + sha256 = "ef23587c1b6dc0866ebf0e91e83ba05d7f7e4fea7951b704781b9cd9f5f27f1c"; }; propagatedBuildInputs = [ azure-mgmt-common ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 92dcc7cd95..6a429a056f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-subscription"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1w91zqi2icld76mcrz0kwq0adb1nr83yqdq6qp1p1445p914qjsh"; + sha256 = "7448a322eceed3d300e181fde0f626c0e37df773f6c7297df2b73d98cb0936cf"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index 48f7296d99..727311cc09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.46.0"; + version = "0.47.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e1988aa2b91e6b5aa84e48ac02d5546945bdc2d8331744869e923ba15066c4a6"; + sha256 = "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix index d10045b41d..2d1ff4c291 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -1,4 +1,5 @@ { lib, python, buildPythonPackage, fetchPypi, isPy27 +, fetchpatch , azure-common , azure-core , msrest @@ -7,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.3.2"; + version = "0.3.5"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c403a47e40e4a80d9c42c854993f5c07f12c2a75bd9a85ba8225985493a9b792"; + sha256 = "71c238c785786a159b3ffd587a5e7fa1d9a517b66b592ae277fed73a9fbfa2b0"; }; propagatedBuildInputs = [ @@ -24,6 +25,14 @@ buildPythonPackage rec { requests ]; + # Fix to actually install the package + patches = [ + (fetchpatch { + url = "https://github.com/Azure/azure-multiapi-storage-python/pull/29/commits/1c8b08dfc9c5445498de3475dec8820eafbd0ca1.patch"; + sha256 = "1f80sdbw4pagrlp9dhcimhp23sdmy0whiba07aa84agkpv4df9ny"; + }) + ]; + # fix namespace pythonNamespaces = [ "azure.multiapi" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index a4f8e161ba..fb4a94952d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.1.1"; + version = "12.1.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "661ed9669b9fbb3163899294d28f11f7c135336e1513aab6bd1ff9ef3c6febb3"; + sha256 = "74422d241454d66fdc3184dbe52334997ebe4f9f9a0d88ec1a2ba6c602f8a332"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/batinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batinfo/default.nix index 57dfd5062c..e8516aecdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/batinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/batinfo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { homepage = "https://github.com/nicolargo/batinfo"; description = "A simple Python lib to retrieve battery information"; license = licenses.lgpl3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ koral ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix new file mode 100644 index 0000000000..0067716b62 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix @@ -0,0 +1,46 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, beancount +, pytest, sh +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "beancount_docverif"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1kjc0axrxpvm828lqq5m2ikq0ls8xksbmm7312zw867gdx56x5aj"; + }; + + propagatedBuildInputs = [ + beancount + ]; + + checkInputs = [ + pytest + sh + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = "https://github.com/siriobalmelli/beancount_docverif"; + description = "Document verification plugin for Beancount"; + longDescription = '' + Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions: + + - Require that every transaction touching an account have an accompanying document on disk. + - Explictly declare the name of a document accompanying a transaction. + - Explicitly declare that a transaction is expected not to have an accompanying document. + - Look for an "implicit" PDF document matching transaction data. + - Associate (and require) a document with any type of entry, including open entries themselves. + - Guarantee integrity: verify that every document declared does in fact exist on disk. + ''; + license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix new file mode 100644 index 0000000000..32ac3e8bd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -0,0 +1,37 @@ +{ stdenv, buildPythonPackage, fetchPypi +, click, click-log, pure-pcapy3 +, pyserial, pyserial-asyncio, voluptuous, zigpy +, asynctest, pytest, pytest-asyncio }: + +let + pname = "bellows"; + version = "0.17.0"; + +in buildPythonPackage rec { + inherit pname version; + + src = fetchPypi { + inherit pname version; + sha256 = "03gckhrxji8lgjsi6xr8yql405kfanii5hjrmakk1328bmq9g5f6"; + }; + + propagatedBuildInputs = [ + click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy + ]; + + checkInputs = [ + asynctest pytest pytest-asyncio + ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace "click-log==0.2.0" "click-log>=0.2.0" + ''; + + meta = with stdenv.lib; { + description = "A Python 3 project to implement EZSP for EmberZNet devices"; + homepage = "https://github.com/zigpy/bellows"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix index e29263a6b4..ec0440b9e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sphinx ]; + # this can be removed >0.19.0 + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools_scm < 4" "setuptools_scm" + ''; + checkInputs = [ hypothesis py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix new file mode 100644 index 0000000000..c178550eb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ecdsa +, pysha3 +}: + +buildPythonPackage rec { + pname = "bip_utils"; + version = "1.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "e8397a315c2f656ccf37ff1c43f5e0d496a10ea692c614fdf9bae1a3d5de3558"; + }; + + propagatedBuildInputs = [ ecdsa pysha3 ]; + + # tests are not packaged in the released tarball + doCheck = false; + + pythonImportsCheck = [ + "bip_utils" + ]; + + meta = { + description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation"; + homepage = "https://github.com/ebellocchia/bip_utils"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biplist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biplist/default.nix new file mode 100644 index 0000000000..b3e9f7b837 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/biplist/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest +}: + +buildPythonPackage rec { + version = "1.0.3"; + pname = "biplist"; + + src = fetchPypi { + inherit pname version; + sha256 = "1im45a9z7ryrfyp1v6i39qia5qagw6i1mhif0hl0praz9iv4j1ac"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = "https://bitbucket.org/wooster/biplist/src/master/"; + description = "Binary plist parser/generator for Python"; + longDescription = '' + Binary Property List (plist) files provide a faster and smaller + serialization format for property lists on OS X. + + This is a library for generating binary plists which can be read + by OS X, iOS, or other clients. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 2036d4dba4..68c44da819 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0m29k3lq37v53pczyr2d5mr3xdh2kv31g2yfnfx8m1ivxvy9z9i7"; + sha256 = "1pz3yd9rhz3cb0yf7dbjhd1awm0w7vsbj73k4v95484j2kdxk3d4"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix index dd85789c59..71b032a34e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix @@ -1,15 +1,17 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, openssl }: +{ stdenv, lib, buildPythonPackage, isPy3k, fetchFromGitHub, openssl }: let ext = if stdenv.isDarwin then "dylib" else "so"; in buildPythonPackage rec { pname = "bitcoinlib"; - version = "0.9.0"; + version = "0.11.0"; + + disabled = !isPy3k; src = fetchFromGitHub { owner = "petertodd"; - rev = "7a8a47ec6b722339de1d0a8144e55b400216f90f"; repo = "python-bitcoinlib"; - sha256 = "1s1jm2nid7ab7yiwlp1n2v3was9i4q76xmm07wvzpd2zvn5zb91z"; + rev = "python-${pname}-v${version}"; + sha256 = "0pwypd966zzivb37fvg4l6yr7ihplqnr1jwz9zm3biip7x89bdzm"; }; postPatch = '' @@ -21,7 +23,7 @@ in buildPythonPackage rec { meta = { homepage = src.meta.homepage; description = "Easy interface to the Bitcoin data structures and protocol"; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ lgpl3 ]; maintainers = with lib.maintainers; [ jb55 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix index aff3f70cb8..6134d92622 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.10.0"; + version = "8.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm"; + sha256 = "0p9d5242pkzag7ac5b5zdjyfqwxvj2jisyjghp6yhjbbwz1z44rb"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix index a3ed2c6b8a..850070b1c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "2.0.2"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d9248bdb0156797abf6d04b5eac581dcb121f5d1db7acbc13282b0609314893a"; + sha256 = "2dfabf228f55676b88acc464f416e2b13ee06470a8ad1dd3e609bb789425fbad"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix index 36361ac011..080165f707 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "boltons"; - version = "20.1.0"; + version = "20.2.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0mbxc2n10mlmpbwhg0byddl1i0s6rlrr6z9xm8zzmkv62136irqh"; + sha256 = "08rd6av8dp5n1vz6nybmayl1mfsmj66cskiaybfshcgix29ca803"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix index 8f5ef73c7e..dc1b1be0d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "boolean.py"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "bastikr"; repo = "boolean.py"; rev = "v${version}"; - sha256 = "1q9ji2jq07qr6vgp9yv6y8lx6h0zyi07fqjga3yi3vpfk46h2jn1"; + sha256 = "02jznrfrihhk69ai1vnh26s3rshl4kfc2id7li6xccavc2ws5y3b"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 53a2be0b8d..4e95946127 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.14.3"; # N.B: if you change this, change botocore too + version = "1.14.16"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "1qapj3hbbj116x7yca3m9ivl44iisrk0cppri9sk3b1mpv371a0v"; + sha256 = "1yywn4wbzn37b5gbkmksqpxnabw1yjvbp710chc3v6cymyv4lnnf"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 0e4870a430..3a35ed0c4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.17.3"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.17.16"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "0mrkkb7vc7jdxrr9gyg92i6ar801kpss53nfqp1di6xfi4jxkx0k"; + sha256 = "0k4bx4anj0xjjfj4jx3v1fhzrmk5k9qgdpxqghxzyzmnsry4y37y"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix index 8e8c89e7f5..3722a294b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.1.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1fqh1bdkk3g222vbrmw3ab4r4mmd1k4x2jayshnqpbspszcqzcdq"; + sha256 = "0aw5n1hqrg5pb5xmcr1b8y9i7v8zj23q9k2p4b6bwnq2c2fqi8wr"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index 0f06e34a54..d6fd70031a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.18.1"; + version = "4.19.2"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "03f56cc6dd0bf5ac3d8e8eb380d212257e16de79fce5e6186afd5c1835561e22"; + sha256 = "1mzcggfr61lqkn6sghg842ah9slfjr0ikc776vbx60iqqw9l1gvn"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix index 069358a4d6..7370d3db7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "btchip-python"; - version = "0.1.28"; + version = "0.1.30"; src = fetchPypi { inherit pname version; - sha256 = "10yxwlsr99gby338rsnczkfigcy36fiajpkr6f44438qlvbx02fs"; + sha256 = "1mraf2lmh70b038k934adxi7d40431j7yq93my3aws99f5xccsb8"; }; propagatedBuildInputs = [ hidapi pyscard ecdsa ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix new file mode 100644 index 0000000000..225b26b4d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "btrfs"; + version = "11"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w92sj47wy53ygz725xr613k32pk5khi0g9lrpp6img871241hrx"; + }; + + meta = with stdenv.lib; { + description = "Inspect btrfs filesystems"; + homepage = "https://github.com/knorrie/python-btrfs"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix index b9a61af8b4..6e487b58cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix @@ -4,6 +4,7 @@ , pythonOlder , attrs , bitstruct +, click , future , pathlib2 , typing @@ -17,20 +18,21 @@ buildPythonPackage rec { pname = "canmatrix"; - version = "0.8"; + version = "0.9.1"; # uses fetchFromGitHub as PyPi release misses test/ dir src = fetchFromGitHub { owner = "ebroecker"; repo = pname; rev = version; - sha256 = "1wzflapyj2j4xsi7d7gfmznmxbgr658n092xyq9nac46rbhpcphg"; + sha256 = "129lcchq45h8wqjvvn0rwpbmih4m0igass2cx7a21z94li97hcia"; }; propagatedBuildInputs = [ # required attrs bitstruct + click future pathlib2 # optional @@ -41,12 +43,18 @@ buildPythonPackage rec { pyyaml ] ++ lib.optional (pythonOlder "3.5") typing; + postPatch = '' + substituteInPlace setup.py \ + --replace "version = versioneer.get_version()" "version = \"${version}\"" + ''; + checkInputs = [ pytest ]; + # long_envvar_name_imports requires stable key value pair ordering checkPhase = '' - pytest -s src/canmatrix + pytest -s src/canmatrix -k 'not long_envvar_name_imports' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix index 83dd1f006f..c064fd62fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix @@ -1,33 +1,19 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , nose , can , canmatrix }: -buildPythonPackage { +buildPythonPackage rec { pname = "canopen"; - version = "0.5.1"; + version = "1.1.0"; - # use fetchFromGitHub until version containing test/sample.eds - # is available on PyPi - # https://github.com/christiansandberg/canopen/pull/57 - - src = fetchFromGitHub { - owner = "christiansandberg"; - repo = "canopen"; - rev = "b20575d84c3aef790fe7c38c5fc77601bade0ea4"; - sha256 = "1qg47qrkyvyxiwi13sickrkk89jp9s91sly2y90bz0jhws2bxh64"; + src = fetchPypi { + inherit pname version; + sha256 = "0fqa4p3qg7800fykib1x264gizhhmb6dz2hajgwr0hxf5xa19wdl"; }; - #src = fetchPypi { - # inherit pname version; - # sha256 = "0806cykarpjb9ili3mf82hsd9gdydbks8532nxgz93qzg4zdbv2g"; - #}; - - # test_pdo failure https://github.com/christiansandberg/canopen/issues/58 - doCheck = false; - propagatedBuildInputs = [ can canmatrix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix index 2dcd075ec0..821561c055 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "capturer"; - version = "2.4"; + version = "3.0"; src = fetchFromGitHub { owner = "xolox"; repo = "python-capturer"; rev = version; - sha256 = "07zy264xd0g7pz9sxjqcpwmrck334xcbb7wfss26lmvgdr5nhcb9"; + sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1"; }; propagatedBuildInputs = [ humanfriendly ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix index 740023c1fd..83ecf49436 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchPypi, libredirect -, case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet +, case, pytest, boto3, moto, kombu, billiard, pytz, future, vine }: buildPythonPackage rec { pname = "celery"; - version = "4.4.4"; + version = "4.4.6"; src = fetchPypi { inherit pname version; - sha256 = "0zk42fxznrhww0dxak9b6nkfqg02z49zr839k6ql7nk3him7n0y2"; + sha256 = "1ni5c3qgbhb7871b3i55wc306m3g2n0qxp92g5gszdxiicjf8xzx"; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; checkInputs = [ case pytest boto3 moto ]; - propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; + propagatedBuildInputs = [ kombu billiard pytz future vine ]; meta = with lib; { homepage = "https://github.com/celery/celery/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix new file mode 100644 index 0000000000..6c14f6c472 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, acme +, certbot +, cloudflare +, isPy3k +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + inherit (certbot) src version; + + pname = "certbot-dns-cloudflare"; + + propagatedBuildInputs = [ + acme + certbot + cloudflare + ]; + + checkInputs = [ + pytest + pytestCheckHook + ]; + + disabled = !isPy3k; + + pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; + + sourceRoot = "source/${pname}"; + + meta = certbot.meta // { + description = "Cloudflare DNS Authenticator plugin for Certbot"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix new file mode 100644 index 0000000000..19e53aa20c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, acme +, certbot +, dnspython +, isPy3k +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + inherit (certbot) src version; + + pname = "certbot-dns-rfc2136"; + + propagatedBuildInputs = [ + acme + certbot + dnspython + ]; + + checkInputs = [ + pytest + pytestCheckHook + ]; + + disabled = !isPy3k; + + pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; + + sourceRoot = "source/${pname}"; + + meta = certbot.meta // { + description = "RFC 2136 DNS Authenticator plugin for Certbot"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix new file mode 100644 index 0000000000..6fba51ce92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, acme +, boto3 +, certbot +, isPy3k +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + inherit (certbot) src version; + + pname = "certbot-dns-route53"; + + propagatedBuildInputs = [ + acme + boto3 + certbot + ]; + + checkInputs = [ + pytest + pytestCheckHook + ]; + + disabled = !isPy3k; + + pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; + + sourceRoot = "source/${pname}"; + + meta = certbot.meta // { + description = "Route53 DNS Authenticator plugin for Certbot"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix index ae5ee106f5..5a3296d71c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, toml }: +{ stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git }: buildPythonPackage rec { pname = "check-manifest"; @@ -9,15 +9,19 @@ buildPythonPackage rec { sha256 = "0d8e1b0944a667dd4a75274f6763e558f0d268fde2c725e894dfd152aae23300"; }; - propagatedBuildInputs = [ toml ]; + # Test requires filesystem access + postPatch = '' + substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist" + ''; - doCheck = false; + propagatedBuildInputs = [ pep517 toml ]; + + checkInputs = [ mock breezy git ]; meta = with stdenv.lib; { homepage = "https://github.com/mgedmin/check-manifest"; description = "Check MANIFEST.in in a Python source package for completeness"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; - broken = true; # pep517 package doesn't exist in nixpkgs }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index 269e59b9c1..1ea6b87fa0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -1,10 +1,19 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, isPy3k -, more-itertools, six, setuptools_scm, setuptools-scm-git-archive -, pytest, pytestcov, portend, pytest-testmon, pytest-mock -, backports_unittest-mock, pyopenssl, requests, trustme, requests-unixsocket -, backports_functools_lru_cache }: - -let inherit (stdenv) lib; in +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k +, jaraco_text +, more-itertools +, portend +, pyopenssl +, pytestCheckHook +, pytestcov +, pytest-mock +, pytest-testmon +, requests +, requests-unixsocket +, setuptools_scm +, setuptools-scm-git-archive +, six +, trustme +}: buildPythonPackage rec { pname = "cheroot"; @@ -19,21 +28,39 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; + propagatedBuildInputs = [ more-itertools six ]; - checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ]; + checkInputs = [ + jaraco_text + portend + pyopenssl + pytestCheckHook + pytestcov + pytest-mock + pytest-testmon + requests + requests-unixsocket + trustme + ]; # Disable doctest plugin because times out # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out # Deselect test_http_over_https_error on darwin because builtin cert fails # Disable warnings-as-errors because of deprecation warnings from socks on python 3.7 - checkPhase = '' - substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" "" - ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"} - pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} + # adds many other pytest utilities which aren't necessary like linting + preCheck = '' + rm pytest.ini ''; + disabledTests= [ + "tls" # touches network + "peercreds_unix_sock" # test urls no longer allowed + ] ++ lib.optionals stdenv.isDarwin [ + "http_over_https_error" + "bind_addr_unix" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix index 01e2955d08..7f5311f45b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "13ihbhjgxyn1xvrbppjvnqm199q5fdwrljs0wm16iwyl56kf3wh3"; + sha256 = "0zpn3miyapskw6s71v614pmga5zfain9j085axm9v50b8r71xh1i"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix index f4f46f2dff..6677ab0633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix @@ -6,6 +6,7 @@ , biopython , numpy , scipy +, scikitlearn , pandas , matplotlib , reportlab @@ -29,6 +30,7 @@ buildPythonPackage rec { biopython numpy scipy + scikitlearn pandas matplotlib reportlab @@ -44,6 +46,8 @@ buildPythonPackage rec { --replace "pandas >= 0.20.1, < 0.25.0" "pandas" ''; + pythonImportsCheck = [ "cnvlib" ]; + meta = with lib; { homepage = "https://cnvkit.readthedocs.io"; description = "A Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix index 219e48ad66..6ef440da0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "coloredlogs"; - version = "10.0"; + version = "14.0"; src = fetchFromGitHub { owner = "xolox"; repo = "python-coloredlogs"; rev = version; - sha256 = "0rdvp4dfvzhx7z7s2jdl3fv7x1hazgpy5gc7bcf05bnbv2iia54a"; + sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x"; }; # patch by risicle diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix index 3aa8ab6224..5eb65ce2fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix @@ -1,29 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, tinycss2 +, pytest +, pytestrunner +, pytestcov +, pytest-flake8 +, pytest-isort +}: buildPythonPackage rec { pname = "cssselect2"; version = "0.3.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "5c2716f06b5de93f701d5755a9666f2ee22cbcd8b4da8adddfc30095ffea3abc"; }; - # We're not interested in code quality tests - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-cov" "" \ - --replace "pytest-flake8" "" \ - --replace "pytest-isort" "" - substituteInPlace setup.cfg \ - --replace "--cov=cssselect2" "" \ - --replace "--flake8" "" \ - --replace "--isort" "" - ''; - propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix index e88591aba9..a0dec64906 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.10.0"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1bqvxm7h3b0wah32jrsn919hp4xr1zlkxclbs261mvd57ps0rf9h"; + sha256 = "02115plwhvyrmal01xp2964w8psysr2kf4ink8mh9z7kmda98l68"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix index a92f6617ab..8cb9250f34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "11fl7756zshlrfiqcr6rcg1m0c4434vdg1bkrcjl54hl02k3pcmv"; + sha256 = "14fp66vasfag1bss09qyjnqa000g56q7vcap3ig57xycflks4c3y"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix index 9c323c6fa3..8cdf0408de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.7.0"; + version = "4.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0md7qqjpsarc8ymfccvsqgj6mgq8gxl09im5v5yxhv8hv24yy4jm"; + sha256 = "16q0d9fidllxm7p51i5p4vzknnc09d114zqw3f4a2spr7llga7xj"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix index 4a9a9a60af..3757ff4740 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.12.0"; + version = "1.13.3"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "0nr5ppjbfmay0d3bah26i4k8xj6xyp24gq0cqlv9lzdrbdd3j9wy"; + sha256 = "131p725rc731ynksp12h9j1faq3vl51d5p64ln22r7zx4pvahss5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debts/default.nix new file mode 100644 index 0000000000..cc571f0563 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/debts/default.nix @@ -0,0 +1,42 @@ +{ lib +, python +, buildPythonPackage +, fetchFromGitLab +, isPy27 +, jinja2 +, pytest +}: + +buildPythonPackage rec { + pname = "debts"; + version = "0.5"; + + # pypi does not ship tests + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "almet"; + repo = "debts"; + rev = "d887bd8b340172d1c9bbcca6426529b8d1c2a241"; # no tags + sha256 = "1d66nka81mv9c07mki78lp5hdajqv4cq6aq2k7bh3mhkc5hwnwlg"; + }; + + disabled = isPy27; + + propagatedBuildInputs = [ jinja2 ]; + + checkInputs = [ pytest ]; + + # for some reason tests only work if the module is properly installed + checkPhase = '' + rm -r debts + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + py.test tests + ''; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A simple library and cli-tool to help you solve some debts settlement scenarios"; + license = licenses.beerware; + maintainers = [ maintainers.symphorien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix new file mode 100644 index 0000000000..2d11dee64a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -0,0 +1,68 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, substituteAll, gdb +, colorama, django, flask, gevent, psutil, pytest +, pytest-timeout, pytest_xdist, requests +, isPy27 +}: + +buildPythonPackage rec { + pname = "debugpy"; + version = "1.0.0b12"; + + src = fetchFromGitHub { + owner = "Microsoft"; + repo = pname; + rev = "v${version}"; + sha256 = "0sz33aq5qldl7kh4qjf5w3d08l9s77ipcj4i9wfklj8f6vf9w1wh"; + }; + + patches = [ + # Hard code GDB path (used to attach to process) + (substituteAll { + src = ./hardcode-gdb.patch; + inherit gdb; + }) + + # Fix importing debugpy in: + # - test_nodebug[module-launch(externalTerminal)] + # - test_nodebug[module-launch(integratedTerminal)] + # + # NOTE: The import failures seen in these tests without the patch + # will be seen if a user "installs" debugpy by adding it to PYTHONPATH. + # To avoid this issue, debugpy should be installed using python.withPackages: + # python.withPackages (ps: with ps; [ debugpy ]) + ./fix-test-pythonpath.patch + ]; + + # Remove pre-compiled "attach" libraries and recompile for host platform + # Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh + preBuild = ''( + set -x + cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process + rm *.so *.dylib *.dll *.exe *.pdb + ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ + "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; + "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; + "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; + }.${stdenv.hostPlatform.system}} + )''; + + checkInputs = [ + colorama django flask gevent psutil pytest + pytest-timeout pytest_xdist requests + ]; + + # Override default arguments in pytest.ini + checkPhase = "pytest --timeout 0 -n $NIX_BUILD_CORES" + # gevent fails to import zope.interface with Python 2.7 + + stdenv.lib.optionalString isPy27 " -k 'not test_gevent'"; + + meta = with stdenv.lib; { + description = "An implementation of the Debug Adapter Protocol for Python"; + homepage = "https://github.com/microsoft/debugpy"; + license = licenses.mit; + maintainers = with maintainers; [ metadark ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch new file mode 100644 index 0000000000..751351e03c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -0,0 +1,12 @@ +diff --git a/tests/debug/session.py b/tests/debug/session.py +index 2b39106..6d45a10 100644 +--- a/tests/debug/session.py ++++ b/tests/debug/session.py +@@ -625,6 +625,7 @@ class Session(object): + if "PYTHONPATH" in self.config.env: + # If specified, launcher will use it in lieu of PYTHONPATH it inherited + # from the adapter when spawning debuggee, so we need to adjust again. ++ self.config.env.prepend_to("PYTHONPATH", os.environ["PYTHONPATH"]) + self.config.env.prepend_to("PYTHONPATH", DEBUGGEE_PYTHONPATH.strpath) + return self._request_start("launch") + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch new file mode 100644 index 0000000000..780cb1aed1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -0,0 +1,13 @@ +diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +index 6d031b4..ecf21f2 100644 +--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py ++++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +@@ -293,7 +293,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show + is_debug = 0 + # Note that the space in the beginning of each line in the multi-line is important! + cmd = [ +- 'gdb', ++ '@gdb@/bin/gdb', + '--nw', # no gui interface + '--nh', # no ~/.gdbinit + '--nx', # no .gdbinit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix index 643556d879..58099a98bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix @@ -1,18 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests, netifaces , pytest, testtools, requests-mock }: buildPythonPackage rec { pname = "denonavr"; - version = "0.8.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "scarface-4711"; repo = "denonavr"; rev = version; - sha256 = "12g9w5674fmyf3f4plbhvpxpyhzw32pzwl0hvwswzrc2823xl6vx"; + sha256 = "0s8v918n6xn44r2mrq5hqbf0znpz64clq7a1jakkgz9py8bi6vnn"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests netifaces ]; doCheck = !isPy27; checkInputs = [ pytest testtools requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/detox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/detox/default.nix deleted file mode 100644 index 5353d4361e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/detox/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, tox, py, eventlet }: - -buildPythonPackage rec { - pname = "detox"; - version = "0.19"; - - src = fetchPypi { - inherit pname version; - sha256 = "e650f95f0c7f5858578014b3b193e5dac76c89285c1bbe4bae598fd641bf9cd3"; - }; - - buildInputs = [ pytest ]; - propagatedBuildInputs = [ tox py eventlet ]; - - checkPhase = '' - py.test - ''; - - # eventlet timeout, and broken invokation 3.5 - doCheck = false; - - meta = with stdenv.lib; { - description = "What is detox?"; - homepage = "https://bitbucket.org/hpk42/detox"; - license = licenses.mit; - # detox is unmaintained and incompatible with tox > 3.6 - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/diceware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/tools/security/diceware/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix index f32d63cfc1..8e35eabfb0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/diceware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix @@ -1,10 +1,10 @@ -{ lib -, python3Packages +{ lib, buildPythonPackage, fetchPypi +, pytestrunner +, setuptools +, coverage, pytest }: -with python3Packages; - -buildPythonApplication rec { +buildPythonPackage rec { pname = "diceware"; version = "0.9.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index 47419ec559..fd31bb40a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "1.3.3"; + version = "1.3.4"; disabled = pythonOlder "3.5.3"; # only distributes wheels on pypi now @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "0ld92vh7kjk3f02nbqyib68844yi4p2kmkyir6v9wi00y1l287l3"; + sha256 = "1i4h6vq681x8s05wi0n3ykavsxjh9hxdxn6banwjcqzhxzkyhsxi"; }; propagatedBuildInputs = [ aiohttp websockets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix index 42af34659c..fa5be71095 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.13"; + version = "2.2.14"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "103db5gmny6bkq9jgr2m6gdfy1n29bj2v87184y1zgpdmkv71ww4"; + sha256 = "14b1w00hrf4n7hla6d6nf2p5r4k6jh3fcmv7bd1v04vpcpvfrw7d"; }; patches = stdenv.lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix index ffff182994..627f8eedae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix @@ -36,7 +36,7 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "1xwrha692if7rwqc0qalgpx9b8indgdan8ppwlcs2v47wjvgg6h3"; + sha256 = "1dka5nap3d28n18pn3wp5xsi4x3z02h1j8rcjdvi3y6dbqjwdw0v"; }; bazelFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix index df98438932..25a2ffea2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.13"; + version = "0.9.14"; src = fetchPypi { inherit pname version; - sha256 = "a0fed3e139c12ee4884b19bcde1d4a170745bcabb6026397876e3236ce38b9db"; + sha256 = "1yz63cgiv910wkx90if09bql1n63lq6hy4wfpqink0q4sxy0mlpv"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix index 9c788bde12..fd43e8cf77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.2.1"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2"; + sha256 = "0m4vgk2831yfdjy8vqyvvfnmwv270a44z358frdzb672wzfbmvi6"; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index b04bc9069f..59541cbb3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.7.1"; + version = "7.8.0"; src = fetchPypi { inherit pname version; - sha256 = "9bfcb2bd137d6d7ca123e252b9d7261cfe4f7723f7b749a99c52b47766cf387c"; + sha256 = "14m7lfn36y0bjlpqxd7j9ggvbx46q30fva4czyspkqi79v7xhdz6"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index 2ab878b081..fd4b99fd5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.4.5"; + version = "1.4.6"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1hqvi7ibhdz812dsjbyyz3rysc6242hi1k9187wwnjmilbbngi3c"; + sha256 = "0prrqyiw9s9wf91s4f0vhqb9babs43aq24naa66qlirskdm87pav"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix new file mode 100644 index 0000000000..84026d7374 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchzip, pytest, asttokens }: + +buildPythonPackage rec { + pname = "executing"; + version = "0.4.3"; + + src = fetchzip { + url = "https://github.com/alexmojaki/executing/archive/v${version}.tar.gz"; + sha256 = "1fqfc26nl703nsx2flzf7x4mgr3rpbd8pnn9c195rca648zhi3nh"; + }; + + checkInputs = [ pytest asttokens ]; + + meta = with lib; { + description = "Get information about what a frame is currently doing, particularly the AST node being executed"; + homepage = "https://github.com/alexmojaki/executing"; + license = licenses.mit; + maintainers = with maintainers; [ renatoGarcia ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index 3513f57cdb..32ebd6a030 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.54.1"; + version = "0.55.1"; format = "flit"; disabled = !isPy3k; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "0k0lss8x6lzf0szcli48v28r269fsx1jdkr9q78liz47dz5x03d8"; + sha256 = "1515nhwari48v0angyl5z3cfpvwn4al2nvqh0cjd9xgxzvm310s8"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix index b5ef6686a4..761690ba9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner -, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing +, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata }: buildPythonPackage rec { @@ -13,10 +13,11 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock pytestrunner ]; - propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ] + propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ] + ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkPhase = '' py.test tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix index 5803d8ea2c..dc1e795054 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix @@ -8,12 +8,16 @@ , wtf-peewee , sqlalchemy , sqlalchemy-citext +, sqlalchemy-utils , flask-mongoengine , flask_sqlalchemy , flask-babelex , shapely , geoalchemy2 , psycopg2 +, arrow +, colour +, email_validator , flask , wtforms , isPy27 @@ -22,12 +26,12 @@ buildPythonPackage rec { pname = "flask-admin"; - version = "1.5.3"; + version = "1.5.6"; src = fetchPypi { pname = "Flask-Admin"; inherit version; - sha256 = "ca0be6ec11a6913b73f656c65c444ae5be416c57c75638dd3199376ce6bc7422"; + sha256 = "1f31vzc0p2xni5mh1wvjk9jxf4ddlx2fj4r0f3vv2n9db3c63iv8"; }; checkInputs = [ @@ -38,12 +42,16 @@ buildPythonPackage rec { wtf-peewee sqlalchemy sqlalchemy-citext + sqlalchemy-utils flask-mongoengine flask_sqlalchemy flask-babelex shapely geoalchemy2 psycopg2 + arrow + colour + email_validator ]; propagatedBuildInputs = [ @@ -52,13 +60,14 @@ buildPythonPackage rec { ] ++ lib.optionals isPy27 [ enum34 ]; checkPhase = '' - # disable tests that require mongodb, postresql + # disable tests that require mongodb, postresql, or network nosetests \ -e "mongoengine" \ -e "pymongo" \ -e "test_form_upload" \ -e "test_postgres" \ -e "geoa" \ + -e "test_ajax_fk" \ flask_admin/tests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index 01bd180a5a..5119d3c39a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -66,7 +66,8 @@ buildPythonPackage rec { --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \ --replace "PyJWT>=1.7.1" "PyJWT" \ --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ - --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" + --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \ + --replace "Flask-Login>=0.3, <0.5" "Flask-Login" ''; # majority of tests require network access or mongo diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix index 17c63f326e..d5b48fd042 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix @@ -1,37 +1,27 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k -, nose, mock, blinker +, nose, mock, blinker, pytest , flask, six, pytz, aniso8601, pycrypto }: buildPythonPackage rec { pname = "Flask-RESTful"; - version = "0.3.6"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap"; + sha256 = "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay"; }; - patches = [ - (fetchpatch { - url = "https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch"; - sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5"; - }) - (fetchpatch { - url = "https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch"; - sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl"; - }) - ]; - - postPatch = lib.optionalString isPy3k '' - # TypeError: Only byte strings can be passed to C code - rm tests/test_crypto.py tests/test_paging.py - ''; - - checkInputs = [ nose mock blinker ]; - propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; + checkInputs = [ pytest nose mock blinker ]; + + # test_reqparse.py: werkzeug move Multidict location (only imported in tests) + # handle_non_api_error isn't updated for addition encoding argument + checkPhase = '' + pytest --ignore=tests/test_reqparse.py -k 'not handle_non_api_error' + ''; + meta = with lib; { homepage = "https://flask-restful.readthedocs.io/"; description = "REST API building blocks for Flask"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index d6912de6fe..f8001bc2af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , isPy3k , flask +, werkzeug }: buildPythonPackage rec { @@ -20,8 +21,13 @@ buildPythonPackage rec { disabled = !isPy3k; + postPatch = '' + sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py + ''; + propagatedBuildInputs = [ flask + werkzeug ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix index bbf8395190..cc9ad87052 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.8"; + version = "0.8.11"; src = fetchPypi { inherit pname version; - sha256 = "06y626kgaz1wn1qajlngihpvd4qz8m6lx6sknmjqhhrznyji58wi"; + sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb"; }; propagatedBuildInputs = [ tkinter supercollider ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix index acbaf93a4e..bcc7a4b5c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix @@ -7,15 +7,15 @@ , crcmod }: -buildPythonPackage { +buildPythonPackage rec { pname = "fx2"; - version = "unstable-2020-01-25"; + version = "0.9"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = "d3e37f640d706aac5e69ae4476f6cd1bd0cd6a4e"; - sha256 = "1dsyknjpgf4wjkfr64lln1lcy7qpxdx5x3qglidrcswzv9b3i4fg"; + rev = version; + sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; }; nativeBuildInputs = [ sdcc ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix new file mode 100644 index 0000000000..74eb5de486 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonApplication +, fetchPypi +, filelock +, requests +, tqdm +, setuptools +}: + +buildPythonApplication rec { + pname = "gdown"; + version = "3.11.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p023812hh7w7d08njjsfn0xzldl4m73yx8p243yb2q49ypjl6nz"; + }; + + propagatedBuildInputs = [ filelock requests tqdm setuptools ]; + + checkPhase = '' + $out/bin/gdown --help > /dev/null + ''; + + meta = with lib; { + description = "A CLI tool for downloading large files from Google Drive"; + homepage = "https://github.com/wkentaro/gdown"; + license = licenses.mit; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index 892b373f06..e96c67b044 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -3,19 +3,25 @@ , fetchPypi , sqlalchemy , shapely +, setuptools_scm +, pytest }: buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.8.3"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9"; + sha256 = "02jbad9vbnjx8bmfvxg77z18nymrry6li8hy9pwi0yiyvwbnycyr"; }; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sqlalchemy shapely ]; + # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst + doCheck = false; + meta = with stdenv.lib; { homepage = "http://geoalchemy.org/"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index 9a86acf83b..07982b1e42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.7.0"; + version = "0.8.0"; disabled = isPy27; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "0cfdvl4cvi0nim1qbmzf7vg0all272i8r0kj4xgdd0hr2j4jdg9p"; + sha256 = "033jygbyycl9s6b0kqix9xynhapc2xd8nh47kcfacn514gyncgah"; }; checkInputs = [ pytest Rtree ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix index b4de607752..a6dd3ecb7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix @@ -1,30 +1,26 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, tox -, pytest -, pylint -, mypy -, black +, git +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "git-revise"; - version = "0.5.1"; + version = "0.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0l3xhg00106p7ysg4gl9dna2zcrax58mzmm0ajjaxw58jfn8wsf1"; + # Missing tests on PyPI + src = fetchFromGitHub { + owner = "mystor"; + repo = pname; + rev = "v${version}"; + sha256 = "03v791yhips9cxz9hr07rhsgxfhwyqq17rzi7ayjhwvy65s4hzs9"; }; disabled = pythonOlder "3.6"; - checkInputs = [ tox pytest pylint mypy black ]; - - checkPhase = '' - tox - ''; + checkInputs = [ git pytestCheckHook ]; meta = with lib; { description = "Efficiently update, split, and rearrange git commits"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix index 6a32364fdf..8a63f78728 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix @@ -18,15 +18,15 @@ buildPythonPackage rec { pname = "glasgow"; - version = "unstable-2020-02-08"; + version = "unstable-2020-06-29"; # python software/setup.py --version realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498"; - sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m"; + rev = "f885790d7927b893e631c33744622d6ebc18b5e3"; + sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk="; }; nativeBuildInputs = [ setuptools_scm sdcc ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix new file mode 100644 index 0000000000..ff2302f546 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, pythonAtLeast +, buildPythonPackage +, fetchPypi +, nose +, coverage +}: + +buildPythonPackage rec { + pname = "globre"; + version = "0.1.5"; + # https://github.com/metagriffin/globre/issues/7 + disabled = pythonAtLeast "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qhjpg0722871dm5m7mmldf6c7mx58fbdvk1ix5i3s9py82448gf"; + }; + + checkInputs = [ nose coverage ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/metagriffin/globre"; + description = "A python glob-like regular expression generation library."; + maintainers = with maintainers; [ glittershark ]; + license = licenses.gpl3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 98e0c8712b..2a7f762970 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.9.3"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "220349ce189a85229fc46875d467101318495a4a735c0ff2f165b9bdbc7511a0"; + sha256 = "01zzlr21rgl1skl7ayppp0qwn6s883i50xcvxs8jxzr4c5zz097s"; }; # No tests included in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix index af57e3209d..16363192c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { postPatch = '' sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py + substituteInPlace setup.py \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix new file mode 100644 index 0000000000..513b76bafa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi +, grpc_google_iam_v1, google_api_core +, pytest, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-secret-manager"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cm3xqacxnbpv2706bd2jl86mvcsphpjlvhzngz2k2p48a0jjx8r"; + }; + + propagatedBuildInputs = [ + google_api_core + grpc_google_iam_v1 + ]; + + checkInputs = [ + mock + pytest + ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Secret Manager API: Stores, manages, and secures access to application secrets"; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix index d3e4b8fd93..9446200b65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , google_resumable_media @@ -11,32 +11,35 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.28.1"; + version = "1.29.0"; src = fetchPypi { inherit pname version; - sha256 = "a7b5c326e7307a83fa1f1f0ef71aba9ad1f3a2bc6a768401e13fc02369fd8612"; + sha256 = "07lsdrxypz5i21x99m1zkxwiax89q80v0av6ak0k4fkys48spj0m"; }; propagatedBuildInputs = [ - google_resumable_media google_api_core google_cloud_core + google_resumable_media setuptools ]; - checkInputs = [ pytest mock ]; + checkInputs = [ + mock + pytest + ]; # remove directory from interferring with importing modules # ignore tests which require credentials checkPhase = '' rm -r google - pytest tests/unit -k 'not create' + pytest tests/unit -k 'not (create or get or post)' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Google Cloud Storage API client library"; homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix index 028ca36542..4cd03103d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpxpy/default.nix @@ -1,14 +1,15 @@ -{ lib, fetchFromGitHub, buildPythonPackage, python, lxml }: +{ lib, fetchFromGitHub, buildPythonPackage, python, lxml, isPy3k }: buildPythonPackage rec { pname = "gpxpy"; - version = "1.3.5"; + version = "1.4.2"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "tkrajina"; repo = pname; rev = "v${version}"; - sha256 = "18r7pfda7g3l0hv8j9565n52cvvgjxiiqqzagfdfaba1djgl6p8b"; + sha256 = "1r5gb660nrkrdbw5m5h1n5k10npcfv9bxqv92z55ds8r7rw2saz6"; }; propagatedBuildInputs = [ lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/update-django-tagging.patch b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/update-django-tagging.patch index 48d16d50f4..9774f7e70a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/update-django-tagging.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/update-django-tagging.patch @@ -1,12 +1,13 @@ -diff -Nur a/setup.py b/setup.py ---- a/setup.py 2020-03-12 18:45:34.654296302 +0100 -+++ b/setup.py 2020-03-12 18:46:17.476893828 +0100 -@@ -115,7 +115,7 @@ +diff --git a/setup.py b/setup.py +index a1a21f1..f0d1051 100644 +--- a/setup.py ++++ b/setup.py +@@ -117,7 +117,7 @@ try: ['templates/*', 'local_settings.py.example']}, scripts=glob('bin/*'), data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, -- install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], -+ install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.6', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], +- install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz', ++ install_requires=['Django>=1.8,<3.1', 'django-tagging==0.5.0', 'pytz', + 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], classifiers=[ 'Intended Audience :: Developers', - 'Natural Language :: English', diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix index 21cc58e67f..9e48f66c13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "2.3.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "029jnwy6zbj4x7f3ffpn1gyx0w9ala9cj2g115g6aa7im3xd2jma"; + sha256 = "0kvbj9dwpx8mjfj86kqx54dbz9k72ki147ssyj0ca2syvb8jm3wb"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix index e12d71836f..e26e936f48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix @@ -1,23 +1,33 @@ { buildPythonPackage , fetchFromGitHub , lib - , black , graphql-core , promise +, fetchpatch +, pythonOlder }: buildPythonPackage rec { pname = "graphql-server-core"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "123q3xziv0s22h10v3f5slirf4b6nxj0hnmarwx9vws6x21bgrgh"; + sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr"; }; + disable = pythonOlder "3.6"; + + patches = [ + (fetchpatch { + url = "https://github.com/graphql-python/graphql-server-core/commit/865ee9d5602f352c958f6f7e15adbe9abe216784.patch"; + sha256 = "03p44p4j8rys7mgamh2h9ibbnac2cqwvp5f5hrl2avj2hh0l6j46"; + }) + ]; + propagatedBuildInputs = [ graphql-core promise diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 672c4b94f3..d1369b8317 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.7.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "d249ab784b23026fcde21e4d69b46eaf9f3559ba3612f1d896a4092ecfc06a75"; + sha256 = "1xkds49z4hjyvz170913dz6886lhq4hb2n6dqqpv6q5p1znsx2gj"; }; propagatedBuildInputs = [ future requests python-dateutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix index 14e5b4edcd..e96d7e2287 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix @@ -30,8 +30,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; checkPhase = '' - ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v \ - --exclude=test_merge_prompt_cb # https://bz.mercurial-scm.org/show_bug.cgi?id=6265 + ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index 7b54d8cd5f..796ddaace8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.13.2"; + version = "1.13.3"; src = fetchPypi { inherit pname version; - sha256 = "00i8732qib86xqa3652vkr178ib3682cls4jcv5g52y0rlkd8bfg"; + sha256 = "e6753651a8598f21fc2c20e8456865ecec276cfea1519182a76d957506727934"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index 635ad7a283..9961288281 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.5.19"; + version = "2020.6.9"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "09a5vajzw3f2kpdq9ydzx1f840xmdmzb6br3ns79mnqnsw6nfs6z"; + sha256 = "12js2xcj4979jklc19hjmv5p2b6689p18p4w9swhjc6cgcwm4jy2"; }; # tests require network connection diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix new file mode 100644 index 0000000000..17783f38d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchFromGitHub, lxml, beautifulsoup4, pytest, pytestrunner }: + +buildPythonPackage rec { + pname = "html-sanitizer"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "matthiask"; + repo = pname; + rev = version; + sha256 = "0nnv34924r0yn01rwlk749j5ijy7yxyj302s1i57yjrkqr3zlvas"; + }; + + propagatedBuildInputs = [ lxml beautifulsoup4 ]; + + meta = with lib; { + description = "An allowlist-based and very opinionated HTML sanitizer that can be used both for untrusted and trusted sources."; + homepage = "https://github.com/matthiask/html-sanitizer"; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix index d68e12b377..864a1300c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "391b558a465d1919a2862926ab9a7c6bef1f2ac2c46daf8dd5115080c42978e4"; + sha256 = "0yhywm8f86pc4f7ivvbwicwhzf0khjqp9jj77pqy6nha6znvpvnh"; }; propagatedBuildInputs = [ requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix index f5a8fc1e46..4cc8574c84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix @@ -1,20 +1,19 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, enum-compat , xorgserver, pytest, pytest-xvfb, pytest-asyncio, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: buildPythonPackage rec { pname = "i3ipc"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "10zpbiw1gcndn439g1vxcdkxllwp02qcmaal4w7hi2rzgaw1xkdk"; + sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715"; }; - propagatedBuildInputs = [ enum-compat xlib ]; + propagatedBuildInputs = [ xlib ]; fontsConf = makeFontsConf { fontDirectories = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix new file mode 100644 index 0000000000..eba5a70577 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi +, asttokens, colorama, executing, pygments +}: + +buildPythonPackage rec { + pname = "icecream"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16kpixl43nrn093cvkmxiq2dzd9xc73zwzkmwp0rs7x01nji8kj3"; + }; + + propagatedBuildInputs = [ asttokens colorama executing pygments ]; + + meta = with lib; { + description = "A little library for sweet and creamy print debugging"; + homepage = "https://github.com/gruns/icecream"; + license = licenses.mit; + maintainers = with maintainers; [ renatoGarcia ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix index d304dddd79..08799a9fb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , tatsu, arrow -, pytest-sugar, pytestpep8, pytest-flakes, pytestcov +, pytestCheckHook, pytestpep8, pytest-flakes }: buildPythonPackage rec { @@ -22,10 +22,7 @@ buildPythonPackage rec { --replace "arrow>=0.11,<0.15" "arrow" ''; - checkInputs = [ pytest-sugar pytestpep8 pytest-flakes pytestcov ]; - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook pytestpep8 pytest-flakes ]; meta = with stdenv.lib; { description = "Pythonic and easy iCalendar library (RFC 5545)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index 9f78298a3f..e1e6915825 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.19"; + version = "1.4.21"; src = fetchPypi { inherit pname version; - sha256 = "249ebc7e2066d6393d27c1b1be3b70433f824a120b1d8274d362f1eb419e3b52"; + sha256 = "105n1prgmzkzdwr8q0bdx82nj7i8p3af1abh864k2fcyjwmpzl64"; }; # Tests not included in PyPI tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix index 5df5e6b18c..38d762ec36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests +{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests, fetchpatch, fetchPypi , alembic , aniso8601 , Babel @@ -15,33 +15,65 @@ , flask_script , flask_sqlalchemy , flask_wtf +, debts , idna , itsdangerous , jinja2 , Mako , markupsafe -, mock , python-dateutil , pytz , six , sqlalchemy +, sqlalchemy-continuum , werkzeug , wtforms , psycopg2 # optional, for postgresql support , flask_testing }: +# ihatemoney is not really a library. It will only ever be imported +# by the interpreter of uwsgi. So overrides for its depencies are fine. +let + # https://github.com/spiral-project/ihatemoney/issues/567 + pinned_wtforms = wtforms.overridePythonAttrs (old: rec { + pname = "WTForms"; + version = "2.2.1"; + src = fetchPypi { + inherit pname version; + sha256 = "0q9vkcq6jnnn618h27lx9sas6s9qlg2mv8ja6dn0hy38gwzarnqc"; + }; + }); + pinned_flask_wtf = flask_wtf.override { wtforms = pinned_wtforms; }; +in + buildPythonPackage rec { pname = "ihatemoney"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "spiral-project"; repo = pname; rev = version; - sha256 = "1ai7v2i2rvswzv21nwyq51fvp8lr2x2cl3n34p11br06kc1pcmin"; + sha256 = "0d4vc6m0jkwlz9ly0hcjghccydvqbldh2jb8yzf94jrgkd5fd7k1"; }; + disabled = isPy27; + + patches = [ + # fix migration on postgresql + # remove on next release + (fetchpatch { + url = "https://github.com/spiral-project/ihatemoney/commit/6129191b26784b895e203fa3eafb89cee7d88b71.patch"; + sha256 = "0yc24gsih9x3pnh2mhj4v5i71x02dq93a9jd2r8b1limhcl4p1sw"; + }) + ]; + + postPatch = '' + # remove draconian pinning + sed -i 's/==.*$//' setup.cfg + ''; + propagatedBuildInputs = [ alembic aniso8601 @@ -58,7 +90,7 @@ buildPythonPackage rec { flask-restful flask_script flask_sqlalchemy - flask_wtf + pinned_flask_wtf idna itsdangerous jinja2 @@ -68,14 +100,16 @@ buildPythonPackage rec { pytz six sqlalchemy + sqlalchemy-continuum werkzeug - wtforms + pinned_wtforms psycopg2 + debts ]; checkInputs = [ flask_testing - ] ++ lib.optionals isPy27 [ mock ]; + ]; passthru.tests = { inherit (nixosTests) ihatemoney; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 3497d74857..4868f3ae37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, isPy27 , pathlib , fetchPypi , pillow @@ -16,6 +17,7 @@ buildPythonPackage rec { pname = "imageio"; version = "2.8.0"; + disabled = isPy27; src = fetchPypi { sha256 = "fb5fd6d3d17126bbaac9af29fe340e2c97a196eb9416d4f28c0e543744a152cf"; @@ -25,11 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ imageio-ffmpeg ffmpeg_3 ]; - propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ - futures - enum34 - pathlib - ]; + propagatedBuildInputs = [ numpy pillow ]; checkPhase = '' export IMAGEIO_USERDIR="$TMP" diff --git a/third_party/nixpkgs/pkgs/applications/misc/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/applications/misc/img2pdf/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index b9c06d5122..2fa46c2ed9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -1,10 +1,9 @@ -{ stdenv, python3Packages }: +{ lib, pillow, fetchPypi, buildPythonPackage, isPy27 }: -with python3Packages; - -buildPythonApplication rec { +buildPythonPackage rec { pname = "img2pdf"; version = "0.3.6"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -15,7 +14,7 @@ buildPythonApplication rec { pillow ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert images to PDF via direct JPEG inclusion"; homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix index d4e544ad8d..b7fbe41f69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six, importlib-metadata, toml }: +{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, nose, six, importlib-metadata, toml }: buildPythonPackage rec { pname = "inflect"; version = "4.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix new file mode 100644 index 0000000000..007ab25eb6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, rx +, certifi +, six +, python-dateutil +, setuptools +, urllib3 +, ciso8601 +, pytz +, pythonOlder +}: + +buildPythonPackage rec { + pname = "influxdb-client"; + version = "1.8.0"; + + disabled = pythonOlder "3.6"; # requires python version >=3.6 + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "influxdb-client-python"; + rev = "v${version}"; + sha256 = "0gf0fjkd10yn1bb86rfapnd5diraivshn9mhzqxaxwlfah45q187"; + }; + + # makes test not reproducible + postPatch = '' + sed -i -e '/randomize/d' test-requirements.txt + ''; + + propagatedBuildInputs = [ + rx + certifi + six + python-dateutil + setuptools + urllib3 + ciso8601 + pytz + ]; + + # requires influxdb server + doCheck = false; + + meta = with lib; { + description = "InfluxDB 2.0 Python client library"; + homepage = "https://github.com/influxdata/influxdb-client-python"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix index d862e3d2ab..ecf3900066 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.3"; + version = "1.9.4"; # Can't use pypi, data files for tests missing src = fetchFromGitHub { owner = "jjjake"; repo = "internetarchive"; rev = "v${version}"; - sha256 = "19av6cpps2qldfl3wb9mcirs1a48a4466m1v9k9yhdznqi4zb0ji"; + sha256 = "10xlblj21hanahsmw6lfggbrbpw08pdmvdgds1p58l8xd4fazli8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix index 4b234cc11a..c32726be7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.13.2"; + version = "0.13.3"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "0jcd849rx30y3wcgzsqbn06v0yjlzvb9x3076q0yxpycdwm1ryvp"; + sha256 = "0y3yk5k2yszcwxsjinvf40b1wl8wi8l6kv7pl9jmx9j53hk6vx6n"; }; propagatedBuildInputs = [ ipython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix index 0c5da2cd7a..44ec6cade9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.5.6"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "1sak58wcpikn4ww1k8gr2vf1hmwzfly31hzcnwiizp7l0vk40qh7"; + sha256 = "0cjsabsbn02vpf3yl0x9xdqgf4f707mbnz2hp2bn6zp9qnyyirx5"; }; propagatedBuildInputs = [ ipywidgets matplotlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix index 692daa7b2f..9700737f48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.15.0"; + version = "7.16.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0ef1433879816a960cd3ae1ae1dc82c64732ca75cec8dab5a4e29783fb571d0e"; + sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix index 5828ada7a6..b04ab3febd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools , setuptools_scm, jaraco_collections, importlib-metadata }: @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six importlib-metadata @@ -27,4 +27,11 @@ buildPythonPackage rec { jaraco_itertools jaraco_collections ]; + + meta = with lib; { + description = "IRC (Internet Relay Chat) protocol library for Python"; + homepage = "https://github.com/jaraco/irc"; + license = licenses.mit; + maintainers = []; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch index 43530fcc32..2dcf7d6486 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch @@ -1,38 +1,27 @@ -From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 10 Mar 2019 13:10:18 +0100 -Subject: [PATCH] Don't run flake8 checks during the build +From fd56b0d85393d684bd3bf99f33d8638da884282f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Thu, 25 Jun 2020 09:52:11 +0100 +Subject: [PATCH] disable flake8/black8/coverage from tests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -If the code simply violates their code style, the Nix package shouldn't fail. +Signed-off-by: Jörg Thalheim --- pytest.ini | 2 +- - setup.cfg | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini -index d165e5e..d8e4694 100644 +index 5027d34..4e2a2d2 100644 --- a/pytest.ini +++ b/pytest.ini -@@ -1,6 +1,6 @@ +@@ -1,5 +1,5 @@ [pytest] norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --flake8 +-addopts=--doctest-modules --flake8 --black --cov +addopts=--doctest-modules doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES filterwarnings= - ignore:Possible nested set::pycodestyle:113 -diff --git a/setup.cfg b/setup.cfg -index 9f3517f..c9033ec 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0 - testing = - pytest >= 3.5, !=3.7.3 - pytest-checkdocs -- pytest-flake8 - docs = - sphinx - jaraco.packaging >= 3.2 -- -2.18.1 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix index 1932f672b0..5df70b6da9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -11,16 +11,23 @@ buildPythonPackage rec { sha256 = "6447d567f57efe5efea386265c7864652e9530830a1b80f43e60b4f222b9ab84"; }; - patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; + nativeBuildInputs = [ setuptools_scm ]; + + patches = [ + ./0001-Don-t-run-flake8-checks-during-the-build.patch + ]; - buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; checkInputs = [ pytest ]; + # tests no longer available through pypi + doCheck = false; checkPhase = '' pytest ''; + pythonImportsCheck = [ "jaraco.itertools" ]; + meta = with lib; { description = "Tools for working with iterables"; homepage = "https://github.com/jaraco/jaraco.itertools"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch deleted file mode 100644 index aab9604b9c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 10 Mar 2019 16:42:21 +0100 -Subject: [PATCH] Don't run flake8 checks during the build - -If the code simply violates their code style, the Nix package shouldn't fail. ---- - pytest.ini | 2 +- - setup.cfg | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/pytest.ini b/pytest.ini -index 9b3c1ec..a5189c1 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,6 +1,6 @@ - [pytest] - norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --flake8 -+addopts=--doctest-modules - doctest_optionflags=ALLOW_UNICODE ELLIPSIS - filterwarnings= - ignore:Possible nested set::pycodestyle:113 -diff --git a/setup.cfg b/setup.cfg -index 3e7bbed..5cac7a2 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -29,7 +29,6 @@ setup_requires = setuptools_scm >= 1.15.0 - testing = - pytest >= 3.5, !=3.7.3 - pytest-checkdocs -- pytest-flake8 - docs = - sphinx - jaraco.packaging >= 3.2 --- -2.18.1 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix index cf4ae4e435..3f9fa4d67c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, setuptools_scm -, tempora, six, pytest +, tempora, six }: buildPythonPackage rec { @@ -11,15 +11,13 @@ buildPythonPackage rec { sha256 = "31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e"; }; - patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; - - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora six ]; - checkInputs = [ pytest ]; - checkPhase = '' - PYTHONPATH=".:$PYTHONPATH" pytest - ''; + # test no longer packaged with pypi + doCheck = false; + + pythonImportsCheck = [ "jaraco.logging" ]; meta = with lib; { description = "Support for Python logging facility"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index e48fec89b9..027ae8000b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.11.6"; + version = "1.11.8"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "0jyygq7zmam7yriiv5j4d6mpjdi2p3p7d53bn3qwfzkh4ifsbfan"; + sha256 = "0rkckbgm04ql4r48wjgljfiqvsz36n99yqcpcyna8lvlm8h4nmwa"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix index 77d3e3e4d8..8976e90b5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "df40c97641cb943661d2db4c33c2e1ff75d491189423249e989bcea4464f3030"; + sha256 = "0qrgyn0znpib485hk0mi68wab6nhwqd3pyjxvp7jn6kijr7mszc0"; }; checkInputs = [ pytest glibcLocales tox pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix index 84acd49792..c7133c206d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix @@ -2,8 +2,7 @@ , buildPythonPackage , fetchFromGitHub , six -, pytest -, pytest-sugar +, pytestCheckHook }: buildPythonPackage rec { @@ -21,11 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest pytest-sugar ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Creates JUnit XML test result documents that can be read by tools such as Jenkins"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix index 008a74dfb3..24d7ee4f71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.3"; + version = "6.1.5"; src = fetchPypi { inherit pname version; - sha256 = "3a32fa4d0b16d1c626b30c3002a62dfd86d6863ed39eaba3f537fade197bb756"; + sha256 = "5099cda1ac86b27b655a715c51e15bdc8bd9595b2b17adb41a2bd446bbbafc4a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 8d08fec6f5..0aab09117e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.1.4"; + version = "2.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7b5bd4a05330a01c8522ee7f1cda5cb2e0d96412d9e1e879a19b3afb63d4ac69"; + sha256 = "162jn51cg36fsn4l2zhnb5n4nbkhm9wlv974ggcnmdij3i4r4yya"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix new file mode 100644 index 0000000000..cccd553a31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix @@ -0,0 +1,53 @@ +{ buildPythonPackage +, certifi +, fetchPypi +, lib +, python-dateutil +, python-slugify +, six +, requests +, tqdm +, urllib3 +}: + +buildPythonPackage rec { + pname = "kaggle"; + version = "1.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f5qrkgklcpgbwncrif7aw4f86dychqplh7k3f4rljwnr9yhjb1w"; + }; + + # The version bounds in the setup.py file are unnecessarily restrictive. + patchPhase = '' + substituteInPlace setup.py \ + --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3' + ''; + + propagatedBuildInputs = [ + certifi + python-dateutil + python-slugify + requests + six + tqdm + urllib3 + ]; + + # Tests try to access the network. + checkPhase = '' + export HOME="$TMP" + mkdir -p "$HOME/.kaggle/" + echo '{"username":"foobar","key":"00000000000000000000000000000000"}' > "$HOME/.kaggle/kaggle.json" + $out/bin/kaggle --help > /dev/null + ''; + pythonImportsCheck = [ "kaggle" ]; + + meta = with lib; { + description = "Official API for https://www.kaggle.com, accessible using a command line tool implemented in Python 3"; + homepage = "https://github.com/Kaggle/kaggle-api"; + license = licenses.asl20; + maintainers = with maintainers; [ cdepillabout ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix index 409a3b6c06..3c040abc72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kazoo"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1jvpn1rcnnq3by1y6wlhfl9jynb110xv5lvd0x0ifkld7vfzd0v8"; + sha256 = "1zpj5cc8624w6i0pxgcxqkjwbkm4pkrv19d7wh5df3jais32g3jq"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix index 41c1654803..a95a890742 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.8.5"; + version = "0.8.8"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1rfybmr0rlljhc0dpd9npbw8x7r6dvnn2wvclz93rmgkzhmd3zah"; + sha256 = "1q2dvkkfx9dvag5v5ps0ki4avh7i003gn9sj30jy1rsv1bg4y2mb"; }; # tests of Nearley support require js2py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix index 3514d5da9a..77b75193ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "latexcodec"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0pyzhidpnc3q3rh9d5hxhzv99rl5limyyrll7xcyssci92fn8gyd"; + sha256 = "16pynfnn8y8xp55yp06i721fccv5dlx9ba6k5bzcwq9j6wf5b8ia"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix index d6b3cc2932..e927862538 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lazr.uri"; - version = "1.0.3"; + version = "1.0.4"; disabled = isPy27; # namespace is broken for python2 src = fetchPypi { inherit pname version; - sha256 = "5c620b5993c8c6a73084176bfc51de64972b8373620476ed841931a49752dc8b"; + sha256 = "1griz2r0vhi9k91wfhlx5cx7y3slkfyzyqldaa9i0zp850iqz0q2"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldap/default.nix index 70b4ba2bf1..0e4f5597ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldap/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "3.2.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "13nvrhp85yr0jyxixcjj012iw8l9wynxxlykm9j3alss6waln73x"; + sha256 = "198as30xy6p760niqps2zdvq2xcmr765h06pmda8fa9y077wl4a7"; }; propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 2220167011..6693756b9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b9eef1a61383fd401a537cf0796a1067a265288b7ab89be93f5571961a8a2902"; + sha256 = "1b28j265kvibgxrgxx0gwfm6cmv252c8ph1j2vb0cpms8ph5if5v"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix index ab00340cfe..220d60663a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libevdev"; - version = "0.7"; + version = "0.9"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4"; + sha256 = "17agnigmzscmdjqmrylg1lza03hwjhgxbpf4l705s6i7p7ndaqrs"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix index 21aa46348b..ed3629ce65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libversion"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1p3snjlsg11vhba8h286h19kn6azlxbywg9f6rdhj8sfraccqlmk"; + sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index 43962c7d4d..7b1601a412 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "6.2.0"; + version = "6.3.0"; src = assert version == libvirt.version; fetchgit { url = "git://libvirt.org/libvirt-python.git"; rev = "v${version}"; - sha256 = "0a8crk29rmnw1kcgi72crb7syacdk03lkl05yand5cxs0l65jwdl"; + sha256 = "088cksq59jxkkzbvmwl8jw9v2k3zibwksl7j57yb51bxaa2sa1cx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix index 8ff0f391f2..4275732881 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix @@ -6,6 +6,7 @@ , ipython , python , scikit-build +, cmake }: buildPythonPackage rec { @@ -17,9 +18,17 @@ buildPythonPackage rec { sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141"; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + cmake + scikit-build + ]; - propagatedBuildInputs = [ ipython scikit-build ]; + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + ipython + ]; disabled = isPyPy; @@ -27,8 +36,12 @@ buildPythonPackage rec { rm -f _line_profiler.c ''; + checkInputs = [ + ipython + ]; + checkPhase = '' - ${python.interpreter} -m unittest discover -s tests + PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH cd tests && ${python.interpreter} -m unittest discover -s . ''; meta = { @@ -36,6 +49,5 @@ buildPythonPackage rec { homepage = "https://github.com/rkern/line_profiler"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index 3a7f381e51..c96975412b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.32.1"; + version = "0.33.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "41262a47b8cbba5a09203b15b65fbdf11192f92aa226c81e99115acdee8f3b8d"; + sha256 = "9c8aae96f7fba10d9ac864b443d1e8c7ee4765c31569a2b201b3d0b67d8fc596"; }; nativeBuildInputs = [ llvm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix new file mode 100644 index 0000000000..bd2a1f6239 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +}: + +buildPythonPackage rec { + version = "2.0.7"; + pname = "mac_alias"; + + src = fetchPypi { + inherit pname version; + sha256 = "08z2i68mk5j0vfy8jqihjm9m6njp1lpjh1m91b60h0k0kpmy71f4"; + }; + + # pypi package does not include tests; + # tests anyway require admin privileges to succeed + doCheck = false; + pythonImportsCheck = [ "mac_alias" ]; + + meta = with lib; { + homepage = "https://github.com/al45tair/mac_alias"; + description = "Generate or read binary Alias and Bookmark records from Python code"; + longDescription = '' + mac_alias lets you generate or read binary Alias and Bookmark records from Python code. + + While it is written in pure Python, some OS X specific code is required + to generate a proper Alias or Bookmark record for a given file, + so this module currently is not portable to other platforms. + ''; + license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix new file mode 100644 index 0000000000..c7a4fc3f42 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, python +, blinker, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, u-msgpack-python, watchdog +, sdnotify +, systemd +}: + +buildPythonPackage rec { + pname = "maestral"; + version = "1.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "SamSchott"; + repo = "maestral"; + rev = "v${version}"; + sha256 = "0d1pxbg69ll07w4bbpzs7zz1yn82qyrym95b0mqmhrrg2ysxjngg"; + }; + + propagatedBuildInputs = [ + blinker + bugsnag + click + dropbox + fasteners + keyring + keyrings-alt + pathspec + Pyro5 + requests + u-msgpack-python + watchdog + ] ++ stdenv.lib.optionals stdenv.isLinux [ + sdnotify + systemd + ]; + + makeWrapperArgs = [ + # Add the installed directories to the python path so the daemon can find them + "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages" + ]; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Open-source Dropbox client for macOS and Linux"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + inherit (src.meta) homepage; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix index f48c36bdb0..b7d17d943f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mahotas"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; rev = "v${version}"; - sha256 = "151hri3lwcm9p7w1nyw99h8c70j51698cvzaiazvwb6gl4khwavv"; + sha256 = "0fjiyl82wj1a6xzr9mss2y2rydl4zchl2cbdbg0jm0fcrs99q4hw"; }; # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/mozfile.nix b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/mozfile.nix index 829e909535..2cce0a2212 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 , six }: @@ -14,7 +13,7 @@ buildPythonPackage rec { sha256 = "e5dc835582ea150e35ecd57e9d86cb707d3aa3b2505679db7332326dd49fd6b8"; }; - propagatedBuildInputs = lib.optional isPy27 six; + propagatedBuildInputs = [ six ]; # mozhttpd -> moznetwork -> mozinfo -> mozfile doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index aca4bf3543..890518658a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.12.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "1d4jhl2xjjp31yjs4zz2cfkvzbi2vr5bsrp07s6nhyc18azxr7ba"; + sha256 = "0mgb9m3298jvw3wa051zn7vp1m8qriys3ps0qn3sq54fndljgg5k"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 362e341576..01cabdd9b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.5.4"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "0csvk3y0y2r9gnfqj91fiqprgp8dxiv4n80b6myraab5s7zn1mvv"; + sha256 = "0czymj9k9faky4dyrbxpr8rfrsb28xz9c0p66dcxvchk3m3ac49k"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index beddba84fb..a5ec28f344 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage, lib, fetchPypi +{ stdenv, lib, buildPythonPackage, pythonAtLeast +, fetchPypi +, libmaxminddb , ipaddress , mock , nose @@ -13,10 +15,15 @@ buildPythonPackage rec { sha256 = "f4d28823d9ca23323d113dc7af8db2087aa4f657fafc64ff8f7a8afda871425b"; }; + buildInputs = [ libmaxminddb ]; + propagatedBuildInputs = [ ipaddress ]; checkInputs = [ nose mock ]; + # Tests are broken for macOS on python38 + doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8"); + meta = with lib; { description = "Reader for the MaxMind DB format"; homepage = "https://www.maxmind.com/en/home"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshlabxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshlabxml/default.nix new file mode 100644 index 0000000000..c1091296d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshlabxml/default.nix @@ -0,0 +1,29 @@ +{ + buildPythonPackage, + fetchPypi, + pythonOlder, + lib, +}: + +buildPythonPackage rec { + pname = "MeshLabXML"; + version = "2018.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1villmg46hqby5jjkkpxr5bxydr72y5b3cbfngwpyxxdljn091w8"; + }; + + propagatedBuildInputs = [ ]; + + doCheck = false; # Upstream not currently have any tests. + + pythonImportsCheck = [ "meshlabxml" ]; + + meta = with lib; { + homepage = "https://github.com/3DLIRIOUS/MeshLabXML"; + description = "Create and run MeshLab XML scripts with Python"; + license = licenses.lgpl21; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix new file mode 100644 index 0000000000..8312ea783c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, substituteAll +, portmidi, pygame, python-rtmidi, rtmidi-python +, pytest +}: + +buildPythonPackage rec { + pname = "mido"; + version = "1.2.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k3sgkxc7j49bapib3b5jnircb1yhyyd8mi0mbfd78zgix9db9y4"; + }; + + patches = [ + (substituteAll { + src = ./libportmidi-cdll.patch; + libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.targetPlatform.extensions.sharedLibrary}"; + }) + ]; + + propagatedBuildInputs = [ + pygame + python-rtmidi + rtmidi-python + ]; + + checkInputs = [ pytest ]; + checkPhase = '' + py.test . -rs -q + ''; + + meta = with lib; { + description = "MIDI Objects for Python"; + homepage = "https://mido.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mido/libportmidi-cdll.patch b/third_party/nixpkgs/pkgs/development/python-modules/mido/libportmidi-cdll.patch new file mode 100644 index 0000000000..455064f12b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mido/libportmidi-cdll.patch @@ -0,0 +1,19 @@ +diff --git a/mido/backends/portmidi_init.py b/mido/backends/portmidi_init.py +index 84bb128..5efcdaa 100644 +--- a/mido/backends/portmidi_init.py ++++ b/mido/backends/portmidi_init.py +@@ -10,13 +10,7 @@ from ctypes import (CDLL, CFUNCTYPE, POINTER, Structure, c_char_p, + create_string_buffer, byref) + import ctypes.util + +-dll_name = '' +-if sys.platform == 'darwin': +- dll_name = ctypes.util.find_library('libportmidi.dylib') +-elif sys.platform in ('win32', 'cygwin'): +- dll_name = 'portmidi.dll' +-else: +- dll_name = 'libportmidi.so' ++dll_name = '@libportmidi@' + + lib = CDLL(dll_name) + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix index b415537106..2e67fbec2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.13"; + version = "0.6.17"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "1s34xp6wgas17mbg6ysciqlgb3qc2p2d5bs9brwr05ys62l6y8cz"; + sha256 = "1f1cpl5x7q0f9lpwxc1pl9j5x5yrksfizl9k939iqklf95ssymff"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix index a97469e807..96c546e5d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "0.6.3"; + version = "0.6.4"; pname = "msrestazure"; # Pypi tarball doesnt include tests @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrestazure-for-python"; rev = "v${version}"; - sha256 = "0pd3qw96c9fz4qgimnc0qf0pz7m9rr1wzhxj8m792swaf3pb18z8"; + sha256 = "0ik81f0n6r27f02gblgm0vl5zl3wc6ijsscihgvc1fgm9f5mk5b5"; }; propagatedBuildInputs = [ adal msrest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix index d28cda99d7..01abd718c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix @@ -15,10 +15,14 @@ buildPythonPackage rec { checkInputs = [ pyyaml pytest ]; + # requires tests files that are not present + doCheck = false; checkPhase = '' py.test ''; + pythonImportsCheck = [ "mt940" ]; + meta = with lib; { description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; homepage = "https://github.com/WoLpH/mt940"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix index b26a3f948c..2744ff9a27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "0.10.1"; pname = "mwclient"; src = fetchFromGitHub { owner = "mwclient"; repo = "mwclient"; rev = "v${version}"; - sha256 = "1c3q6lwmb05yqywc4ya98ca7hsl15niili8rccl4n1yqp77c103v"; + sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; }; checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix index bdc032a942..0bcf216fa4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.780"; + version = "0.782"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4ef13b619a289aa025f2273e05e755f8049bb4eaba6d703a425de37d495d178d"; + sha256 = "030kn709515452n6gy2i1d9fg6fyrkmdz228lfpmbslybsld9xzg"; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index 5850d7e67b..11777dbf9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ let py = python; in buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.20"; + version = "8.0.21"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1pm98mjbkhwawhni98cjhp0gg3mim75i0sdby77vzrlcrxajxkbw"; + sha256 = "0ky7rn9259807gji3fhvkmdmrgyaps431l9l9y6gh66i84kw1b3l"; }; propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix new file mode 100644 index 0000000000..08cfb66408 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix @@ -0,0 +1,120 @@ +{ lib +, fetchFromGitHub +, fetchurl +, buildPythonPackage +, pkgsStatic +, openssl +, invoke +, pytest +, tls-parser +, cacert +}: + +let + zlibStatic = pkgsStatic.zlib; + nasslOpensslArgs = { + static = true; + enableSSL2 = true; + }; + nasslOpensslFlagsCommon = [ + "zlib" + "no-zlib-dynamic" + "no-shared" + "--with-zlib-lib=${zlibStatic.out}/lib" + "--with-zlib-include=${zlibStatic.out.dev}/include" + "enable-rc5" + "enable-md2" + "enable-gost" + "enable-cast" + "enable-idea" + "enable-ripemd" + "enable-mdc2" + "-fPIC" + ]; + opensslStatic = (openssl.override nasslOpensslArgs).overrideAttrs ( + oldAttrs: rec { + name = "openssl-${version}"; + version = "1.1.1"; + src = fetchurl { + url = "https://www.openssl.org/source/${name}.tar.gz"; + sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8"; + }; + configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [ + "enable-weak-ssl-ciphers" + "enable-tls1_3" + "no-async" + ]; + patches = [ ./nix-ssl-cert-file.patch ]; + buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; + } + ); + opensslLegacyStatic = (openssl.override nasslOpensslArgs).overrideAttrs ( + oldAttrs: rec { + name = "openssl-${version}"; + version = "1.0.2e"; + src = fetchurl { + url = "https://www.openssl.org/source/${name}.tar.gz"; + sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; + }; + configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon; + patches = [ ]; + buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ]; + # openssl_1_0_2 needs `withDocs = false` + outputs = lib.remove "doc" oldAttrs.outputs; + } + ); +in +buildPythonPackage rec { + pname = "nassl"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "nabla-c0d3"; + repo = pname; + rev = version; + sha256 = "1dhgkpldadq9hg5isb6mrab7z80sy5bvzad2fb54pihnknfwhp8z"; + }; + + postPatch = '' + mkdir -p deps/openssl-OpenSSL_1_0_2e/ + cp ${opensslLegacyStatic.out}/lib/libssl.a \ + ${opensslLegacyStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_1_0_2e/ + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps + + mkdir -p deps/openssl-OpenSSL_1_1_1/ + cp ${opensslStatic.out}/lib/libssl.a \ + ${opensslStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_1_1_1/ + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include + ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps + + mkdir -p deps/zlib-1.2.11/ + cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/ + ''; + + propagatedBuildInputs = [ tls-parser ]; + + nativeBuildInputs = [ invoke ]; + + buildPhase = '' + invoke build.nassl + invoke package.wheel + ''; + + checkInputs = [ pytest ]; + + checkPhase = '' + # Skip online tests + pytest -k 'not Online' + ''; + + meta = with lib; { + homepage = "https://github.com/nabla-c0d3/nassl"; + description = "Low-level OpenSSL wrapper for Python 3.7+"; + platforms = with platforms; linux ++ darwin; + license = licenses.agpl3; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch b/third_party/nixpkgs/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch new file mode 100644 index 0000000000..893fb3eb66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c +--- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 ++++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 +@@ -97,7 +97,9 @@ + switch (cmd) { + case X509_L_FILE_LOAD: + if (argl == X509_FILETYPE_DEFAULT) { +- file = getenv(X509_get_default_cert_file_env()); ++ file = getenv("NIX_SSL_CERT_FILE"); ++ if (!file) ++ file = getenv(X509_get_default_cert_file_env()); + if (file) + ok = (X509_load_cert_crl_file(ctx, file, + X509_FILETYPE_PEM) != 0); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix new file mode 100644 index 0000000000..18704eaee0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, + async_generator, traitlets, nbformat, nest-asyncio, jupyter_client, + pytest, xmltodict, nbconvert, ipywidgets +}: + +buildPythonPackage rec { + pname = "nbclient"; + version = "0.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1id6m2dllkjpbv2w0yazxhlkhdd9cac6lxv9csf053il9wq322lk"; + }; + + checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; + propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jupyter/nbclient"; + description = "A client library for executing notebooks"; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix index 2f8c57e003..0c75fc4ac5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.6"; + version = "5.0.7"; src = fetchPypi { inherit pname version; - sha256 = "049af048ed76b95c3c44043620c17e56bc001329e07f83fec4f177f0e3d7b757"; + sha256 = "54d4d6354835a936bad7e8182dcd003ca3dc0cedfee5a306090e04854343b340"; }; LC_ALL="en_US.utf8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index 9b96bc12d6..f46322954f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "77545508fff12fed427fffbd9eae932712fe3db7cc6729b0af5bbd122d7146cf"; + sha256 = "0j56bxdj08vn3q1804qwb1ywhga1mdg1awgm7i64wfpfwi8df2zm"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix index 9d47114464..3d5c1520d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "netdisco"; - version = "2.7.0"; + version = "2.7.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "46839e47c57554241971fbf3ba7e0077cadd22dd2bcf7eec4f72b243de2e062d"; + sha256 = "0rkaz9377f4ldxcqxcmcc9hwdv5dda8nl7vrnp2pj3ppivq5629w"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix index 2ca6635674..22a734a7a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , isPy27 -, nose , pytest +, nose , numpy , h5py , pydicom @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "3.1.0"; + version = "3.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "774adcff834f22915afb68c6cdd7acbcb5d0240b7f87f6da6c63ff405480884b"; + sha256 = "1kir9g7kmy2qygyzczx8nj4b0sc6jjvqy0ssm39bxzqsr1vzzvxm"; }; propagatedBuildInputs = [ numpy scipy h5py pydicom ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ nose pytest ]; checkPhase = '' - nosetests + pytest ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix index 3cb2056c7c..98d95afa99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "nmigen"; - version = "unstable-2019-02-08"; + version = "unstable-2020-04-02"; # python setup.py --version realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen"; - rev = "66f4510c4465be5d0763d7835770553434e4ee91"; - sha256 = "19y39c4ywckm4yzrpjzcdl9pqy9d1sf1zsb4zpzajpmnfqccc3b0"; + rev = "c79caead33fff14e2dec42b7e21d571a02526876"; + sha256 = "sha256-3+mxHyg0a92/BfyePtKT5Hsk+ra+fQzTjCJ2Ech44/s="; }; disabled = pythonOlder "3.6"; @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; - homepage = "https://github.com/nmigen/nmigen"; + homepage = "https://nmigen.info/nmigen"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix index 14900d5c55..080734bd25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "ntlm-auth"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "jborean93"; repo = "ntlm-auth"; rev = "v${version}"; - sha256 = "168k3ygwbvnfcwn7q1nv3vvy6b9jc4cnpix0xgg5j8av7v1x0grn"; + sha256 = "00dpf5bfsy07frsjihv1k10zmwcyq4bvkilbxha7h6nlwpcm2409"; }; checkInputs = [ mock pytest requests unittest2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index f65f5079b2..f5726b91b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -12,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.8.1"; + version = "0.6.8.4"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "1rn6i2mcljhb9nmh8qj3slcmqzs9jx8s7j8r2b7685n7751h5ipj"; + sha256 = "0awhwksnmqmbciimqmd11wygp7bnq57khcg4n9r4ld53s147rmqm"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index 909a37c782..19d25a8e69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -13,14 +13,14 @@ }: buildPythonPackage rec { - version = "0.49.1"; + version = "0.50.0"; pname = "numba"; # uses f-strings disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "89e1ad8215918036b0ffc53501888d44ed44c1f2cb09a9e047d06af5cd7e7a5a"; + sha256 = "c9e5752821530694294db41ee19a4b00e5826c689821907f6c2ece9a02756b29"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix index d0bb0a88cf..3e3316788e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix @@ -21,17 +21,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - # Run the test suite. - # It requires the build path to be in the python search path. checkPhase = '' - pushd $out - ${python}/bin/${python.executable} <=3.5 is supported + + src = fetchPypi { + inherit pname version; + sha256 = "1ycnxrw2qgm7kdapsnhz80jsqkghgvb5giqwapn0m30rplwc3s36"; + }; + + propagatedBuildInputs = [ + pydsdl + ]; + + # allow for writable directory for darwin + preBuild = '' + export HOME=$TMPDIR + ''; + + # repo doesn't contain tests, ensure imports aren't broken + pythonImportsCheck = [ + "nunavut" + ]; + + meta = with lib; { + description = "A UAVCAN DSDL template engine"; + longDescription = '' + It exposes a pydsdl abstract syntax tree to Jinja2 templates allowing + authors to generate code, schemas, metadata, documentation, etc. + ''; + homepage = "https://nunavut.readthedocs.io/"; + maintainers = with maintainers; [ wucke13 ]; + license = with licenses; [ bsd3 mit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix index e9dce6b232..f132614d1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, isPy3k , bitcoinlib, GitPython, pysha3, git }: buildPythonPackage rec { @@ -15,6 +15,14 @@ buildPythonPackage rec { sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr"; }; + patches = [ + # build against bitcoinlib-0.11 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/opentimestamps/python-opentimestamps/pull/43.patch"; + sha256 = "0bxzk4pzpqk7zrk2x7vn2bj2n3pc5whf8ijbd225s6674q450zbg"; + }) + ]; + # Remove a failing test which expects the test source file to reside in the # project's Git repo postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ovito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ovito/default.nix index 5f852b2929..c5dddd68fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ovito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ovito/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { # ensures not built on hydra # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048 hydraPlatforms = [ ]; + broken = true; # cmake unable to find Qt5Core and other dependencies }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 5d7bb4a6d6..a2d16f603f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "b35d625282baa7b51e82e52622c300a1ca9f786711b2af7cbe64f1e6831f4126"; + sha256 = "69c5d920a0b2a9838e677f78f4dde506b95ea8e4d30da25859db6469ded84fa8"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; @@ -95,6 +95,9 @@ in buildPythonPackage rec { "order_without_freq" # tries to import from pandas.tests post install "util_in_top_level" + # Fails with 1.0.5 + "test_constructor_list_frames" + "test_constructor_with_embedded_frames" ] ++ optionals isDarwin [ "test_locale" "test_clipboard" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix index 27c2134f4f..0fc7bf7ee2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "panel"; - version = "0.9.5"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "53340615f30f67f3182793695ebe52bf25e7bbb0751aba6f29763244350d0f42"; + sha256 = "2e86d82bdd5e7664bf49558eedad62b664d5403ec9e422e5ddfcf69e3bd77318"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix index 591401be22..73f72bd289 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -7,6 +7,7 @@ , pyyaml , nbformat , nbconvert +, nbclient , six , tqdm , jupyter_client @@ -14,6 +15,7 @@ , entrypoints , tenacity , futures +, black , backports_tempfile , isPy27 , pytest @@ -37,12 +39,14 @@ buildPythonPackage rec { pyyaml nbformat nbconvert + nbclient six tqdm jupyter_client requests entrypoints tenacity + black ] ++ lib.optionals isPy27 [ futures backports_tempfile diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix index 9d45f35d36..5b12f04b2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "paste"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { pname = "Paste"; inherit version; - sha256 = "16sichvhyci1gaarkjs35mai8vphh7b244qm14hj1isw38nx4c03"; + sha256 = "1csqn7g9b05hp3fgd82355k4pb5rv12k9x6p2mdw2v01m385171p"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix index d21d9d0715..c8967fa5ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,45 +1,25 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchFromGitHub, - python, cmake, git, swig, boost, udev, - setuptools, enum34, wrapt, future }: +{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver +, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build }: buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.11.4"; - disabled = python.isPy3k; + version = "0.14.2"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "0lgmcnrlcivmawmlcwnn4pdp6afdbnf3fyfgq22xzs6v72m9gp81"; + sha256 = "1zbi3v4jmgq1a3ml34dq48y1hinw2008vwqn30l09r5vqvdgnj8m"; }; - nativeBuildInputs = [ cmake swig git setuptools ]; - buildInputs = [ boost udev ]; + # doCheck tries to write to the global python directory to install things + doCheck = false; + + nativeBuildInputs = [ cmake swig git setuptools scikit-build ]; + buildInputs = [ boost udev pc-ble-driver ]; propagatedBuildInputs = [ enum34 wrapt future ]; - patches = [ - # build system expects case-insensitive file system - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/NordicSemiconductor/pc-ble-driver-py/pull/84.patch"; - sha256 = "0ibx5g2bndr5h9sfnx51bk9b62q4jvpdwhxadbnj3da8kvcz13cy"; - }) - ]; - - postPatch = '' - # do not force static linking of boost - sed -i /Boost_USE_STATIC_LIBS/d pc-ble-driver/cmake/*.cmake - - cd python - ''; - - preBuild = '' - pushd ../build - cmake .. - make -j $NIX_BUILD_CORES - popd - ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix index 5f3f0a5145..5f6ef894d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.10.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0fmzccbmr0jn9ynamdb9ly2ai8qs5qfk8alfgnzr3fbjvpwsbd7k"; + sha256 = "0937rnk3c2z1jkdmbw9hfm80p5k467q7rqhn6slfiprs4kflgpd1"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 2ba64faad3..a14a790059 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.5"; + version = "8.12.6"; src = fetchPypi { inherit pname version; - sha256 = "3586f19abeb92aa6b539d7a4757cb507cf54efcd78224e895caf20fbdde07c26"; + sha256 = "02yfyphrrlx00r7s2j522kjszchq6ql8gb33lasm6q8wwy7hfcnk"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/6.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/6.nix index ad69f4f234..64f162c24e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/6.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/6.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - python -m pytest -v -x -W always + python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"} runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix index 532d9d0ede..939eeafd9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pint"; - version = "0.11"; + version = "0.14"; src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "0kfgnmcs6z9ndhzvwg2xzhpwxgyyagdsdz5dns1jy40fa1q113rh"; + sha256 = "0wkzb7g20wzpqr3xaqpq96dlfv6irw202icsz81ys8npp7mm194s"; }; disabled = pythonOlder "3.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix index e4ace129d9..fa566c8951 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { name = "${pname}-${version}-source"; }; + # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 + # Also update pkgs/development/interpreters/python/hooks/pip-install-hook.sh accordingly + patches = [ ./reproducible.patch ]; + nativeBuildInputs = [ bootstrapped-pip ]; # pip detects that we already have bootstrapped_pip "installed", so we need diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch b/third_party/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch new file mode 100644 index 0000000000..528ac2b49b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch @@ -0,0 +1,13 @@ +diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py +index e7315ee4..4e36b03d 100644 +--- a/src/pip/_internal/operations/install/wheel.py ++++ b/src/pip/_internal/operations/install/wheel.py +@@ -615,6 +615,8 @@ def install_wheel( + direct_url=None, # type: Optional[DirectUrl] + ): + # type: (...) -> None ++ _temp_dir_for_testing = ( ++ _temp_dir_for_testing or os.environ.get("NIX_PIP_INSTALL_TMPDIR")) + with TempDirectory( + path=_temp_dir_for_testing, kind="unpacked-wheel" + ) as unpacked_dir, ZipFile(wheel_path, allowZip64=True) as z: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix index 4e730df1c9..5cc5789144 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , isPy27 , appdirs +, importlib-metadata , requests , pytest }: @@ -20,8 +22,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs requests + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; + # can be removed when https://github.com/nschloe/pipdate/pull/41 gets merged + postPatch = '' + substituteInPlace setup.cfg \ + --replace "importlib_metadata" "importlib_metadata; python_version < \"3.8\"" + ''; + checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix new file mode 100644 index 0000000000..3b1c2bd5bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "pkuseg"; + version = "0.0.25"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "148yp0l7h8cflxag62pc1iwj5b5liyljnaxwfjaiqwl96vwjn0fx"; + }; + + # Does not seem to have actual tests, but unittest discover + # recognizes some non-tests as tests and fails. + doCheck = false; + + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy ]; + + pythonImportsCheck = [ "pkuseg" ]; + + meta = with stdenv.lib; { + description = "Toolkit for multi-domain Chinese word segmentation"; + homepage = "https://github.com/lancopku/pkuseg-python"; + license = licenses.unfree; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix new file mode 100644 index 0000000000..d674e876b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix @@ -0,0 +1,41 @@ +{ lib +, pythonOlder +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, semver + # Check Inputs +, nose +}: + +buildPythonPackage rec { + pname = "pkutils"; + version = "1.1.1"; + disabled = !isPy3k; # some tests using semver fail due to unicode errors on Py2.7 + + src = fetchFromGitHub { + owner = "reubano"; + repo = "pkutils"; + rev = "v${version}"; + sha256 = "01yaq9sz6vyxk8yiss6hsmy70qj642cr2ifk0sx1mlh488flcm62"; + }; + + propagatedBuildInputs = [ semver ]; + + # Remove when https://github.com/reubano/pkutils/pull/4 merged + postPatch = '' + substituteInPlace requirements.txt --replace "semver>=2.2.1,<2.7.3" "semver" + ''; + + checkInputs = [ nose ]; + pythonImportsCheck = [ "pkutils" ]; + + checkPhase = "nosetests"; + + meta = with lib; { + description = "A Python packaging utility library"; + homepage = "https://github.com/reubano/pkutils/"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 3c4c6ae4ec..65325f70b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -1,26 +1,38 @@ { lib -, fetchurl +, fetchFromGitHub +, python , buildPythonPackage +, socat , psutil +, hglib , pygit2 +, pyuv +, i3ipc }: -# The source of this package needs to be patched to include the full path to -# the executables of git, mercurial and bazaar. +# TODO: bzr support is missing because nixpkgs switched to `breezy` buildPythonPackage rec { - version = "2.7"; + version = "2.8.1"; pname = "powerline"; - src = fetchurl { - url = "https://github.com/powerline/powerline/archive/${version}.tar.gz"; - name = "${pname}-${version}.tar.gz"; - sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0xscckcbw75pbcl4546ndrjs4682pn2sqqrd6qvqm0s6zswg7a0y"; }; - propagatedBuildInputs = [ psutil pygit2]; + propagatedBuildInputs = [ + socat + psutil + hglib + pygit2 + pyuv + i3ipc + ]; -# error: This is still beta and some tests still fail + # tests are travis-specific doCheck = false; postInstall = '' @@ -29,19 +41,9 @@ buildPythonPackage rec { install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf" install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf" - install -dm755 "$out/share/vim/vimfiles/plugin" - install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim" - - install -dm755 "$out/share/zsh/site-contrib" - install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh" - - install -dm755 "$out/share/tmux" - install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" - - install -dm755 "$out/share/fish/vendor_functions.d" - install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish" - - ''; + cp -ra powerline/bindings/{bash,fish,shell,tcsh,tmux,vim,zsh} $out/share/ + rm $out/share/*/*.py + ''; meta = { homepage = "https://github.com/powerline/powerline"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix index 5fffbae45f..1b762fed05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "prance"; - version = "0.18.3"; + version = "0.19.0"; src = fetchPypi { inherit pname version; - sha256 = "4600ec749ade4f10d1cc8b07cd7a372f02985efd66100e287e67ccb1d48b5fc5"; + sha256 = "0ffpfny3z8v3g0drirm27qafafbbvbc4h5k8v7yiwirnh0vn9v46"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix index 47715b9e56..698c9cc1cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "6.5.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "0d5whaw4731gllffhwrh2qqnlki4j8q83xaf3v4spkd40ps3q7b4"; + sha256 = "07wyn2pa80ps55kk66rvf4daqyn3y5lzxhx6qh1lpn3p2bacbw9h"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix index aebe5766e9..39e3bb239c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy27 , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers, pytest @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "prawcore"; version = "1.4.0"; + disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101 src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix index a933093bef..c0f536480d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.4.0"; + version = "2.6.0"; disabled = isPy27; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1l0lcl3l2544m2k8jlmblfsjn0p2hdxrzzwy646xpvp0rcs2wgkh"; + sha256 = "05d9635v0yzrj2848m2hn9axbvds0dymv49rlyj238v3vlzncmqn"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index a7671d0356..5136cf2010 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.51.3"; + version = "3.51.4"; src = fetchPypi { inherit pname version; - sha256 = "ecf687696dd449067f69ef6730c4d4a0189db1f8d1aad9e376358354631d5b2c"; + sha256 = "0dnfw8mdrz78gck4ibnv64cinbp5f7kw349wjgpwv53z6p7jiwhk"; }; propagatedBuildInputs = [ python-utils ]; @@ -29,10 +29,10 @@ buildPythonPackage rec { pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov pytestcache freezegun ]; - # ignore tests on the nix wrapped setup.py and don't flake .eggs directory + # ignore tests on the nix wrapped setup.py checkPhase = '' runHook preCheck - ${python.interpreter} setup.py test --addopts "--ignore=.eggs" + ${python.interpreter} setup.py test runHook postCheck ''; @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://progressbar-2.readthedocs.io/en/latest/"; description = "Text progressbar library for python"; license = licenses.bsd3; - maintainers = with maintainers; [ ashgillman ]; + maintainers = with maintainers; [ ashgillman turion ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix index 55d7bafc01..ad47163e48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "property-manager"; - version = "2.3.1"; + version = "3.0"; src = fetchFromGitHub { owner = "xolox"; repo = "python-property-manager"; rev = version; - sha256 = "0s4nwipxd8c2vp4rd8mxrj8wbycniz5ki5n177d0dbrnll5amcz0"; + sha256 = "1v7hjm7qxpgk92i477fjhpcnjgp072xgr8jrgmbrxfbsv4cvl486"; }; propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix new file mode 100644 index 0000000000..71673da7ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pure-pcapy3"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr"; + }; + + meta = with stdenv.lib; { + description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement."; + homepage = "http://bitbucket.org/viraptor/pure-pcapy"; + license = licenses.bsd2; + maintainers = with maintainers; [ etu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix new file mode 100644 index 0000000000..229b174ade --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, pythonAtLeast +, isPy27 +, buildPythonPackage +, fetchPypi +, blessings +, six +, nose +, coverage +}: + +buildPythonPackage rec { + pname = "pxml"; + version = "0.2.13"; + disabled = pythonAtLeast "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c9zzfv6ciyf9qm7556wil45xxgykg1cj8isp1b88gimwcb2hxg4"; + }; + + propagatedBuildInputs = [ blessings six ]; + checkInputs = [ nose coverage ]; + + # test_prefixedWhitespace fails due to a python3 StringIO issue requiring + # bytes rather than str + checkPhase = '' + nosetests -e 'test_prefixedWhitespace' + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/metagriffin/pxml"; + description = ''A python library and command-line tool to "prettify" and colorize XML.''; + maintainers = with maintainers; [ glittershark ]; + license = licenses.gpl3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 9a61fa1f54..9434944a1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.7.1"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "8ef8e54098efd29a6bcac28d127480ae2b7491c1d33e4e0c7bbf0fc8949e0fae"; + sha256 = "1jbd2npa942f3bqwpvc6kb3b9jxk7ksczd4grrdimfb6w7binzv4"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index fe6f191f61..690b5d717a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "6.0.0"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "15beaafdb155885794443d99fa687a2787d8bad8ba440ecda10bb72bd6c8c815"; + sha256 = "1wrl2mcsga60ps9fa6mf12c7agshwsvcmlrhwsbj1kmng5yqxq9h"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix index eaf20baf75..bc910cea58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyclipper"; - version = "1.1.0.post3"; + version = "1.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "164yksvqwqvwzh8f8lq92asg87hd8rvcy2xb5vm4y4ccvd5xgb7i"; + sha256 = "0irs5sn6ldpg70630nfndghjnpxv8jldk61zyczfzp1jcz53b43s"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix new file mode 100644 index 0000000000..a0b743bb8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, gnupg +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pycoin"; + version = "0.90.20200322"; + + src = fetchPypi { + inherit pname version; + sha256 = "c8af579e86c118deb64d39e0d844d53a065cdd8227ddd632112e5667370b53a3"; + }; + + propagatedBuildInputs = [ setuptools ]; + + postPatch = '' + substituteInPlace ./pycoin/cmds/tx.py --replace '"gpg"' '"${gnupg}/bin/gpg"' + ''; + + checkInputs = [ pytestCheckHook ]; + + dontUseSetuptoolsCheck = true; + + # Disable tests depending on online services + disabledTests = [ + "ServicesTest" + "test_tx_pay_to_opcode_list_txt" + "test_tx_fetch_unspent" + "test_tx_with_gpg" + ]; + + meta = with stdenv.lib; { + description = "Utilities for Bitcoin and altcoin addresses and transaction manipulation"; + homepage = "https://github.com/richardkiss/pycoin"; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix index 584ba838cc..2cd707ee8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "19.8.18"; + version = "20.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1jxkdjffrhn0il0nm14dlzxpd6f3v1hbxzxsprcksafgmm0almrw"; + sha256 = "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix index de6f672e27..e6602ba9da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix @@ -1,8 +1,10 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pytest , pytestrunner +, pytestCheckHook , numpy , pillow }: @@ -10,6 +12,7 @@ buildPythonPackage rec { version = "2.0.0"; pname = "pydicom"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -17,7 +20,10 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pillow ]; - checkInputs = [ pytest pytestrunner ]; + + checkInputs = [ pytest pytestrunner pytestCheckHook ]; + disabledTests = [ "test_invalid_bit_depth_raises" ]; + # harmless failure; see https://github.com/pydicom/pydicom/issues/1119 meta = with stdenv.lib; { homepage = "https://pydicom.github.io"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix new file mode 100644 index 0000000000..655adecd5c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder }: + + buildPythonPackage rec { + pname = "pydsdl"; + version = "1.4.2"; + disabled = pythonOlder "3.5"; # only python>=3.5 is supported + + src = fetchFromGitHub { + owner = "UAVCAN"; + repo = pname; + rev = version; + sha256 = "03kbpzdrjzj5vpgz5rhc110pm1axdn3ynv88b42zq6iyab4k8k1x"; + }; + + propagatedBuildInputs = [ + ]; + + # allow for writable directory for darwin + preBuild = '' + export HOME=$TMPDIR + ''; + + # repo doesn't contain tests, ensure imports aren't broken + pythonImportsCheck = [ + "pydsdl" + ]; + + meta = with lib; { + description = "A UAVCAN DSDL compiler frontend implemented in Python"; + longDescription = '' + It supports all DSDL features defined in the UAVCAN specification. + ''; + homepage = "https://uavcan.org"; + maintainers = with maintainers; [ wucke13 ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix index 962803402e..d563fa2766 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "pygls"; - version = "0.8.1"; + version = "0.9.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "openlawlibrary"; repo = pname; rev = "v${version}"; - sha256 = "1853rfdks5n8nw6ig96j7his5kqd75hrvzvd0win4niycaqsag6m"; + sha256 = "1wfp4hjin1mb6nkzhpfh5v8q8rwvn9zh0mwwj4dlxkqx5lp272hl"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygogo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygogo/default.nix new file mode 100644 index 0000000000..89031c9610 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygogo/default.nix @@ -0,0 +1,36 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, pkutils + # Check Inputs +, pytestCheckHook +, nose +}: + +buildPythonPackage rec { + pname = "pygogo"; + version = "0.13.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "reubano"; + repo = "pygogo"; + rev = "v${version}"; + sha256 = "19rdf4sjrm5lp1vq1bki21a9lrkzz8sgrfwgjdkq4sgy90hn1jn9"; + }; + + nativeBuildInputs = [ pkutils ]; + + checkInputs = [ nose ]; + checkPhase = "nosetests"; + pythonImportsCheck = [ "pygogo" ]; + + meta = with lib; { + description = "A Python logging library with super powers"; + homepage = "https://github.com/reubano/pygogo/"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygrok/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygrok/default.nix new file mode 100644 index 0000000000..8f694a117f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygrok/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, regex, pytest }: + +buildPythonPackage rec { + pname = "pygrok"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "garyelephant"; + repo = "pygrok"; + rev = "v${version}"; + sha256 = "07487rcmv74srnchh60jp0vg46g086qmpkaj8gxqhp9rj47r1s4m"; + }; + + propagatedBuildInputs = [ regex ]; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + maintainers = with maintainers; [ winpat ]; + description = "A python implementation of jordansissel's grok regular expression library"; + homepage = "https://github.com/garyelephant/pygrok"; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix new file mode 100644 index 0000000000..d2b31ebbf4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix @@ -0,0 +1,53 @@ +{ lib, buildPythonPackage, fetchPypi +, dateutil, docopt, pyyaml +, pytest, testfixtures +}: + +buildPythonPackage rec { + version = "1.7.0"; + pname = "pykwalify"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cnfzkg1b01f825ikpw2fhjclf9c8akxjfrbd1vc22x1lg2kk2vy"; + }; + + propagatedBuildInputs = [ + dateutil + docopt + pyyaml + ]; + + checkInputs = [ + pytest + testfixtures + ]; + + checkPhase = '' + pytest \ + -k 'not test_multi_file_support' + ''; + + meta = with lib; { + homepage = "https://github.com/Grokzen/pykwalify"; + description = "YAML/JSON validation library"; + longDescription = '' + This framework is a port with a lot of added functionality + of the Java version of the framework kwalify that can be found at + http://www.kuwata-lab.com/kwalify/ + + The original source code can be found at + http://sourceforge.net/projects/kwalify/files/kwalify-java/0.5.1/ + + The source code of the latest release that has been used can be found at + https://github.com/sunaku/kwalify. + Please note that source code is not the original authors code + but a fork/upload of the last release available in Ruby. + + The schema this library is based on and extended from: + http://www.kuwata-lab.com/kwalify/ruby/users-guide.01.html#schema + ''; + license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix index 060dc02a03..10449717ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pylast"; - version = "3.2.1"; + version = "3.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3c984be04c9a22a884c3106a7f75749466d27c68870d6fb7e1f56b71becea7c0"; + sha256 = "1wqd23bbk5si2mcmswsi486zqnydjjf8g7924gcz6cc1x036lasd"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix index af4b0177eb..9a33f10dde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.0.15"; + version = "2.1.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "0wpzd3j01njxfclbhxz31s5clc7il67nhm4lz89q2aaj19c0xzsa"; + sha256 = "1gvbh2a480x3ddrq6xzray7kdsz8nb8n16xm2lf03w2nqnsdbkwy"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix index 568d85b7e1..e283cc10d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, - pytest, pytestrunner, pyenchant, setuptools }: + pytest, pytestrunner, setuptools }: buildPythonPackage rec { pname = "pylint"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p"; }; - checkInputs = [ pytest pytestrunner pyenchant ]; + checkInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 1986dd4936..ccb7643981 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { sha256 = "b95e31850f3af163c2283ed40432f053acbc8fc6eba6a069cb518d9dbf71848c"; }; - nativeBuildInputs = [ pytestrunner toml ]; + nativeBuildInputs = [ pytestrunner ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; - propagatedBuildInputs = [ astroid isort mccabe ]; + propagatedBuildInputs = [ astroid isort mccabe toml ]; postPatch = lib.optionalString stdenv.isDarwin '' # Remove broken darwin test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix index 478b08b264..c59a67606e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pyls-black"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "rupert"; repo = "pyls-black"; rev = "v${version}"; - sha256 = "1ynynay9g6yma39szbzf15ypq3c72fg1i0kjmq1dwxarj68i2gf9"; + sha256 = "0cjf0mjn156qp0x6md6mncs31hdpzfim769c2lixaczhyzwywqnj"; }; disabled = !isPy3k; @@ -27,9 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/rupert/pyls-black"; description = "Black plugin for the Python Language Server"; license = licenses.mit; - # Not compatible with 0.33.1 - # https://github.com/rupert/pyls-black/issues/24 - broken = true; # since 2020-06-16 maintainers = [ maintainers.mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index 12d9daf5b3..2cd0a0a020 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, networkx }: +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, plotly, networkx }: buildPythonPackage rec { pname = "pymatgen"; @@ -10,7 +10,26 @@ buildPythonPackage rec { }; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas networkx ]; + + + propagatedBuildInputs = [ + enum34 + matplotlib + monty + networkx + numpy + palettable + pandas + plotly + pydispatcher + requests + ruamel_yaml + scipy + six + spglib + sympy + tabulate + ]; # No tests in pypi tarball. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index c91892585d..10ca99de7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.17.0"; + version = "1.17.2"; src = fetchPypi { inherit pname version; - sha256 = "0de92a8fb65db6e661594cc5865a340a2daac3cb9bb58e030820769ece1343c1"; + sha256 = "1dn4kf6hcwr77pxlxirwmqk9kgpf55122xf48y1nhsmphkkk4ads"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index e1b6abb752..766952ee26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2020.1"; + version = "2020.2"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7513f7054f4eeb5361de1f5113883145fc67dbabde73a2148f221ae05af4d22c"; + sha256 = "afd9f22547bcd879b9e54252fc885b45034ebfd1890e630827f1afb408a03d23"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypubsub/default.nix new file mode 100644 index 0000000000..fd19167a3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypubsub/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytest }: + +buildPythonPackage rec { + pname = "pypubsub"; + version = "4.0.3"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "schollii"; + repo = "pypubsub"; + rev = "v4.0.3"; + sha256 = "02j74w28wzmdvxkk8i561ywjgizjifq3hgcl080yj0rvkd3wivlb"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + cd tests/suite + py.test + ''; + + meta = with lib; { + homepage = "https://github.com/schollii/pypubsub"; + description = "Python 3 publish-subcribe library"; + longDescription = '' + Provides a publish-subscribe API to facilitate event-based or + message-based architecture in a single-process application. It is pure + Python and works on Python 3.3+. It is centered on the notion of a topic; + senders publish messages of a given topic, and listeners subscribe to + messages of a given topic, all inside the same process. The package also + supports a variety of advanced features that facilitate debugging and + maintaining topics and messages in larger desktop- or server-based + applications. + ''; + license = licenses.bsd2; + maintainers = with maintainers; [ tfmoraes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix index 3d7fe0bcc5..d1850c1288 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "4c08ab34881fae5ecf9ddfe6c1220b9e41e6d3eb1579a7d8ef501abb8e509251"; + sha256 = "0p5k73wjfh0zzjvby8b5107cx7x0c2rdj66zh1nc8y95i0anf2na"; }; propagatedBuildInputs = [ scipy numpy pyqt4 pyopengl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix index 3c0ae90455..c4e10910db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -10,12 +10,12 @@ let in buildPythonPackage rec { pname = "PyQtWebEngine"; - version = "5.14.0"; + version = "5.15.0"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "14hw49akb35n9pgiw564x8ykmsifihn9p2ax2x4zmywb3w2ra5g1"; + sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix index 38730e7baa..bb3c2c895b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; # ignore network related tests, which fail in sandbox - disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" ]; + disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ]; meta = with lib; { description = "Distributed object middleware for Python (RPC)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix index 4bda0b3c65..d563a62a46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }: let # Package does not support configuring the pcsc library. @@ -30,6 +30,21 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC) "-I ${getDev pcsclite}/include/PCSC"; + # The error message differs depending on the macOS host version. + # Since Nix reports a constant host version, but proxies to the + # underlying library, it's not possible to determine the correct + # expected error message. This patch allows both errors to be + # accepted. + # See: https://github.com/LudovicRousseau/pyscard/issues/77 + # Building with python from nix on macOS version 10.13 or + # greater still causes this issue to occur. + patches = optionals withApplePCSC [ + (fetchpatch { + url = "https://github.com/LudovicRousseau/pyscard/commit/945e9c4cd4036155691f6ce9706a84283206f2ef.patch"; + sha256 = "19n8w1wzn85zywr6xf04d8nfg7sgzjyvxp1ccp3rgfr4mcc36plc"; + }) + ]; + propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; nativeBuildInputs = [ swig ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch deleted file mode 100644 index 62b20477c9..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/test/test_SCardGetErrorMessage.py b/test/test_SCardGetErrorMessage.py -old mode 100644 -new mode 100755 -index c6fe755..c1217f5 ---- a/test/test_SCardGetErrorMessage.py -+++ b/test/test_SCardGetErrorMessage.py -@@ -29,12 +29,10 @@ class TestError(unittest.TestCase): - self.assertEqual(res, expected) - - res = SCardGetErrorMessage(1) -+ expected = "Unknown error: 0x00000001" - # macOS bug not yet fixed -- if get_platform().startswith('macosx-') and get_platform() < 'macosx-10.13': -- expected = "Unkown error: 0x00000001" -- else: -- expected = "Unknown error: 0x00000001" -- self.assertEqual(res, expected) -+ macos_bug_expected = "Unkown error: 0x00000001" -+ self.assertIn(res, [expected, macos_bug_expected]) - - - if __name__ == '__main__': diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix index 8134e8a573..e12db4d2e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.12.3"; + version = "5.12.6"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; - sha256 = "0hk89jm8pa0q6kifask5rrffa3bvx02dg2f97ibv7wds9dysnyjg"; + sha256 = "1n45l6xxyxs6cfp2l4rp8qs1c2fyfwyrdxa4qcpwfsqsi51rydsk"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspinel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspinel/default.nix index d841a41621..dcd35132c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspinel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspinel/default.nix @@ -1,21 +1,32 @@ -{ buildPythonPackage, fetchPypi, lib, future, pyserial, ipaddress }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +, future, pyserial, ipaddress +}: buildPythonPackage rec { pname = "pyspinel"; - version = "1.0.1"; + version = "unstable-2020-06-19"; # no versioned release since 2018 + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "5cbfd0f6e9ef3b5cd3a4e72a9a0cee1fe50d518b43746be07a1fd17e883328c2"; + src = fetchFromGitHub { + owner = "openthread"; + repo = pname; + rev = "e0bb3f8e6f49b593ab248a75de04a71626ae8101"; + sha256 = "0nfmdkgbhmkl82dfxjpwiiarxngm6a3fvdrzpaqp60a4b17pipqg"; }; - propagatedBuildInputs = [ pyserial ipaddress future ]; + propagatedBuildInputs = [ + future + ipaddress + pyserial + ]; doCheck = false; + pythonImportsCheck = [ "spinel" ]; - meta = { + meta = with lib; { description = "Interface to the OpenThread Network Co-Processor (NCP)"; homepage = "https://github.com/openthread/pyspinel"; - maintainers = with lib.maintainers; [ gebner ]; + license = licenses.asl20; + maintainers = with maintainers; [ gebner ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix index 5f391668b9..5a3219f430 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix @@ -7,17 +7,19 @@ buildPythonPackage rec { pname = "pytest-black"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "c743dfeffe6b2cb25c0ed1a84cc306dff4b504b713b5a6d1bc3824fa73a7d693"; + sha256 = "0dvlfic7nvfj97rg5fwj7ahw83n9yj3jjbp5m60n47mlx7z0qg2z"; }; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ black pytest toml ]; + pythonImportsCheck = [ "pytest_black" ]; + meta = with lib; { description = "A pytest plugin to enable format checking with black"; homepage = "https://github.com/shopkeep/pytest-black"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix new file mode 100644 index 0000000000..8809bc143c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, freezegun +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-freezegun"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "060cdf192848e50a4a681a5e73f8b544c4ee5ebc1fab3cb7223a0097bac2f83f"; + }; + + propagatedBuildInputs = [ + freezegun + pytest + ]; + + meta = with lib; { + description = "Wrap tests with fixtures in freeze_time"; + homepage = "https://github.com/ktosiek/pytest-freezegun"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix index 96f78426db..869466c650 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "758156cb4dc1db72adc1b7e253011f5eea117fab32af03cedb4cbfc6058b5f8f"; + sha256 = "01j0sx8yxd7sbmvwky68mvnwrxxs5bjkvi61043jzff1ga92kg9h"; }; propagatedBuildInputs = [ isort ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix index 9b25e2045e..53ab515e6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-metadata"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1711gippwsl7c1wi8pc2y75xqq5sn1sscpqvrxjvpjm8pcx2138n"; + sha256 = "0593jf8l30ayrqr9gkmwfbhz9h8cyqp7mgwp7ah1gjysbajf1rmp"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix index cb5b7bf099..d1f271ea2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix @@ -4,15 +4,16 @@ , termcolor , pytest , packaging +, pytestCheckHook }: buildPythonPackage rec { pname = "pytest-sugar"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "1630b5b7ea3624919b73fde37cffb87965c5087a4afab8a43074ff44e0d810c4"; + sha256 = "b1b2186b0a72aada6859bea2a5764145e3aaa2c1cfbb23c3a19b5f7b697563d3"; }; propagatedBuildInputs = [ @@ -21,6 +22,10 @@ buildPythonPackage rec { packaging ]; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "A plugin that changes the default look and feel of py.test"; homepage = "https://github.com/Frozenball/pytest-sugar"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix index 1f2978228e..658ca7122f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0ncaq7icijls6qh66kv19w3i9av2wnmaycfr4yadyybajr8yvffz"; + sha256 = "1cgisd7lb9q2hf55558cbn5jfhv65vsgk46ykgidzf9kqcq1kymr"; }; # package has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix index b9ae9be428..64078d68a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -3,15 +3,17 @@ , fetchPypi , pytest , virtual-display +, isPy27 }: buildPythonPackage rec { pname = "pytest-xvfb"; - version = "1.2.0"; + version = "2.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a7544ca8d0c7c40db4b40d7a417a7b071c68d6ef6bdf9700872d7a167302f979"; + sha256 = "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix index 51ca3be32c..dd9191835a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "3b9909bc96b0edc6b01586e1eed05e71174ef4e04c71da5786370cebea53ad74"; + sha256 = "0gf3r4xvqk9ai1k3ka8c4dlblqhs7286zbd1b20adn953fdcj44c"; }; propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix index a2bf20188f..12a327be2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, fetchPypi, lib, isPy3k -, pkgconfig, igraph }: +, pkgconfig, igraph +, texttable }: buildPythonPackage rec { pname = "python-igraph"; @@ -7,12 +8,18 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ igraph ]; + propagatedBuildInputs = [ texttable ]; src = fetchPypi { inherit pname version; sha256 = "4601638d7d22eae7608cdf793efac75e6c039770ec4bd2cecf76378c84ce7d72"; }; + # NB: We want to use our igraph, not vendored igraph, but even with + # pkg-config on the PATH, their custom setup.py still needs to be explicitly + # told to do it. ~ C. + setupPyGlobalFlags = [ "--use-pkg-config" ]; + doCheck = !isPy3k; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix new file mode 100644 index 0000000000..24d86289bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, tox, flake8, alabaster +}: + +buildPythonPackage rec { + pname = "python-rtmidi"; + version = "1.4.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0b0y3hnjl2fvm3jyfvp1msfikp19vbqqqi7lawgy3azisvdyrgq7"; + }; + + checkInputs = [ + tox + flake8 + alabaster + ]; + + meta = with lib; { + description = "A Python binding for the RtMidi C++ library implemented using Cython"; + homepage = "https://chrisarndt.de/projects/python-rtmidi/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index f36f823956..0552b18f80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "12.7"; + version = "12.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1vwf4pgjrg9a6w51ds9wmzq31bmi3f7xs79gdzzfxfmqmy1hb2r1"; + sha256 = "1hzdnjxqgqv868agaipga4padq2q5s4hd1yzvh3n48b9ck2qcw9j"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix index 821ad8c7ba..8495505806 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.9113"; + version = "3.0.10114"; src = fetchPypi { inherit pname version; - sha256 = "5422b79d347b6419008ee91cfd9663edc37eaf2a0bd8fb9017d4cc2e5f249dda"; + sha256 = "0fq0w1pk2z7limhiyk8f3bqwa67yfgwcszd0v6ipy9x8psas5a61"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix index 27445554dd..2a85482cbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python3-openid"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "00l5hrjh19740w00b3fnsqldnla41wbr2rics09dl4kyd1fkd3b2"; + sha256 = "1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk"; }; propagatedBuildInputs = [ defusedxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix index ac48fe1c24..9aa11a480c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a"; }; - propagatedBuildInputs = [ nose ]; + checkInputs = [ nose ]; meta = with stdenv.lib; { description = "A small Python library to parse various kinds of time expressions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 80c3c6d729..efe6400fcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -104,13 +104,14 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.1"; pname = "pytorch"; disabled = !isPy3k; outputs = [ "out" # output standard python package - "dev" # output libtorch only + "dev" # output libtorch headers + "lib" # output libtorch libraries ]; src = fetchFromGitHub { @@ -118,9 +119,24 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "19qyrjd72mc0llcfn50av8ym05f2iwa38gv068wykji4ph7qjlv2"; + sha256 = "1xjbn4hi96m7xslv3p2jc6qcsng0fx3w1m6isqfah81piljf8wng"; }; + patches = lib.optionals stdenv.isAarch64 [ + # GNU aarch64 assembler does not support 4s on neon mov: + # https://github.com/pytorch/pytorch/issues/33124 + # + # Fix from: + # https://github.com/pytorch/pytorch/pull/40584 + # + # This patch can be removed with the next major version (1.6.0). + (fetchpatch { + name = "qnnpack-neon-fix.patch"; + url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff"; + sha256 = "13spncaqlpsp8qk2850yly7xqwmhhfwznhmzkk8jgpslkbx75vgq"; + }) + ]; + preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ @@ -224,9 +240,11 @@ in buildPythonPackage rec { ]; postInstall = '' mkdir $dev - cp -r $out/${python.sitePackages}/torch/lib $dev/lib cp -r $out/${python.sitePackages}/torch/include $dev/include cp -r $out/${python.sitePackages}/torch/share $dev/share + + mkdir $lib + cp -r $out/${python.sitePackages}/torch/lib $lib/lib ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix new file mode 100644 index 0000000000..0c78b30595 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix @@ -0,0 +1,50 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, nunavut +, pyserial , pytest, ruamel_yaml}: + + buildPythonPackage rec { + pname = "pyuavcan"; + version = "1.1.0.dev1"; + disabled = pythonOlder "3.7"; # only python>=3.7 is supported + + src = fetchFromGitHub { + owner = "UAVCAN"; + repo = pname; + rev = version; + sha256 = "0fmbmdnnh679zkllv5m6pkrasg7m9vjwabqnmz5m7flrgdh6h4qa"; + }; + + propagatedBuildInputs = [ + numpy + nunavut + pyserial + pytest + ruamel_yaml + ]; + + # allow for writable directory for darwin + preBuild = '' + export HOME=$TMPDIR + export PYTHONASYNCIODEBUG=1 + ''; + + # tests fail ATM. + doCheck = false; + + # check at least that import works, as tests fail + pythonImportsCheck = [ + "pyuavcan" + ]; + + meta = with lib; { + description = "A full-featured implementation of the UAVCAN protocol stack"; + longDescription = '' + It is intended for non-embedded, user-facing applications such as GUI + software, diagnostic tools, automation scripts, prototypes, and various + R&D cases. PyUAVCAN consists of a Python library (package) and a simple + CLI tool for basic diagnostics and shell script automation. + ''; + homepage = "https://pyuavcan.readthedocs.io"; + maintainers = with maintainers; [ wucke13 ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix index f12d943aad..545fb23673 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix @@ -1,23 +1,32 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, importlib-resources, pytest, xvfb_run }: buildPythonPackage rec { pname = "pywebview"; - version = "3.2"; + version = "3.3.1"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; rev = version; - sha256 = "0anwm6s0pp7xmgylr4m52v7lw825sdby7fajcl929l099n757gq7"; + sha256 = "015z7n0hdgkzn0p7aw1xsv6lwc260p8q67jx0zyd1zghnwyj8k79"; }; - # disabled due to error in loading unittest - # don't know how to make test from: None - doCheck = false; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + + checkInputs = [ pytest xvfb_run ]; + + checkPhase = '' + pushd tests + patchShebangs run.sh + xvfb-run -s '-screen 0 800x600x24' ./run.sh + popd + ''; meta = with lib; { homepage = "https://github.com/r0x0r/pywebview"; - description = "Lightweight cross-platform wrapper around a webview."; + description = "Lightweight cross-platform wrapper around a webview"; license = licenses.bsd3; maintainers = with maintainers; [ jojosch ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix index 9748e3e434..962ba62f50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix @@ -48,5 +48,6 @@ buildPythonPackage { maintainers = with lib.maintainers; [ pandaman ]; + broken = true; # last update Oct 2018, failed tests don't error the build, and out-of-date with latest python3Packages.qiskit }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix index 7c74ddab2b..3f0439efc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.5"; @@ -28,7 +28,7 @@ buildPythonPackage rec { repo = "qiskit-aer"; rev = version; fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "0pbi8ldz8f1zm7pf2n5229g6kccriq21f24q9cb7bd4j5gdky5sk"; + sha256 = "0vw6b69h8pvzxhaz3k8sg9ac792gz3kklfv0izs6ra83y1dfwhjz"; }; nativeBuildInputs = [ @@ -48,14 +48,6 @@ buildPythonPackage rec { pybind11 ]; - patches = [ - (fetchpatch{ - name = "qiskit-aer-pr-727-fix-random-unitary-test.patch"; - url = "https://github.com/Qiskit/qiskit-aer/commit/09afb3b6b0710042ab65d88e863363f2c843dcb0.patch"; - sha256 = "0521b7i4fpc5brqs08w381g3c655f9cbn6my1740jnk7dv5lhsv9"; - }) - ]; - postPatch = '' # remove dependency on PyPi cmake package, which isn't in Nixpkgs substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" @@ -85,6 +77,11 @@ buildPythonPackage rec { pytestCheckHook ]; dontUseSetuptoolsCheck = true; # Otherwise runs tests twice + disabledTests = [ + # broken with cvxpy >= 1.1.0, see https://github.com/Qiskit/qiskit-aer/issues/779. + # TODO: Remove once resolved, probably next qiskit-aer version + "test_clifford" + ]; preCheck = '' # Tests include a compiled "circuit" which is auto-built in $HOME diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix index 8037d28f82..fe90ee63e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub # , cplex -, cvxopt +, cvxpy , dlx , docplex , fastdtw @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.7.0"; + version = "0.7.3"; disabled = pythonOlder "3.5"; @@ -33,13 +33,13 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "0yykw6k1rb3f2ihcp0y9pb0695mcmy29nyqlj89qs4da0503vxvh"; + sha256 = "04zcnrc0vi6dfjahp1019h2ngdgi7l7jvfs9aw0y306nd9g6qgjc"; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ # cplex - cvxopt + cvxpy docplex dlx # Python Dancing Links package fastdtw @@ -81,7 +81,6 @@ buildPythonPackage rec { "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ "', ImportWarning)\n" \ >> qiskit/optimization/__init__.py - ''; postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts. @@ -106,6 +105,9 @@ buildPythonPackage rec { # Disabled due to missing pyscf "test_validate" # test/chemistry/test_inputparser.py + "test_binary" # in SklearnSVM, seems to have trouble with eigenvectors converging + "test_pauli_expect_single" # fails for unknown reason, 3e-3 out of tolerance + # Disabling slow tests > 10 seconds "TestVQE" "TestVQC" @@ -127,9 +129,15 @@ buildPythonPackage rec { "test_shor_no_factors_1_5" "test_shor_no_factors_2_7" "test_evolve_2___suzuki___1__3_" - "test_delta_4" + "test_delta" "test_swaprz" "test_deprecated_algo_result" + "test_unsorted_grouping" + "test_ad_hoc_data" + "test_nft" + "test_oh" + "test_confidence_intervals_00001" + "test_eoh" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 5f8f0d94e4..02cdb8397c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.7.0"; + version = "0.7.2"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1n13jjx1cx5gswwk8rpxfjqyk97cwx1n2hwsabkcbi7fksw3c5jk"; + sha256 = "11h1ca4v11pajzn1cxqhim1hfziqzj27xzakwln13g8zmiqx3csp"; }; propagatedBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { ]; # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6) - prePatch = '' + postPatch = '' substituteInPlace requirements.txt --replace "websockets>=7,<8" "websockets" substituteInPlace setup.py --replace "websockets>=7,<8" "websockets" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index 79998a8432..bfd2bffbf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.3.0"; + version = "0.3.3"; disabled = pythonOlder "3.6"; @@ -25,14 +25,9 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "16h04n9hxw669nq2ii16l6h75x8afisvp3j062n4c62kcqci0x4x"; + sha256 = "0sy9qpw0jqirsk9y61j5kr18jrw1wa812n7y98fjj6w668rrv560"; }; - # Fixed qiskit-ignis PR #385, figured this is easier than fetchpatch - postPatch = '' - substituteInPlace qiskit/ignis/logging/ignis_logging.py --replace "self.configure_logger" "self._configure_logger" - ''; - propagatedBuildInputs = [ numpy qiskit-terra diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index 78c28a282c..c1c0dd9283 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.14.1"; + version = "0.14.2"; disabled = pythonOlder "3.5"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0pd7x2jrqy7q1s38ychqw9bayjn2rvi6rq7c2c0kd160rwj1l2sc"; + sha256 = "0p5wapjvy81pnks100xbb23kbs2wyys9ykyc8z4968wl487lq4g5"; }; nativeBuildInputs = [ cython ]; @@ -94,6 +94,9 @@ buildPythonPackage rec { "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; + disabledTests = [ + "test_random_clifford_valid" # random test, fails at least once when testing locally. + ]; pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix index ded9c68e6f..81468da30f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.19.1"; + version = "0.19.6"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "0p1sahgf6qgbkvxb067mnyj6ya8nv7y57yyiiaadhjw242sjkjy5"; + sha256 = "0liby6ffgrla6wr4k742qkg8m80im372p6hmr4gkz47nmc76zy1i"; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; # following doesn't work b/c they are distributed across different nix sitePackages dirs. Tested with pytest though. - # pythonImportsCheck = [ "qiskit" "qiskit.terra" "qiskit.ignis" "qiskit.aer" "qiskit.aqua" ]; + pythonImportsCheck = [ "qiskit" "qiskit.circuit" "qiskit.ignis" "qiskit.providers.aer" "qiskit.aqua" ]; meta = { description = "Software for developing quantum computing programs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix index 4d63cb5f45..2ee9c82f08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -1,7 +1,6 @@ { lib , pythonPackages , qscintilla -, lndir , qtbase }: with pythonPackages; @@ -11,8 +10,9 @@ buildPythonPackage { src = qscintilla.src; format = "other"; - nativeBuildInputs = [ lndir sip qtbase ]; - buildInputs = [ qscintilla pyqt5 ]; + nativeBuildInputs = [ sip qtbase ]; + buildInputs = [ qscintilla ]; + propagatedBuildInputs = [ pyqt5 ]; postPatch = '' substituteInPlace Python/configure.py \ @@ -22,9 +22,9 @@ buildPythonPackage { ''; preConfigure = '' - mkdir -p $out - lndir ${pyqt5} $out - rm -rf "$out/nix-support" + # configure.py will look for this folder + mkdir -p $out/share/sip/PyQt5 + cd Python substituteInPlace configure.py \ --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index 4cadba28a8..ca6a19220d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.4"; + version = "4.7.5"; src = fetchPypi { inherit pname version; - sha256 = "1zgm57011kpbh6388p8cqwkcgqwlmb7rc9cy3zn9rrnna48byj7x"; + sha256 = "f5cb275d30fc8085e2d1d18bc363e5ba0ce6e559bf37d7d6727b773134298754"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix index 2d78b62609..33fc54241d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix @@ -1,7 +1,7 @@ { - lib, fetchPypi, buildPythonPackage, isPy3k, + lib, fetchPypi, buildPythonPackage, isPy3k, pythonOlder, # runtime dependencies - pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, + pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, importlib-metadata, # test suite dependencies nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy, # additional runtime dependencies are required on Python 2.x @@ -45,6 +45,8 @@ buildPythonPackage rec { pyOpenSSL ndg-httpsclient pyasn1 + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index f5e418d925..236970a5d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.1.4"; + version = "1.1.5"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "1a1ik66b7n6h9gxlr5yb16hhf5h9117av2ggykpfaw699xxhnz30"; + sha256 = "168b6hmx026jsvhnq6s5k0qfhzda02mmx1alax6wqk16mk63mqcz"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rednose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rednose/default.nix index 8c3c98bf63..948fe39dae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rednose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rednose/default.nix @@ -1,4 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, nose, six, colorama, termstyle }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +, nose, six, colorama, termstyle }: buildPythonPackage rec { pname = "rednose"; @@ -15,7 +16,8 @@ buildPythonPackage rec { # Do not test on Python 2 because the tests suite gets stuck # https://github.com/NixOS/nixpkgs/issues/60786 - doCheck = !(isPy27); + # Also macOS tests are broken on python38 + doCheck = !(isPy27 || (stdenv.isDarwin && pythonAtLeast "3.8")); checkInputs = [ six ]; propagatedBuildInputs = [ nose colorama termstyle ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index 9cd3d131e9..dc8b6d92aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.42"; + version = "3.5.44"; src = fetchPypi { inherit pname version; - sha256 = "9c21f202697a6cea57b9d716288fc919d99cbabeb30222eebfc7ff77eac32744"; + sha256 = "0f544p640yz7ivwkl635bpzkx4vy5qccs2rlyr61d9vv1jbm01k7"; }; checkInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix index 531edab274..309f3532cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix @@ -2,27 +2,30 @@ , buildPythonPackage , pythonOlder , pythonAtLeast -, isPy37 -, isPy38 +, python , fetchFromGitHub , fetchPypi # Check inputs , pytestCheckHook }: - let - rx-version = "0.3.3"; - wheel-args = if isPy37 then - { python = "cp37"; sha256 = "1gbz7sh9i4h41xs9c40lixfdigmvfykkgxgzwsrs8v0smx20dczy"; } - else if isPy38 then - { python = "cp38"; sha256 = "09xxgp4ac4q6mfkj6lsqqfrzz1cb02vxy7wlv0bq3z2hd0jcanxk"; } - else throw "python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"; + rx-version = "0.3.4"; + + wheel-hashes = { + "3.7" = { python = "cp37"; sha256 = "1hfrdj8svkfdraa299gcj18a601l4zn646fkgq7m56brpagssf9l"; }; + "3.8" = { python = "cp38"; sha256 = "0jm10ywaqr0b456pcp01pb7035nawlndfi998jv8p1a2f5xwjgiq"; }; + }; + lookup = set: key: default: if (builtins.hasAttr key set) then (builtins.getAttr key set) else default; + wheel-args = lookup + wheel-hashes + python.pythonVersion + (throw "retworkx python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"); github-source = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; rev = rx-version; - sha256 = "160w5vkzrl5rzcrdwhjq820i5lmc527m6hg0kxx0k6n2bz9qn26g"; + sha256 = "0cd3x64y49q9a3jrkiknlfkiccxkxgl624x5pqk7gm34s1lnzl8h"; }; in buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix new file mode 100644 index 0000000000..68927cc9ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi +, alsaLib +}: + +buildPythonPackage rec { + pname = "rtmidi-python"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wpcaxfpbmsjc78g8841kpixr0a3v6zn0ak058s3mm25kcysp4m0"; + }; + + buildInputs = [ alsaLib ]; + + # package has no tests + doCheck = false; + + pythonImportsCheck = [ + "rtmidi_python" + ]; + + meta = with lib; { + description = "Python wrapper for RtMidi"; + homepage = "https://github.com/superquadratic/rtmidi-python"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix index fd57a8013c..00808e744a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix @@ -1,15 +1,16 @@ -{ lib, fetchFromGitHub, buildPythonPackage, nose }: +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, nose }: buildPythonPackage rec { pname = "rx"; - version = "1.6.1"; + version = "3.1.0"; + disabled = pythonOlder "3.6"; # There are no tests on the pypi source src = fetchFromGitHub { owner = "ReactiveX"; repo = "rxpy"; - rev = version; - sha256 = "14bca67a26clzcf2abz2yb8g9lfxffjs2l236dp966sp0lfbpsn5"; + rev = "v${version}"; + sha256 = "0rcwa8001il9p7s096b9gc5yld8cyxvrsmwh1gpc9b87j172z6ax"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 14eb1d9a3f..c4f56e2d4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -9,11 +9,9 @@ , ujson , pytest , gunicorn -, pytestcov , aiohttp , beautifulsoup4 , pytest-sanic -, pytest-sugar , pytest-benchmark # required just httpcore / requests-async @@ -100,11 +98,9 @@ buildPythonPackage rec { checkInputs = [ pytest gunicorn - pytestcov aiohttp beautifulsoup4 pytest-sanic - pytest-sugar pytest-benchmark uvicorn ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix index 1715cf2b7c..06d2d40d18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; rev = "v${version}"; - sha256 = "0k4334nxf1n6gwb9m57sqcchmlssglfd116mpl72glmmdc451d5j"; + sha256 = "1qvh7q0fkls5r8r9mrph6igcvv8x3qsslqsc5jf1n20alcs5zjrl"; }; buildInputs = [ opencl-headers ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix index ace6c248ab..1a94aa9659 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -9,11 +9,11 @@ let }); in buildPythonPackage rec { pname = "scipy"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59"; + sha256 = "4ff72877d19b295ee7f7727615ea8238f2d59159df0bdd98f91754be4a2767f0"; }; checkInputs = [ nose pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix index 159047eafd..96917f45be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { # Trick to disable certain tests that depend on timing which # will always fail on hydra export TRAVIS="" - nosetests tests/test_selectors2.py + nosetests tests/test_selectors2.py \ + --exclude=test_above_fd_setsize ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix index bc0262a89c..5aca34b52f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytestcov +}: -buildPythonPackage { +buildPythonPackage rec { pname = "semver"; - version = "2.8.1"; + version = "2.10.2"; src = fetchFromGitHub { - owner = "k-bx"; + owner = "python-semver"; repo = "python-semver"; - rev = "41775dd5f143dfa6ca94885056c9ef5b3ed4e6e1"; # not tagged in repository - sha256 = "1rqaakha4sw06k9h0h4g1wmk66zkmhpq92y2rw0kyfpp6xk1zbk2"; + rev = version; + sha256 = "0yxjmcgk5iwp53l9z1cg0ajrj18i09ircs11ifpdrggzm8n1blf3"; }; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest + checkInputs = [ pytestCheckHook pytestcov ]; meta = with stdenv.lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; - homepage = "https://github.com/k-bx/python-semver"; + homepage = "https://python-semver.readthedocs.io/en/latest/"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index ef2680bc4c..9d2a533ecb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -17,6 +17,8 @@ , stdenv , tornado , urllib3 +, trytond +, werkzeug }: buildPythonPackage rec { @@ -28,10 +30,10 @@ buildPythonPackage rec { sha256 = "0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c"; }; - checkInputs = [ django flask tornado bottle rq falcon sqlalchemy ] + checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug ] ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; - propagatedBuildInputs = [ urllib3 certifi ]; + propagatedBuildInputs = [ urllib3 certifi trytond ]; meta = with stdenv.lib; { homepage = "https://github.com/getsentry/sentry-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index 69b89a376f..b618ec6f63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ let pname = "setuptools"; - version = "46.1.3"; + version = "47.3.1"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "1f6bp3qy5zvykimadk8k11k3629hmnwlw2cfw4vwcsvdarhig673"; + sha256 = "0sy3p4ibgqx67hzn1f254jh8070a8kl9g2la62p3c74k2x7p0r7f"; name = "${pname}-${version}-source"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix index 13a946aeaf..099c89803a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = licenses.mit; - maintainers = [ maintainers."1000101" ]; + maintainers = with maintainers; [ maintainers."1000101" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch index 0884c020e8..c3c63dc67b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch @@ -1,6 +1,6 @@ ---- pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2019-06-15 10:31:04.712949189 +0200 -+++ pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2019-06-15 11:52:52.894987343 +0200 -@@ -317,15 +317,15 @@ +--- pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2020-07-08 14:37:13.022476435 -0700 ++++ pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2020-07-08 14:37:18.271484269 -0700 +@@ -330,17 +330,15 @@ } #endif // NEED_CLANG_BUILTIN_INCLUDES @@ -9,10 +9,12 @@ - // A fix for this has been added to Clang 5.0, so, the code can be removed - // once Clang 5.0 is the minimum version. - if (needsGppInternalHeaders()) { -- const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); +- const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++"))); - for (const HeaderPath &h : gppPaths) { -- if (h.path.contains("c++")) +- if (h.path.contains("c++") +- || h.path.contains("sysroot")) { // centOS - headerPaths.append(h); +- } + const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); + for (const HeaderPath &h : gppPaths) { + // PySide2 requires that Qt headers are not -isystem @@ -25,3 +27,4 @@ } } #else + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix index acb0717811..d1117b3a9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix @@ -6,14 +6,14 @@ }: buildPythonPackage rec { - version = "2.2.0"; + version = "2.2.2"; pname = "simpleparse"; disabled = isPy3k || isPyPy; src = fetchPypi { pname = "SimpleParse"; inherit version; - sha256 = "18ccdc249bb550717af796af04a7d50aef523368901f64036a48eee5daca149d"; + sha256 = "010szm4mbqgfdksa2n4l9avj617rb0gkwrryc70mfjmyww0bd1m6"; }; doCheck = false; # weird error diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix index 2ea72441d1..f718b3655f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix @@ -1,21 +1,27 @@ -{ buildPythonPackage, fetchPypi, lib, setuptools_scm, pytestCheckHook }: +{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools_scm +, pytestCheckHook }: buildPythonPackage rec { pname = "simpy"; version = "4.0.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ setuptools ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = "https://simpy.readthedocs.io/en/latest/"; - description = "A process-based discrete-event simulation framework based on standard Python."; + homepage = "https://simpy.readthedocs.io/en/${version}/"; + description = "Process-based discrete-event simulation framework based on standard Python"; license = [ licenses.mit ]; - maintainers = with maintainers; [ shlevy ]; + maintainers = with maintainers; [ dmrauh shlevy ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 958c9ab826..c0b8aaca24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.6"; + version = "2.1.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s"; + sha256 = "0yj3yb0qvfdv4wh7nzcsh9in8nzk7b59dvjj0x02rsmlv4kw9ah1"; }; propagatedBuildInputs = [ regex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix index ffcf0bfeac..3742c62520 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sortedcollections"; - version = "1.1.2"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "12nkw69lnyvh9wy6rsd0ng4bcia81vkhj1rj1kj1k3vzppn0sgmr"; + sha256 = "0sihzm5aqz7r3irh4jn6rzicb7lf81d27z7vl6kaslnhwcsizhsq"; }; propagatedBuildInputs = [ sortedcontainers ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 51b04d372c..0e22311a04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.3.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "0nri437dyapiq5gx8lbmjdfvqw2cnw3di13kp44rzr17bm5yh2jv"; + sha256 = "07zf7kivj4r1n6xwisld7n90bpi095bqbc9xpv668grq1rpf53c1"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json index 1c02b05d30..3a427f8932 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json @@ -1,79 +1,145 @@ [{ + "pname": "da_core_news_lg", + "version": "2.3.0", + "sha256": "18y1jany1ha27jkwb9563haxsbylm0axkh5c8009lsfxc8y2w9hr", + "license": "cc-by-sa-40" +}, +{ + "pname": "da_core_news_md", + "version": "2.3.0", + "sha256": "06nm5grj5jdx0rja7vw1f91vvd69p6vhafrwpfr1npqk24j6cacb", + "license": "cc-by-sa-40" +}, +{ + "pname": "da_core_news_sm", + "version": "2.3.0", + "sha256": "00byhlrcbg4wxplr473g9b3126pvk4vwy0q34xg0zx4994qb6rgn", + "license": "cc-by-sa-40" +}, +{ + "pname": "de_core_news_lg", + "version": "2.3.0", + "sha256": "0rixhgdz4z7sq6f2b1w3n5cn1645cr37g40hbd9xzlvdzdf5cg6d", + "license": "mit" +}, +{ "pname": "de_core_news_md", "version": "2.3.0", "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6", - "license": "cc-by-sa-40" + "license": "mit" }, { "pname": "de_core_news_sm", "version": "2.3.0", "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7", - "license": "cc-by-sa-40" + "license": "mit" +}, +{ + "pname": "el_core_news_lg", + "version": "2.3.0", + "sha256": "001c19dd1kirlvzbdv2i89zw8nf6c4icv2w0chm7rd6x9m3i13gd", + "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", "version": "2.3.0", "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0", - "license": "cc-by-sa-40" + "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", "version": "2.3.0", "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b", - "license": "cc-by-sa-40" + "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", "version": "2.3.0", "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2", - "license": "cc-by-sa-40" + "license": "mit" }, { "pname": "en_core_web_md", "version": "2.3.0", "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh", - "license": "cc-by-sa-40" + "license": "mit" }, { "pname": "en_core_web_sm", "version": "2.3.0", "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a", - "license": "cc-by-sa-40" + "license": "mit" }, { "pname": "en_vectors_web_lg", "version": "2.3.0", "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743", - "license": "cc-by-sa-40" + "license": "cc-by-sa-30" +}, +{ + "pname": "es_core_news_lg", + "version": "2.3.0", + "sha256": "1r0pr0lzs3j9w7rd5z9nw87iayjm36v7f7gamvaiiphs6bc5p7ls", + "license": "gpl3" }, { "pname": "es_core_news_md", "version": "2.3.0", "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2", - "license": "cc-by-sa-40" + "license": "gpl3" }, { "pname": "es_core_news_sm", "version": "2.3.0", "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d", - "license": "cc-by-sa-40" + "license": "gpl3" +}, +{ + "pname": "fr_core_news_lg", + "version": "2.3.0", + "sha256": "1yliamws8nqqjhpk9gr2dzlk0dms2mr958zbj21biv8fimbq60ik", + "license": "lgpllr" }, { "pname": "fr_core_news_md", "version": "2.3.0", "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db", - "license": "cc-by-sa-40" + "license": "lgpllr" }, { "pname": "fr_core_news_sm", "version": "2.3.0", "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0", - "license": "cc-by-sa-40" + "license": "lgpllr" +}, +{ + "pname": "it_core_news_lg", + "version": "2.3.0", + "sha256": "192rdmqnwl3ajxzhnw4r1cqv5bkziv0yc2bbzckmzqss64wk7k70", + "license": "cc-by-nc-sa-30" +}, +{ + "pname": "it_core_news_md", + "version": "2.3.0", + "sha256": "019ih4vwq1w6j38j0wc8pyyg1an6yy37wxq2w4amwppynmmcnd5w", + "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", "version": "2.3.0", "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds", + "license": "cc-by-nc-sa-40" +}, +{ + "pname": "lt_core_news_lg", + "version": "2.3.0", + "sha256": "0hn5w8n7mgv33i6gvnaxl1j44n9gz4j86gg1a9jjlgdw5z98n0p2", + "license": "cc-by-sa-40" +}, +{ + "pname": "lt_core_news_md", + "version": "2.3.0", + "sha256": "1xya79cz2xd5vgzg6qg0ww5j2bmv7kppdk3mdjf6zpwrlzwdbk5d", "license": "cc-by-sa-40" }, { @@ -82,27 +148,117 @@ "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9", "license": "cc-by-sa-40" }, +{ + "pname": "nb_core_news_lg", + "version": "2.3.0", + "sha256": "18mblypw3c82004qz5w1p3262iqwn99wl9b781dq7aqwxskr02d6", + "license": "mit" +}, +{ + "pname": "nb_core_news_md", + "version": "2.3.0", + "sha256": "0iw97k9glxbar8mrpvnmmcb1nffgdhb83akn99p53pwmqbzxy9p3", + "license": "mit" +}, { "pname": "nb_core_news_sm", "version": "2.3.0", "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7", "license": "mit" }, +{ + "pname": "nl_core_news_lg", + "version": "2.3.0", + "sha256": "016166kzpgi0p3m0x3k308a0r60a28yz7npagjvmpl1dfm9lzhnv", + "license": "cc-by-sa-40" +}, +{ + "pname": "nl_core_news_md", + "version": "2.3.0", + "sha256": "1anfhig531k9k14s0cbgsvmvifp3h50qi1h8dhx894kjmq10k2lg", + "license": "cc-by-sa-40" +}, { "pname": "nl_core_news_sm", "version": "2.3.0", "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj", "license": "cc-by-sa-40" }, +{ + "pname": "pl_core_news_lg", + "version": "2.3.0", + "sha256": "1acchp8pv1h4c6cwvxz07lh4ychn6aw809zfg3mbbsxgsgd2ahjr", + "license": "gpl3" +}, +{ + "pname": "pl_core_news_md", + "version": "2.3.0", + "sha256": "19jjjjvbys3ayibkm3cx497b4bh63ll39hfq04wx116rj4ajpwwg", + "license": "gpl3" +}, +{ + "pname": "pl_core_news_sm", + "version": "2.3.0", + "sha256": "166mqlfkgiszcc6hwg2mr6sir9y88y22nd81a1nidq0fiif5lfji", + "license": "gpl3" +}, +{ + "pname": "pt_core_news_lg", + "version": "2.3.0", + "sha256": "18gvdmfwyy2sbq6206imglhghyagd6a4gb6wcfkwhm7lzbnq714d", + "license": "cc-by-sa-40" +}, +{ + "pname": "pt_core_news_md", + "version": "2.3.0", + "sha256": "1yxnpwby2aq6ydvd35lylc4fs141fisfnzlx8pl88pp2b2gxijvl", + "license": "cc-by-sa-40" +}, { "pname": "pt_core_news_sm", "version": "2.3.0", "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph", "license": "cc-by-sa-40" }, +{ + "pname": "ro_core_news_sm", + "version": "2.3.0", + "sha256": "0lsmbdwsaczv37y5sa1vvgwszy2hs8jp24a0nvc5qm8vb71rxj8w", + "license": "cc-by-sa-40" +}, +{ + "pname": "ro_core_news_md", + "version": "2.3.0", + "sha256": "1igwkz3yd1117gi2g78yilh9ln8n5yrdimas4prfxjgzwid3q8bc", + "license": "cc-by-sa-40" +}, +{ + "pname": "ro_core_news_lg", + "version": "2.3.0", + "sha256": "0id1y32kjfans7llh1i55rgr4n2x6xn208y4qf6yl3pbc17i0n9z", + "license": "cc-by-sa-40" +}, { "pname": "xx_ent_wiki_sm", "version": "2.3.0", "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn", - "license": "cc-by-sa-40" + "license": "mit" +}, +{ + "pname": "zh_core_web_lg", + "version": "2.3.1", + "sha256": "17zxk7cz47k07yb3qaigc3sx4dj4zwilr1lsn2jq6w7jc8k2h1ll", + "license": "mit" +}, +{ + "pname": "zh_core_web_md", + "version": "2.3.1", + "sha256": "1n4iwxyam4ykn0f9jdzwkhczack8r9c3kkbyga3c4h6iwqsflzcj", + "license": "mit" +}, +{ + "pname": "zh_core_web_sm", + "version": "2.3.1", + "sha256": "1lj5nwhx38cpwnvajwxlfkf84dr1xx2h6wwbg3scycsh459i9fpc", + "license": "mit" }] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix index b091c3b7d5..b83ae5d7dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix @@ -1,6 +1,9 @@ -{ stdenv, buildPythonPackage, fetchurl, spacy }: +{ stdenv, lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }: let - buildModelPackage = { pname, version, sha256, license }: buildPythonPackage { + buildModelPackage = { pname, version, sha256, license }: + let + lang = builtins.substring 0 2 pname; + in buildPythonPackage { inherit pname version; src = fetchurl { @@ -8,7 +11,8 @@ let inherit sha256; }; - propagatedBuildInputs = [ spacy ]; + propagatedBuildInputs = [ spacy ] + ++ lib.optionals (lang == "zh") [ jieba pkuseg ]; meta = with stdenv.lib; { description = "Models for the spaCy NLP library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix index f60d7383ba..d72830f3fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k +, dask , numpy , scipy , numba @@ -19,7 +20,7 @@ buildPythonPackage rec { sha256 = "ffbca00a53f938e4f04230f582b210440efb54d74d60af1d1ced3864f61677ac"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest dask ]; propagatedBuildInputs = [ numpy scipy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix new file mode 100644 index 0000000000..0d0fd58236 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "spidev"; + version = "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "03cicc9kpi5khhq0bl4dcy8cjcl2j488mylp8sna47hnkwl5qzwa"; + }; + + # package does not include tests + doCheck = false; + + pythonImportsCheck = [ "spidev" ]; + + meta = with lib; { + homepage = "https://github.com/doceme/py-spidev"; + description = "Python bindings for Linux SPI access through spidev"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix index 47da1d9c0d..f530d0f0cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { comment = "Scientific Python Development Environment"; desktopName = "Spyder"; genericName = "Python IDE"; - categories = "Application;Development;IDE;"; + categories = "Development;IDE;"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix new file mode 100644 index 0000000000..fb854c1809 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, flask +, flask_login +, flask_sqlalchemy +, flexmock +, pytestCheckHook +, sqlalchemy +, sqlalchemy-utils +, sqlalchemy-i18n +}: + +buildPythonPackage rec { + pname = "SQLAlchemy-Continuum"; + version = "1.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b7q0rqy5q7m9yw7yl7jzrk8p1jh1hqmqvzf45rwmwxs724kfkjg"; + }; + + propagatedBuildInputs = [ + sqlalchemy + sqlalchemy-utils + ]; + + # indicate tests that we don't have a database server at hand + DB = "sqlite"; + + checkInputs = [ + pytestCheckHook + sqlalchemy-i18n + flask + flask_login + flask_sqlalchemy + flexmock + ]; + + meta = with lib; { + homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; + description = "Versioning and auditing extension for SQLAlchemy"; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-i18n/default.nix new file mode 100644 index 0000000000..4ef0adefe3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, sqlalchemy +, sqlalchemy-utils +, psycopg2 +}: + +buildPythonPackage rec { + pname = "SQLAlchemy-i18n"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "15xah8643p29kciz365ixs9pbsflj92pzr2d9anbdh2biyf4cka8"; + }; + + propagatedBuildInputs = [ + sqlalchemy + sqlalchemy-utils + ]; + + # tests require running a postgresql server + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/kvesteri/sqlalchemy-i18n"; + description = "Internationalization extension for SQLAlchemy models"; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 67242a9916..657ec7ac07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.36.5"; + version = "0.36.6"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "0d3lrhqdw3lhkj79wpfxi6cmlxnw99prpq8m70c5q8kinv26h038"; + sha256 = "0srs5w486wp5zydjs70igi5ypgxhm6h73grb85jz03fqpqaanzvs"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 81aede240e..8ccfaca179 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.6"; + version = "1.4.7"; src = fetchPypi { inherit pname version; - sha256 = "0da3a6700a370fcd671265502c7c4aca39a1d055de9a1dcc8b9b751c9ad3efa8"; + sha256 = "0096vrdnax467vl0xl4m0z9pqddl9dhvk6gyryx6gvaslrvn2j26"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix index 54590f2e35..d1de78788d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.0.1"; + version = "2.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "fa3c7375be8fe75f23c27feafbfb5f738d55ffdbf02964c6896fb7684f519a52"; + sha256 = "1h246zvh2wsqyjlw3a3bwmd1zwrkgpflk4z4i9k3sqp2j1jika54"; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix new file mode 100644 index 0000000000..6cbdc81ef8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage +, dnspython +, mock, nose +}: + +buildPythonPackage rec { + pname = "srvlookup"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zf1v04zd5phabyqh0nhplr5a8vxskzfrzdh4akljnz1yk2n2a0b"; + }; + + propagatedBuildInputs = [ dnspython ]; + checkInputs = [ mock nose ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/gmr/srvlookup"; + license = [ licenses.bsd3 ]; + description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples."; + maintainers = [ maintainers.mmlb ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix new file mode 100644 index 0000000000..c127f6ea2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, pytest +, buildPythonPackage +, nassl +, cryptography +, typing-extensions +, faker +}: + +buildPythonPackage rec { + pname = "sslyze"; + version = "3.0.8"; + + src = fetchFromGitHub { + owner = "nabla-c0d3"; + repo = pname; + rev = version; + sha256 = "06mwzxw6xaqin2gwzcqb9r7qhbyx3k7zcxygxywi2bpxyjv9lq32"; + }; + + patchPhase = '' + substituteInPlace setup.py \ + --replace "cryptography>=2.6,<=2.9" "cryptography>=2.6,<=3" + ''; + + checkInputs = [ pytest ]; + + checkPhase = '' + # Most of the tests are online; hence, applicable tests are listed + # explicitly here + pytest \ + tests/test_main.py \ + tests/test_scanner.py \ + tests/cli_tests/test_console_output.py \ + tests/cli_tests/test_json_output.py \ + tests/cli_tests/test_server_string_parser.py \ + tests/plugins_tests/test_scan_commands.py \ + tests/plugins_tests/certificate_info/test_certificate_utils.py \ + -k "not (TestScanner and test_client_certificate_missing)" + ''; + + propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; + + meta = with lib; { + homepage = "https://github.com/nabla-c0d3/sslyze"; + description = "Fast and powerful SSL/TLS scanning library"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.agpl3; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix index c65fb0990f..697bb624fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix @@ -1,7 +1,7 @@ { lib -, self , buildPythonPackage , fetchPypi +, isPy27 , nose , numpy , scipy @@ -20,11 +20,13 @@ buildPythonPackage rec { sha256 = "5bde3fa0a35a91b45dba7cbc28270b5b649ff1d721c89290883f6e831672d5f0"; }; - checkInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib]; + nativeBuildInputs = [ cython ]; + checkInputs = [ nose ]; + propagatedBuildInputs = [ numpy scipy pandas patsy matplotlib ]; # Huge test suites with several test failures doCheck = false; + pythonImportsCheck = [ "statsmodels" ]; meta = { description = "Statistical computations and models for use with SciPy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix index 343aaddfbb..cee258dbd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix @@ -14,6 +14,13 @@ buildPythonPackage rec { sha256 = "64082ebedf6d36ff409ab2878f1aad5c9035f916c5f15a9a1ec7dffc6dfbbed8"; }; + patches = [ + # SOMAXCONN limit of glibc-2.31 has been increased from 128 to 4096: + # * https://sourceware.org/git/?p=glibc.git;a=commit;h=96958e2700f5b4f4d1183a0606b2b9848a53ea44 + # * https://github.com/Supervisor/supervisor/issues/1346 + ./glibc-2.31.patch + ]; + # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/glibc-2.31.patch b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/glibc-2.31.patch new file mode 100644 index 0000000000..b2d9564eea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/glibc-2.31.patch @@ -0,0 +1,13 @@ +diff --git a/supervisor/tests/base.py b/supervisor/tests/base.py +index 643e609..8aa45e7 100644 +--- a/supervisor/tests/base.py ++++ b/supervisor/tests/base.py +@@ -358,7 +358,7 @@ class DummySocketConfig: + return not self.__eq__(other) + + def get_backlog(self): +- return 128 ++ return 4096 + + def create_and_bind(self): + return DummySocket(self.fd) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix index bb3cd94620..2d0efeceda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix @@ -20,6 +20,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; + # this versioning was done to prevent normal pip users from encountering + # issues with package failing to build from source, but nixpkgs is better + postPatch = '' + substituteInPlace setup.py \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + ''; + # No tests in archive. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch b/third_party/nixpkgs/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch new file mode 100644 index 0000000000..f807a6d251 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch @@ -0,0 +1,28 @@ +From 9dfd2a8fac4a643fd007390762ccc8564588b4bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Thu, 25 Jun 2020 10:16:52 +0100 +Subject: [PATCH] pytest: remove flake8/black/coverage +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + pytest.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pytest.ini b/pytest.ini +index bd6998d..a464529 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,6 +1,6 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 --black --cov ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS + filterwarnings= + # suppress known warning +-- +2.27.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix index d1f40f349f..d4139ce762 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm, pytest, freezegun, backports_unittest-mock -, six, pytz, jaraco_functools }: +, setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock +, six, pytz, jaraco_functools, pythonOlder }: buildPythonPackage rec { pname = "tempora"; @@ -11,14 +11,21 @@ buildPythonPackage rec { sha256 = "e370d822cf48f5356aab0734ea45807250f5120e291c76712a1d766b49ae34f8"; }; - buildInputs = [ setuptools_scm ]; + disabled = pythonOlder "3.2"; + + nativeBuildInputs = [ setuptools_scm ]; + + patches = [ + ./0001-pytest-remove-flake8-black-coverage.patch + ]; propagatedBuildInputs = [ six pytz jaraco_functools ]; - checkInputs = [ pytest freezegun backports_unittest-mock ]; + checkInputs = [ + pytest-freezegun pytest freezegun backports_unittest-mock + ]; checkPhase = '' - substituteInPlace pytest.ini --replace "--flake8" "" pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix new file mode 100644 index 0000000000..d2532777d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix @@ -0,0 +1,31 @@ +{ boto3, buildPythonPackage, crc32c, fetchFromGitHub, lib, matplotlib, moto +, numpy, pillow, pytorch, protobuf, six, pytestCheckHook +, tensorflow-tensorboard, torchvision }: + +buildPythonPackage rec { + pname = "tensorboardx"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "lanpa"; + repo = "tensorboardX"; + rev = "v${version}"; + sha256 = "0qqalq0fhbx0wnd8wdwhyhkkv2brvj9qbk3373vk3wjxbribf5c7"; + }; + + checkInputs = [ + pytestCheckHook boto3 crc32c matplotlib moto pillow pytorch tensorflow-tensorboard torchvision + ]; + + propagatedBuildInputs = [ numpy protobuf six ]; + + disabledTests = [ "test_TorchVis" "test_onnx_graph" ]; + + meta = with lib; { + description = "Library for writing tensorboard-compatible logs"; + homepage = "https://github.com/lanpa/tensorboardX"; + license = licenses.mit; + maintainers = with maintainers; [ lebastr akamaus ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix index dbac36ff07..16c3eeec7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.1.0"; + version = "2.2.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - sha256 = "0wk9viil54ms1s2ir7zxygqa425i69hx8zngwhdqvw9nlr4gdig5"; + sha256 = "1hkx4k6927xn4qpwiba6wa56n0qqm7s23bymm377j9bz2bfsr7fh"; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix index 21ce440c63..7636791905 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -61,7 +61,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "1snj7fxfxzvrqv9cpir1daxcg3fip6cvbk94y3mi2h50k3ni826i"; + sha256 = "1qw7vkwnxy45z4vm94isq5m96xiz35sigag7vjg1xb2sklbymxh8"; }; buildAttrs = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index b3db882c82..7c875ec059 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy27 +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy27 , mock, pytest, sybil, zope_component, twisted }: buildPythonPackage rec { @@ -15,12 +15,16 @@ buildPythonPackage rec { doCheck = !isPy27; checkPhase = '' # django is too much hasle to setup at the moment - pytest -W ignore::DeprecationWarning --ignore=testfixtures/tests/test_django testfixtures/tests + pytest -W ignore::DeprecationWarning \ + --ignore=testfixtures/tests/test_django \ + -k 'not (log_then_patch or our_wrap_dealing_with_mock_patch or patch_with_dict)' \ + testfixtures/tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Simplistix/testfixtures"; description = "A collection of helpers and mock objects for unit tests and doc tests"; license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix index 2d8581cfb9..6f4eb927f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix @@ -1,6 +1,16 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, fetchpatch , webencodings -, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: +# Check inputs +, pytest +, pytestrunner +, pytestcov +, pytest-flake8 +, pytest-isort +}: buildPythonPackage rec { pname = "tinycss2"; @@ -12,7 +22,15 @@ buildPythonPackage rec { sha256 = "1kw84y09lggji4krkc58jyhsfj31w8npwhznr7lf19d0zbix09v4"; }; - patches = [ ./remove-redundant-dependency.patch ]; + patches = [ + ( + fetchpatch { + name = "tinycss2-fix-pytest-flake8-fail.patch"; + url = "https://github.com/Kozea/tinycss2/commit/6556604fb98c2153412384d6f0f705db2da1aa60.patch"; + sha256 = "1srvdzg1bak65fawd611rlskcgn5abmwmyjnk8qrrrasr554bc59"; + } + ) + ]; propagatedBuildInputs = [ webencodings ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch deleted file mode 100644 index 27ec511c55..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index b3b3c2d..480f3e6 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -33,7 +33,6 @@ project_urls = - - [options] - packages = find: --setup_requires = pytest-runner - install_requires = - setuptools >= 39.2.0 - webencodings >= 0.4 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix new file mode 100644 index 0000000000..5b6bfe6a0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix @@ -0,0 +1,29 @@ +{ lib +, isPy27 +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tls-parser"; + version = "1.2.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "nabla-c0d3"; + repo = "tls_parser"; + rev = version; + sha256 = "12qj3vg02r5a51w6gbgb1gcxicqc10lbbsdi57jkkfvbqiindbd0"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/nabla-c0d3/tls_parser"; + description = "Small library to parse TLS records"; + platforms = with platforms; linux ++ darwin; + license = licenses.mit; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix new file mode 100644 index 0000000000..e3578cbf8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -0,0 +1,121 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, fetchurl +, maturin +, pipInstallHook +, pytest +, python +, requests +}: + +let + robertaVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-vocab.json"; + sha256 = "0m86wpkfb2gdh9x9i9ng2fvwk1rva4p0s98xw996nrjxs7166zwy"; + }; + robertaMerges = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt"; + sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w"; + }; + bertVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt"; + sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07"; + }; + openaiVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json"; + sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x"; + }; + openaiMerges = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt"; + sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f"; + }; +in rustPlatform.buildRustPackage rec { + pname = "tokenizers"; + version = "0.8.1.rc1"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = "python-v${version}"; + sha256 = "1bzvfffnjjskx8zlq1qsqfd47570my2wnbq4ip8i1hkz10q900qv"; + }; + + cargoSha256 = "0s5z3g1njb7wlyb32ba6xas4zc62c3zhmp1mrvghmaxpvljp6k7b"; + + sourceRoot = "source/bindings/python"; + + nativeBuildInputs = [ + maturin + pipInstallHook + ]; + + propagatedBuildInputs = [ + python + ]; + + # tokenizers uses pyo3, which requires Rust nightly. + RUSTC_BOOTSTRAP = 1; + + doCheck = false; + doInstallCheck = true; + + postUnpack = '' + # Add data files for tests, otherwise tests attempt network access. + mkdir $sourceRoot/tests/data + ( cd $sourceRoot/tests/data + ln -s ${robertaVocab} roberta-base-vocab.json + ln -s ${robertaMerges} roberta-base-merges.txt + ln -s ${bertVocab} bert-base-uncased-vocab.txt + ln -s ${openaiVocab} openai-gpt-vocab.json + ln -s ${openaiMerges} openai-gpt-merges.txt ) + ''; + + postPatch = '' + # pyo3's build check verifies that Rust is a nightly + # version. Disable this check. + substituteInPlace $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/build.rs \ + --replace "check_rustc_version()?;" "" + + # Patching the vendored dependency invalidates the file + # checksums, so remove them. This should be safe, since + # this is just a copy of the vendored dependencies and + # the integrity of the vendored dependencies is validated + # by cargoSha256. + sed -r -i 's|"files":\{[^}]+\}|"files":{}|' \ + $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/.cargo-checksum.json + + # Maturin uses the crate name as the wheel name. + substituteInPlace Cargo.toml \ + --replace "tokenizers-python" "tokenizers" + ''; + + buildPhase = '' + maturin build --release --manylinux off + ''; + + installPhase = '' + # Put the wheels where the pip install hook can find them. + install -Dm644 -t dist target/wheels/*.whl + pipInstallPhase + ''; + + installCheckInputs = [ + pytest + requests + ]; + + installCheckPhase = '' + # Append paths, or the binding's tokenizer module will be + # used, since the test directories have __init__.py + pytest --import-mode=append + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/huggingface/tokenizers"; + description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix new file mode 100644 index 0000000000..e7aa53360e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytest +, pytestrunner +, pytestCheckHook +, pytorch +}: + +buildPythonPackage rec { + pname = "torchgpipe"; + version = "0.0.5"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "kakaobrain"; + repo = pname; + rev = "v${version}"; + sha256 = "0mqdavnqb8a320li2r7xw11w2lg03l59xxyg2fxpg4z57v0rbasi"; + }; + + propagatedBuildInputs = [ pytorch ]; + + checkInputs = [ pytest pytestrunner pytestCheckHook ]; + disabledTests = [ "test_inplace_on_requires_grad" ]; + # seems like a harmless failure: + ## AssertionError: + ## Pattern 'a leaf Variable that requires grad has been used in an in-place operation.' + ## does not match 'a leaf Variable that requires grad is being used in an in-place operation.' + + meta = with lib; { + description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU"; + homepage = "https://torchgpipe.readthedocs.io"; + license = licenses.asl20; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix new file mode 100644 index 0000000000..6d889a09d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix @@ -0,0 +1,37 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, backports_abc +, backports_ssl_match_hostname +, certifi +, singledispatch +, futures +, isPy27 +}: + +buildPythonPackage rec { + pname = "tornado"; + version = "4.5.3"; + + propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ]; + + # We specify the name of the test files to prevent + # https://github.com/NixOS/nixpkgs/issues/14634 + checkPhase = '' + ${python.interpreter} -m unittest discover *_test.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; + }; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "A web framework and asynchronous networking library"; + homepage = "https://www.tornadoweb.org/"; + license = lib.licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/5.nix new file mode 100644 index 0000000000..da27033197 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/5.nix @@ -0,0 +1,37 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, backports_abc +, backports_ssl_match_hostname +, certifi +, singledispatch +, futures +, isPy27 +}: + +buildPythonPackage rec { + pname = "tornado"; + version = "5.1.1"; + + propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ]; + + # We specify the name of the test files to prevent + # https://github.com/NixOS/nixpkgs/issues/14634 + checkPhase = '' + ${python.interpreter} -m unittest discover *_test.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"; + }; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "A web framework and asynchronous networking library"; + homepage = "https://www.tornadoweb.org/"; + license = lib.licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix index 102cf0fed5..8d9cadeb3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix @@ -2,35 +2,11 @@ , python , buildPythonPackage , fetchPypi -, backports_abc -, backports_ssl_match_hostname -, certifi -, singledispatch -, pythonOlder -, futures -, version ? "5.1" }: -let - versionMap = { - "4.5.3" = { - sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; - }; - "5.1" = { - sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582"; - }; - }; -in - -with versionMap.${version}; - buildPythonPackage rec { pname = "tornado"; - inherit version; - - propagatedBuildInputs = [ backports_abc certifi singledispatch ] - ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname - ++ lib.optional (pythonOlder "3.2") futures; + version = "6.0.4"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -39,14 +15,15 @@ buildPythonPackage rec { ''; src = fetchPypi { - inherit pname sha256 version; + inherit pname version; + sha256 = "0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc"; }; __darwinAllowLocalNetworking = true; meta = { description = "A web framework and asynchronous networking library"; - homepage = "http://www.tornadoweb.org/"; + homepage = "https://www.tornadoweb.org/"; license = lib.licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index 138c24ebbe..7d326ea152 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.46.1"; + version = "4.47.0"; src = fetchPypi { inherit pname version; - sha256 = "cd140979c2bebd2311dfb14781d8f19bd5a9debb92dcab9f6ef899c987fcf71f"; + sha256 = "63ef7a6d3eb39f80d6b36e4867566b3d8e5f1fe3d6cb50c5e9ede2b3198ba7b7"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 09ebf739d7..1f1451c5f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -1,41 +1,81 @@ { buildPythonPackage , stdenv , fetchFromGitHub -, sacremoses -, requests -, sentencepiece , boto3 -, tqdm +, filelock , regex +, requests , numpy -, pytest +, sacremoses +, sentencepiece +, timeout-decorator +, tokenizers +, tqdm +, pytestCheckHook }: buildPythonPackage rec { pname = "transformers"; - version = "2.2.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "1p8p3lhhiyk1xl9gpgq4vbchyz57v3w7hhvsj1r90zs3cckindl8"; + sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6"; }; - propagatedBuildInputs = [ numpy sacremoses requests sentencepiece boto3 tqdm regex ]; + propagatedBuildInputs = [ + boto3 + filelock + numpy + regex + requests + sacremoses + sentencepiece + tokenizers + tqdm + ]; - checkInputs = [ pytest ]; - # pretrained tries to download from s3 - checkPhase = '' - cd transformers # avoid importing local files - HOME=$TMPDIR pytest -k 'not pretrained_tokenizers' + checkInputs = [ + pytestCheckHook + timeout-decorator + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8" ''; + preCheck = '' + export HOME="$TMPDIR" + cd tests + ''; + + # Disable tests that require network access. + disabledTests = [ + "test_all_tokenizers" + "test_batch_encoding_is_fast" + "test_batch_encoding_pickle" + "test_config_from_model_shortcut" + "test_config_model_type_from_model_identifier" + "test_from_pretrained_use_fast_toggle" + "test_hf_api" + "test_outputs_can_be_shorter" + "test_outputs_not_longer_than_maxlen" + "test_pretokenized_tokenizers" + "test_tokenizer_equivalence_en_de" + "test_tokenizer_from_model_type" + "test_tokenizer_from_model_type" + "test_tokenizer_from_pretrained" + "test_tokenizer_identifier_with_correct_config" + ]; + meta = with stdenv.lib; { homepage = "https://github.com/huggingface/transformers"; description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ pashashocky ]; + maintainers = with maintainers; [ danieldk pashashocky ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix index 13eeaf9f80..a8e84acc2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "2b8cf2078ed189ffbb0f29421798d7a63ff0d7823682a0d69c01bd8240363cac"; + sha256 = "0j3pswbckrhd6plblb0bwzsbvk50nqmxq6dvjclvcr5cljzs7xvg"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index c6d1ba00a8..6ae449d8cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.6.43"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "f62dbaf4739858148fe4889f3b4dff93da281982b6592f211c4d33c2e00678eb"; + sha256 = "195jx8q6rri8nl1fkhirlwvpv8ahrbnhrrprws5kw2phdnq3qy3b"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix similarity index 58% rename from third_party/nixpkgs/pkgs/applications/office/trytond/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index c45562a0c8..4b8afbddb3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -1,40 +1,65 @@ -{ stdenv, python2Packages -, withPostgresql ? true }: +{ stdenv +, buildPythonApplication +, fetchPypi +, mock +, lxml +, relatorio +, genshi +, dateutil +, polib +, python-sql +, werkzeug +, wrapt +, passlib +, bcrypt +, pydot +, python-Levenshtein +, simplejson +, html2text +, psycopg2 +, withPostgresql ? true +}: with stdenv.lib; -python2Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "trytond"; - version = "4.8.4"; - src = python2Packages.fetchPypi { + version = "5.6.2"; + src = fetchPypi { inherit pname version; - sha256 = "1935045b1b4674de602b4279a9cfd0a14431624a28ccb490234cffecb81fbca7"; + sha256 = "0mlfl34zmmqrwip39mvhkk0h6dsljqwff2mk1ldahm253d4vzflp"; }; # Tells the tests which database to use DB_NAME = ":memory:"; - buildInputs = with python2Packages; [ + buildInputs = [ mock ]; - propagatedBuildInputs = with python2Packages; ([ - dateutil + propagatedBuildInputs = [ lxml + relatorio + genshi + dateutil polib python-sql - relatorio werkzeug wrapt - ipaddress + passlib # extra dependencies bcrypt pydot python-Levenshtein simplejson - cdecimal html2text - ] ++ stdenv.lib.optional withPostgresql psycopg2); + ] ++ stdenv.lib.optional withPostgresql psycopg2; + + # If unset, trytond will try to mkdir /homeless-shelter + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = { description = "The server of the Tryton application platform"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 18e28c358b..d4cd7b5d59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.39.0"; + version = "6.43.0"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1l2j54kjd1lrf072a3i5037qxpm8n378dddzd3m711ylz6vp638f"; + sha256 = "0p2chrzakqx5694g305j0klh9lxlclm5qp0qjm6wqicivyybggzg"; }; buildInputs = [ nose mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix index b3dddbbba6..47f9fe1a03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix @@ -8,16 +8,18 @@ , requests_toolbelt , setuptools_scm , tqdm +, colorama +, rfc3986 }: buildPythonPackage rec { pname = "twine"; - version = "3.1.1"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160"; + sha256 = "34352fd52ec3b9d29837e6072d5a2a7c6fe4290e97bba46bb8d478b5c598f7ab"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -29,6 +31,8 @@ buildPythonPackage rec { requests requests_toolbelt tqdm + colorama + rfc3986 ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Requires network diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix index da75b7f18d..2f0617731e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix @@ -4,16 +4,17 @@ , stdenv , setuptools_scm , pytest +, typing-extensions , glibcLocales }: buildPythonPackage rec { pname = "typeguard"; - version = "2.8.0"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "e718f493d805d596cba238a61aa83b874530a333783ca9d597fe5bf27143f042"; + sha256 = "123jnq7igm26a5347jf2j60bww9g84l80f208dzlbk49h7cg77jj"; }; buildInputs = [ setuptools_scm ]; @@ -25,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace " --cov" "" ''; - checkInputs = [ pytest ]; + checkInputs = [ pytest typing-extensions ]; checkPhase = '' py.test . diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index e1527ea27e..71a38c88d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.8"; + version = "1.2.9"; src = fetchPypi { inherit pname version; - sha256 = "12yq435h27iv1kzgq3gl7c7hxdivvc2sl0l1kslgf2wxw53n7jgj"; + sha256 = "1gqccakzivga3lb9sh4aniamqpnlbbwxfbkhrb6833k1zha01w8j"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix index c956e5d8b3..d80009e647 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "ueberzug"; - version = "18.1.5"; + version = "18.1.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1rj864sdn1975v59i8j3cfa9hni1hacq0z2b8m7wib0da9apygby"; + sha256 = "13a9q9rvkbsym5nrc1y2anhyx317vj1vi8k8kln8gin2yw311pyb"; }; buildInputs = [ libX11 libXext ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix index 0c68fe9bb1..295d6febf3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy3k , isPyPy , setuptools_scm }: @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "ujson"; version = "3.0.0"; - disabled = isPyPy; + disabled = isPyPy || (!isPy3k); src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix index 2e87565554..8cf0662455 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, numpy }: +{ stdenv, fetchPypi, buildPythonPackage +, nose, numpy, future +}: buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.2"; + version = "3.1.4"; src = fetchPypi { inherit pname version; - sha256 = "07kahmr0vfmncf8y4x6ldjrghnd4gsf0fwykgjj5ijvqi9xc21xs"; + sha256 = "0s69kdhl8vhqazhxqdvb06l83x0iqdm0yr4vp3p52alzi6a8lm33"; }; - buildInputs = [ nose numpy ]; + propagatedBuildInputs = [ future ]; + checkInputs = [ nose numpy ]; - # No tests included - doCheck = false; + checkPhase = "python setup.py nosetests -sv"; meta = with stdenv.lib; { homepage = "https://pythonhosted.org/uncertainties/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 4481aedfaf..113f5535f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -1,8 +1,9 @@ -{lib, fetchPypi, buildPythonPackage, six}: +{lib, fetchPypi, buildPythonPackage, isPy27, six}: buildPythonPackage rec { pname = "unittest-xml-reporting"; version = "3.0.2"; + disabled = isPy27; propagatedBuildInputs = [six]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index 567846b0ae..424f4d08fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { "--tb=native" # ignore code linting tests "--ignore=tests/test_sourcecode.py" + # Fails on Python 3.8 + # https://salsa.debian.org/python-team/modules/uvloop/-/commit/302a7e8f5a2869e13d0550cd37e7a8f480e79869 + "--ignore=tests/test_tcp.py" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix index cb90bfbc59..6e1dc98256 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix @@ -1,9 +1,7 @@ { stdenv -, pythonAtLeast , buildPythonPackage , fetchPypi , isPy27 -, fetchpatch , click , click-log , click-threading @@ -11,25 +9,21 @@ , requests , requests_oauthlib # required for google oauth sync , atomicwrites -, milksnake -, shippai , hypothesis -, pytest +, pytestCheckHook , pytest-localserver , pytest-subtesthack , setuptools_scm }: -# Packaging documentation at: -# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst buildPythonPackage rec { - version = "0.16.7"; + version = "0.16.8"; pname = "vdirsyncer"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; + sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5"; }; propagatedBuildInputs = [ @@ -46,43 +40,25 @@ buildPythonPackage rec { checkInputs = [ hypothesis - pytest + pytestCheckHook pytest-localserver pytest-subtesthack ]; - patches = [ - # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 - (fetchpatch { - url = "https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch"; - sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; - }) - ]; - postPatch = '' - # Invalid argument: 'perform_health_check' is not a valid setting - substituteInPlace tests/conftest.py \ - --replace "perform_health_check=False" "" - substituteInPlace tests/unit/test_repair.py \ - --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + substituteInPlace setup.py --replace "click>=5.0,<6.0" "click" ''; - checkPhase = '' - make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test + preCheck = '' + export DETERMINISTIC_TESTS=true ''; - # Tests started to fail lately, for any python version even as low as 3.5 but - # if you enable the check, you'll see even severer errors with a higher then - # 3.5 python version. Hence it's marked as broken for higher then 3.5 and the - # checks are disabled unconditionally. As a general end user advice, use the - # normal "unstable" `vdirsyncer` derivation, not this one. - doCheck = false; + + disabledTests = [ "test_verbosity" ]; meta = with stdenv.lib; { homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; license = licenses.mit; - # vdirsyncer (unstable) works with mainline python versions - broken = (pythonAtLeast "3.6"); maintainers = with maintainers; [ loewenheim ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix index 6f445e9474..b193ee27d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -1,9 +1,10 @@ -{ stdenv, buildPythonPackage , fetchPypi +{ stdenv, buildPythonPackage , fetchPypi, pythonOlder , pytest, jupyter_core, pandas, ipywidgets }: buildPythonPackage rec { pname = "vega"; version = "3.4.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix index f310148d75..383eed03a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.3.0"; + version = "2.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1xcjyp1190z6a226fg0clvhf43gjsbyn60amblsg7w7cw86d033l"; + sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix index 1865b5792b..7f37b8def7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0qv0zpr6kwjwygx9k8jgafiil5wh2zsyryvbxghzv4yn7jb3xpdq"; + sha256 = "136c5qwmvpkdy4njpcwhppnhah7jjlhhjzzzk5lpk8i6f4fz2xg8"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix index 4acc5a369b..273cd7ac5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , python , six }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "webcolors"; version = "1.11.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix index 275a46a147..e9e5001fec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "willow"; - version = "1.3"; + version = "1.4"; disabled = pythonOlder "2.7"; src = fetchPypi { pname = "Willow"; inherit version; - sha256 = "0dzc3cjkwp0h3v1n94c33zr5yw5fdd6dkm6vccp9i8dncmpw912g"; + sha256 = "0b3lh7z98nlh4yn0cmvk7bimhfk5w4qvbmjr6jn880ji9h2ixq6d"; }; propagatedBuildInputs = [ six pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix index 759e48eb99..d005527b4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix @@ -1,18 +1,12 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, codecov, coverage -, flake8 , matplotlib , mock , numpy , pillow , pytest , pytestcov -, pytest-sugar -, setuptools -, twine -, wheel }: - + buildPythonPackage rec { pname = "word_cloud"; version = "1.6.0"; @@ -28,12 +22,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy pillow ]; # Tests require extra dependencies - checkInputs = [ codecov coverage flake8 mock pytest pytestcov pytest-sugar setuptools twine wheel ]; + checkInputs = [ mock pytest pytestcov ]; # skip tests which make assumptions about installation checkPhase = '' pytest -k 'not cli_as_executable' ''; - + meta = with stdenv.lib; { description = "A little word cloud generator in Python"; homepage = "https://github.com/amueller/word_cloud"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix index 272c903f57..e6897830fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0xndv47iwc9k8cp5r9r1z3r0xww0r5x5b7qsmn39gk2gsg0119c6"; + sha256 = "0hvmbc41kdwrjns8z1s4a59a4azdvzb8q3vs7nn1li4qm4l0g3yh"; }; propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index abce8ac12f..e04fa770e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , python +, setuptools , isPy3k }: @@ -18,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [numpy pandas]; + propagatedBuildInputs = [ numpy pandas setuptools ]; checkPhase = '' pytest $out/${python.sitePackages} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix index e1694b9d33..1c42b1b178 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.7.6"; + version = "0.7.7"; src = fetchPypi { inherit pname version; - sha256 = "ff4121d42d318f31f71b248f37acfc21455a7d897a3c117b578744c89bc34f6c"; + sha256 = "09vigknmz15izirfddkmb3a39h1rp2jmc00bnrff12i757n7jjl4"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index d3db09bc02..72b524d999 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -1,22 +1,23 @@ { lib, buildPythonPackage, fetchFromGitHub , elementpath +, lxml , pytest }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.2.2"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1h8321jb6q3dhlh3608y3f3sbbzfd3jg1psyirxkrm4w5xs3lbvy"; + sha256 = "04rlcm5777cv7aw9mf0z1xrj8cn2rljfzs9i2za6sdk6h1ngpj3q"; }; propagatedBuildInputs = [ elementpath ]; - checkInputs = [ pytest ]; + checkInputs = [ lxml pytest ]; postPatch = '' substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix index a3a5da18a9..ee385e483b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.4.3"; + version = "1.4.4"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "8b6b1afe7731d7d9cbb0398b4a811ebb5e6be5c174f72c68abf81f919a435de9"; + sha256 = "0impn5fbs9h8qjnbvn7j2v25lh20z8gbcx5xi9dhhzcp2z9gjvbx"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index c01c862e2f..b6e23f9e8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "A linter for YAML files"; homepage = "https://github.com/adrienverge/yamllint"; license = licenses.gpl3; - maintainers = with maintainers; [ mikefaille ]; + maintainers = with maintainers; [ jonringer mikefaille ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix index 706db82437..ef4754504d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchPypi +, fetchpatch , buildPythonPackage , zope_testrunner , manuel @@ -16,13 +17,17 @@ buildPythonPackage rec { sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; + patches = [ + # fixes 3.8+ logger validation issues, has been merged into master, remove next bump + (fetchpatch { + url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch"; + sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij"; + }) + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; - disabled = pythonAtLeast "3.8"; # 3.6.0 introduces compatibility for 3.8 and 3.9 - meta = with stdenv.lib; { description = "Structured Configuration Library"; homepage = "https://pypi.python.org/pypi/ZConfig"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix new file mode 100644 index 0000000000..7223800caa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, asynctest, pytest, pytest-asyncio }: + +buildPythonPackage rec { + pname = "zigpy-cc"; + version = "0.4.4"; + + propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ asynctest pytest pytest-asyncio ]; + + src = fetchPypi { + inherit pname version; + sha256 = "117a9xak4y5nksfk9rgvzd6l7hscvzspl1wf3gydyq2lc7b3ggnl"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with Texas Instruments CC2531 radios for zigpy"; + homepage = "http://github.com/sanyatuning/zigpy-cc"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix index 80667cf6ec..af52e94253 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -1,14 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi -, aiohttp, crccheck, pyserial, pyserial-asyncio, pycryptodome, zigpy -, pytest }: +, pyserial, pyserial-asyncio, zigpy +, pytest, pytest-asyncio, asynctest }: buildPythonPackage rec { pname = "zigpy-deconz"; version = "0.9.2"; - nativeBuildInputs = [ pytest ]; - buildInputs = [ aiohttp crccheck pycryptodome ]; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { inherit pname version; @@ -19,7 +18,7 @@ buildPythonPackage rec { description = "Library which communicates with Deconz radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-deconz"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ etu mvnetbiz ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix new file mode 100644 index 0000000000..7026664480 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, pytest }: + +buildPythonPackage rec { + pname = "zigpy-xbee"; + version = "0.12.1"; + + buildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest ]; + + src = fetchPypi { + inherit pname version; + sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with XBee radios for zigpy"; + homepage = "http://github.com/zigpy/zigpy-xbee"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix new file mode 100644 index 0000000000..43f291841f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, pytest }: + +buildPythonPackage rec { + pname = "zigpy-zigate"; + version = "0.6.1"; + + buildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with ZiGate radios for zigpy"; + homepage = "http://github.com/doudz/zigpy-zigate"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index dfe1a5c547..8c9a41cdb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -1,25 +1,24 @@ { stdenv, buildPythonPackage, fetchPypi -, aiohttp, crccheck, pycryptodome, pycrypto +, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous , pytest, pytest-asyncio, asynctest }: buildPythonPackage rec { - pname = "zigpy-homeassistant"; - version = "0.19.0"; + pname = "zigpy"; + version = "0.22.0"; - nativeBuildInputs = [ pytest pytest-asyncio asynctest ]; - buildInputs = [ aiohttp pycryptodome ]; - propagatedBuildInputs = [ crccheck pycrypto ]; + propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ]; + checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { inherit pname version; - sha256 = "779cff7affb86b7141aa641c188342b22be0ec766adee0d180c93e74e2b10adc"; + sha256 = "1y8n96g5g6qsx8s2z028f1cyp2w8y7kksi8k2yyzpqvmanbxyjhc"; }; meta = with stdenv.lib; { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ etu mvnetbiz ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix index d3cd69943a..b1792d7185 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, zope_testrunner }: buildPythonPackage rec { @@ -12,12 +13,12 @@ buildPythonPackage rec { sha256 = "c12d929c67ab3eaef9b8a7fba3d19cce8500c8fd25afed8058c8e15f324cbd5b"; }; + checkInputs = [ zope_testrunner ]; + meta = with stdenv.lib; { homepage = "https://github.com/zopefoundation/zope.contenttype"; description = "A utility module for content-type (MIME type) handling"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; - broken = true; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix index bcac246e8f..a0c7ccd438 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix @@ -3,19 +3,18 @@ , fetchPypi , cffi , hypothesis -, zstd }: buildPythonPackage rec { pname = "zstandard"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561"; + sha256 = "0lkn7n3bfp7zip6hkqwkqwc8pxmhhs4rr699k77h51rfln6kjllh"; }; - propagatedBuildInputs = [ cffi zstd ]; + propagatedBuildInputs = [ cffi ]; checkInputs = [ hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 65f27f497b..9ccc369429 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -305,19 +305,26 @@ in }; mathematical = attrs: { - buildInputs = [ + nativeBuildInputs = [ + ruby cmake bison flex - glib pkgconfig - cairo - pango - gdk-pixbuf - libxml2 python3 ]; + buildInputs = [ + cairo + fribidi + gdk-pixbuf + glib + libxml2 + pango + ]; + + strictDeps = true; + # The ruby build script takes care of this dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix index a2d829f85c..215319e4e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0c2j2qki0czkpsqxv75qg95pk9f0w4rqa5ln07rs4bj9dk2lrr3l"; + sha256 = "0h7s40xk7qmrc560k6vyx67lvimp74giwj21a43np0gcxq4f9icd"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 0376454909..fd1c2c964a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "1zc03frbag0lhxxbrdhip5h61ah16rqfcs314nyx7lfn3jd0gqzd"; + sha256 = "1ilqynjvvczxdvsfszkmrz1casrbsbklw8nbgh5l1nx8kxsp5lx7"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "15qf5hb6gm4lm1dcsqqs8nmd43m1qmw2g2zpj3c0abs5fbdz8k3a"; + cargoSha256 = "0jcn1b4v9glh058sfd270b33g988n672q50f8kyhwl8xip7xzj06"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 288482ab6f..632d3005e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.33"; + version = "8.34"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "03innxi9f44z2c785a94n3i0adm6mn3jjgqlvgx46nmigvw41mz6"; + sha256 = "0qgldd0rna5y50vflkjnhl4hb4nhh28d0zwsv32872g6hivl7fzb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 545cc035c9..40294e3f4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.1"; + version = "2.2.3"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0ijgvp2ifs4wnqmxidinwdcpv41iia74nk0xahasnjm8ljvgnnqh"; + sha256 = "029l4f7d6c6kj2arc2zij4r04y36p537c6qaa6v87dd9piz85k0j"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index aed991dab3..ce60cf1392 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.127.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0daacbb4il3mm8fkbk5qlpvzp3pmrqagq2hr1gsjaf8vnmissvvm"; + sha256 = "1psplmqd1l6mxw0rbji2h73fvqhpp1zf9clzgc8khmkh0bbhc5ss"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix index c7ac2986fd..179a74c56d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix @@ -23,12 +23,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "20.0"; - slang = "Calcium"; + version = "21.1"; + slang = "Scandium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "03dvn162djylj2skmk6vv75gh87mm4s5cspkzcrlm5x0rlla2yqn"; + sha256 = "0qq0d08dzr0dmdjysiimdqmwlzgnn932vp5kf8lfn3nl45ai09dy"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix index bd7b831b81..68f12dac70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.28"; + version = "4.5.29"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "0mjpkd5c9igkxp9jg8cvrgrxw9x7ag1p5xivjbzhb3vld6xjm4dh"; + sha256 = "1v1pff5fiv41khvrnlpdks2vddjnvziyn14qqj6v26snyhwi86zh"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix index 6e19d89702..8bda0ac222 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.13"; + version = "0.14"; src = fetchurl { - sha256 = "1jav4qf7d303by9iy6v08w73wfwzj76i54inh90w1s34m9q44aa9"; + sha256 = "1vq0c8jqspvlss8hbazml44fi0mbslgnp2i9wcr0qrjpvfbl6623"; url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index 3f3731e2ac..f80483e0e1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, makeWrapper, openjdk }: stdenv.mkDerivation rec { pname = "pmd"; - version = "6.17.0"; - - nativeBuildInputs = [ unzip ]; + version = "6.25.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0000w28dg5z8gs7cxhx7d0fv10ry0yxamk5my28ncqqsg7a4qy8w"; + sha256 = "0ykg0wylyfiwjlhkbfjqfam34174paihrw7x1dwfq9anyn5bjf0k"; }; + nativeBuildInputs = [ unzip makeWrapper ]; + installPhase = '' runHook preInstall mkdir -p $out cp -R {bin,lib} $out + wrapProgram $out/bin/run.sh --prefix PATH : ${openjdk.jre}/bin runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index d4d09f7ae2..88b556bd06 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "09s4a7xgzr6qr268j3bqjj18s9gn9xcssfvm6w918m7wd39zgqy0"; + sha256 = "14zsgapc18r0xccld21jalk50i6xa0bgd56a0l8kamffhf0jnifk"; }; - vendorSha256 = "1w833lx52m61dv4aq25946bnfwj8yd2g7w989d66ih39simxsvzr"; + vendorSha256 = "0k14inpxg4qd28kg9n58n1hj40bzzqb1ywhiw9cb9az4j0xaa3hi"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 251162efd8..00800eb185 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,17 +2,19 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.21.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "0mmh161zwrkjwpw01zcgh7hsap7lgdxhg191bajzig6vlq287jyh"; + sha256 = "15rfr4mfawbsa0ja9ishxp4inhch8dgzayl6p0qsnad24g7v4ygq"; }; goPackagePath = "github.com/liamg/tfsec"; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ]; + meta = with lib; { homepage = "https://github.com/liamg/tfsec"; description = "Static analysis powered security scanner for your terraform code"; diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 8af26a06c5..c2ebf22350 100644 --- a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,4 +1,5 @@ -{ lib +{ fetchFromGitHub +, lib , python , enableTelemetry ? false }: @@ -6,6 +7,14 @@ let py = python.override { packageOverrides = self: super: { + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.25.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "08756yl5lpqgrpr80f2b6bdcgygr37l6q1yygklcg9hz4yfpccav"; + }; + }); + flask = super.flask.overridePythonAttrs (oldAttrs: rec { version = "1.0.2"; src = oldAttrs.src.override { @@ -30,11 +39,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.44.0"; + version = "1.0.0rc1"; src = fetchPypi { inherit pname version; - sha256 = "0r3m41xjmg8m2jwsqwc9kdkcs3xbz8dsl240ybwbnr7rp29pnirf"; + sha256 = "011b334gdvd9lhqia8c952q3cmzj99vik680180nbp0qh2xw6zpf"; }; # Tests are not included in the PyPI package @@ -66,9 +75,11 @@ buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ + --replace "boto3~=1.13.0, >=1.13.0" "boto3~=1.14.3" \ --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.5.8" \ + --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ + --replace "tomlkit==0.5.8" "tomlkit~=0.6.0" \ --replace "requests==2.22.0" "requests~=2.22" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix new file mode 100644 index 0000000000..9f1ab778ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "bazel-kazel"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = "repo-infra"; + rev = "v${version}"; + sha256 = "0g4lgz5xgmxabaa8pygmdnrnslfrcb84vgr6bninl9v5zz4wajbm"; + }; + + vendorSha256 = "1lizvg9r7cck1cgk20np2syv4ljbc0zj1kydiiajf7y5x7d3lwha"; + + subPackages = [ "cmd/kazel" ]; + + meta = with lib; { + description = "kazel - a BUILD file generator for go and bazel"; + homepage = "https://github.com/kubernetes/repo-infra"; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index f331272a5f..fae1310bd5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -56,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "16zgjd6zww9skk34ggfx5l3kbsdyv98zxawrvmx1arv5gaj63pp9"; + sha256 = "0rfdwss8aahydiybwhi3j0qw12j1l91k9lbn1vaip0bmnq5qfwh9"; }; buildAttrs = { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index d615657ebe..9910256afc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -64,7 +64,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0rfjyvw370yn4rp1f2772b2h3jbycymdw26zx38krzy5zq0iajyp"; + sha256 = "1m7fmb03lirffxx04ck73bn5zwaji7zdwhlqq8s1c6pgp755d3vi"; }; buildAttrs = { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 77caa23256..60c1662f9f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self @@ -25,11 +25,11 @@ }: let - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1ylbfdcb6rhnc3sr292c6shl754i0h0i050f4gr4bppn6sa15v24"; + sha256 = "0ir796kl8r9hpr3li26qsdy1z2lx2bv82zmk4a2s7q64clyg9wg0"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -53,8 +53,8 @@ let else srcs."java_tools_javac11_linux-v8.0.zip") srcs."coverage_output_generator-v2.1.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.16.0.tar.gz" - srcs."3.1.0.tar.gz" + srcs."android_tools_pkg-0.19.0rc1.tar.gz" + srcs."bazel-toolchains-3.1.0.tar.gz" srcs.rules_pkg srcs.rules_cc srcs.rules_java @@ -465,6 +465,7 @@ stdenv.mkDerivation rec { # when a command can’t be found in a bazel build, you might also # need to add it to `defaultShellPath`. nativeBuildInputs = [ + installShellFiles zip python3 unzip @@ -507,9 +508,15 @@ stdenv.mkDerivation rec { mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} # shell completion files - mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions - mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel - cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ + installShellCompletion --bash \ + --name bazel.bash \ + ./bazel_src/output/bazel-complete.bash + installShellCompletion --zsh \ + --name _bazel \ + ./bazel_src/scripts/zsh_completion/_bazel + installShellCompletion --fish \ + --name bazel.fish \ + ./bazel_src/scripts/fish/completions/bazel.fish ''; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json index 786a31c9bb..4007a77b06 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json @@ -7,6 +7,14 @@ "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" ] }, + "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { + "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": { "name": "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz", "sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96", @@ -15,14 +23,6 @@ "https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz" ] }, - "3.1.0.tar.gz": { - "name": "3.1.0.tar.gz", - "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" - ] - }, "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", @@ -65,14 +65,22 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz" + "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" }, - "android_tools_pkg-0.16.0.tar.gz": { - "name": "android_tools_pkg-0.16.0.tar.gz", - "sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361", + "android_tools_pkg-0.19.0rc1.tar.gz": { + "name": "android_tools_pkg-0.19.0rc1.tar.gz", + "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" + ] + }, + "bazel-toolchains-3.1.0.tar.gz": { + "name": "bazel-toolchains-3.1.0.tar.gz", + "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" ] }, "bazel_j2objc": { @@ -114,10 +122,19 @@ "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", "strip_prefix": "bazel-toolchains-3.1.0", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" ] }, + "bazel_website": { + "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n", + "name": "bazel_website", + "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4", + "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42", + "urls": [ + "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz" + ] + }, "build_bazel_rules_nodejs": { "name": "build_bazel_rules_nodejs", "sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37", @@ -126,14 +143,6 @@ "https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz" ] }, - "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": { - "name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" - ] - }, "com_google_googletest": { "name": "com_google_googletest", "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", @@ -201,11 +210,11 @@ }, "io_bazel_skydoc": { "name": "io_bazel_skydoc", - "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7", - "strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" ] }, "java_tools_javac11_darwin-v8.0.zip": { @@ -337,6 +346,15 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" ] }, + "openjdk_linux_ppc64le_vanilla": { + "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", + "name": "openjdk_linux_ppc64le_vanilla", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, "openjdk_linux_vanilla": { "downloaded_file_path": "zulu-linux-vanilla.tar.gz", "name": "openjdk_linux_vanilla", @@ -589,6 +607,24 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" ] }, + "remotejdk11_linux_ppc64le_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_ppc64le_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, "remotejdk11_macos_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk11_macos_for_testing", diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 2f026c9d99..8318298345 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "3.2.1"; + version = "3.3.0"; goPackagePath = "github.com/bazelbuild/buildtools"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "1f2shjskcmn3xpgvb9skli5xaf942wgyg5ps7r905n1zc0gm8izn"; + sha256 = "0g411gjbm02qd5b50iy6kk81kx2n5zw5x1m6i6g7nrmh38p3pn9k"; }; goDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py index e57dc05bb7..52d40e0f94 100755 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py @@ -35,6 +35,7 @@ def list_source_repository(**kw): pass def new_local_repository(**kw): pass def local_repository(**kw): pass DOC_VERSIONS = [] +def stardoc_repositories(**kw): pass def skydoc_repositories(**kw): pass def rules_sass_dependencies(**kw): pass def node_repositories(**kw): pass diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix index b119b5a381..45fb791f3a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200606"; + version = "20200629"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "00kh1g8z6808ylbfcn9afpb0xmb99k302dfdsmyx1rsn65xs58v7"; + sha256 = "1cxmsz48ap6gpwx5qkkvvfsiqxc7zpn8gzmhvc1jsfha68195ms5"; }; nativeBuildInputs = [ getopt ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 17362702e3..a9a3fd71a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.17.2"; + version = "3.17.3"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "199srp8yfai51pcbpmfyc4s8vzrmh2dm91bp582hj2l29x634xzw"; + sha256 = "0h4c3nwk7wmzcmmlwyb16zmjqr44l4k591m2y9p9zp3m498hvmhb"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index d7aec3527b..e09277e498 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, git, pkgconfig }: +{ lib, python3, fetchFromGitHub, git, pkgconfig }: # Note: # Conan has specific dependency demands; check @@ -39,12 +39,14 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.25.0"; + version = "1.27.0"; pname = "conan"; - src = newPython.pkgs.fetchPypi { - inherit pname version; - sha256 = "1wgmx6s4h5m6zixb3wlaicy56rsqcy2srzmvii80xdx9g5wvi9pv"; + src = fetchFromGitHub { + owner = "conan-io"; + repo = "conan"; + rev = version; + sha256 = "0ncqs1p4g23fmzgdmwppgxr8w275h38hgjdzs456cgivz8xs9rjl"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -75,23 +77,20 @@ in newPython.pkgs.buildPythonApplication rec { ] ++ (with newPython.pkgs; [ codecov mock - pytest - node-semver nose parameterized webtest ]); - # Conan 1.14.0 has removed all tests from the Pypi source dist: - # https://github.com/conan-io/conan/pull/4713 - # We have recommended they be added back: - # https://github.com/conan-io/conan/issues/4563#issuecomment-602225083 + # TODO: reenable tests now that we fetch tests w/ the source from GitHub. + # Not enabled right now due to time constraints/failing tests that I didn't have time to track down doCheck = false; postPatch = '' substituteInPlace conans/requirements.txt \ --replace "PyYAML>=3.11, <3.14.0" "PyYAML" \ - --replace "deprecation>=2.0, <2.1" "deprecation" + --replace "deprecation>=2.0, <2.1" "deprecation" \ + --replace "six>=1.10.0,<=1.14.0" "six" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix new file mode 100644 index 0000000000..f01f38ecd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: + +assert guileSupport -> ( pkgconfig != null && guile != null ); + +let + version = "4.3"; +in +stdenv.mkDerivation { + pname = "gnumake"; + inherit version; + + src = fetchurl { + url = "mirror://gnu/make/make-${version}.tar.gz"; + sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"; + }; + + patches = [ + # Purity: don't look for library dependencies (of the form `-lfoo') in /lib + # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for + # included Makefiles, don't look in /usr/include and friends. + ./impure-dirs.patch + ]; + + nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; + buildInputs = stdenv.lib.optionals guileSupport [ guile ]; + + configureFlags = stdenv.lib.optional guileSupport "--with-guile" + + # Make uses this test to decide whether it should keep track of + # subseconds. Apple made this possible with APFS and macOS 10.13. + # However, we still support macOS 10.11 and 10.12. Binaries built + # in Nixpkgs will be unable to use futimens to set mtime less than + # a second. So, tell Make to ignore nanoseconds in mtime here by + # overriding the autoconf test for the struct. + # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. + ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + + outputs = [ "out" "man" "info" ]; + + meta = with stdenv.lib; { + homepage = "https://www.gnu.org/software/make/"; + description = "A tool to control the generation of non-source files from sources"; + license = licenses.gpl3Plus; + + longDescription = '' + Make is a tool which controls the generation of executables and + other non-source files of a program from the program's source files. + + Make gets its knowledge of how to build your program from a file + called the makefile, which lists each of the non-source files and + how to compute it from other files. When you write a program, you + should write a makefile for it, so that it is possible to use Make + to build and install the program. + ''; + + platforms = platforms.all; + maintainers = [ maintainers.vrthra ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch new file mode 100644 index 0000000000..6c7d9d2463 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch @@ -0,0 +1,25 @@ +diff -Naur a/src/read.c b/src/read.c +--- a/src/read.c ++++ b/src/read.c +@@ -109,9 +109,6 @@ + #endif + INCLUDEDIR, + #ifndef _AMIGA +- "/usr/gnu/include", +- "/usr/local/include", +- "/usr/include", + #endif + 0 + }; +diff -Naur a/src/remake.c b/src/remake.c +--- a/src/remake.c ++++ b/src/remake.c +@@ -1601,8 +1601,6 @@ + static const char *dirs[] = + { + #ifndef _AMIGA +- "/lib", +- "/usr/lib", + #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index b5215611c0..1d5ef75fb2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,14 +51,24 @@ rec { }; }; - gradle_latest = gradle_5_6; + gradle_latest = gradle_6_5; + + gradle_6_5 = gradleGen rec { + name = "gradle-6.5.1"; + nativeVersion = "0.22-milestone-3"; + + src = fetchurl { + url = "https://services.gradle.org/distributions/${name}-bin.zip"; + sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh"; + }; + }; gradle_5_6 = gradleGen rec { name = "gradle-5.6.4"; nativeVersion = "0.18"; src = fetchurl { - url = "http://services.gradle.org/distributions/${name}-bin.zip"; + url = "https://services.gradle.org/distributions/${name}-bin.zip"; sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d"; }; }; @@ -68,7 +78,7 @@ rec { nativeVersion = "0.14"; src = fetchurl { - url = "http://services.gradle.org/distributions/${name}-bin.zip"; + url = "https://services.gradle.org/distributions/${name}-bin.zip"; sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix index ed145d38c7..e21410fb6f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mage"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "magefile"; repo = pname; rev = "v${version}"; - sha256 = "0lazf4r5ps1s04pvz608qaxbrbc6dv0j99n39iv42zwxxh0mbd0p"; + sha256 = "0c77xgz2bz4j9sh9v7f49iqyamc4lvvldcmn6v50hk98s9193gbf"; }; vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; @@ -27,4 +27,4 @@ buildGoModule rec { maintainers = with maintainers; [ swdunlop ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 44ff87d71a..ccb03c39a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "10rjhkncxswbh30jsq7j4is5ngp1r737j45xdwl9z1frmwz6l67d"; + sha256 = "1zcl0yqy5sdy7p9d0b113mwv0f7fi0nhhgy9f0vyk12xjdj3kim5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index 79707fc64d..c62fb0f251 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, python3, fetchFromGitHub, mkdocs, which, findutils, coreutils -, perl +{ stdenv, lib, python3, fetchFromGitHub, which, findutils, coreutils +, perl, installShellFiles , doCheck ? true }: stdenv.mkDerivation rec { pname = "redo-apenwarr"; - version = "0.42a"; + version = "0.42c"; src = fetchFromGitHub rec { owner = "apenwarr"; repo = "redo"; rev = "${repo}-${version}"; - sha256 = "172z2idslhcqibd4lw82k6349nl5fdda2vj10dqcjz0lvv6n7php"; + sha256 = "0kc2gag1n5583195gs38gjm8mb7in9y70c07fxibsay19pvvb8iw"; }; postPatch = '' @@ -53,15 +53,21 @@ (with python3.pkgs; [ beautifulsoup4 markdown ]) which findutils + installShellFiles ]; + postInstall = '' + installShellCompletion --bash contrib/bash_completion.d/redo + ''; + meta = with lib; { - description = "Smaller, easier, more powerful, and more reliable than make. An implementation of djb's redo."; + description = "Smaller, easier, more powerful, and more reliable than make. An implementation of djb's redo"; homepage = "https://github.com/apenwarr/redo"; maintainers = with maintainers; [ andrewchambers ck3d ]; license = licenses.asl20; + platforms = python3.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile new file mode 100644 index 0000000000..f2c43cc500 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile @@ -0,0 +1,10 @@ +CFLAGS=-Os + +all: redo links + +links: + sh links.do + +install: + mkdir -p "$(out)/bin" + cp --no-dereference redo redo-* "$(out)/bin" diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix new file mode 100644 index 0000000000..1480f32a50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + pname = "redo-c"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = pname; + rev = "v${version}"; + sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b"; + }; + + postPatch = '' + cp '${./Makefile}' Makefile + ''; + + meta = with stdenv.lib; { + description = "An implementation of the redo build system in portable C with zero dependencies"; + homepage = "https://github.com/leahneukirchen/redo-c"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ ck3d ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix new file mode 100644 index 0000000000..41149522e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "rocm-cmake"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "rocm-cmake"; + rev = "rocm-${version}"; + sha256 = "1x1mj1acarhin319zycms8sqm9ylw2mcdbkpqjlb8yfsgiaa99ja"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "CMake modules for common build tasks for the ROCm stack"; + homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index ae9d47addd..2eb3643440 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.12"; + version = "1.3.13"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "0mwdqn0vk90wdpfzrbbc8l28407z5d62bvsi6jlgds2vbywjprxl"; + sha256 = "08mx84kzpm750zjxm225nh9wqm7js5y2k6hgb8xw3n574zg58hc5"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix index 135fdccd7c..a01c0372de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix @@ -15,6 +15,11 @@ buildPythonApplication rec { sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pygls = "^0.8.1"' 'pygls = "^0.9.0"' + ''; + nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ pygls pyparsing ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index eb55bf5dd4..d7ee1c2a51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { - owner = "instrumenta"; + owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38"; + sha256 = "0d6n51p4b8jwkfqympwxkqxssgy462m5pgv5qvm6jy5pm566qa08"; }; - vendorSha256 = "1kay7b5rxypj4i0d2iwdlb1mj0qq3zvlrjp34zzv5kywz5gy4144"; + vendorSha256 = "150fj2c9qll39wiqk41w0qms0sdqiacb2z015j38kg60r8f6i4lm"; buildFlagsArray = '' -ldflags= @@ -20,9 +20,9 @@ buildGoModule rec { meta = with lib; { description = "Write tests against structured configuration data"; - homepage = "https://github.com/instrumenta/conftest"; + inherit (src.meta) homepage; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b788e70a4d..c75d71f3a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { inherit version; pname = "gitlab-runner"; goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; + subPackages = [ "." ]; commonPackagePath = "${goPackagePath}/common"; buildFlagsArray = '' -ldflags= @@ -35,7 +36,6 @@ buildGoPackage rec { patches = [ ./fix-shell-path.patch ]; postInstall = '' - touch $out/bin/hello install -d $out/bin/helper-images ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index d9d7b490cf..6086d204b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.235.1"; + version = "2.235.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0pb7dy95ygvyb25hm6akf40f5gr5wa2njad7ncglrpmz14xfnxb3"; + sha256 = "16rn5fbafkiriwzk6mr37am1270d64w6ngijr81kf7hpmz7lq4lp"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix index 65f47c837b..4af8a7e902 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cue"; - version = "0.2.0"; + version = "0.2.1"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "06kag5dwkq4zsh1b52b74g3slsxlwwiap2w3709qjhrgda8w2zn3"; + sha256 = "0v9ynbpv7q4lgi1q4qqvfn24z09z2l9lwqjldaffb4i04vyymdfx"; }; - vendorSha256 = "1lhjd98n9j1cq36b5lhscb7k32qmyqg7zs6zc8yab494bm8sz89g"; + vendorSha256 = "1s6mm3lsrs5vgvw4i4a3wxksd9wanbkjlahyz6hbnm3451ra0nyq"; subPackages = [ "cmd/cue" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index ccf7a699da..00babb3c82 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky"; + sha256 = "0v00k658b4ca9bpn2yiiy3gq5gr6hms8mlk31wf8svwsjyzjibzr"; }; - vendorSha256 = "1915h1hi2y2sx5jvx84c1j281zaz100gbhyalvg5jqjr1van5s4d"; + vendorSha256 = "00vp925vf9clk5bkw5fvj34id4v548rlssizh52z9psvdizj8q5p"; meta = with stdenv.lib; { description = "Database migration tool"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index ae993f9611..5049eb07b8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1h5mcbs6mkk6cqjm8qm63rynz7611gq32v2jirl1qn71x2s7pq6y"; + sha256 = "1q20iswakhnrmsmlcsjnhl3glj4p0314gridqyy4wh7s77bcakg5"; }; buildInputs = [ jre makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix index 1e40bc52b4..646739982c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix @@ -10,7 +10,7 @@ let desktopName = "Oracle SQL Developer"; genericName = "Oracle SQL Developer"; comment = "Oracle's Oracle DB GUI client"; - categories = "Application;Development;"; + categories = "Development;"; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix index 96b39e42d1..ec22252cbe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "1hn4fq0asivfs56rw9ck1vc3g6h6fnwywh8v4zs2bkyn62fg9mcw"; + sha256 = "162xbx4dhfx4a6sksm7x60gr7ylyila4vidmdf0bn7xlvglggazf"; }; buildInputs = [ hiredis http-parser jansson libevent ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix new file mode 100644 index 0000000000..44411d0db7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -0,0 +1,119 @@ +{ buildEnv +, fetchurl +, fontconfig +, freetype +, glib +, gsettings-desktop-schemas +, gtk3 +, jdk11 +, lib +, libX11 +, libXrender +, libXtst +, makeDesktopItem +, makeWrapper +, shared-mime-info +, stdenv +, unzip +, webkitgtk +, zlib +}: + +with lib; +let + pVersion = "1.10.0.20200225"; + pVersionTriple = splitVersion pVersion; + majorVersion = elemAt pVersionTriple 0; + minorVersion = elemAt pVersionTriple 1; + patchVersion = elemAt pVersionTriple 2; + baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}"; + jdk = jdk11; +in +stdenv.mkDerivation rec { + pname = "eclipse-mat"; + version = "${pVersion}"; + + src = fetchurl { + url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; + sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx"; + }; + + desktopItem = makeDesktopItem { + name = "eclipse-mat"; + exec = "eclipse-mat"; + icon = "eclipse"; + comment = "Eclipse Memory Analyzer"; + desktopName = "Eclipse MAT"; + genericName = "Java Memory Analyzer"; + categories = "Development;"; + }; + + unpackPhase = '' + unzip $src + ''; + + buildCommand = '' + mkdir -p $out + unzip $src + mv mat $out + + # Patch binaries. + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + libCairo=$out/eclipse/libcairo-swt.so + patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer + [ -f $libCairo ] && patchelf --set-rpath ${ + stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ] + } $libCairo + + # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/ + makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ + --prefix PATH : ${jdk}/bin \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" + + # Create desktop item. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + find $out/mat/plugins -name 'eclipse*.png' -type f -exec cp {} $out/share/pixmaps \; + mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png + ''; + + buildInputs = [ + fontconfig + freetype + glib + gsettings-desktop-schemas + gtk3 + jdk + libX11 + libXrender + libXtst + makeWrapper + zlib + unzip + shared-mime-info + webkitgtk + ]; + + dontBuild = true; + dontConfigure = true; + + meta = with stdenv.lib; { + description = "Fast and feature-rich Java heap analyzer"; + longDescription = '' + The Eclipse Memory Analyzer is a tool that helps you find memory + leaks and reduce memory consumption. Use the Memory Analyzer to + analyze productive heap dumps with hundreds of millions of + objects, quickly calculate the retained sizes of objects, see + who is preventing the Garbage Collector from collecting objects, + run a report to automatically extract leak suspects. + ''; + homepage = "https://www.eclipse.org/mat"; + license = licenses.epl20; + maintainers = [ maintainers.ktor ]; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix index c038e4fdfa..2b96830b00 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix @@ -4,14 +4,14 @@ , lib }: python.pkgs.buildPythonApplication rec { - version = "1.1.7"; + version = "1.1.9"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "1xs4qmja7mm9m67368k2s9p7pmkdx9xz4g3xrsks0s8hwwyliz1s"; + sha256 = "098dcg8jdi4q1prfjmd2lbhcyzb8fmmfhbxhid4kqx8vcv7r0iql"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index 85b68cff20..79c8236a06 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -46,13 +46,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.0.10"; + version = "1.0.11"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1fn61cl1d33yd1jgqm8jpffjw3xlyyhkn032g14d9gnwkcaf4649"; + sha256 = "EYNLdrvSs8S/GCYy0jGsnP1+C988y1j7WzcLfczM1Ew="; }; nativeBuildInputs = [ @@ -87,9 +87,11 @@ in stdenv.mkDerivation rec { patches = [ # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch + + # Hardcode paths (substituteAll { src = ./fix-paths.patch; - bzr = "${breezy}/bin/bzr"; + brz = "${breezy}/bin/brz"; cp = "${coreutils}/bin/cp"; patch = "${patch}/bin/patch"; tar = "${gnutar}/bin/tar"; diff --git a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch index e24fade686..c0df2c6cbe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch @@ -1,5 +1,16 @@ +diff --git a/src/builder-context.c b/src/builder-context.c +index dde12790..3a379297 100644 --- a/src/builder-context.c +++ b/src/builder-context.c +@@ -256,7 +256,7 @@ builder_context_init (BuilderContext *self) + g_autofree char *path = NULL; + + self->rofiles_file_lock = init; +- path = g_find_program_in_path ("rofiles-fuse"); ++ path = g_find_program_in_path ("@rofilesfuse@"); + self->have_rofiles = path != NULL; + } + @@ -800,7 +800,7 @@ builder_context_enable_rofiles (BuilderContext *self, g_autoptr(GFile) rofiles_base = NULL; g_autoptr(GFile) rofiles_dir = NULL; @@ -9,6 +20,8 @@ "-o", "kernel_cache,entry_timeout=60,attr_timeout=60,splice_write,splice_move", (char *)flatpak_file_get_path_cached (self->app_dir), +diff --git a/src/builder-git.c b/src/builder-git.c +index ef517adb..6ab095f0 100644 --- a/src/builder-git.c +++ b/src/builder-git.c @@ -44,7 +44,7 @@ git (GFile *dir, @@ -29,6 +42,8 @@ va_end (ap); return res; +diff --git a/src/builder-source-archive.c b/src/builder-source-archive.c +index 3c694e57..0de62318 100644 --- a/src/builder-source-archive.c +++ b/src/builder-source-archive.c @@ -443,7 +443,7 @@ tar (GFile *dir, @@ -67,17 +82,21 @@ va_end (ap); return res; +diff --git a/src/builder-source-bzr.c b/src/builder-source-bzr.c +index ceeec94a..8abe6f53 100644 --- a/src/builder-source-bzr.c +++ b/src/builder-source-bzr.c @@ -124,7 +124,7 @@ bzr (GFile *dir, + gboolean res; va_list ap; - va_start (ap, error); -- res = flatpak_spawn (dir, output, 0, error, "bzr", ap); -+ res = flatpak_spawn (dir, output, 0, error, "@bzr@", ap); - va_end (ap); +- brz = g_find_program_in_path ("brz"); ++ brz = g_find_program_in_path ("@brz@"); - return res; + va_start (ap, error); + res = flatpak_spawn (dir, output, 0, error, brz ? brz : "bzr", ap); +diff --git a/src/builder-source-patch.c b/src/builder-source-patch.c +index 8721e1e4..d7f4d840 100644 --- a/src/builder-source-patch.c +++ b/src/builder-source-patch.c @@ -247,15 +247,15 @@ patch (GFile *dir, @@ -99,6 +118,8 @@ } for (i = 0; extra_options != NULL && extra_options[i] != NULL; i++) g_ptr_array_add (args, (gchar *) extra_options[i]); +diff --git a/src/builder-utils.c b/src/builder-utils.c +index f1c06db5..2e3347c5 100644 --- a/src/builder-utils.c +++ b/src/builder-utils.c @@ -149,7 +149,7 @@ strip (GError **error, diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index adb36d8e92..19d898ce99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.4.4"; + version = "6.5.0"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "16zckqq64jv3031ssrvzw4ny98gnxhy2hsdp877i38zxqsvzdcym"; + sha256 = "0qag8xz347vwwqlwirlz5vnhvfga79ihwqp1y0rbqzhcnwpjzc69"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index 1c5811f7b5..587a23f659 100644 --- a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "1mdja838jxhcasi251fsc3yig3s5vmfqab1wpm34xinr8blii90f"; + sha256 = "1q0iy732smad1v25da9vmlk8r5iscjrk678pq6mda9sbmiq693r3"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 256e534155..b5fcd548ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -1,24 +1,34 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "golangci-lint"; - version = "1.27.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1capiw8af4wmx3wpfslb30xivfyh72x5kj12f8p5pwhl6id31931"; + sha256 = "18rhd5baqg68wsil8rqzg1yiqys4y53lqy8gcp68wn4i4jnvkgsm"; }; - vendorSha256 = "16wr8ixicbvdpg5mg6q07sa1b03ydpwdbvbjl3r9qihdqkhhzlr1"; + vendorSha256 = "0dg3rjzkvzh4n7r4kp68qhg96ijqks9hkz1cjcc02xa38ygma7gz"; subPackages = [ "cmd/golangci-lint" ]; + nativeBuildInputs = [ installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=19700101-00:00:00" ]; + + postInstall = '' + for shell in bash zsh; do + HOME=$TMPDIR $out/bin/golangci-lint completion $shell > golangci-lint.$shell + installShellCompletion golangci-lint.$shell + done + ''; + meta = with lib; { - description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; - homepage = "https://golangci.com/"; - license = licenses.agpl3; - platforms = platforms.unix; + description = "Fast linters Runner for Go"; + homepage = "https://golangci-lint.run/"; + license = licenses.gpl3; maintainers = with maintainers; [ anpryl manveru ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix index a77f9fa8dd..cfa4defe04 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "gopls"; - version = "0.4.1"; + version = "0.4.3"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "18migk7arxm8ysfzidl7mdr069fxym9bfi6zisj7dliczw0qnkzv"; + sha256 = "1r670c7p63l0fhx671r3mb1jgvvfv1382079fv59z07j5j5hizbc"; }; modRoot = "gopls"; - vendorSha256 = "1jaav6c5vybgks5hc164is0i7h097c5l75s7w3wi5a3zyzkbiyny"; + vendorSha256 = "1xdvkdkvk7a32jspzjcgxkfdn78d2zm53wxmc9c4sqysxsgy6lbw"; meta = with stdenv.lib; { description = "Official language server for the Go language"; homepage = "https://github.com/golang/tools/tree/master/gopls"; license = licenses.bsd3; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 zimbatm ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix index 2600d13cab..f11a7fc35d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -1,29 +1,28 @@ -{ buildGoPackage -, lib -, fetchFromGitHub -}: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gosec"; - version = "1.2.0"; + version = "2.3.0"; goPackagePath = "github.com/securego/gosec"; - excludedPackages = ''cmd/tlsconfig''; + + subPackages = [ "cmd/gosec" ]; src = fetchFromGitHub { owner = "securego"; - repo = "gosec"; - rev = version; - sha256 = "1420yl4cjp4v4xv0l0wbahgl6bjhz77lx5va9hqa6abddmqvx1hg"; + repo = pname; + rev = "v${version}"; + sha256 = "0z782rr4z0nhlj6cmjd17pbi65zabpmb83mv4y93wi4qa7kkpm2g"; }; - goDeps = ./deps.nix; + vendorSha256 = "0zrmhqcid8xr6i1xxg3s8sll8a667w2vmn5asdw0b43k6k3h941p"; - meta = with lib; { - description = "Golang security checker"; + meta = with stdenv.lib; { homepage = "https://github.com/securego/gosec"; - license = licenses.asl20 ; - maintainers = with maintainers; [ kalbasit ]; + description = "Golang security checker"; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit nilp0inter ]; platforms = platforms.linux ++ platforms.darwin; }; } + diff --git a/third_party/nixpkgs/pkgs/development/tools/gosec/deps.nix b/third_party/nixpkgs/pkgs/development/tools/gosec/deps.nix deleted file mode 100644 index 80a77e7fb8..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/gosec/deps.nix +++ /dev/null @@ -1,193 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "0de1eaf82fa3"; - sha256 = "177af7bjq6clmkqshnmnwlpwvx80kpi2277q275iwq59lp48viq1"; - }; - } - - { - 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/nbutton23/zxcvbn-go"; - fetch = { - type = "git"; - url = "https://github.com/nbutton23/zxcvbn-go"; - rev = "a22cb81b2ecd"; - sha256 = "0hm16vc7xrw0cqla6xcn59bb7n2sa0j8rkniywn5dqnbrpza12cd"; - }; - } - - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "11459a886d9c"; - sha256 = "1nswc1fnrrs792qbix05h91bilj8rr3wxmxgwi97p2gjk0r292zh"; - }; - } - - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "dcabb60a477c"; - sha256 = "1775lv5jbsgv3ghq5v2827slqlhqdadrzc1nkpq4y0hdv2qzrgkm"; - }; - } - - { - 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/ryanuber/go-glob"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/go-glob"; - rev = "256dc444b735"; - sha256 = "07rsd7hranghwc68ib0r2zxd9d5djanzjvd84j9dgj3wqsyg5mi2"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "8351a756f30f"; - sha256 = "0b6m579i3wrx1m69mqkdng5gjfssprxx0pg45kzrdi68sh0zr5d1"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "164713f0dfce"; - sha256 = "1qn9vvyqsaaj0az0rbilzc4pfv9sl4vh78c2g37yya5gcdnarh3w"; - }; - } - - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "1cbadb444a80"; - sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; - }; - } - - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "e531a2a1c15f"; - sha256 = "0740w56nmjqdj7ld1h3gpcpi3x8n81bdx0pp267rz9hmwkrb2s1c"; - }; - } - - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "eb3733d160e7"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index fba4585155..fc9fdee0b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44"; + sha256 = "079cyk12r662z8njaawdqfjab1giy5xkjhln2rns03j5n67ixhgj"; }; - vendorSha256 = "0d45i8wm35m2cdbk48razkdr49a3hfwnp84inlz7hj054cq6vimi"; + vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix new file mode 100644 index 0000000000..171e87530d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -0,0 +1,49 @@ +{ mkDerivation, aeson, async, base, base16-bytestring, binary +, blaze-markup, brittany, bytestring, Cabal, cabal-helper +, containers, cryptohash-sha1, data-default, deepseq, Diff +, directory, extra, fetchgit, filepath, floskell, ghc, ghc-check +, ghc-paths, ghcide, gitrev, hashable, haskell-lsp +, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core +, hspec-expectations, lens, lsp-test, optparse-applicative +, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions +, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml +, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun +, text, time, transformers, unix, unordered-containers, yaml +}: +mkDerivation { + pname = "haskell-language-server"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "092i32kc9dakl6cg1dpckrb87g4k8s4w1nvrs5x85n9ncgkpqk25"; + rev = "2a192db290bfe8640dafb6c1d650a0815e70d966"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary brittany bytestring Cabal cabal-helper containers + data-default deepseq Diff directory extra filepath floskell ghc + ghcide gitrev hashable haskell-lsp hie-bios hslogger lens + optparse-simple ormolu process regex-tdfa shake stylish-haskell + text transformers unix unordered-containers + ]; + executableHaskellDepends = [ + aeson async base base16-bytestring binary bytestring containers + cryptohash-sha1 data-default deepseq directory extra filepath ghc + ghc-check ghc-paths ghcide gitrev hashable haskell-lsp hie-bios + hslogger optparse-applicative process safe-exceptions shake text + time unordered-containers + ]; + testHaskellDepends = [ + aeson base blaze-markup bytestring containers data-default + directory filepath haskell-lsp haskell-lsp-types hie-bios hslogger + hspec hspec-core hspec-expectations lens lsp-test stm tasty + tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit + tasty-rerun text unordered-containers yaml + ]; + testToolDepends = [ ghcide ]; + homepage = "https://github.com/haskell/haskell-language-server#readme"; + description = "LSP server for GHC"; + license = stdenv.lib.licenses.asl20; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix new file mode 100644 index 0000000000..8c68c88729 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -0,0 +1,58 @@ +{ mkDerivation, aeson, array, async, base, base16-bytestring +, binary, bytestring, Chart, Chart-diagrams, containers +, cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg +, directory, extra, fetchgit, filepath, fuzzy, ghc, ghc-boot +, ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev +, haddock-library, hashable, haskell-lsp, haskell-lsp-types +, hie-bios, hslogger, lens, lsp-test, mtl, network-uri +, opentelemetry, optparse-applicative, parser-combinators +, prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck +, quickcheck-instances, regex-tdfa, rope-utf16-splay +, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty +, tasty-expected-failure, tasty-hunit, tasty-quickcheck +, tasty-rerun, text, time, transformers, unix, unordered-containers +, utf8-string, yaml +}: +mkDerivation { + pname = "ghcide"; + version = "0.2.0"; + src = fetchgit { + url = "https://github.com/wz1000/ghcide"; + sha256 = "0rifbrfvbgv7szgwc5apzb0i5fbkr2spzqvwg5kzng5b4zrf9a9d"; + rev = "cc09b6d4cf03efa645c682347c62850c2291be25"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base binary bytestring containers data-default + deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th + haddock-library hashable haskell-lsp haskell-lsp-types hslogger mtl + network-uri opentelemetry prettyprinter prettyprinter-ansi-terminal + regex-tdfa rope-utf16-splay safe-exceptions shake sorted-list stm + syb text time transformers unix unordered-containers utf8-string + ]; + executableHaskellDepends = [ + aeson async base base16-bytestring binary bytestring containers + cryptohash-sha1 data-default deepseq directory extra filepath ghc + ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types + hie-bios hslogger optparse-applicative safe-exceptions shake text + time unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory extra filepath ghc + ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types + lens lsp-test network-uri optparse-applicative parser-combinators + process QuickCheck quickcheck-instances rope-utf16-splay + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text + ]; + benchmarkHaskellDepends = [ + aeson base bytestring Chart Chart-diagrams containers diagrams + diagrams-svg directory extra filepath lsp-test optparse-applicative + parser-combinators process safe-exceptions shake text yaml + ]; + homepage = "https://github.com/digital-asset/ghcide#readme"; + description = "The core of an IDE"; + license = stdenv.lib.licenses.asl20; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh new file mode 100755 index 0000000000..498859843c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix jq curl +# +# This script will update the haskell-language-server derivation to the latest version using +# cabal2nix. +# +# Note that you should always try building haskell-language-server after updating it here, since +# some of the overrides in pkgs/development/haskell/configuration-nix.nix may +# need to be updated/changed. + +set -eo pipefail + +# This is the directory of this update.sh script. +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +# =========================== +# ghcide fork on https://github.com/wz1000/ghcide +# =========================== + +# ghcide derivation created with cabal2nix. +ghcide_derivation_file="${script_dir}/hls-ghcide.nix" + +# This is the current revision of hls in Nixpkgs. +ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivation_file")" + +# This is the revision of ghcide used by hls on GitHub. +ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output) + +echo "Updating haskell-language-server from old version $ghcide_old_version to new version $ghcide_new_version." +echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." + +cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file" + + +# =========================== +# HLS +# =========================== + +# hls derivation created with cabal2nix. +hls_derivation_file="${script_dir}/default.nix" + +# This is the current revision of hls in Nixpkgs. +hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")" + +# This is the latest release version of hls on GitHub. +hls_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output) + +echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." +echo "Running cabal2nix and outputting to ${hls_derivation_file}..." + +cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" + +echo "Finished." diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 9b33d6e067..60f8c2ecb2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+':'}$PATH + export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH" ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; in diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index ee7ed47662..48be7c568d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hcloud"; - version = "1.16.2"; + version = "1.17.0"; goPackagePath = "github.com/hetznercloud/cli"; @@ -10,24 +10,20 @@ buildGoModule rec { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0cxh92df8gdl4bmr22pdvdxdkdjyfy0jv48y0k6awy1xz61r94ap"; + sha256 = "1brqqcyyljkdd24ljx2qbr648ihhhmr8mq6gs90n63r59ci6ksch"; }; - vendorSha256 = "1iiqmdnjnrsqgjisb5j5casa2hmqmafn79157skl5zxawndvc2rj"; + nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; + vendorSha256 = "1m96j9cwqz2b67byf53qhgl3s0vfwaklj2pm8364qih0ilvifppj"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' - mkdir -p \ - $out/etc/bash_completion.d \ - $out/share/zsh/vendor-completions - - # Add bash completions - $out/bin/hcloud completion bash > "$out/etc/bash_completion.d/hcloud" - - # Add zsh completions - echo "#compdef hcloud" > "$out/share/zsh/vendor-completions/_hcloud" - $out/bin/hcloud completion zsh >> "$out/share/zsh/vendor-completions/_hcloud" + for shell in bash zsh; do + $out/bin/hcloud completion $shell > hcloud.$shell + installShellCompletion hcloud.$shell + done ''; meta = { @@ -37,4 +33,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix index 23e0f56845..5ef1840906 100644 --- a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.41.1"; + version = "7.42.2"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "12ilk0rkpwx8n9b7dird2jfmwnkqndlwjf5wgdcbl014mkl1411b"; + sha256 = "1fddqqn2nwvniignkq8d5jvh0217zb960s402h57l4wg3djq7phr"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://cli.heroku.com"; + homepage = "https://devcenter.heroku.com/articles/heroku-cli"; description = "Everything you need to get started using Heroku"; maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg marsam ]; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix b/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix index 360f1dbdcf..091a463843 100644 --- a/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "icestorm"; - version = "2020.04.22"; + version = "2020.07.08"; passthru = rec { pythonPkg = if usePyPy then pypy3 else python3; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "cd2610e0fa1c6a90e8e4e4cfe06db1b474e752bb"; - sha256 = "05ckmmvgymr7vhrpnqsiafwm8z5rhc3h91v506lzi6jpjzcs23hj"; + rev = "d12308775684cf43ab923227235b4ad43060015e"; + sha256 = "18ykv6np8sp7rb7c1cm3ha3qnj280gpkyn476faahb15jh0nbjmw"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index c59f6716a7..e55e71eeb4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { comment = "Java Troubleshooting Tool"; desktopName = "VisualVM"; genericName = "Java Troubleshooting Tool"; - categories = "Application;Development;"; + categories = "Development;"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 5fa2b12e9c..42ee4041f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash -, installShellFiles }: +{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.5.11"; + version = "0.6.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0li5lspxfrim8gymqzzd5djjfbfi7jh1m234qlzy5vkx2q9qg0xv"; + sha256 = "1sl235wr4fdsw0f0x7jynv6ljhvgis4d87xzpvjzajhdaappdp8d"; }; - cargoSha256 = "1sp8xrh3gmgmphh1bv050p1ybjybk9x8kswyxz2rd93q3zb5hpzz"; + cargoSha256 = "0k3aqwvdm95403s279gkksklnikgyjpf5qvngsvsrm5xqda438jk"; nativeBuildInputs = [ installShellFiles ]; @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh --name _just completions/just.zsh ''; - checkInputs = [ coreutils bash dash ]; + checkInputs = [ coreutils bash ]; preCheck = '' # USER must not be empty diff --git a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix index b8a8dc7515..fce25903ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.37.1"; + version = "0.37.2"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0i5frcy3ya1qwq0hl67gq6fgz0c8vgskgha25irsw7j2ndf4qp8i"; + sha256 = "1hhycvvp21gy6g71hwf3pk2jnccpnhcf2z7c85shzffhddy1wc0v"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix index 8b980dc7e3..c11c7fcbc9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix @@ -1,53 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, kubectl, makeWrapper }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: -with lib; - -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubectx"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55"; + sha256 = "1c7y5hj4w72bm6y3riw0acayn4w9x7bbf1vykqcprbyw3a3dvcsw"; }; - buildInputs = [ makeWrapper ]; + vendorSha256 = "168hfdc2rfwpz2ls607bz5vsm1aw4brhwm8hmbiq1n1l2dn2dj0y"; - dontBuild = true; - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/zsh/site-functions - mkdir -p $out/share/bash-completion/completions - mkdir -p $out/share/fish/vendor_completions.d - - cp kubectx $out/bin - cp kubens $out/bin - - # Provide ZSH completions - cp completion/kubectx.zsh $out/share/zsh/site-functions/_kubectx - cp completion/kubens.zsh $out/share/zsh/site-functions/_kubens - - # Provide BASH completions - cp completion/kubectx.bash $out/share/bash-completion/completions/kubectx - cp completion/kubens.bash $out/share/bash-completion/completions/kubens - - # Provide FISH completions - cp completion/*.fish $out/share/fish/vendor_completions.d/ - - for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]} - done + postInstall = '' + installShellCompletion completion/* ''; - meta = { + meta = with stdenv.lib; { description = "Fast way to switch between clusters and namespaces in kubectl!"; license = licenses.asl20; homepage = "https://github.com/ahmetb/kubectx"; - maintainers = with maintainers; [ periklis ]; + maintainers = with maintainers; [ jlesquembre ]; platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index c3ae1eb30e..9d37dcfd5d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.4"; + version = "0.20.6"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "134f04ybzgghm7ghyxair111aflmkjrbfj0bkxfp1w0a3jm6sfsk"; + sha256 = "0zim9ipwh2vkw2g41rw3p35i8fz208hyr71npfn4as8f1nl4gi4i"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index 5f4af62687..e5046d1d1d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, coursier, jdk, jre, makeWrapper }: -let - baseName = "metals"; - version = "0.9.0"; +stdenv.mkDerivation rec { + pname = "metals"; + version = "0.9.2"; + deps = stdenv.mkDerivation { - name = "${baseName}-deps-${version}"; + name = "${pname}-deps-${version}"; buildCommand = '' export COURSIER_CACHE=$(pwd) ${coursier}/bin/coursier fetch org.scalameta:metals_2.12:${version} \ @@ -15,11 +16,8 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "116q2jzqlmdhkqvjg31b9ib8w1k7rlr8gmjcr7z32idpn16hqg59"; + outputHash = "1gnf2p578nk1ygx3cc4mb7fa690c51nbdwvc2qz2805m4xg3x7zv"; }; -in -stdenv.mkDerivation rec { - name = "${baseName}-${version}"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk deps ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix index e781bb80ac..6d9149d410 100644 --- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.5"; + version = "1.3.6"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "16n1dk9jgy78mrkvr78m4x772kn09y5aa4d06wl4sdgn6apcq2mc"; + sha256 = "0jmj5xpj4invvpp289gh81vq7b4mmfhqb2h50yjn7wgdicyn295a"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 21ad66b62b..e10ad15fff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "17w7pqpn9pkzc85lrsmyhxy6rip47dxw1hkz4ml3y5n68nysfpb9"; + sha256 = "0xmrb8wbxkb52l2c7fxxy5wa9lsl591fl65zicv0nrbil36q4wfd"; }; vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix new file mode 100644 index 0000000000..8a457593d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchurl +, erlangR22 +}: + +stdenv.mkDerivation rec { + pname = "asls"; + version = "0.4.0"; + + src = fetchurl { + url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz"; + sha256 = "0zy89fvdhk2bj41fzx349gi8237ww96s21hlg6blqmfhvfxsnszg"; + }; + + buildInputs = [ erlangR22 ]; + installPhase = "install -Dm755 -t $out/bin asls"; + + meta = with stdenv.lib; { + description = "AssemblyScript Language Server"; + homepage = "https://github.com/saulecabrera/asls"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ saulecabrera ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix new file mode 100644 index 0000000000..6be0ab2acb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cc-tool/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, boost +, libusb1 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "cc-tool"; + version = "unstable-2020-05-19"; + + src = fetchFromGitHub { + owner = "dashesy"; + repo = pname; + rev = "19e707eafaaddee8b996ad27a9f3e1aafcb900d2"; + hash = "sha256:1f78j498fdd36xbci57jkgh25gq14g3b6xmp76imdpar0jkpyljv"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ boost libusb1 ]; + + postPatch = '' + substituteInPlace udev/90-cc-debugger.rules \ + --replace 'MODE="0666"' 'MODE="0660", GROUP="plugdev", TAG+="uaccess"' + ''; + + postInstall = '' + install -D udev/90-cc-debugger.rules $out/lib/udev/rules.d/90-cc-debugger.rules + ''; + + meta = with stdenv.lib; { + description = "Command line tool for the Texas Instruments CC Debugger"; + longDescription = '' + cc-tool provides support for Texas Instruments CC Debugger + ''; + homepage = "https://github.com/dashesy/cc-tool"; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = [ maintainers.CRTified ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 61ed3825bd..ead30a56e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -1,30 +1,22 @@ -{ stdenv, fetchurl, perl, zlib, makeWrapper }: +{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.4.1"; + version = "3.7.10"; - src = fetchurl { - sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; - url = "mirror://samba/ccache/${pname}-${version}.tar.xz"; + src = fetchFromGitHub { + owner = "ccache"; + repo = "ccache"; + rev = "v${version}"; + sha256 = "0v6pvj50y18fxh2f6cx6xyg545xcpxfmrcg9bzbc6lc5acrvvjm7"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; buildInputs = [ zlib ]; outputs = [ "out" "man" ]; - # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) - patches = [ - ./fix-debug-prefix-map-suite.patch - ./skip-fs-dependent-test.patch - ]; - - postPatch = '' - substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' - ''; - doCheck = !stdenv.isDarwin; passthru = { @@ -71,8 +63,8 @@ let ccache = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; - homepage = "http://ccache.samba.org/"; - downloadPage = "https://ccache.samba.org/download.html"; + homepage = "https://ccache.dev/"; + downloadPage = "https://ccache.dev/download.html"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch deleted file mode 100644 index 98a6fbf10b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/test/suites/debug_prefix_map.bash -+++ b/test/suites/debug_prefix_map.bash -@@ -29,7 +29,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - -@@ -39,7 +39,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - -@@ -52,10 +52,10 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi -- if ! grep "name" test.o >/dev/null 2>&1; then -+ if ! objdump -g test.o | grep ": name$" >/dev/null 2>&1; then - test_failed "Relocation (name) not found in test.o" - fi - -@@ -65,7 +65,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch deleted file mode 100644 index 7b233df653..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/test/suites/cleanup.bash -+++ b/test/suites/cleanup.bash -@@ -94,23 +94,6 @@ - - $CCACHE -F 0 -M 256K >/dev/null - CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null -- expect_file_count 3 '*.o' $CCACHE_DIR -- expect_file_count 3 '*.d' $CCACHE_DIR -- expect_file_count 3 '*.stderr' $CCACHE_DIR -- expect_stat 'files in cache' 9 -- expect_stat 'cleanups performed' 1 -- for i in 3 4 5; do -- file=$CCACHE_DIR/a/result$i-4017.o -- if [ ! -f $file ]; then -- test_failed "File $file removed when it shouldn't" -- fi -- done -- for i in 0 1 2 6 7 8 9; do -- file=$CCACHE_DIR/a/result$i-4017.o -- if [ -f $file ]; then -- test_failed "File $file not removed when it should" -- fi -- done - - # ------------------------------------------------------------------------- - TEST "Automatic cache cleanup, limit_multiple 0.9" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 5b641a3ec5..6dcf7ed46c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.8302"; + version = "0.1.8599"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1rq1x6893n4siljn2jizrnz8b8qlic1y087gikh5p5140zpcbhnx"; + sha256 = "1brv38mzc2i6mg4rk9ichjsv5w0gr6xrf6qmhnal12cll2krn9k3"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix index f6a4a4d9f6..0d058ef1f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cli11"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "1nqri8ahisi00nwh6cynhq5n9iq9iydkysnxj36r2y20yvbi4bxj"; + sha256 = "0hbch0vk8irgmiaxnfqlqys65v1770rxxdfn3d23m2vqyjh0j9l6"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 487c979c70..e7dc7c6f73 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200514T134144"; + version = "20200706T152722"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "1c56k9zxi71gjlrmjk2risx04dzr460vql42pfjwm1cv543kij9r"; + sha256 = "1gjlsmahmmjklribdwbqybh1zj5qcv4aaxw7ffqg7rayf967w4pj"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/easypdkprog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/easypdkprog/default.nix new file mode 100644 index 0000000000..92d1a550ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/easypdkprog/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "easypdkprog"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "free-pdk"; + repo = "easy-pdk-programmer-software"; + rev = version; + sha256 = "0hc3gdmn6l01z63hzzwdhbdyy288gh5v219bsfm8fb1498vpnd6f"; + }; + + installPhase = '' + install -Dm755 -t $out/bin easypdkprog + '' + lib.optionalString stdenv.isLinux '' + install -Dm644 -t $out/etc/udev/rules.d Linux_udevrules/70-stm32vcp.rules + ''; + + meta = with lib; { + description = "Read, write and execute programs on PADAUK microcontroller"; + homepage = "https://github.com/free-pdk/easy-pdk-programmer-software"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ david-sawatzke ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 56bfe26ec0..4ad7f83006 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs }: +{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs, argp-standalone }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.176"; + version = "0.180"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb"; + sha256 = "17an1f67bfzxin482nbcxdl5qvywm27i9kypjyx8ilarbkivc9xq"; }; patches = [ ./debug-info-from-env.patch ]; @@ -17,13 +17,19 @@ stdenv.mkDerivation rec { # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. nativeBuildInputs = [ m4 bison flex gettext bzip2 ]; - buildInputs = [ zlib bzip2 xz ]; + buildInputs = [ zlib bzip2 xz ] + ++ lib.optional stdenv.hostPlatform.isMusl argp-standalone; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -fgnu89-inline" + ''; + configureFlags = [ "--program-prefix=eu-" # prevent collisions with binutils "--enable-deterministic-archives" + "--disable-debuginfod" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index fb884c8ffa..680e10d662 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }: { # Package for phase-1 of the db migration for Hydra. @@ -24,22 +24,15 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-06-01"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a"; - sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4"; + rev = "bb32aafa4a9b027c799e29b1bcf68727e3fc5f5b"; + sha256 = "0kl9h70akwxpik3xf4dbbh7cyqn06023kshfvi14mygdlb84djgx"; }; nix = nixFlakes; - patches = [ - (fetchpatch { - url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch"; - sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w"; - }) - ]; - tests = { db-migration = nixosTests.hydra-db-migration.mig; basic = nixosTests.hydra.hydra-unstable; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix index 0a6155e649..eeb9100a4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,25 +1,22 @@ -{ stdenv, python2Packages, fetchFromGitHub }: +{ stdenv, python37Packages, fetchFromGitHub }: -with python2Packages; buildPythonApplication rec { +with python37Packages; buildPythonApplication rec { pname = "nrfutil"; - version = "5.2.0"; + version = "6.1"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-nrfutil"; rev = "v${version}"; - sha256 = "1hajjgz8r4fjbwqr22p5dvb6k83dpxf8k7mhx20gkbrrx9ivqh79"; + sha256 = "0g43lf5jmk0qxb7r4h68wr38fli6pjjk67w8l2cpdm9rd8jz4lpn"; }; - propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa + propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa protobuf tqdm piccata pyspinel intelhex pyyaml crcmod libusb1 ipaddress ]; checkInputs = [ nose behave ]; postPatch = '' - # remove version bound on pyyaml - sed -i /pyyaml/d requirements.txt - mkdir test-reports ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix new file mode 100644 index 0000000000..58178cde17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, bzip2 +, libusb1 +, libzip +, openssl +}: + +stdenv.mkDerivation rec { + pname = "nxpmicro-mfgtools"; + version = "1.3.191"; + + src = fetchFromGitHub { + owner = "NXPmicro"; + repo = "mfgtools"; + rev = "uuu_${version}"; + sha256 = "196blmd7nf5kamvay22rvnkds2v6h7ab8lyl10dknxgy8i8siqq9"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ bzip2 libusb1 libzip openssl ]; + + preConfigure = "echo ${version} > .tarball-version"; + + meta = with stdenv.lib; { + description = "Freescale/NXP I.MX chip image deploy tools"; + longDescription = '' + UUU (Universal Update Utility) is a command line tool, evolved out of + MFGTools (aka MFGTools v3). + + One of the main purposes is to upload images to I.MX SoC's using at least + their boot ROM. + + With time, the need for an update utility portable to Linux and Windows + increased. UUU has the same usage on both Windows and Linux. It means the same + script works on both OS. + ''; + homepage = "https://github.com/NXPmicro/mfgtools"; + license = licenses.bsd3; + maintainers = [ maintainers.bmilanov ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index 9e4dbcac5b..13386fb9e8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1ag55n3gfwcp6v8v3hha8bdqxw9r4bmz97p00vyqla9gjzn5ka9w"; + sha256 = "05y8683f0r8bf8gn5miiwqkfz550s2c9kmvz0a1g7y99r9n6kzjk"; }; - vendorSha256 = "0lann22hjdcrwyab76hinvbbmg3rf7y3knrxlfg0164gl3y5xb5g"; + vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg"; subPackages = [ "cmd/reviewdog" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix index a7e197f9d7..b9f84edc96 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Application;Development"; + categories = "Development"; }; buildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix index 53336ab417..d4cd353281 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -6,7 +6,7 @@ let name = "stm32CubeMX"; exec = "stm32cubemx"; desktopName = "STM32CubeMX"; - categories = "Application;Development;"; + categories = "Development;"; icon = "stm32cubemx"; }; in diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix index 23700a2ddc..cbae92dd6d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k + buildInputs = [ perl.out ] ++ stdenv.lib.optional libunwind.supportsHost libunwind; # support -k - postPatch = "patchShebangs strace-graph"; + postPatch = "patchShebangs --host strace-graph"; configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index 70b07dd71c..6141b0b999 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "0ib0p361sxh2qzxccg32pcml4by4mk45abhljwmljwybs34wh5rh"; + sha256 = "0s6k78n94q13crdlgxb5c8qn708nbzn6nmhkil4s23f0qdskcah2"; }; - vendorSha256 = "0q772i49nyxzs51jrh45n14ljh7qj5wygkn2x32pxi6ykw6la4x8"; + vendorSha256 = "1dmv16v1c9sydbl1g69pgwvrhznd0a133giwrcbqi4cyg1fdb3sr"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index cbbdd416ff..f2c8a6c4cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "terraform-ls"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "11776nq1ixrg791xlmryjxldsc8gn69j1fc0wd6cdywy8yp2lh4w"; + sha256 = "105wk7lzsjl5qa1qnb40msj3wh4awqykkynj5fs0a7nzbcbrpxsj"; }; goPackagePath = "github.com/hashicorp/terraform-ls"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch index da28a30971..f0a8c4dfdc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch @@ -4,8 +4,9 @@ diff -ur texinfo-6.5/configure texinfo-6.5-patched/configure @@ -23281,7 +23281,7 @@ # env -i gives this build host configure a clean environment; # consequently, we have to re-initialize $PATH. - env -i CC="$CC_FOR_BUILD" AR="$AR_FOR_BUILD" RANLIB="$RANLIB_FOR_BUILD" \ +- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ - PATH="$PATH" \ ++ env -i CC="$CC_FOR_BUILD" AR="$AR_FOR_BUILD" RANLIB="$RANLIB_FOR_BUILD" \ + PATH="$PATH" CFLAGS="$NATIVE_TOOLS_CFLAGS" LDFLAGS="$NATIVE_TOOLS_LDFLAGS" \ tools_only=1 \ ${confdir}/configure --build=${build} --host=${build} \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index dee4c910fb..fe54aff87c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.2.1"; + version = "12.0.4"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1bdq66si9vvvyf5nia8ww77imp0f8jas0yfcvq1rialwm9922dfl"; + sha256 = "0vj6xpp5ss82n1zxljy5893s8l1pdhar5xqay5vvglkp8bzblin6"; }; - cargoSha256 = "17666wh4sfzhgxngymd02892mqpkr8jm6a4w95wwsc9iinzbygrm"; + cargoSha256 = "02c2pdjzd49qznm1yj3rnli48267ajjdklrb1cpj0rhpirw4rh1j"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock index e26b31cbaf..91df15a9bb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock @@ -1,28 +1,38 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.4.0) - backports (3.16.1) - coderay (1.1.2) + activesupport (5.2.4.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + coderay (1.1.3) + concurrent-ruby (1.1.6) ethon (0.12.0) ffi (>= 1.3.0) - faraday (0.17.3) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - faraday_middleware (0.14.0) - faraday (>= 0.7.4, < 1.0) - ffi (1.12.2) - gh (0.15.1) - addressable (~> 2.4.0) - backports - faraday (~> 0.8) + faraday_middleware (1.0.0) + faraday (~> 1.0) + ffi (1.13.1) + gh (0.17.0) + activesupport (~> 5.0) + addressable (~> 2.4) + faraday (~> 1.0) + faraday_middleware (~> 1.0) multi_json (~> 1.0) net-http-persistent (~> 2.9) net-http-pipeline - highline (1.7.10) + highline (2.0.3) + i18n (1.8.3) + concurrent-ruby (~> 1.0) json (2.3.0) launchy (2.4.3) addressable (~> 2.3) method_source (0.9.2) + minitest (5.14.1) multi_json (1.14.1) multipart-post (2.1.1) net-http-persistent (2.9.4) @@ -30,20 +40,24 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) + public_suffix (4.0.5) pusher-client (0.6.2) json websocket (~> 1.0) - travis (1.8.11) - backports - faraday (~> 0.9) - faraday_middleware (~> 0.9, >= 0.9.1) + thread_safe (0.3.6) + travis (1.9.1) + faraday (~> 1.0) + faraday_middleware (~> 1.0) gh (~> 0.13) - highline (~> 1.6) - launchy (~> 2.1) + highline (~> 2.0) + json (~> 2.3) + launchy (~> 2.1, < 2.5.0) pusher-client (~> 0.4) typhoeus (~> 0.6, >= 0.6.8) typhoeus (0.8.0) ethon (>= 0.8.0) + tzinfo (1.2.7) + thread_safe (~> 0.1) websocket (1.2.8) PLATFORMS diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix index da2f5e8e7a..e10475a916 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix @@ -1,31 +1,45 @@ { - addressable = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; - type = "gem"; - }; - version = "2.4.0"; - }; - backports = { + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5"; + sha256 = "02fdawr3wyvpzpja3r7mvb8lmn2mm5jdw502bx3ncr2sy2nw1kx6"; type = "gem"; }; - version = "3.16.1"; + version = "5.2.4.3"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; }; coderay = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + type = "gem"; + }; + version = "1.1.6"; }; ethon = { dependencies = ["ffi"]; @@ -42,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "0.17.3"; + version = "1.0.1"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -53,37 +67,52 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; type = "gem"; }; - version = "0.14.0"; + version = "1.0.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; gh = { - dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"]; + dependencies = ["activesupport" "addressable" "faraday" "faraday_middleware" "multi_json" "net-http-persistent" "net-http-pipeline"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg"; + sha256 = "1nj2dm2pahfa4d39y8csvjv5l3hpsm6yjq2y96vj2bqgg0qs26bj"; type = "gem"; }; - version = "0.15.1"; + version = "0.17.0"; }; highline = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; - version = "1.7.10"; + version = "2.0.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; + type = "gem"; + }; + version = "1.8.3"; }; json = { groups = ["default"]; @@ -114,6 +143,16 @@ }; version = "0.9.2"; }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + type = "gem"; + }; + version = "5.14.1"; + }; multi_json = { groups = ["default"]; platforms = []; @@ -159,6 +198,16 @@ }; version = "0.11.3"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; + type = "gem"; + }; + version = "4.0.5"; + }; pusher-client = { dependencies = ["json" "websocket"]; source = { @@ -168,16 +217,26 @@ }; version = "0.6.2"; }; - travis = { - dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"]; + thread_safe = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18zbi46as4d2wn83safawciyny0g2sk7yz5fvjvqmfk4ywpfrwrr"; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; }; - version = "1.8.11"; + version = "0.3.6"; + }; + travis = { + dependencies = ["faraday" "faraday_middleware" "gh" "highline" "json" "launchy" "pusher-client" "typhoeus"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yizj5nqvyrfbyiv1kfwc33dylhsmk5l007z06djj152v04z63i3"; + type = "gem"; + }; + version = "1.9.1"; }; typhoeus = { dependencies = ["ethon"]; @@ -188,6 +247,17 @@ }; version = "0.8.0"; }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; websocket = { source = { remotes = ["https://rubygems.org"]; diff --git a/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix index 2f3d21f9c8..7bcf72df55 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "mustache-go"; - version = "1.0.1"; + version = "1.2.0"; goPackagePath = "github.com/cbroglie/mustache"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cbroglie"; repo = "mustache"; rev = "v${version}"; - sha256 = "1aywj4fijsv66n6gjiz3l8g1vg0fqzwbf8dcdcgfsvsdb056p90v"; + sha256 = "0mnh5zbpfwymddm1dppg9i9d1r8jqyg03z2gl6c5a8fgbrnxpjvc"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index 9a69f88c80..7e7c185fbc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.11"; + name = "camlp5-7.12"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel711.tar.gz"; - sha256 = "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4"; + url = "https://github.com/camlp5/camlp5/archive/rel712.tar.gz"; + sha256 = "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf"; }; buildInputs = [ ocaml ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix new file mode 100644 index 0000000000..ba8fa4bba6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix @@ -0,0 +1,48 @@ +{ lib, buildDunePackage, fetchurl, makeWrapper +, curly, fmt, bos, cmdliner, re, rresult, logs +, odoc, opam-format, opam-core, opam-state +, opam, git, findlib, mercurial, bzip2, gnutar, coreutils +, alcotest, mdx +}: + +# don't include dune as runtime dep, so user can +# choose between dune and dune_2 +let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; +in buildDunePackage rec { + pname = "dune-release"; + version = "1.3.3"; + + minimumOCamlVersion = "4.06"; + + src = fetchurl { + url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "04qmgvjh1233ri878wi5kifdd1070w5pbfkd8yk3nnqnslz35zlb"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core + rresult logs odoc bos ]; + checkInputs = [ alcotest mdx ]; + doCheck = true; + + useDune2 = true; + + # remove check for curl in PATH, since curly is patched + # to have a fixed path to the binary in nix store + postPatch = '' + sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml + ''; + + # tool specific env vars have been deprecated, use PATH + preFixup = '' + wrapProgram $out/bin/dune-release \ + --prefix PATH : "${lib.makeBinPath runtimeInputs}" + ''; + + meta = with lib; { + description = "Release dune packages in opam"; + homepage = "https://github.com/ocamllabs/dune-release"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index ac3b7f2a42..001c424603 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1hvgj78xqqqph8dwn1jjkjp8bpppvwzx33lzkvwh5wn5zd4xij8j"; + sha256 = "184ri2w1n1yvhar1aq3fcxibdxx67728dz6gy5rf33j4hvr5kyay"; }; buildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 90e0a7935d..888cc51a99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,19 +1,18 @@ -{ lib, fetchFromGitHub, buildDunePackage -, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree +{ lib, fetchurl, buildDunePackage +, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree }: buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.5.2"; + version = "3.6.0"; + useDune2 = true; - src = fetchFromGitHub { - owner = "ocsigen"; - repo = "js_of_ocaml"; - rev = version; - sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8"; + src = fetchurl { + url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; + sha256 = "51eaa89c83ef3168ef270bf7997cbc35a747936d3f51aa6fac58fb0323b4cbb0"; }; - nativeBuildInputs = [ ocaml findlib dune cppo ]; + nativeBuildInputs = [ ocaml findlib dune_2 cppo ]; buildInputs = [ cmdliner ]; configurePlatforms = []; @@ -23,6 +22,6 @@ buildDunePackage rec { description = "Compiler from OCaml bytecode to Javascript"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://ocsigen.org/js_of_ocaml/"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 9ca6ca6742..666cda592f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , ocaml-migrate-parsetree, ppx_tools_versioned, uchar }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ]; - nativeBuildInputs = [ ocaml findlib dune ]; + nativeBuildInputs = [ ocaml findlib dune_2 ]; postPatch = "patchShebangs lib/generate_stubs.sh"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 5c8f4377e8..2ad8578894 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx , ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml, ocaml_lwt, lwt_log }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 344352467e..50bcd69eb6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , ocamlbuild }: @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune ]; + buildInputs = [ ocaml findlib dune_2 ]; propagatedBuildInputs = [ ocamlbuild ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 3adad22bd9..69783c7ead 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ]; + buildInputs = [ ocaml findlib dune_2 ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ]; buildPhase = "dune build -p js_of_ocaml-ppx"; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 47396829f8..d3cc4e0878 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , js_of_ocaml, ppxlib }: @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune ]; + buildInputs = [ ocaml findlib dune_2 ]; propagatedBuildInputs = [ js_of_ocaml ppxlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index c39c985183..fcfeeaf8d9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml, reactivedata, tyxml }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix new file mode 100644 index 0000000000..a157041cf9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule, go, lib, fetchFromGitHub, makeWrapper }: + +buildGoModule rec { + pname = "operator-sdk"; + version = "0.18.2"; + + src = fetchFromGitHub { + owner = "operator-framework"; + repo = pname; + rev = "v${version}"; + sha256 = "02vzxqbh4yw9yvr9cr43hyi0v4hzii4mdb8am41n5y71bcld73v8"; + }; + + vendorSha256 = "0kdbpm6phdcw1rcjggrdvc8hgs3hjc81545qh8jv6zwipmn89i1p"; + + subPackages = [ "cmd/operator-sdk" ]; + + buildInputs = [ go makeWrapper ]; + + # operator-sdk uses the go compiler at runtime + allowGoReference = true; + postFixup = '' + wrapProgram $out/bin/operator-sdk --prefix PATH : ${lib.makeBinPath [ go ]} + ''; + + meta = with lib; { + description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding."; + homepage = "https://github.com/operator-framework/operator-sdk"; + license = licenses.asl20; + maintainers = with maintainers; [ arnarg ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index 5302f7ca64..0b6476998b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "16h8panwpljwdq902v9x7inpnks51fn0kqlbyqfjvpilv6md73p2"; + sha256 = "0qry9ar16dpg9nzrq7jh3fqh4ah2xvcf6v00fc81z08yjd1ljk2b"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 50a0c3447b..659af3e0f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -7,7 +7,7 @@ let inherit (poetryLib) isCompatible readTOML moduleName; # Poetry2nix version - version = "1.9.2"; + version = "1.10.0"; /* The default list of poetry2nix override overlays */ defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); @@ -22,6 +22,9 @@ let # Get license by id falling back to input string getLicenseBySpdxId = spdxId: spdxLicenses.${spdxId} or spdxId; + # Experimental withPlugins functionality + toPluginAble = (import ./plugins.nix { inherit pkgs lib; }).toPluginAble; + /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. */ @@ -33,6 +36,7 @@ let , python ? pkgs.python3 , pwd ? projectDir , preferWheels ? false + , __isBootstrap ? false # Hack: Always add Poetry as a build input unless bootstrapping }@attrs: let poetryPkg = poetry.override { inherit python; }; @@ -77,6 +81,7 @@ let value = self.mkPoetryDep ( pkgMeta // { inherit pwd preferWheels; + inherit __isBootstrap; source = pkgMeta.source or null; files = lockFiles.${name}; pythonPackages = self; @@ -106,6 +111,8 @@ let # The canonical name is setuptools-scm setuptools-scm = super.setuptools_scm; + __toPluginAble = toPluginAble self; + inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook; } ) @@ -176,11 +183,12 @@ let , python ? pkgs.python3 , pwd ? projectDir , preferWheels ? false + , __isBootstrap ? false # Hack: Always add Poetry as a build input unless bootstrapping , ... }@attrs: let poetryPython = mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd preferWheels; + inherit pyproject poetrylock overrides python pwd preferWheels __isBootstrap; }; py = poetryPython.python; @@ -206,7 +214,7 @@ let ( dep: let - pkg = py.pkgs."${dep}"; + pkg = py.pkgs."${moduleName dep}"; constraints = deps.${dep}.python or ""; isCompat = compat constraints; in diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 20175f6bad..6b784fd8fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -17,6 +17,7 @@ , sourceSpec , supportedExtensions ? lib.importJSON ./extensions.json , preferWheels ? false +, __isBootstrap ? false # Hack: Always add Poetry as a build input unless bootstrapping , ... }: @@ -106,6 +107,7 @@ pythonPackages.callPackage baseBuildInputs ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg ++ lib.optional isLocal buildSystemPkgs + ++ lib.optional (!__isBootstrap) [ pythonPackages.poetry ] ); propagatedBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 62f2ed6e30..756694796a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -24,7 +24,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; } ); @@ -255,6 +255,11 @@ self: super: } ); + libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { + nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = [ pkgs.libvirt ]; + }); + llvmlite = super.llvmlite.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; @@ -345,6 +350,14 @@ self: super: } ); + mip = super.mip.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoPatchelfHook ]; + + buildInputs = old.buildInputs ++ [ pkgs.zlib self.cppy ]; + } + ); + netcdf4 = super.netcdf4.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -454,7 +467,14 @@ self: super: old: let parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); - _arrow-cpp = pkgs.arrow-cpp.override { inherit (self) python; }; + + # Starting with nixpkgs revision f149c7030a7, pyarrow takes "python3" as an argument + # instead of "python". Below we inspect function arguments to maintain compatibilitiy. + _arrow-cpp = pkgs.arrow-cpp.override ( + builtins.intersectAttrs + (lib.functionArgs pkgs.arrow-cpp.override) { python = self.python; python3 = self.python; } + ); + ARROW_HOME = _arrow-cpp; arrowCppVersion = parseMinor pkgs.arrow-cpp; pyArrowVersion = parseMinor super.pyarrow; @@ -595,6 +615,12 @@ self: super: } ); + python-ldap = super.python-ldap.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.openldap pkgs.cyrus_sasl ]; + } + ); + pytoml = super.pytoml.overridePythonAttrs ( old: { doCheck = false; @@ -841,6 +867,14 @@ self: super: } ); + tensorflow = super.tensorflow.overridePythonAttrs ( + old: { + postInstall = '' + rm $out/bin/tensorboard + ''; + } + ); + tensorpack = super.tensorpack.overridePythonAttrs ( old: { postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index b41b6e4a91..d06a1c1d6a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -7,6 +7,9 @@ poetry2nix.mkPoetryApplication { projectDir = ./.; + # Don't include poetry in inputs + __isBootstrap = true; + src = fetchFromGitHub (lib.importJSON ./src.json); # "Vendor" dependencies (for build-system support) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index ce17718568..cb955a62d1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock @@ -113,7 +113,7 @@ description = "Python package for providing Mozilla's CA Bundle." name = "certifi" optional = false python-versions = "*" -version = "2020.4.5.2" +version = "2020.4.5.1" [[package]] category = "main" @@ -488,10 +488,6 @@ python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3" version = "1.0.2" [package.dependencies] -[package.dependencies.pathlib2] -python = "<3" -version = "*" - [package.dependencies.typing] python = "<3.5" version = "*" @@ -503,7 +499,7 @@ marker = "python_version < \"3.7\"" name = "importlib-resources" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -version = "2.0.0" +version = "1.5.0" [package.dependencies] [package.dependencies.contextlib2] @@ -668,14 +664,11 @@ marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_v name = "livereload" optional = false python-versions = "*" -version = "2.6.2" +version = "2.6.1" [package.dependencies] six = "*" - -[package.dependencies.tornado] -python = ">=2.8" -version = "*" +tornado = "*" [[package]] category = "main" @@ -1328,7 +1321,7 @@ marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_v name = "regex" optional = false python-versions = "*" -version = "2020.6.8" +version = "2020.5.14" [[package]] category = "main" @@ -1533,7 +1526,7 @@ description = "tox is a generic virtualenv management and test command line tool name = "tox" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -version = "3.15.2" +version = "3.15.1" [package.dependencies] colorama = ">=0.4.1" @@ -1662,7 +1655,7 @@ marker = "python_version < \"3.5\" or python_version >= \"3.5\"" name = "wcwidth" optional = false python-versions = "*" -version = "0.2.4" +version = "0.2.3" [package.dependencies] [package.dependencies."backports.functools-lru-cache"] @@ -1733,8 +1726,8 @@ cachy = [ {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, ] certifi = [ - {file = "certifi-2020.4.5.2-py2.py3-none-any.whl", hash = "sha256:9cd41137dc19af6a5e03b630eefe7d1f458d964d406342dd3edf625839b944cc"}, - {file = "certifi-2020.4.5.2.tar.gz", hash = "sha256:5ad7e9a056d25ffa5082862e36f119f7f7cec6457fa07ee2f8c339814b80c9b1"}, + {file = "certifi-2020.4.5.1-py2.py3-none-any.whl", hash = "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304"}, + {file = "certifi-2020.4.5.1.tar.gz", hash = "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519"}, ] cffi = [ {file = "cffi-1.14.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:1cae98a7054b5c9391eb3249b86e0e99ab1e02bb0cc0575da191aedadbdf4384"}, @@ -1967,8 +1960,8 @@ importlib-metadata = [ importlib-resources = [ {file = "importlib_resources-1.0.2-py2.py3-none-any.whl", hash = "sha256:6e2783b2538bd5a14678284a3962b0660c715e5a0f10243fd5e00a4b5974f50b"}, {file = "importlib_resources-1.0.2.tar.gz", hash = "sha256:d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078"}, - {file = "importlib_resources-2.0.0-py2.py3-none-any.whl", hash = "sha256:a86462cf34a6d391d1d5d598a5e2f5aac9fc00b265d40542e1196328f015d1f6"}, - {file = "importlib_resources-2.0.0.tar.gz", hash = "sha256:7f6aae2ed252ba10f5d1af5676b0e35f3b3eb7d3cc103b8365cc92aec0c79258"}, + {file = "importlib_resources-1.5.0-py2.py3-none-any.whl", hash = "sha256:85dc0b9b325ff78c8bef2e4ff42616094e16b98ebd5e3b50fe7e2f0bbcdcde49"}, + {file = "importlib_resources-1.5.0.tar.gz", hash = "sha256:6f87df66833e1942667108628ec48900e02a4ab4ad850e25fbf07cb17cf734ca"}, ] ipaddress = [ {file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"}, @@ -1999,7 +1992,8 @@ keyring = [ {file = "keyring-20.0.1.tar.gz", hash = "sha256:963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"}, ] livereload = [ - {file = "livereload-2.6.2.tar.gz", hash = "sha256:d1eddcb5c5eb8d2ca1fa1f750e580da624c0f7fcb734aa5780dc81b7dcbd89be"}, + {file = "livereload-2.6.1-py2.py3-none-any.whl", hash = "sha256:78d55f2c268a8823ba499305dcac64e28ddeb9a92571e12d543cd304faf5817b"}, + {file = "livereload-2.6.1.tar.gz", hash = "sha256:89254f78d7529d7ea0a3417d224c34287ebfe266b05e67e51facaf82c27f0f66"}, ] lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, @@ -2048,11 +2042,6 @@ markupsafe = [ {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, ] mkdocs = [ @@ -2229,27 +2218,27 @@ pyyaml = [ {file = "PyYAML-5.3.1.tar.gz", hash = "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"}, ] regex = [ - {file = "regex-2020.6.8-cp27-cp27m-win32.whl", hash = "sha256:fbff901c54c22425a5b809b914a3bfaf4b9570eee0e5ce8186ac71eb2025191c"}, - {file = "regex-2020.6.8-cp27-cp27m-win_amd64.whl", hash = "sha256:112e34adf95e45158c597feea65d06a8124898bdeac975c9087fe71b572bd938"}, - {file = "regex-2020.6.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:92d8a043a4241a710c1cf7593f5577fbb832cf6c3a00ff3fc1ff2052aff5dd89"}, - {file = "regex-2020.6.8-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:bae83f2a56ab30d5353b47f9b2a33e4aac4de9401fb582b55c42b132a8ac3868"}, - {file = "regex-2020.6.8-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:b2ba0f78b3ef375114856cbdaa30559914d081c416b431f2437f83ce4f8b7f2f"}, - {file = "regex-2020.6.8-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:95fa7726d073c87141f7bbfb04c284901f8328e2d430eeb71b8ffdd5742a5ded"}, - {file = "regex-2020.6.8-cp36-cp36m-win32.whl", hash = "sha256:e3cdc9423808f7e1bb9c2e0bdb1c9dc37b0607b30d646ff6faf0d4e41ee8fee3"}, - {file = "regex-2020.6.8-cp36-cp36m-win_amd64.whl", hash = "sha256:c78e66a922de1c95a208e4ec02e2e5cf0bb83a36ceececc10a72841e53fbf2bd"}, - {file = "regex-2020.6.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:08997a37b221a3e27d68ffb601e45abfb0093d39ee770e4257bd2f5115e8cb0a"}, - {file = "regex-2020.6.8-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2f6f211633ee8d3f7706953e9d3edc7ce63a1d6aad0be5dcee1ece127eea13ae"}, - {file = "regex-2020.6.8-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:55b4c25cbb3b29f8d5e63aeed27b49fa0f8476b0d4e1b3171d85db891938cc3a"}, - {file = "regex-2020.6.8-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:89cda1a5d3e33ec9e231ece7307afc101b5217523d55ef4dc7fb2abd6de71ba3"}, - {file = "regex-2020.6.8-cp37-cp37m-win32.whl", hash = "sha256:690f858d9a94d903cf5cada62ce069b5d93b313d7d05456dbcd99420856562d9"}, - {file = "regex-2020.6.8-cp37-cp37m-win_amd64.whl", hash = "sha256:1700419d8a18c26ff396b3b06ace315b5f2a6e780dad387e4c48717a12a22c29"}, - {file = "regex-2020.6.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:654cb773b2792e50151f0e22be0f2b6e1c3a04c5328ff1d9d59c0398d37ef610"}, - {file = "regex-2020.6.8-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:52e1b4bef02f4040b2fd547357a170fc1146e60ab310cdbdd098db86e929b387"}, - {file = "regex-2020.6.8-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:cf59bbf282b627130f5ba68b7fa3abdb96372b24b66bdf72a4920e8153fc7910"}, - {file = "regex-2020.6.8-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:5aaa5928b039ae440d775acea11d01e42ff26e1561c0ffcd3d805750973c6baf"}, - {file = "regex-2020.6.8-cp38-cp38-win32.whl", hash = "sha256:97712e0d0af05febd8ab63d2ef0ab2d0cd9deddf4476f7aa153f76feef4b2754"}, - {file = "regex-2020.6.8-cp38-cp38-win_amd64.whl", hash = "sha256:6ad8663c17db4c5ef438141f99e291c4d4edfeaacc0ce28b5bba2b0bf273d9b5"}, - {file = "regex-2020.6.8.tar.gz", hash = "sha256:e9b64e609d37438f7d6e68c2546d2cb8062f3adb27e6336bc129b51be20773ac"}, + {file = "regex-2020.5.14-cp27-cp27m-win32.whl", hash = "sha256:e565569fc28e3ba3e475ec344d87ed3cd8ba2d575335359749298a0899fe122e"}, + {file = "regex-2020.5.14-cp27-cp27m-win_amd64.whl", hash = "sha256:d466967ac8e45244b9dfe302bbe5e3337f8dc4dec8d7d10f5e950d83b140d33a"}, + {file = "regex-2020.5.14-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:27ff7325b297fb6e5ebb70d10437592433601c423f5acf86e5bc1ee2919b9561"}, + {file = "regex-2020.5.14-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:ea55b80eb0d1c3f1d8d784264a6764f931e172480a2f1868f2536444c5f01e01"}, + {file = "regex-2020.5.14-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:c9bce6e006fbe771a02bda468ec40ffccbf954803b470a0345ad39c603402577"}, + {file = "regex-2020.5.14-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:d881c2e657c51d89f02ae4c21d9adbef76b8325fe4d5cf0e9ad62f850f3a98fd"}, + {file = "regex-2020.5.14-cp36-cp36m-win32.whl", hash = "sha256:99568f00f7bf820c620f01721485cad230f3fb28f57d8fbf4a7967ec2e446994"}, + {file = "regex-2020.5.14-cp36-cp36m-win_amd64.whl", hash = "sha256:70c14743320a68c5dac7fc5a0f685be63bc2024b062fe2aaccc4acc3d01b14a1"}, + {file = "regex-2020.5.14-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:a7c37f048ec3920783abab99f8f4036561a174f1314302ccfa4e9ad31cb00eb4"}, + {file = "regex-2020.5.14-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:89d76ce33d3266173f5be80bd4efcbd5196cafc34100fdab814f9b228dee0fa4"}, + {file = "regex-2020.5.14-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:51f17abbe973c7673a61863516bdc9c0ef467407a940f39501e786a07406699c"}, + {file = "regex-2020.5.14-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:ce5cc53aa9fbbf6712e92c7cf268274eaff30f6bd12a0754e8133d85a8fb0f5f"}, + {file = "regex-2020.5.14-cp37-cp37m-win32.whl", hash = "sha256:8044d1c085d49673aadb3d7dc20ef5cb5b030c7a4fa253a593dda2eab3059929"}, + {file = "regex-2020.5.14-cp37-cp37m-win_amd64.whl", hash = "sha256:c2062c7d470751b648f1cacc3f54460aebfc261285f14bc6da49c6943bd48bdd"}, + {file = "regex-2020.5.14-cp38-cp38-manylinux1_i686.whl", hash = "sha256:329ba35d711e3428db6b45a53b1b13a0a8ba07cbbcf10bbed291a7da45f106c3"}, + {file = "regex-2020.5.14-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:579ea215c81d18da550b62ff97ee187b99f1b135fd894a13451e00986a080cad"}, + {file = "regex-2020.5.14-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:3a9394197664e35566242686d84dfd264c07b20f93514e2e09d3c2b3ffdf78fe"}, + {file = "regex-2020.5.14-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:ce367d21f33e23a84fb83a641b3834dd7dd8e9318ad8ff677fbfae5915a239f7"}, + {file = "regex-2020.5.14-cp38-cp38-win32.whl", hash = "sha256:1386e75c9d1574f6aa2e4eb5355374c8e55f9aac97e224a8a5a6abded0f9c927"}, + {file = "regex-2020.5.14-cp38-cp38-win_amd64.whl", hash = "sha256:7e61be8a2900897803c293247ef87366d5df86bf701083b6c43119c7c6c99108"}, + {file = "regex-2020.5.14.tar.gz", hash = "sha256:ce450ffbfec93821ab1fea94779a8440e10cf63819be6e176eb1973a6017aff5"}, ] requests = [ {file = "requests-2.21.0-py2.py3-none-any.whl", hash = "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"}, @@ -2327,8 +2316,8 @@ tornado = [ tox = [ {file = "tox-3.12.1-py2.py3-none-any.whl", hash = "sha256:f5c8e446b51edd2ea97df31d4ded8c8b72e7d6c619519da6bb6084b9dd5770f9"}, {file = "tox-3.12.1.tar.gz", hash = "sha256:f87fd33892a2df0950e5e034def9468988b8d008c7e9416be665fcc0dd45b14f"}, - {file = "tox-3.15.2-py2.py3-none-any.whl", hash = "sha256:50a188b8e17580c1fb931f494a754e6507d4185f54fb18aca5ba3e12d2ffd55e"}, - {file = "tox-3.15.2.tar.gz", hash = "sha256:c696d36cd7c6a28ada2da780400e44851b20ee19ef08cfe73344a1dcebbbe9f3"}, + {file = "tox-3.15.1-py2.py3-none-any.whl", hash = "sha256:322dfdf007d7d53323f767badcb068a5cfa7c44d8aabb698d131b28cf44e62c4"}, + {file = "tox-3.15.1.tar.gz", hash = "sha256:8c9ad9b48659d291c5bc78bcabaa4d680d627687154b812fa52baedaa94f9f83"}, ] tqdm = [ {file = "tqdm-4.46.1-py2.py3-none-any.whl", hash = "sha256:07c06493f1403c1380b630ae3dcbe5ae62abcf369a93bbc052502279f189ab8c"}, @@ -2380,8 +2369,8 @@ virtualenv = [ {file = "virtualenv-20.0.21.tar.gz", hash = "sha256:a116629d4e7f4d03433b8afa27f43deba09d48bc48f5ecefa4f015a178efb6cf"}, ] wcwidth = [ - {file = "wcwidth-0.2.4-py2.py3-none-any.whl", hash = "sha256:79375666b9954d4a1a10739315816324c3e73110af9d0e102d906fdb0aec009f"}, - {file = "wcwidth-0.2.4.tar.gz", hash = "sha256:8c6b5b6ee1360b842645f336d9e5d68c55817c26d3050f46b235ef2bc650e48f"}, + {file = "wcwidth-0.2.3-py2.py3-none-any.whl", hash = "sha256:980fbf4f3c196c0f329cdcd1e84c554d6a211f18e252e525a0cf4223154a41d6"}, + {file = "wcwidth-0.2.3.tar.gz", hash = "sha256:edbc2b718b4db6cdf393eefe3a420183947d6aa312505ce6754516f458ff8830"}, ] webencodings = [ {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index 0cdaef9908..7a384698f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.0.8" +version = "1.0.9" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace " diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 5e91db253e..7a9f578bd7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,6 +1,6 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "6f9d6b0e1b7b1d3a7d7b2ca3478ad2cb0a7188e2", - "sha256": "1g9kcp3zlfk3f063hz1av9jj7s60pwxzqgj59w21sd5fx7yzdsaf" + "rev": "1d64e1c75cfd03d8f98533645a7815f0dbcaf421", + "sha256": "0gi1li55rim60hf1gdpgpx84zlkaj0wv12wbv7dib9malhfj3pnz" } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix new file mode 100644 index 0000000000..b5e807c6e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix @@ -0,0 +1,70 @@ +{ pkgs, lib }: +let + inherit (pkgs) stdenv; + + mkPluginDrv = + { self + , plugins + , drv + , postInstall ? "" + , nativeBuildInputs ? [ ] + , buildInputs ? [ ] + }: + let + env = self.python.withPackages (ps: plugins); + in + stdenv.mkDerivation { + pname = drv.pname + "-with-plugins"; + + inherit (drv) src version meta; + + buildInputs = drv.buildInputs ++ drv.propagatedBuildInputs ++ buildInputs; + nativeBuildInputs = drv.nativeBuildInputs ++ nativeBuildInputs; + + dontConfigure = true; + dontBuild = true; + dontUsePythonRecompileBytecode = true; + + passthru = { + inherit (drv.passthru) withPlugins; + inherit plugins; + }; + + # Link bin/ from environment, but only if it's in a plugin + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + for bindir in ${lib.concatStringsSep " " (map (d: "${lib.getBin d}/bin") plugins)}; do + for bin in $bindir/*; do + ln -s ${env}/bin/$(basename $bin) $out/bin/ + done + done + + runHook postInstall + ''; + + inherit postInstall; + }; + +in +{ + + # Provide the `withPlugins` function + toPluginAble = self: { drv + , finalDrv + , postInstall ? "" + , nativeBuildInputs ? [ ] + , buildInputs ? [ ] + }: drv.overridePythonAttrs (old: { + passthru = old.passthru // { + withPlugins = pluginFn: mkPluginDrv { + plugins = [ finalDrv ] ++ pluginFn self; + inherit self postInstall nativeBuildInputs buildInputs; + drv = finalDrv; + }; + }; + }); + +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index 70fee45a87..34126a7713 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "0nv3min7jyrv4scn7bhizc9vmqhmv6sg0nvfnr0m59pm5806vdpi"; + sha256 = "0mfccjcll7dxrhdi2bhfbggmkqdp8cmq5vf8vbb05qzpvlswvkf7"; }; - cargoSha256 = "1vywm3iqs3qnkrvi7i70sv21hznn3y3hza1i9gvcxfmh03wzhwx0"; + cargoSha256 = "1gp5m432273mr0zwq1kdswdjgp0kajr0imymqyc4yj9i931by1xv"; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index ebe23e1973..8dd09a2dee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.6.0"; + version = "0.6.4"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "1xinaxxdsyhy8jl6albw8q9nl12iq11xny6a6a55niqzhvy1sdmp"; + sha256 = "0a00sw6r8z6pyqqa6f5c7czxjnjdx3kz1bacy790nsngvz17l30h"; }; - cargoSha256 = "0i326vny4gygalsimsgkqsvlq09av8pv9a7a0yxcbk170a7zyxb0"; + cargoSha256 = "0x92yh9pl30h4k53269dgnryb6z8nfl2mfx3wpcp3ph5na2knwpj"; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index 7379fbffe5..ea51cef24b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.5.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; rev = version; - sha256 = "0qy4xb7bxyw2x2ya7zmbkz48wxb69jcnvvj7021f1kyc6wdwcxs7"; + sha256 = "1d4bq9140bri8cd9zcxh5hhc51vr0s6jadjhwkp688w7k10rq7w8"; }; - cargoSha256 = "0d24crgx6wrb1p96w2yww7cs474x2pz4i6f26cry8pf5dwqfsqdm"; + cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr"; meta = with stdenv.lib; { description = "Command line helpers for fuzzing"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix index f16a5d5727..8626ae243b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-inspect"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "mre"; repo = pname; rev = version; - sha256 = "0rjy8jlar939fkl7wi8a6zxsrl4axz2nrhv745ny8x38ii4sfbzr"; + sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0v7g9rkw7axy99vcfi7sy2pw7wnpq424jvd8xchcv8ghh8yw9lyc"; + cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw"; meta = with lib; { description = "See what Rust is doing behind the curtains"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock index 7ba549f28d..191e96f021 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -1,18 +1,27 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. [[package]] -name = "adler32" -version = "1.0.4" +name = "adler" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10" [[package]] name = "aho-corasick" -version = "0.7.10" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" dependencies = [ - "memchr", + "memchr 0.1.11", +] + +[[package]] +name = "aho-corasick" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr 2.3.3", ] [[package]] @@ -21,7 +30,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -38,9 +47,9 @@ checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" [[package]] name = "attohttpc" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5db1932a9d70d5091139d6b0e04ec6a4d9f9184041c15d71a5ef954cb3c5312" +checksum = "fe174d1b67f7b2bafed829c09db039301eb5841f66e43be2cf60b326e7f8e2cc" dependencies = [ "flate2", "http", @@ -58,7 +67,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -75,9 +84,9 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "bitflags" @@ -98,13 +107,16 @@ dependencies = [ [[package]] name = "bytes" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" +checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b" +dependencies = [ + "loom", +] [[package]] name = "cargo-make" -version = "0.31.0" +version = "0.32.0" dependencies = [ "ci_info", "clap", @@ -123,7 +135,7 @@ dependencies = [ "run_script", "rust_info", "rusty-hook", - "semver", + "semver 0.10.0", "serde", "serde_derive", "serde_json", @@ -133,21 +145,31 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.54" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311" +checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe" [[package]] name = "cfg-if" -version = "0.1.10" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" + +[[package]] +name = "chrono" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" +dependencies = [ + "num", + "time", +] [[package]] name = "ci_info" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19c5f9baeac8a1176ca7fc58a0cc1abadd84d360365a93d1dd31e926f3f502b" +checksum = "24f638c70e8c5753795cc9a8c07c44da91554a09e4cf11a7326e8161b0a3c45e" dependencies = [ "envmnt", ] @@ -174,8 +196,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" dependencies = [ "atty", - "lazy_static", - "winapi", + "lazy_static 1.4.0", + "winapi 0.3.9", ] [[package]] @@ -217,14 +239,14 @@ checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", "cfg-if", - "lazy_static", + "lazy_static 1.4.0", ] [[package]] name = "dirs" -version = "2.0.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "2fddc3610d8f9552384e06ebc87f714e1d0b2b64a99194d2faf36d7ae5f48549" dependencies = [ "cfg-if", "dirs-sys", @@ -238,7 +260,7 @@ checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ "libc", "redox_users", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -252,16 +274,17 @@ dependencies = [ [[package]] name = "duckscriptsdk" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b258092ada5ae7b5dda45906ebcae3e77c419a98e324750bc92af2b8912dd65e" +checksum = "0033c9c694e0a358f42316e3517442ca9039de8b3838d8320fb129da5dbec28b" dependencies = [ "attohttpc", - "base64 0.12.1", + "base64 0.12.3", "cfg-if", "duckscript", "fs_extra", "fsio", + "ftp", "glob", "home", "java-properties", @@ -340,9 +363,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "envmnt" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7e7d8c007e12db7b3bd6f04b8e47e206c9173d9c75413a042ccc941723c8" +checksum = "0dad160daebf530422640d9496277681d6a2caa3172ec8fd2a315a122829319b" dependencies = [ "fsio", "indexmap", @@ -359,9 +382,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" +checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" dependencies = [ "cfg-if", "crc32fast", @@ -406,6 +429,30 @@ dependencies = [ "users", ] +[[package]] +name = "ftp" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "542951aad0071952c27409e3bd7cb62d1a3ad419c4e7314106bf994e0083ad5d" +dependencies = [ + "chrono", + "lazy_static 0.1.16", + "regex 0.1.80", +] + +[[package]] +name = "generator" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68" +dependencies = [ + "cc", + "libc", + "log", + "rustc_version", + "winapi 0.3.9", +] + [[package]] name = "getopts" version = "0.2.21" @@ -440,9 +487,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71" +checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" dependencies = [ "libc", ] @@ -453,7 +500,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -490,9 +537,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" +checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" [[package]] name = "java-properties" @@ -501,9 +548,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" dependencies = [ "encoding", - "regex", + "regex 1.3.9", ] +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417" + [[package]] name = "lazy_static" version = "1.4.0" @@ -525,12 +588,32 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "loom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", +] + [[package]] name = "matches" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +[[package]] +name = "memchr" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" +dependencies = [ + "libc", +] + [[package]] name = "memchr" version = "2.3.3" @@ -549,11 +632,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" +checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" dependencies = [ - "adler32", + "adler", ] [[package]] @@ -562,7 +645,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" dependencies = [ - "lazy_static", + "lazy_static 1.4.0", "libc", "log", "openssl", @@ -586,6 +669,47 @@ version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" +[[package]] +name = "num" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" +dependencies = [ + "num-integer", + "num-iter", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +dependencies = [ + "autocfg", +] + [[package]] name = "num_cpus" version = "1.13.0" @@ -598,14 +722,14 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.29" +version = "0.10.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" dependencies = [ "bitflags", "cfg-if", "foreign-types", - "lazy_static", + "lazy_static 1.4.0", "libc", "openssl-sys", ] @@ -658,9 +782,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ "proc-macro2", ] @@ -723,18 +847,37 @@ dependencies = [ "rust-argon2", ] +[[package]] +name = "regex" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" +dependencies = [ + "aho-corasick 0.5.3", + "memchr 0.1.11", + "regex-syntax 0.3.9", + "thread_local 0.2.7", + "utf8-ranges", +] + [[package]] name = "regex" version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", - "thread_local", + "aho-corasick 0.7.13", + "memchr 2.3.3", + "regex-syntax 0.6.18", + "thread_local 1.0.1", ] +[[package]] +name = "regex-syntax" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" + [[package]] name = "regex-syntax" version = "0.6.18" @@ -743,11 +886,11 @@ checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" [[package]] name = "remove_dir_all" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -778,10 +921,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" [[package]] -name = "rusty-hook" -version = "0.11.1" +name = "rustc_version" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27138b73a8ce63ae918707a5e3b57f9b0c0842a57b82f0e43474cf4e3aaf0ff4" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rusty-hook" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3" dependencies = [ "ci_info", "getopts", @@ -810,10 +962,16 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ - "lazy_static", - "winapi", + "lazy_static 1.4.0", + "winapi 0.3.9", ] +[[package]] +name = "scoped-tls" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" + [[package]] name = "security-framework" version = "0.4.4" @@ -837,6 +995,15 @@ dependencies = [ "libc", ] +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + [[package]] name = "semver" version = "0.10.0" @@ -854,15 +1021,15 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.111" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d" +checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" [[package]] name = "serde_derive" -version = "1.0.111" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250" +checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ "proc-macro2", "quote", @@ -871,9 +1038,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2" +checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" dependencies = [ "itoa", "ryu", @@ -886,15 +1053,9 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" dependencies = [ - "regex", + "regex 1.3.9", ] -[[package]] -name = "smallvec" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" - [[package]] name = "strsim" version = "0.8.0" @@ -903,9 +1064,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2" +checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" dependencies = [ "proc-macro2", "quote", @@ -923,7 +1084,7 @@ dependencies = [ "rand", "redox_syscall", "remove_dir_all", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -937,33 +1098,68 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13f926965ad00595dd129fa12823b04bbf866e9085ab0a5f2b05b850fbfc344" +checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479" +checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "thread-id" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" +dependencies = [ + "kernel32-sys", + "libc", +] + +[[package]] +name = "thread_local" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" +dependencies = [ + "thread-id", +] + [[package]] name = "thread_local" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" dependencies = [ - "lazy_static", + "lazy_static 1.4.0", ] +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "tinyvec" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" + [[package]] name = "toml" version = "0.5.6" @@ -993,24 +1189,24 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" dependencies = [ - "smallvec", + "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "url" @@ -1033,10 +1229,16 @@ dependencies = [ ] [[package]] -name = "vcpkg" -version = "0.2.9" +name = "utf8-ranges" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d1e41d56121e07f1e223db0a4def204e45c85425f6a16d462fd07c8d10d74c" +checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" + +[[package]] +name = "vcpkg" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" [[package]] name = "vec_map" @@ -1051,7 +1253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", - "winapi", + "winapi 0.3.9", "winapi-util", ] @@ -1063,9 +1265,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "which" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3edc3cf5458851a4d6a2329232bd5f42c7f9bbe4c4782c4ef9ce37e5d101b2" +checksum = "b5fe1a9cb33fe7cf77d431070d0223e544b1e4e7f7764bad0a3e691a6678a131" dependencies = [ "libc", "thiserror", @@ -1073,20 +1275,32 @@ dependencies = [ [[package]] name = "whoami" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08eb844b158ea881e81b94556eede7f7e306e4c7b976aad88f49e6e36dec391" +checksum = "7884773ab69074615cb8f8425d0e53f11710786158704fca70f53e71b0e05504" [[package]] name = "winapi" -version = "0.3.8" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", ] +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -1099,7 +1313,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index d4023dcf25..bffa9186fd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }: +{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config +, SystemConfiguration +}: rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.31.0"; + version = "0.32.0"; src = let @@ -10,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0svb3avmmkgwsv1dvzgzixp5fvcl93hn8xb3zx729jq8a47l2vsi"; + sha256 = "1bkc3z1w9gbjymmr5lk322kn0rd6b57v92a32jf7nckllxf43807"; }; in runCommand "source" {} '' @@ -22,9 +24,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "0yk06kpqjfc39dxk9f67c5qijnm8f8lvrb9da1kn8ql8dv8crsw2"; + cargoSha256 = "0l7krag7n4kjvh3d4zhkk1jdswsrkag5z664fm1zwvf6rw6sfdmi"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 850b6d2e1e..91f2592360 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,23 +1,25 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.4.1"; + version = "7.5.0"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "1nq7sfdxvqldj94laz562y4cvgagm67b6a5b7bzxdip0sf1l11f8"; + sha256 = "181v922nx8152ymszig1kw6y0mnix6si1zfnv6vqgr5r53pwkbc1"; }; - cargoSha256 = "1rjx3k8li8ck5cdygm4pd2i5wkslr6d9z9vl2vp0x6hqv1gcv5zh"; + cargoSha256 = "1abhzi1396x8lnxvakj34nysl3ybvsaf21j678wzaqwj16sd3w3d"; buildInputs = lib.optional stdenv.isDarwin CoreServices; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) - checkPhase = "PATH=target/debug:$PATH cargo test"; + preCheck = '' + export PATH="$(pwd)/target/${rust.toRustTarget stdenv.hostPlatform}/release:$PATH" + ''; meta = with lib; { description = "A Cargo subcommand for watching over Cargo project's source"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index bc0ae5d33f..655d726e66 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "15mk7q89rs723c7i9wwq4rrvakwh834wvrsmsnayji5k1kwaj351"; + sha256 = "0pw55334i10k75qkig8bgcnlsy613zw2p5j4xyz8v71s4vh1a58j"; }; - cargoSha256 = "03irndd48ck62chm4vmlcnfm98gwd86xm1ssq9glw3b3y0n6x845"; + cargoSha256 = "0088ijnjhqfvdb1wxy9jc7hq8c0yxgj5brlg68n9vws1mz9rilpy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/Cargo.lock.patch b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/Cargo.lock.patch deleted file mode 100644 index 9f7d46d490..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 09ecb81..c37c646 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -733,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "maturin" --version = "0.8.0-beta.1" -+version = "0.8.0" - dependencies = [ - "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index e4ee97d024..9eee570f67 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -5,21 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1fjai0c0j8zzaj4c186dkbvx6cpj0vi3sc1qbjbgn2cm8azsd6m6"; + sha256 = "1y6bxqbv7k8xvqjzgpf6n2n3yad4qxr2dwwlw8cb0knd7cfl2a2n"; }; - # The maturin 0.8.0 lockfile has an incorrect version for maturin - # itself. The upstream lockfiles are normally correct, so this - # should be removed post-0.8.0. - cargoPatches = [ ./Cargo.lock.patch ]; - - cargoSha256 = "01sh523fi46k5xwdslhnmjz128jkdw47gp9bd8gim3ay13zkcn1i"; + cargoSha256 = "1f12k6n58ycv79bv416566fnsnsng8jk3f6fy5j78py1qgy30swm"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/racer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/racer/default.nix index 0a29577e0c..f74e757184 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/racer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/racer/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.30"; + version = "2.1.33"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; - rev = "c2b0080243fefdad7f7b223e8a7fdef3e1f0fa77"; - sha256 = "0svvdkfqpk2rw0wxyrhkxy553k55lg7jxc0ly4w1195iwv14ad3y"; + rev = "v${version}"; + sha256 = "0fxcif42k8x70zwpi76h2jxyr048mjzakh52yzqavyr8irl55ll2"; }; - cargoSha256 = "0zaqa89z3nf23s2q1jpmfz4lygh4zq9ymql71d748fgjy9psr449"; + cargoSha256 = "115ydgv4wd4bf3xhm96zlc9z1lhmrcnm1v5pgzl9846l27ka1z13"; - buildInputs = [ makeWrapper ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; # a nightly compiler is required unless we use this cheat code. - RUSTC_BOOTSTRAP=1; + RUSTC_BOOTSTRAP = 1; RUST_SRC_PATH = rustPlatform.rustcSrc; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index e9d4deefb4..a64d687123 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-06-08"; + rev = "2020-07-13"; version = "unstable-${rev}"; - sha256 = "0ywwsb717d1rwcy2yij58sj123pan0fb80sbsiqqprcln0aaspip"; - cargoSha256 = "1c6rmrhx7q4qcanr26yzlwc2rp1hh55m80jn56hy6hfcvwcdaij4"; + sha256 = "1mfhqq3wr2pxyr571xsyhlw4ikiqc0m7w6i31qmj4xq59klc003h"; + cargoSha256 = "09abiyc4cr47qxmvmc2az0addwxny0wpg9gilg8s8awgx1irxcqc"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index ae6ad80cdd..d5ac9eaa5e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -24,6 +24,8 @@ rustPlatform.buildRustPackage { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + RUST_ANALYZER_REV = rev; + inherit doCheck; # Skip tests running `rustup` for `cargo fmt`. preCheck = '' @@ -33,6 +35,16 @@ rustPlatform.buildRustPackage { export RUST_SRC_PATH=${rustPlatform.rustcSrc} ''; + # Temporary disabled until #93119 is fixed. + doInstallCheck = false; + installCheckPhase = '' + runHook preInstallCheck + versionOutput="$($out/bin/rust-analyzer --version)" + echo "'rust-analyzer --version' returns: $versionOutput" + [[ "$versionOutput" == "rust-analyzer ${rev}" ]] + runHook postInstallCheck + ''; + meta = with stdenv.lib; { description = "An experimental modular compiler frontend for the Rust language"; homepage = "https://github.com/rust-analyzer/rust-analyzer"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh index 9291125425..b0435be720 100755 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -49,13 +49,16 @@ sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \ build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" # We need devDependencies to build vsix. jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ - >"$build_deps/package.json" + >"$build_deps/package.json.new" -# FIXME: Lock the version of @type/vscode, the latest one (1.43.0) will cause build failure. -vscode_lock_ver="$(jq '.dependencies."@types/vscode".version' --raw-output "$node_src/package-lock.json")" -jq '.dependencies."@types/vscode" = "'$vscode_lock_ver'"' "$build_deps/package.json" >"$build_deps/package.json.new" -mv "$build_deps"/package.json{.new,} +if cmp --quiet "$build_deps"/package.json{.new,}; then + echo "package.json not changed, skip updating nodePackages" + rm "$build_deps"/package.json.new +else + echo "package.json changed, updating nodePackages" + mv "$build_deps"/package.json{.new,} -pushd "../../../node-packages" -./generate.sh -popd + pushd "../../../node-packages" + ./generate.sh + popd +fi diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index d46ad59109..13649b387a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -1,30 +1,24 @@ diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs -index 4b432785..fa45e87e 100644 +index 3beddf54..0f859b8d 100644 --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs -@@ -109,10 +109,11 @@ impl Package for DirectoryPackage { - match &*part.0 { - "file" => { - if self.copy { -- builder.copy_file(path.clone(), &src_path)? -+ builder.copy_file(path.clone(), &src_path)?; +@@ -113,6 +113,7 @@ impl Package for DirectoryPackage { } else { -- builder.move_file(path.clone(), &src_path)? -+ builder.move_file(path.clone(), &src_path)?; + builder.move_file(path.clone(), &src_path)? } + nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path) } "dir" => { if self.copy { -@@ -135,6 +136,22 @@ impl Package for DirectoryPackage { +@@ -135,6 +136,29 @@ impl Package for DirectoryPackage { } } +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { -+ let is_bin = if let Some(p) = src_path.parent() { -+ p.ends_with("bin") ++ let (is_bin, is_lib) = if let Some(p) = src_path.parent() { ++ (p.ends_with("bin"), p.ends_with("lib")) + } else { -+ false ++ (false, false) + }; + + if is_bin { @@ -34,6 +28,13 @@ index 4b432785..fa45e87e 100644 + .arg(dest_path) + .output(); + } ++ else if is_lib { ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-rpath") ++ .arg("@libPath@") ++ .arg(dest_path) ++ .output(); ++ } +} + #[derive(Debug)] diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index 959eb6875c..fd772ff40b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -1,38 +1,47 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform -, pkgconfig, curl, Security, CoreServices }: +, pkgconfig, curl, zlib, Security, CoreServices }: rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.21.1"; + version = "1.22.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "0d7l3j8js16zgdx37kykavr343v65vchldz88j38jjyc43pcm2pg"; + sha256 = "0nf42pkyn87y0n93vd63bihx74h4bpisv74aqldg3vcav2iv35s1"; }; - cargoSha256 = "1y13kfski36rfvqkp3mxxn12aidp339j7rigv49msyr004ac5y8s"; + cargoSha256 = "0ghjrx7y25s6rjp06h0iyv4195x7daj57bqza01i1j4hm5nkhqhi"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - curl + curl zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; } '' + (let + libPath = lib.makeLibraryPath [ + zlib # libz.so.1 + ]; + in + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ --subst-var patchelf \ - --subst-var dynamicLinker + --subst-var dynamicLinker \ + --subst-var libPath '') + ) ]; - doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; + # Disable tests until they can be run with --features no-self-update + doCheck = false; + #doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; postInstall = '' pushd $out/bin diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix index 0905c27d4c..c445026193 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.5.2"; + version = "2.6.2"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "14sfpzhd7r8srl9qyrdfqwmgrircqsgrr5hwvg8h1vaiwakq7m00"; + outputHash = "1q2bsc6vqgbgzg8hcz8pn6vl3263ghjfbkn93vijvmz0ivc806j4"; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index e104784fbe..b94217d20a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,17 +2,16 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.11.0"; - # rev is the ${version} commit, mainly for skaffold version command output - rev = "931a70a6334436735bfc4ff7633232dd5fc73cc1"; + version = "1.12.0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; buildFlagsArray = let t = "${goPackagePath}/pkg/skaffold"; in '' -ldflags= + -s -w -X ${t}/version.version=v${version} - -X ${t}/version.gitCommit=${rev} + -X ${t}/version.gitCommit=${src.rev} -X ${t}/version.buildDate=unknown ''; @@ -20,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "035xp34m8kzb75mivgf3kw026n2h6g2a7j2mi32nxl1a794w36zi"; + sha256 = "12m2yqlngxvyyiqa58fmdwi752bz3mkk8fi312dvakr5kysnvn1l"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix index b59ef341df..15d6553bbb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spring-boot-cli"; - version = "2.3.0"; + version = "2.3.1"; src = fetchzip { url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "1zjbgs1qx75jgxc46x9380iqh8pfgacih38ad3qxd0106a8lcp5h"; + sha256 = "0ddmwcifrmw197vc49b0x8vfampj3n947r4vv4nni5vjclqqfds5"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix index 99b0e4cd18..dc85934789 100644 --- a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "02aa4iwwi89r6sj1q5sj74n2cy1rj94yfh39cp97zlx4lam9pj6b"; + sha256 = "0q7yg90yxnpaafg6sg7mqkh86qkn43kxy73p9nqkkgrikdnrjh5a"; }; - cargoSha256 = "09d9gaa83djfkfdx3m4d3kkq550q8y67wb292mrj4xb0kcfrhnpq"; + cargoSha256 = "1a747bmc6s007ram0w4xf1y2nb3pphvqnlx59098lr3v7gllp7x3"; checkFlags = "--test-threads=1"; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix b/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix index 49484032ff..6fc18fabe7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -8,18 +8,18 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.06.12"; + version = "2020.06.29"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-168-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-176-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "5c9f6ad076da75ea925def4297c528058d9bf54a"; - sha256 = "1iwpfkibnb9a5kkw5wxyl1fpw1a72pf2icnp1c6sazrphiz8dbf7"; + rev = "f93243b000c52b755c70829768d2ae6bcf7bb91a"; + sha256 = "0f7xv99bxmidk7byahc821yzy8mln29gknz3w239i9xbwxzc6wc4"; name = "trellis"; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/unity3d/default.nix b/third_party/nixpkgs/pkgs/development/tools/unity3d/default.nix index 13ab61b556..dfb5f6abf4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/unity3d/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/unity3d/default.nix @@ -4,7 +4,7 @@ , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium -, libpqxx +, libpqxx, libselinux, pciutils, libpulseaudio }: let @@ -15,6 +15,8 @@ let libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb libpqxx gtk3 + + libselinux pciutils libpulseaudio ]; libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ]; binPath = lib.makeBinPath [ nodejs gnutar ]; @@ -56,6 +58,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin makeWrapper $unitydir/Unity $out/bin/unity-editor \ + --prefix LD_LIBRARY_PATH : "${libPath64}" \ --prefix LD_PRELOAD : "$unitydir/libunity-nosuid.so" \ --prefix PATH : "${binPath}" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix index bb84584e83..7e62aaf408 100644 --- a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -11,7 +11,10 @@ in appimageTools.wrapType2 rec { libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5 libX11 libXcursor libXdamage libXfixes libXrender libXi - libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]); + libXcomposite libXext libXrandr libXtst libSM libICE libxcb + + libselinux pciutils libpulseaudio + ]); profile = '' export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS diff --git a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix index 11c9875bf9..45e2fcd3f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.16"; + version = "1.0.18"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "1zzc46d6m7l5lil423417crdda2cqb396p2idcla2ps161hwq3qp"; + sha256 = "06b90ajgxqp4hcw7fqag7gphdn4q1rfglb7cw868n7wskwv45kc7"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch deleted file mode 100644 index 86fbb81de0..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ /dev/null @@ -1,2546 +0,0 @@ -From a13aff157f899a6388b3c9e621680049f329a028 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Fri, 1 May 2020 23:44:08 +0200 -Subject: [PATCH] Add cargo.lock - ---- - Cargo.lock | 2527 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 2527 insertions(+) - create mode 100644 Cargo.lock - -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 00000000..4822cea1 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,2527 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "add" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "adler32" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.28" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9a60d744a80c30fcb657dfe2c1b22bcb3e814c1a1e3674f32bf5820b570fbff" -+ -+[[package]] -+name = "arrayref" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -+ -+[[package]] -+name = "ascii" -+version = "0.8.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" -+ -+[[package]] -+name = "askama" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5" -+dependencies = [ -+ "askama_derive", -+ "askama_shared", -+] -+ -+[[package]] -+name = "askama_derive" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083" -+dependencies = [ -+ "askama_shared", -+ "nom 4.2.3", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "syn 0.15.44", -+] -+ -+[[package]] -+name = "askama_shared" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71" -+dependencies = [ -+ "num-traits 0.2.11", -+ "serde", -+ "serde_derive", -+ "toml 0.4.10", -+] -+ -+[[package]] -+name = "assert_cmd" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" -+dependencies = [ -+ "escargot", -+ "predicates", -+ "predicates-core", -+ "predicates-tree", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+ -+[[package]] -+name = "autocfg" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+ -+[[package]] -+name = "base64" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+dependencies = [ -+ "byteorder", -+ "safemem", -+] -+ -+[[package]] -+name = "base64" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -+ -+[[package]] -+name = "bitflags" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "blake2b_simd" -+version = "0.5.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -+dependencies = [ -+ "arrayref", -+ "arrayvec", -+ "constant_time_eq", -+] -+ -+[[package]] -+name = "buf_redux" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" -+dependencies = [ -+ "memchr", -+ "safemem", -+] -+ -+[[package]] -+name = "bumpalo" -+version = "3.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" -+ -+[[package]] -+name = "byteorder" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" -+ -+[[package]] -+name = "canvas" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.52" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "char" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "chrono" -+version = "0.4.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" -+dependencies = [ -+ "num-integer", -+ "num-traits 0.2.11", -+ "time", -+] -+ -+[[package]] -+name = "chunked_transfer" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" -+ -+[[package]] -+name = "clap" -+version = "2.33.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags 1.2.1", -+ "strsim 0.8.0", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "closures" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "cloudabi" -+version = "0.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+dependencies = [ -+ "bitflags 1.2.1", -+] -+ -+[[package]] -+name = "color_quant" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" -+ -+[[package]] -+name = "console_error_panic_hook" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" -+dependencies = [ -+ "cfg-if", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "console_log" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -+ -+[[package]] -+name = "crossbeam-deque" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -+dependencies = [ -+ "crossbeam-epoch", -+ "crossbeam-utils", -+ "maybe-uninit", -+] -+ -+[[package]] -+name = "crossbeam-epoch" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -+dependencies = [ -+ "autocfg 1.0.0", -+ "cfg-if", -+ "crossbeam-utils", -+ "lazy_static", -+ "maybe-uninit", -+ "memoffset", -+ "scopeguard", -+] -+ -+[[package]] -+name = "crossbeam-queue" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" -+dependencies = [ -+ "cfg-if", -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -+dependencies = [ -+ "autocfg 1.0.0", -+ "cfg-if", -+ "lazy_static", -+] -+ -+[[package]] -+name = "curl" -+version = "0.4.29" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "762e34611d2d5233a506a79072be944fddd057db2f18e04c0d6fa79e3fd466fd" -+dependencies = [ -+ "curl-sys", -+ "libc", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "socket2", -+ "winapi", -+] -+ -+[[package]] -+name = "curl-sys" -+version = "0.4.31+curl-7.70.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" -+dependencies = [ -+ "cc", -+ "libc", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+ "vcpkg", -+ "winapi", -+] -+ -+[[package]] -+name = "deflate" -+version = "0.7.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -+dependencies = [ -+ "adler32", -+ "byteorder", -+] -+ -+[[package]] -+name = "diff" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" -+ -+[[package]] -+name = "difference" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -+ -+[[package]] -+name = "dirs" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -+dependencies = [ -+ "libc", -+ "redox_users", -+ "winapi", -+] -+ -+[[package]] -+name = "docopt" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -+dependencies = [ -+ "lazy_static", -+ "regex", -+ "serde", -+ "strsim 0.9.3", -+] -+ -+[[package]] -+name = "dom" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "either" -+version = "1.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+ -+[[package]] -+name = "enum_primitive" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -+dependencies = [ -+ "num-traits 0.1.43", -+] -+ -+[[package]] -+name = "env_logger" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log 0.4.8", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "escargot" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" -+dependencies = [ -+ "lazy_static", -+ "log 0.4.8", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] -+name = "fetch" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "serde", -+ "serde_derive", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "web-sys", -+] -+ -+[[package]] -+name = "filetime" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi", -+] -+ -+[[package]] -+name = "float-cmp" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "da62c4f1b81918835a8c6a484a397775fff5953fe83529afd51b05f5c6a6617d" -+dependencies = [ -+ "num-traits 0.2.11", -+] -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "fuchsia-cprng" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+ -+[[package]] -+name = "futures" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-io", -+ "futures-sink", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-channel" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8" -+dependencies = [ -+ "futures-core", -+ "futures-sink", -+] -+ -+[[package]] -+name = "futures-channel-preview" -+version = "0.3.0-alpha.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" -+dependencies = [ -+ "futures-core-preview", -+] -+ -+[[package]] -+name = "futures-core" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a" -+ -+[[package]] -+name = "futures-core-preview" -+version = "0.3.0-alpha.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" -+ -+[[package]] -+name = "futures-executor" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba" -+dependencies = [ -+ "futures-core", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-io" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6" -+ -+[[package]] -+name = "futures-macro" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+] -+ -+[[package]] -+name = "futures-sink" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6" -+ -+[[package]] -+name = "futures-task" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27" -+ -+[[package]] -+name = "futures-util" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-macro", -+ "futures-sink", -+ "futures-task", -+ "memchr", -+ "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", -+ "slab", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "gif" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f" -+dependencies = [ -+ "color_quant", -+ "lzw", -+] -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "guide-supported-types-examples" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "hello_world" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -+ -+[[package]] -+name = "humantime" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+dependencies = [ -+ "quick-error", -+] -+ -+[[package]] -+name = "id-arena" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" -+dependencies = [ -+ "rayon", -+] -+ -+[[package]] -+name = "idna" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "image" -+version = "0.12.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158" -+dependencies = [ -+ "byteorder", -+ "enum_primitive", -+ "gif", -+ "jpeg-decoder", -+ "num-iter", -+ "num-rational", -+ "num-traits 0.1.43", -+ "png", -+ "scoped_threadpool", -+] -+ -+[[package]] -+name = "import_js" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "inflate" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" -+ -+[[package]] -+name = "itoa" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" -+ -+[[package]] -+name = "jpeg-decoder" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b47b4c4e017b01abdc5bcc126d2d1002e5a75bbe3ce73f9f4f311a916363704" -+dependencies = [ -+ "byteorder", -+ "rayon", -+] -+ -+[[package]] -+name = "js-sys" -+version = "0.3.39" -+dependencies = [ -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "wasm-bindgen-test", -+] -+ -+[[package]] -+name = "julia_set" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "leb128" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" -+ -+[[package]] -+name = "libc" -+version = "0.2.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" -+ -+[[package]] -+name = "libz-sys" -+version = "1.0.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" -+dependencies = [ -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "log" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+dependencies = [ -+ "log 0.4.8", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "lzw" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+ -+[[package]] -+name = "maybe-uninit" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" -+ -+[[package]] -+name = "memchr" -+version = "2.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" -+ -+[[package]] -+name = "memoffset" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8" -+dependencies = [ -+ "autocfg 1.0.0", -+] -+ -+[[package]] -+name = "mime" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+dependencies = [ -+ "log 0.3.9", -+] -+ -+[[package]] -+name = "mime_guess" -+version = "1.8.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" -+dependencies = [ -+ "mime", -+ "phf", -+ "phf_codegen", -+ "unicase", -+] -+ -+[[package]] -+name = "multipart" -+version = "0.15.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" -+dependencies = [ -+ "buf_redux", -+ "httparse", -+ "log 0.4.8", -+ "mime", -+ "mime_guess", -+ "quick-error", -+ "rand 0.4.6", -+ "safemem", -+ "tempdir", -+ "twoway", -+] -+ -+[[package]] -+name = "no-std" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "nom" -+version = "4.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -+dependencies = [ -+ "memchr", -+ "version_check 0.1.5", -+] -+ -+[[package]] -+name = "nom" -+version = "5.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" -+dependencies = [ -+ "memchr", -+ "version_check 0.9.1", -+] -+ -+[[package]] -+name = "normalize-line-endings" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" -+ -+[[package]] -+name = "num-integer" -+version = "0.1.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" -+dependencies = [ -+ "autocfg 1.0.0", -+ "num-traits 0.2.11", -+] -+ -+[[package]] -+name = "num-iter" -+version = "0.1.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00" -+dependencies = [ -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits 0.2.11", -+] -+ -+[[package]] -+name = "num-rational" -+version = "0.1.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -+dependencies = [ -+ "num-integer", -+ "num-traits 0.2.11", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+dependencies = [ -+ "num-traits 0.2.11", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -+dependencies = [ -+ "autocfg 1.0.0", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "openssl" -+version = "0.10.29" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" -+dependencies = [ -+ "bitflags 1.2.1", -+ "cfg-if", -+ "foreign-types", -+ "lazy_static", -+ "libc", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+ -+[[package]] -+name = "openssl-src" -+version = "111.9.0+1.1.1g" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.55" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" -+dependencies = [ -+ "autocfg 1.0.0", -+ "cc", -+ "libc", -+ "openssl-src", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -+ -+[[package]] -+name = "performance" -+version = "0.1.0" -+dependencies = [ -+ "humantime", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "phf" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -+dependencies = [ -+ "phf_shared", -+] -+ -+[[package]] -+name = "phf_codegen" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -+dependencies = [ -+ "phf_generator", -+ "phf_shared", -+] -+ -+[[package]] -+name = "phf_generator" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -+dependencies = [ -+ "phf_shared", -+ "rand 0.6.5", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+dependencies = [ -+ "siphasher", -+ "unicase", -+] -+ -+[[package]] -+name = "pin-utils" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+ -+[[package]] -+name = "png" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" -+dependencies = [ -+ "bitflags 0.7.0", -+ "deflate", -+ "inflate", -+ "num-iter", -+] -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+ -+[[package]] -+name = "predicates" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030" -+dependencies = [ -+ "difference", -+ "float-cmp", -+ "normalize-line-endings", -+ "predicates-core", -+ "regex", -+] -+ -+[[package]] -+name = "predicates-core" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" -+ -+[[package]] -+name = "predicates-tree" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" -+dependencies = [ -+ "predicates-core", -+ "treeline", -+] -+ -+[[package]] -+name = "proc-macro-error" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" -+dependencies = [ -+ "proc-macro-error-attr", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+ "version_check 0.9.1", -+] -+ -+[[package]] -+name = "proc-macro-error-attr" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" -+dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+ "syn-mid", -+ "version_check 0.9.1", -+] -+ -+[[package]] -+name = "proc-macro-hack" -+version = "0.5.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63" -+ -+[[package]] -+name = "proc-macro-nested" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" -+ -+[[package]] -+name = "proc-macro2" -+version = "0.4.30" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -+dependencies = [ -+ "unicode-xid 0.1.0", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" -+dependencies = [ -+ "unicode-xid 0.2.0", -+] -+ -+[[package]] -+name = "quick-error" -+version = "1.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -+ -+[[package]] -+name = "quote" -+version = "0.6.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -+dependencies = [ -+ "proc-macro2 0.4.30", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" -+dependencies = [ -+ "proc-macro2 1.0.10", -+] -+ -+[[package]] -+name = "rand" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -+dependencies = [ -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "rdrand", -+ "winapi", -+] -+ -+[[package]] -+name = "rand" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -+dependencies = [ -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "winapi", -+] -+ -+[[package]] -+name = "rand" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+dependencies = [ -+ "autocfg 0.1.7", -+ "libc", -+ "rand_chacha 0.1.1", -+ "rand_core 0.4.2", -+ "rand_hc 0.1.0", -+ "rand_isaac", -+ "rand_jitter", -+ "rand_os", -+ "rand_pcg", -+ "rand_xorshift", -+ "winapi", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+dependencies = [ -+ "getrandom", -+ "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc 0.2.0", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -+dependencies = [ -+ "autocfg 0.1.7", -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+dependencies = [ -+ "rand_core 0.4.2", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_isaac" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rand_jitter" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -+dependencies = [ -+ "libc", -+ "rand_core 0.4.2", -+ "winapi", -+] -+ -+[[package]] -+name = "rand_os" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+dependencies = [ -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.4.2", -+ "rdrand", -+ "winapi", -+] -+ -+[[package]] -+name = "rand_pcg" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -+dependencies = [ -+ "autocfg 0.1.7", -+ "rand_core 0.4.2", -+] -+ -+[[package]] -+name = "rand_xorshift" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rayon" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" -+dependencies = [ -+ "crossbeam-deque", -+ "either", -+ "rayon-core", -+] -+ -+[[package]] -+name = "rayon-core" -+version = "1.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" -+dependencies = [ -+ "crossbeam-deque", -+ "crossbeam-queue", -+ "crossbeam-utils", -+ "lazy_static", -+ "num_cpus", -+] -+ -+[[package]] -+name = "raytrace-parallel" -+version = "0.1.0" -+dependencies = [ -+ "console_error_panic_hook", -+ "futures-channel-preview", -+ "js-sys", -+ "rayon", -+ "rayon-core", -+ "raytracer", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "web-sys", -+] -+ -+[[package]] -+name = "raytracer" -+version = "0.1.0" -+source = "git+https://github.com/alexcrichton/raytracer?branch=update-deps#42faa13859f7d8d47fd18be785c108003a207786" -+dependencies = [ -+ "image", -+ "serde", -+ "serde_derive", -+] -+ -+[[package]] -+name = "rdrand" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.56" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+ -+[[package]] -+name = "redox_users" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -+dependencies = [ -+ "getrandom", -+ "redox_syscall", -+ "rust-argon2", -+] -+ -+[[package]] -+name = "regex" -+version = "1.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+ "thread_local", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "request-animation-frame" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "rouille" -+version = "3.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f" -+dependencies = [ -+ "base64 0.9.3", -+ "chrono", -+ "filetime", -+ "multipart", -+ "num_cpus", -+ "rand 0.5.6", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "sha1", -+ "term", -+ "threadpool", -+ "time", -+ "tiny_http", -+ "url", -+] -+ -+[[package]] -+name = "rust-argon2" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -+dependencies = [ -+ "base64 0.11.0", -+ "blake2b_simd", -+ "constant_time_eq", -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "rust-duck-typed-interfaces" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+ -+[[package]] -+name = "ryu" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" -+ -+[[package]] -+name = "safemem" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -+ -+[[package]] -+name = "sample" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "wasm-bindgen-test", -+] -+ -+[[package]] -+name = "schannel" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" -+dependencies = [ -+ "lazy_static", -+ "winapi", -+] -+ -+[[package]] -+name = "scoped-tls" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" -+ -+[[package]] -+name = "scoped_threadpool" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" -+ -+[[package]] -+name = "scopeguard" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+ -+[[package]] -+name = "serde" -+version = "1.0.106" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.106" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" -+dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.52" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "sha1" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" -+ -+[[package]] -+name = "siphasher" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+ -+[[package]] -+name = "slab" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -+ -+[[package]] -+name = "smallvec" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" -+ -+[[package]] -+name = "socket2" -+version = "0.3.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi", -+] -+ -+[[package]] -+name = "sourcefile" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "strsim" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -+ -+[[package]] -+name = "structopt" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef" -+dependencies = [ -+ "clap", -+ "lazy_static", -+ "structopt-derive", -+] -+ -+[[package]] -+name = "structopt-derive" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+] -+ -+[[package]] -+name = "syn" -+version = "0.15.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -+dependencies = [ -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "unicode-xid 0.1.0", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" -+dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "unicode-xid 0.2.0", -+] -+ -+[[package]] -+name = "syn-mid" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -+dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+] -+ -+[[package]] -+name = "tempdir" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -+dependencies = [ -+ "rand 0.4.6", -+ "remove_dir_all", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "rand 0.7.3", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi", -+] -+ -+[[package]] -+name = "term" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -+dependencies = [ -+ "byteorder", -+ "dirs", -+ "winapi", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thread_local" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "threadpool" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8dae184447c15d5a6916d973c642aec485105a13cd238192a6927ae3e077d66" -+dependencies = [ -+ "num_cpus", -+] -+ -+[[package]] -+name = "time" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "tiny_http" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" -+dependencies = [ -+ "ascii", -+ "chrono", -+ "chunked_transfer", -+ "log 0.4.8", -+ "url", -+] -+ -+[[package]] -+name = "todomvc" -+version = "0.1.0" -+dependencies = [ -+ "askama", -+ "console_error_panic_hook", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "toml" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "treeline" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" -+ -+[[package]] -+name = "trybuild" -+version = "1.0.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4e5696e4fd793743fbcc29943fe965ea3993b6c3d2a6a3a35c6680d926fd3a49" -+dependencies = [ -+ "glob", -+ "lazy_static", -+ "serde", -+ "serde_json", -+ "termcolor", -+ "toml 0.5.6", -+] -+ -+[[package]] -+name = "twoway" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "typescript-tests" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "unicase" -+version = "1.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+dependencies = [ -+ "version_check 0.1.5", -+] -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+dependencies = [ -+ "matches", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -+dependencies = [ -+ "smallvec", -+] -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+ -+[[package]] -+name = "url" -+version = "1.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+dependencies = [ -+ "idna", -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+ -+[[package]] -+name = "version_check" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+ -+[[package]] -+name = "version_check" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" -+ -+[[package]] -+name = "walrus" -+version = "0.14.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d96e9ec3f81fdb3210b12b2b1e9e39369c8050a3a28e692e5247e3ab5196410" -+dependencies = [ -+ "anyhow", -+ "id-arena", -+ "leb128", -+ "log 0.4.8", -+ "rayon", -+ "walrus-macro", -+ "wasmparser 0.42.1", -+] -+ -+[[package]] -+name = "walrus-macro" -+version = "0.14.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" -+dependencies = [ -+ "heck", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.9.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.62" -+dependencies = [ -+ "cfg-if", -+ "js-sys", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "wasm-bindgen-futures", -+ "wasm-bindgen-macro", -+ "wasm-bindgen-test", -+ "wasm-bindgen-test-crate-a", -+ "wasm-bindgen-test-crate-b", -+] -+ -+[[package]] -+name = "wasm-bindgen-anyref-xform" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "rayon", -+ "walrus", -+ "wasmprinter", -+ "wast 3.0.4", -+ "wat", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.62" -+dependencies = [ -+ "bumpalo", -+ "lazy_static", -+ "log 0.4.8", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-benchmark" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "wasm-bindgen-cli" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "assert_cmd", -+ "curl", -+ "diff", -+ "docopt", -+ "env_logger", -+ "log 0.4.8", -+ "openssl", -+ "predicates", -+ "rayon", -+ "rouille", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "tempfile", -+ "walrus", -+ "wasm-bindgen-cli-support", -+ "wasm-bindgen-shared", -+ "wit-printer", -+ "wit-text", -+ "wit-validator", -+ "wit-walrus", -+] -+ -+[[package]] -+name = "wasm-bindgen-cli-support" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "base64 0.9.3", -+ "log 0.4.8", -+ "rustc-demangle", -+ "serde_json", -+ "tempfile", -+ "walrus", -+ "wasm-bindgen-anyref-xform", -+ "wasm-bindgen-multi-value-xform", -+ "wasm-bindgen-shared", -+ "wasm-bindgen-threads-xform", -+ "wasm-bindgen-wasm-conventions", -+ "wasm-bindgen-wasm-interpreter", -+ "wit-text", -+ "wit-validator", -+ "wit-walrus", -+] -+ -+[[package]] -+name = "wasm-bindgen-futures" -+version = "0.4.12" -+dependencies = [ -+ "cfg-if", -+ "futures-channel-preview", -+ "js-sys", -+ "wasm-bindgen", -+ "wasm-bindgen-test", -+ "web-sys", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.62" -+dependencies = [ -+ "quote 1.0.4", -+ "trybuild", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.62" -+dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-multi-value-xform" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "rayon", -+ "walrus", -+ "wasmprinter", -+ "wast 3.0.4", -+ "wat", -+] -+ -+[[package]] -+name = "wasm-bindgen-paint" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.62" -+ -+[[package]] -+name = "wasm-bindgen-test" -+version = "0.3.12" -+dependencies = [ -+ "console_error_panic_hook", -+ "js-sys", -+ "scoped-tls", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "wasm-bindgen-test-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-test-crate-a" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "wasm-bindgen-test-crate-b" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "wasm-bindgen-test-macro" -+version = "0.3.12" -+dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+] -+ -+[[package]] -+name = "wasm-bindgen-threads-xform" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "walrus", -+ "wasm-bindgen-wasm-conventions", -+] -+ -+[[package]] -+name = "wasm-bindgen-wasm-conventions" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "walrus", -+] -+ -+[[package]] -+name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "log 0.4.8", -+ "tempfile", -+ "walrus", -+ "wat", -+] -+ -+[[package]] -+name = "wasm-bindgen-webidl" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "env_logger", -+ "heck", -+ "lazy_static", -+ "log 0.4.8", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "sourcefile", -+ "structopt", -+ "syn 1.0.18", -+ "wasm-bindgen-backend", -+ "weedle", -+] -+ -+[[package]] -+name = "wasm-in-wasm" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+] -+ -+[[package]] -+name = "wasm2js" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "wasmparser" -+version = "0.42.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1527c84a5bd585215f29c06b0e2a5274e478ad4dfc970d26ffad66fdc6cb311d" -+ -+[[package]] -+name = "wasmparser" -+version = "0.51.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a" -+ -+[[package]] -+name = "wasmprinter" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8bd423d45b95fcee11775472bfdce66c63c45ada23c1b338e0a63d623a6c475b" -+dependencies = [ -+ "anyhow", -+ "wasmparser 0.51.4", -+] -+ -+[[package]] -+name = "wast" -+version = "3.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1" -+dependencies = [ -+ "leb128", -+] -+ -+[[package]] -+name = "wast" -+version = "14.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17" -+dependencies = [ -+ "leb128", -+] -+ -+[[package]] -+name = "wat" -+version = "1.0.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03db18bc33cff3859c296efbefdcc00763a644539feeadca3415a1cee8a2835d" -+dependencies = [ -+ "wast 14.0.0", -+] -+ -+[[package]] -+name = "web-sys" -+version = "0.3.39" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "wasm-bindgen-test", -+] -+ -+[[package]] -+name = "webaudio" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "webgl" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "webidl-tests" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "wasm-bindgen-test", -+ "wasm-bindgen-webidl", -+] -+ -+[[package]] -+name = "websockets" -+version = "0.1.0" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "webxr" -+version = "0.1.0" -+dependencies = [ -+ "futures", -+ "js-sys", -+ "serde", -+ "serde_derive", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "web-sys", -+] -+ -+[[package]] -+name = "weedle" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" -+dependencies = [ -+ "nom 5.1.1", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "wit-parser" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "29a378ab795034efe2c4a6c8a388a2d9b31d360ad441c0bc9859b3d4d37e62a3" -+dependencies = [ -+ "anyhow", -+ "leb128", -+ "wit-schema-version", -+] -+ -+[[package]] -+name = "wit-printer" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c76e17384f4feb766d109a42c309b78de75ea2b3745f663ac3f5f331633f77f" -+dependencies = [ -+ "anyhow", -+ "wasmprinter", -+ "wit-parser", -+ "wit-schema-version", -+] -+ -+[[package]] -+name = "wit-schema-version" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a" -+ -+[[package]] -+name = "wit-text" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2aa19a002c984e25356af8938a8f4b7f0c9fe3963498e7ae1f90d64da9e563f5" -+dependencies = [ -+ "anyhow", -+ "wast 3.0.4", -+ "wit-writer", -+] -+ -+[[package]] -+name = "wit-validator" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2454229f760a433842db154c9bb54da896fdf2352b1d63261f617bcdf20be0bd" -+dependencies = [ -+ "anyhow", -+ "wasmparser 0.51.4", -+ "wit-parser", -+ "wit-schema-version", -+] -+ -+[[package]] -+name = "wit-walrus" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e14fbb9453201558c582d227c2b75df5c050409f467e8c220fcd57dc369280a" -+dependencies = [ -+ "anyhow", -+ "id-arena", -+ "walrus", -+ "wit-parser", -+ "wit-schema-version", -+ "wit-writer", -+] -+ -+[[package]] -+name = "wit-writer" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ebeb128df9e103e61f8ddd8a190259f3c48b73fe86a5932f40f4de526ef357e8" -+dependencies = [ -+ "leb128", -+ "wit-schema-version", -+] -+ -+[[package]] -+name = "without-a-bundler" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "without-a-bundler-no-modules" -+version = "0.1.0" -+dependencies = [ -+ "wasm-bindgen", -+ "web-sys", -+] --- -2.25.4 - diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock new file mode 100644 index 0000000000..690b1998e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -0,0 +1,2551 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "add" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "adler32" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" + +[[package]] +name = "aho-corasick" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" + +[[package]] +name = "ascii" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" + +[[package]] +name = "askama" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7acc25b09d27eaec97794c58d8483a227f2adc98b762f915745525d8781dba0" +dependencies = [ + "askama_derive", + "askama_escape", + "askama_shared", +] + +[[package]] +name = "askama_derive" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f7dc4c28f064af8bbba24867ec6c3165c645635cb1306bca4c0f991ce8b15a9" +dependencies = [ + "askama_shared", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "askama_escape" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" + +[[package]] +name = "askama_shared" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b64d552e0dc2837d5c27276e80521cf864f42c079e476b3035a196566fcee59" +dependencies = [ + "askama_escape", + "humansize", + "nom", + "num-traits 0.2.12", + "percent-encoding 2.1.0", + "proc-macro2", + "quote", + "serde", + "syn", + "toml", +] + +[[package]] +name = "assert_cmd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da" +dependencies = [ + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] +name = "autocfg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +dependencies = [ + "byteorder", + "safemem", +] + +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + +[[package]] +name = "bitflags" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "blake2b_simd" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + +[[package]] +name = "buf_redux" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" +dependencies = [ + "memchr", + "safemem", +] + +[[package]] +name = "bumpalo" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" + +[[package]] +name = "byteorder" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "canvas" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "cc" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "char" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "chrono" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" +dependencies = [ + "num-integer", + "num-traits 0.2.12", + "time", +] + +[[package]] +name = "chunked_transfer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" + +[[package]] +name = "clap" +version = "2.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.2.1", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "closures" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags 1.2.1", +] + +[[package]] +name = "color_quant" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" + +[[package]] +name = "console_error_panic_hook" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "console_log" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "crossbeam-deque" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg 1.0.0", + "cfg-if", + "crossbeam-utils", + "lazy_static", + "maybe-uninit", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg 1.0.0", + "cfg-if", + "lazy_static", +] + +[[package]] +name = "curl" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0447a642435be046540f042950d874a4907f9fee28c0513a0beb3ba89f91eb7" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi", +] + +[[package]] +name = "curl-sys" +version = "0.4.32+curl-7.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "834425a2f22fdd621434196965bf99fbfd9eaed96348488e27b7ac40736c560b" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi", +] + +[[package]] +name = "deflate" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +dependencies = [ + "adler32", + "byteorder", +] + +[[package]] +name = "deno" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" + +[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + +[[package]] +name = "dirs" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "docopt" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" +dependencies = [ + "lazy_static", + "regex", + "serde", + "strsim 0.9.3", +] + +[[package]] +name = "dom" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + +[[package]] +name = "enum_primitive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" +dependencies = [ + "num-traits 0.1.43", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime 1.3.0", + "log 0.4.11", + "regex", + "termcolor", +] + +[[package]] +name = "fetch" +version = "0.1.0" +dependencies = [ + "js-sys", + "serde", + "serde_derive", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "filetime" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "affc17579b132fc2461adf7c575cc6e8b134ebca52c51f5411388965227dc695" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "winapi", +] + +[[package]] +name = "float-cmp" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62c4f1b81918835a8c6a484a397775fff5953fe83529afd51b05f5c6a6617d" +dependencies = [ + "num-traits 0.2.12", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "futures" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-channel-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" +dependencies = [ + "futures-core-preview", +] + +[[package]] +name = "futures-core" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" + +[[package]] +name = "futures-core-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" + +[[package]] +name = "futures-executor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" + +[[package]] +name = "futures-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" + +[[package]] +name = "futures-task" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" +dependencies = [ + "once_cell", +] + +[[package]] +name = "futures-util" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f" +dependencies = [ + "color_quant", + "lzw", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "guide-supported-types-examples" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "heck" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hello_world" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "hermit-abi" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +dependencies = [ + "libc", +] + +[[package]] +name = "httparse" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" + +[[package]] +name = "humansize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "humantime" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +dependencies = [ + "rayon", +] + +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158" +dependencies = [ + "byteorder", + "enum_primitive", + "gif", + "jpeg-decoder", + "num-iter", + "num-rational", + "num-traits 0.1.43", + "png", + "scoped_threadpool", +] + +[[package]] +name = "import_js" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "inflate" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" + +[[package]] +name = "itoa" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" + +[[package]] +name = "jpeg-decoder" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" +dependencies = [ + "byteorder", + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.42" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", +] + +[[package]] +name = "julia_set" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "leb128" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" + +[[package]] +name = "libc" +version = "0.2.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701" + +[[package]] +name = "libz-sys" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ + "log 0.4.11", +] + +[[package]] +name = "log" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lzw" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" + +[[package]] +name = "memoffset" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +dependencies = [ + "autocfg 1.0.0", +] + +[[package]] +name = "mime" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" +dependencies = [ + "log 0.3.9", +] + +[[package]] +name = "mime_guess" +version = "1.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" +dependencies = [ + "mime", + "phf", + "phf_codegen", + "unicase", +] + +[[package]] +name = "multipart" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" +dependencies = [ + "buf_redux", + "httparse", + "log 0.4.11", + "mime", + "mime_guess", + "quick-error", + "rand 0.4.6", + "safemem", + "tempdir", + "twoway", +] + +[[package]] +name = "no-std" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check 0.9.2", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "num-integer" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +dependencies = [ + "autocfg 1.0.0", + "num-traits 0.2.12", +] + +[[package]] +name = "num-iter" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +dependencies = [ + "autocfg 1.0.0", + "num-integer", + "num-traits 0.2.12", +] + +[[package]] +name = "num-rational" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" +dependencies = [ + "num-integer", + "num-traits 0.2.12", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.12", +] + +[[package]] +name = "num-traits" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +dependencies = [ + "autocfg 1.0.0", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" + +[[package]] +name = "openssl" +version = "0.10.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +dependencies = [ + "bitflags 1.2.1", + "cfg-if", + "foreign-types", + "lazy_static", + "libc", + "openssl-sys", +] + +[[package]] +name = "openssl-probe" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + +[[package]] +name = "openssl-src" +version = "111.10.1+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "375f12316ddf0762f7cf1e2890a0a857954b96851b47b5af7fc06940c9e12f83" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +dependencies = [ + "autocfg 1.0.0", + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "performance" +version = "0.1.0" +dependencies = [ + "humantime 2.0.1", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +dependencies = [ + "phf_shared", + "rand 0.6.5", +] + +[[package]] +name = "phf_shared" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +dependencies = [ + "siphasher", + "unicase", +] + +[[package]] +name = "pin-project" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" + +[[package]] +name = "png" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" +dependencies = [ + "bitflags 0.7.0", + "deflate", + "inflate", + "num-iter", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" + +[[package]] +name = "predicates" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030" +dependencies = [ + "difference", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" + +[[package]] +name = "predicates-tree" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" +dependencies = [ + "predicates-core", + "treeline", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check 0.9.2", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "syn-mid", + "version_check 0.9.2", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" + +[[package]] +name = "proc-macro-nested" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" + +[[package]] +name = "proc-macro2" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi", +] + +[[package]] +name = "rand" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "winapi", +] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.7", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc 0.1.0", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.7", + "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.7", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rayon" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +dependencies = [ + "autocfg 1.0.0", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +dependencies = [ + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "raytrace-parallel" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "futures-channel-preview", + "js-sys", + "rayon", + "rayon-core", + "raytracer", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "raytracer" +version = "0.1.0" +source = "git+https://github.com/alexcrichton/raytracer?branch=update-deps#42faa13859f7d8d47fd18be785c108003a207786" +dependencies = [ + "image", + "serde", + "serde_derive", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_users" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +dependencies = [ + "getrandom", + "redox_syscall", + "rust-argon2", +] + +[[package]] +name = "regex" +version = "1.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", +] + +[[package]] +name = "regex-syntax" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "request-animation-frame" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "rouille" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f" +dependencies = [ + "base64 0.9.3", + "chrono", + "filetime", + "multipart", + "num_cpus", + "rand 0.5.6", + "serde", + "serde_derive", + "serde_json", + "sha1", + "term", + "threadpool", + "time", + "tiny_http", + "url", +] + +[[package]] +name = "rust-argon2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +dependencies = [ + "base64 0.11.0", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", +] + +[[package]] +name = "rust-duck-typed-interfaces" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "sample" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", +] + +[[package]] +name = "schannel" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "scoped_threadpool" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" + +[[package]] +name = "siphasher" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] +name = "slab" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + +[[package]] +name = "socket2" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "winapi", +] + +[[package]] +name = "sourcefile" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "structopt" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "syn-mid" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +dependencies = [ + "rand 0.4.6", + "remove_dir_all", +] + +[[package]] +name = "tempfile" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +dependencies = [ + "cfg-if", + "libc", + "rand 0.7.3", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "term" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" +dependencies = [ + "byteorder", + "dirs", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "tiny_http" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" +dependencies = [ + "ascii", + "chrono", + "chunked_transfer", + "log 0.4.11", + "url", +] + +[[package]] +name = "tinyvec" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" + +[[package]] +name = "todomvc" +version = "0.1.0" +dependencies = [ + "askama", + "console_error_panic_hook", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "toml" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +dependencies = [ + "serde", +] + +[[package]] +name = "treeline" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" + +[[package]] +name = "trybuild" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe777c4e2060f44d83892be1189f96200be8ed3d99569d5c2d5ee26e62c0ea9" +dependencies = [ + "glob", + "lazy_static", + "serde", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "twoway" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" +dependencies = [ + "memchr", +] + +[[package]] +name = "typescript-tests" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +dependencies = [ + "version_check 0.1.5", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +dependencies = [ + "matches", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ + "idna", + "matches", + "percent-encoding 1.0.1", +] + +[[package]] +name = "vcpkg" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" + +[[package]] +name = "version_check" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walrus" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d470d0583e65f4cab21a1ff3c1ba3dd23ae49e68f516f0afceaeb001b32af39" +dependencies = [ + "anyhow", + "id-arena", + "leb128", + "log 0.4.11", + "rayon", + "walrus-macro", + "wasmparser", +] + +[[package]] +name = "walrus-macro" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c2bb690b44cb1b0fdcc54d4998d21f8bdaf706b93775425e440b174f39ad16" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasm-bindgen" +version = "0.2.65" +dependencies = [ + "cfg-if", + "js-sys", + "serde", + "serde_derive", + "serde_json", + "wasm-bindgen-futures", + "wasm-bindgen-macro", + "wasm-bindgen-test", + "wasm-bindgen-test-crate-a", + "wasm-bindgen-test-crate-b", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.65" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.11", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-benchmark" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-cli" +version = "0.2.65" +dependencies = [ + "anyhow", + "assert_cmd", + "curl", + "diff", + "docopt", + "env_logger", + "log 0.4.11", + "openssl", + "predicates", + "rayon", + "rouille", + "serde", + "serde_derive", + "serde_json", + "tempfile", + "walrus", + "wasm-bindgen-cli-support", + "wasm-bindgen-shared", + "wit-printer", + "wit-text", + "wit-validator", + "wit-walrus", +] + +[[package]] +name = "wasm-bindgen-cli-support" +version = "0.2.65" +dependencies = [ + "anyhow", + "base64 0.9.3", + "log 0.4.11", + "rustc-demangle", + "serde_json", + "tempfile", + "walrus", + "wasm-bindgen-externref-xform", + "wasm-bindgen-multi-value-xform", + "wasm-bindgen-shared", + "wasm-bindgen-threads-xform", + "wasm-bindgen-wasm-conventions", + "wasm-bindgen-wasm-interpreter", + "wit-text", + "wit-validator", + "wit-walrus", +] + +[[package]] +name = "wasm-bindgen-externref-xform" +version = "0.2.65" +dependencies = [ + "anyhow", + "rayon", + "walrus", + "wasmprinter", + "wast", + "wat", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.15" +dependencies = [ + "cfg-if", + "futures-channel-preview", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-test", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.65" +dependencies = [ + "quote", + "trybuild", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.65" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" +version = "0.2.65" +dependencies = [ + "anyhow", + "rayon", + "walrus", + "wasmprinter", + "wast", + "wat", +] + +[[package]] +name = "wasm-bindgen-paint" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.65" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.15" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-crate-a" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "wasm-bindgen-test-crate-b" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.15" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "wasm-bindgen-threads-xform" +version = "0.2.65" +dependencies = [ + "anyhow", + "walrus", + "wasm-bindgen-wasm-conventions", +] + +[[package]] +name = "wasm-bindgen-wasm-conventions" +version = "0.2.65" +dependencies = [ + "anyhow", + "walrus", +] + +[[package]] +name = "wasm-bindgen-wasm-interpreter" +version = "0.2.65" +dependencies = [ + "anyhow", + "log 0.4.11", + "tempfile", + "walrus", + "wasm-bindgen-wasm-conventions", + "wat", +] + +[[package]] +name = "wasm-bindgen-webidl" +version = "0.2.65" +dependencies = [ + "anyhow", + "env_logger", + "heck", + "lazy_static", + "log 0.4.11", + "proc-macro2", + "quote", + "sourcefile", + "structopt", + "syn", + "wasm-bindgen-backend", + "weedle", +] + +[[package]] +name = "wasm-in-wasm" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", +] + +[[package]] +name = "wasm-in-wasm-imports" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", +] + +[[package]] +name = "wasm2js" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "wasmparser" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" + +[[package]] +name = "wasmprinter" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334551eb8b0b1be16cf366a54ce9b541ac32a96e9b51e67ebbae1696f108f112" +dependencies = [ + "anyhow", + "wasmparser", +] + +[[package]] +name = "wast" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5" +dependencies = [ + "leb128", +] + +[[package]] +name = "wat" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" +dependencies = [ + "wast", +] + +[[package]] +name = "web-sys" +version = "0.3.42" +dependencies = [ + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", +] + +[[package]] +name = "webaudio" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "webgl" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "webidl-tests" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "wasm-bindgen-test", + "wasm-bindgen-webidl", +] + +[[package]] +name = "webrtc_datachannel" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "websockets" +version = "0.1.0" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "webxr" +version = "0.1.0" +dependencies = [ + "futures", + "js-sys", + "serde", + "serde_derive", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "weedle" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" +dependencies = [ + "nom", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wit-parser" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f5fd97866f4b9c8e1ed57bcf9446f3d0d8ba37e2dd01c3c612c046c053b06f7" +dependencies = [ + "anyhow", + "leb128", + "wit-schema-version", +] + +[[package]] +name = "wit-printer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f19ca44555a3c14d69acee6447a6e4f52771b0c6e5d8db3e42db3b90f6fce9" +dependencies = [ + "anyhow", + "wasmprinter", + "wit-parser", + "wit-schema-version", +] + +[[package]] +name = "wit-schema-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a" + +[[package]] +name = "wit-text" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f" +dependencies = [ + "anyhow", + "wast", + "wit-writer", +] + +[[package]] +name = "wit-validator" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c11d93d925420e7872b226c4161849c32be38385ccab026b88df99d8ddc6ba6" +dependencies = [ + "anyhow", + "wasmparser", + "wit-parser", + "wit-schema-version", +] + +[[package]] +name = "wit-walrus" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b532d7bc47d02a08463adc934301efbf67e7b1e1284f8a68edc85d1ca84fa125" +dependencies = [ + "anyhow", + "id-arena", + "walrus", + "wit-parser", + "wit-schema-version", + "wit-writer", +] + +[[package]] +name = "wit-writer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ad01ba5e9cbcff799a0689e56a153776ea694cec777f605938cb9880d41a09" +dependencies = [ + "leb128", + "wit-schema-version", +] + +[[package]] +name = "without-a-bundler" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "without-a-bundler-no-modules" +version = "0.1.0" +dependencies = [ + "wasm-bindgen", + "web-sys", +] diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index 9adabeb573..97a48a3700 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,21 +1,29 @@ -{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security, ... }: +{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security +, runCommand +}: rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.62"; + version = "0.2.65"; - src = fetchFromGitHub { - owner = "rustwasm"; - repo = "wasm-bindgen"; - rev = version; - sha256 = "0d3ph3g220nvzwxa71rch03j5c0w06v8z4lmlyp5kky6p86r37hz"; - }; + src = + let + tarball = fetchFromGitHub { + owner = "rustwasm"; + repo = "wasm-bindgen"; + rev = version; + sha256 = "0qfz5x2hmfxz0kjc1biki0748d4qi8ws0b4bx9y2fs8dgbnppkzf"; + }; + in runCommand "source" { } '' + cp -R ${tarball} $out + chmod -R +w $out + cp ${./Cargo.lock} $out/Cargo.lock + ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "13lj2yx2bcwac1b4gpwcgiwqvy178zis6r1pidn4pgwqv7zxa7p2"; - cargoPatches = [ ./0001-Add-cargo.lock.patch ]; + cargoSha256 = "1rjf4f8hm4vqjcdhi7s5az8p5633dg425m8hh32kakq1ar06pfvj"; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix index 500fde0ef4..8db0b719c6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { comment = "Platform independend Python debugger"; desktopName = "Winpdb"; genericName = "Python Debugger"; - categories = "Application;Development;Debugger;"; + categories = "Development;Debugger;"; }; # Don't call gnome-terminal with "--disable-factory" flag, which is diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix index cdbba23692..6a6d6e3928 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.9.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0i3fhdq8v9459mlnazkv9bpkcv01rdy5rk149lhpsan76zlyzzwr"; + sha256 = "0703zlrmv0if575rj1mrgfg1a5qbf98sqjhhj09hab69i96wbrk9"; }; - cargoSha256 = "0c2ss3j53vra1b4m3jsy2w2gdf6k1hw3qf6sd4qlg2ybk4k83g3b"; + cargoSha256 = "0znzyqzvbqcl4mmxpsvaf592xrs968x57czj45jibmafq033dbfa"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 22032e145d..89bc169d50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -284,7 +284,7 @@ in rec { '') workspaceDependenciesTransitive; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // { + in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies"] // { inherit src pname; name = baseName; @@ -389,7 +389,7 @@ in rec { # yarn2nix is the only package that requires the yarnNix option. # All the other projects can auto-generate that file. yarnNix = ./yarn.nix; - + # Using the filter above and importing package.json from the filtered # source results in an error in restricted mode. To circumvent this, # we import package.json from the unfiltered source diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index fc6fcd2348..e830309381 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "0fr6zwnij3r53dqdw43qfmp4nw26gv6zmj066l44fazka4fl25i6"; + sha256 = "1rdpjxnq6cs6gwpp4bijp38b657yzjqcdzf98lhhpbpskjz8k8pp"; }; vendorSha256 = "1bjy3qr26zndr3dhh9gd33rhm5gy779525qgzjw4a4mla0p2q6kl"; diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index 3b38d86b45..abc07fc3e9 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "4.8.0"; + version = "4.9.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0wivvh3fhyhxx9f6vp0kgqkjj4957hj0b15r2igbxnyqvahwxgx7"; + sha256 = "1lyhwy4rg6gdsj4590ya5v27lmyz6hnn4dhs51dq5i069rsw9qw4"; }; # don't remove runtime deps diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 95778c2544..e5e76628ec 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -18,22 +18,21 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "0034c2qp8sf6li7d38rnd6h9vhhi82p5rysm0pkrdhlmfqkqdgma"; + sha256 = "0wxwsp8g5i8jsjn3fsry81xj4lyp1ik6ngcypwvb5v8x30jci6ng"; fetchSubmodules = true; }; - cargoSha256 = "1wbqxv2mzbs27j617a88gd7z0fjnjr2z1nklqfk49y62v8f1vsm1"; + cargoSha256 = "0sss85v9k3f5narnmdv428sblqzkyb47xvvavz1m6x03qw11h8zh"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; - buildInputs = with stdenv.lib; [ ] - ++ optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ]; # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and place it in the locations it will require it in advance diff --git a/third_party/nixpkgs/pkgs/development/web/deno/deps.nix b/third_party/nixpkgs/pkgs/development/web/deno/deps.nix index 32669a6111..61cb967a36 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/deps.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.5.1"; + version = "0.6.0"; sha256s = { - x86_64-linux = "1gggnbki6b733qfx16gkqpplfsfmg1xv2a3nhh42xiykwsh987xl"; - aarch64-linux = "1an5ylm0w2x0dm34m9z6sld8f067f2rnsndr6mh6smp19jl889ma"; - x86_64-darwin = "1x1f5r8s8n00xag6d36j4h40rfc0r1w4wnmcr02sspzzkpyjxn2l"; + x86_64-linux = "1mpgddlcsfc5jpkqpwpbld9d2pr3dflkbd1w9ryai0aymv8r2rmb"; + aarch64-linux = "0qqr0i6z39fb298azp2rm0ns0bw3il3xj5zy58cn96h624rxkn67"; + x86_64-darwin = "0pj7127cvz01kq6vs91sdxkwkbjx7j3cv7lwvyilifbl01j3vwip"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 1a7a3d6607..2437962191 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.131"; + version = "0.0.135"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0b9qrraydihw4wglif3rjmjlqdsgxh873023z3rgrvf7dwrhc9y0"; + sha256 = "0gxd32pb901hlr493gp736rjd5fpwgqvmlir6b5r0fzyv22f8x2d"; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 5eeed80007..12754b6d44 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -141,7 +141,7 @@ in description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu gilligan cko ]; + maintainers = with maintainers; [ goibhniu gilligan cko marsam ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index 214292afbb..503461cc48 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.18.1"; - sha256 = "0yjwd8yilm85wkginvhhchcikjsl8g3l3qagbg0l2y1hg8f0anfa"; + version = "12.18.2"; + sha256 = "1wnxab2shqgs5in0h39qy2fc7f32pcz4gl9i2mj1001pfani1g9q"; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix index 92cac53c78..37156b5a96 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -9,6 +9,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.4.0"; - sha256 = "1fbx1r3fflpsy0s7zknca0xyv2gg0ff5fl8czzsb79imqjlgcy0x"; + version = "14.5.0"; + sha256 = "1d6w7ycdiqbkip7m6m8xly31qgx7ywakzvrnqdq8ini5sricjlgb"; } diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index e56ab1bbba..854ca5e04e 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, makeDesktopItem, wrapGAppsHook -, atk, at-spi2-atk, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 -, freetype, fontconfig, nss, nspr, pango, udev, libX11, libxcb, libXi +, atk, at-spi2-atk, at-spi2-core, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 +, freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes , libXrender, libXtst, libXScrnSaver }: stdenv.mkDerivation rec { pname = "postman"; - version = "7.24.0"; + version = "7.26.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0wriyj58icgljmghghyxi1mnjr1vh5jyp8lzwcf6lcsdvsh0ccmw"; + sha256 = "05xs389bf0127n8rdivbfxvgjvlrk9pyr74klswwlksxciv74i3j"; name = "${pname}.tar.gz"; }; @@ -25,13 +25,14 @@ stdenv.mkDerivation rec { comment = "API Development Environment"; desktopName = "Postman"; genericName = "Postman"; - categories = "Application;Development;"; + categories = "Development;"; }; buildInputs = [ stdenv.cc.cc.lib atk at-spi2-atk + at-spi2-core alsaLib cairo cups @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { nspr pango udev + libuuid libX11 libxcb libXi diff --git a/third_party/nixpkgs/pkgs/games/anki/default.nix b/third_party/nixpkgs/pkgs/games/anki/default.nix index 489e72768e..0d713b1f71 100644 --- a/third_party/nixpkgs/pkgs/games/anki/default.nix +++ b/third_party/nixpkgs/pkgs/games/anki/default.nix @@ -31,7 +31,7 @@ let # when updating, also update rev-manual to a recent version of - # https://github.com/dae/ankidocs + # https://github.com/ankitects/anki-docs # The manual is distributed independently of the software. version = "2.1.15"; sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss"; @@ -42,8 +42,8 @@ let pname = "anki-manual"; inherit version; src = fetchFromGitHub { - owner = "dae"; - repo = "ankidocs"; + owner = "ankitects"; + repo = "anki-docs"; rev = rev-manual; sha256 = sha256-manual; }; @@ -112,16 +112,10 @@ buildPythonApplication rec { ./no-version-check.patch ]; - buildPhase = '' - # Dummy build phase - # Anki does not use setup.py - ''; + # Anki does not use setup.py + dontBuild = true; postPatch = '' - # Remove unused starter. We'll create our own, minimalistic, - # starter. - # rm anki/anki - # Remove QT translation files. We'll use the standard QT ones. rm "locale/"*.qm @@ -134,10 +128,10 @@ buildPythonApplication rec { # UTF-8 locale needed for testing LC_ALL = "en_US.UTF-8"; + # - Anki writes some files to $HOME during tests + # - Skip tests using network checkPhase = '' - # - Anki writes some files to $HOME during tests - # - Skip tests using network - env HOME=$TMP pytest --ignore tests/test_sync.py + HOME=$TMP pytest --ignore tests/test_sync.py ''; installPhase = '' @@ -170,6 +164,7 @@ buildPythonApplication rec { cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki ''; + # now wrapPythonPrograms from postFixup will add both python and qt env variables dontWrapQtApps = true; preFixup = '' @@ -179,8 +174,6 @@ buildPythonApplication rec { ) ''; - # now wrapPythonPrograms from postFixup will add both python and qt env variables - passthru = { inherit manual; }; diff --git a/third_party/nixpkgs/pkgs/games/assaultcube/default.nix b/third_party/nixpkgs/pkgs/games/assaultcube/default.nix index f40e2ecf22..6c3a7f1168 100644 --- a/third_party/nixpkgs/pkgs/games/assaultcube/default.nix +++ b/third_party/nixpkgs/pkgs/games/assaultcube/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { desktopName = "AssaultCube"; comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay."; genericName = "First-person shooter"; - categories = "Application;Game;ActionGame;Shooter"; + categories = "Game;ActionGame;Shooter"; icon = "assaultcube.png"; exec = pname; }; diff --git a/third_party/nixpkgs/pkgs/games/cataclysm-dda/default.nix b/third_party/nixpkgs/pkgs/games/cataclysm-dda/default.nix index ad1a9c409d..c046b0d3a2 100644 --- a/third_party/nixpkgs/pkgs/games/cataclysm-dda/default.nix +++ b/third_party/nixpkgs/pkgs/games/cataclysm-dda/default.nix @@ -9,12 +9,12 @@ let in stdenv.mkDerivation (common // rec { - version = "0.E"; + version = "0.E-2"; name = "cataclysm-dda-${version}"; src = fetchFromCleverRaven { rev = version; - sha256 = "0pbi0fw37zimzdklfj58s1ql0wlqq7dy6idkcsib3hn910ajaxan"; + sha256 = "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68"; }; patches = [ ./patches/fix_locale_dir.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/chiaki/default.nix b/third_party/nixpkgs/pkgs/games/chiaki/default.nix index ac22811844..be4ec7b73b 100644 --- a/third_party/nixpkgs/pkgs/games/chiaki/default.nix +++ b/third_party/nixpkgs/pkgs/games/chiaki/default.nix @@ -1,23 +1,23 @@ { lib, mkDerivation, fetchFromGitHub -, cmake, ffmpeg_3, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf +, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf , python3Packages, SDL2 }: mkDerivation rec { pname = "chiaki"; - version = "1.1.3"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "thestr4ng3r"; repo = "chiaki"; fetchSubmodules = true; - sha256 = "12cb4wpibh077san9rpsmavihf0xy9iqc9zl7y0aagrkl50h19kr"; + sha256 = "00lzsbjd1w1bhlblgf7zp112sk8ac09c3bzi5ljxbn02mi0an3qp"; }; nativeBuildInputs = [ cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf ]; - buildInputs = [ ffmpeg_3 libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; + buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/games/chocolate-doom/default.nix b/third_party/nixpkgs/pkgs/games/chocolate-doom/default.nix index 1c2a24de01..1b77a72f8d 100644 --- a/third_party/nixpkgs/pkgs/games/chocolate-doom/default.nix +++ b/third_party/nixpkgs/pkgs/games/chocolate-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "chocolate-doom"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "chocolate-doom"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0ajzb767wyj8vzhjpsmgslw42b0155ji4alk26shxl7k5ijbzn0j"; + sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix index ea7c3c6e47..5bd6e714e4 100644 --- a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix +++ b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "crispy-doom"; @@ -11,6 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4"; }; + patches = [ + # Fixes CVE-2020-14983 + (fetchpatch { + url = "https://github.com/chocolate-doom/chocolate-doom/commit/f1a8d991aa8a14afcb605cf2f65cd15fda204c56.diff"; + sha256 = "1z6pxg9azcqq7g09hjc09d01knd803nhqilkw2kbx8648hil9mgn"; + }) + (fetchpatch { + url = "https://github.com/chocolate-doom/chocolate-doom/commit/54fb12eeaa7d527defbe65e7e00e37d5feb7c597.diff"; + sha256 = "0ww21jn02ld73rkp06f7fqy92jqv8c9q4d1mvsryag1gmvy57znj"; + }) + ]; + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; diff --git a/third_party/nixpkgs/pkgs/games/eduke32/default.nix b/third_party/nixpkgs/pkgs/games/eduke32/default.nix index 60abe29646..53baac79ee 100644 --- a/third_party/nixpkgs/pkgs/games/eduke32/default.nix +++ b/third_party/nixpkgs/pkgs/games/eduke32/default.nix @@ -12,7 +12,7 @@ let comment = "Duke Nukem 3D port"; desktopName = "Enhanced Duke Nukem 3D"; genericName = "Duke Nukem 3D port"; - categories = "Application;Game;"; + categories = "Game;"; }; wrapper = "eduke32-wrapper"; diff --git a/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix b/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix index 46f21629ca..4e855dbd05 100644 --- a/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix +++ b/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix @@ -1,46 +1,38 @@ -{ stdenv, fetchurl, unzip, python2 }: +{ stdenv +, fetchurl +, fetchFromGitHub +, unzip +, python3 +, enableDefaultMusicPack ? true +}: -python2.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "endgame-singularity"; - version = "0.30c"; - format = "other"; + version = "1.00"; srcs = [ - (fetchurl { - url = "http://www.emhsoft.com/singularity/singularity-${version}-src.tar.gz"; - sha256 = "13zjhf67gmla67nkfpxb01rxs8j9n4hs0s4n9lnnq4zgb709yxgl"; + (fetchFromGitHub { + owner = "singularity"; + repo = "singularity"; + rev = "v${version}"; + sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; }) - (fetchurl { + ] ++ stdenv.lib.optional enableDefaultMusicPack ( + fetchurl { url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; - }) - ]; - sourceRoot = "."; + } + ); + sourceRoot = "source"; nativeBuildInputs = [ unzip ]; # The music is zipped - propagatedBuildInputs = with python2.pkgs; [ pygame numpy ]; + propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ]; - # This is not an error: it needs both compilation rounds - buildPhase = '' - ${python2.interpreter} -m compileall "singularity-${version}" - ${python2.interpreter} -O -m compileall "singularity-${version}" - ''; - - installPhase = '' - install -Dm755 "singularity-${version}/singularity.py" "$out/share/singularity.py" - install -Dm644 "singularity-${version}/singularity.pyo" "$out/share/singularity.pyo" - install -Dm644 "singularity-${version}/singularity.pyc" "$out/share/singularity.pyc" - cp -R "singularity-${version}/code" "singularity-${version}/data" "$out/share/" - cp -R "endgame-singularity-music-007" "$out/share/music" - ''; - - # Tell it where to find python libraries - # Also cd to the same directory as the code, since it uses relative paths - postFixup = '' - makeWrapper "${python2.interpreter}" "$out/bin/endgame-singularity" \ - --set PYTHONPATH "$PYTHONPATH" \ - --run "cd \"$out/share\"" \ - --add-flags "$out/share/singularity.py" + # Add the music + postInstall = stdenv.lib.optionalString enableDefaultMusicPack '' + cp -R "../endgame-singularity-music-007" \ + "$(echo $out/lib/python*/site-packages/singularity)/music" + # ↑ we cannot glob on [...]/music, it doesn't exist yet ''; meta = { diff --git a/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix index 3b47cb40ad..79e507e13a 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/default.nix +++ b/third_party/nixpkgs/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "1h0gv7cdn999hm2fl93kq6g98bzd1x3c8afq8v0a04dqjarjgr86"; version = "0.18.32"; withAuth = true; }; + experimental = bdist { sha256 = "1idhq836xk1qvhlval28rskqkw06x8hh0izfw9vsf06xym2knkyf"; version = "0.18.34"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "017ggrsnhwyfgx99q0wjagafjvk5pb6lcxl72y37gig72bfcapab"; version = "0.18.32"; }; + experimental = bdist { sha256 = "05kvb8al7x0as62q6bwk89lmvnjdvsmcm3ahgghl5zzz38rrzbwd"; version = "0.18.34"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; @@ -166,7 +166,7 @@ let ''; homepage = "https://www.factorio.com/"; license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen ]; + maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen priegger ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; }; diff --git a/third_party/nixpkgs/pkgs/games/flightgear/default.nix b/third_party/nixpkgs/pkgs/games/flightgear/default.nix index c16c33666f..e32f2e96d4 100644 --- a/third_party/nixpkgs/pkgs/games/flightgear/default.nix +++ b/third_party/nixpkgs/pkgs/games/flightgear/default.nix @@ -6,15 +6,15 @@ }: let - version = "2019.1.1"; + version = "2020.1.2"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { - pname = "flightgear-base"; + pname = "flightgear-data"; inherit version; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "14zm0hzshbca4ych72631hpc4pw2w24zib62ri3lwm8nz6j63qhf"; + sha256 = "0ldsjb54k8nb99h6n4f4x20nawd2pa0a8skkwkrgckdpmdv0zwyk"; }; phases = [ "installPhase" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "189wal08p9lrz757pmazxnf85sfymsqrm3nfvdad95pfp6bg7pyi"; + sha256 = "1770kgwa7z70sx6da9x1q9cszpd3ywz6nn8jrb6xv8ldjqcpqpvb"; }; # Of all the files in the source and data archives, there doesn't seem to be diff --git a/third_party/nixpkgs/pkgs/games/frogatto/default.nix b/third_party/nixpkgs/pkgs/games/frogatto/default.nix index 35ff970611..efcff024a5 100644 --- a/third_party/nixpkgs/pkgs/games/frogatto/default.nix +++ b/third_party/nixpkgs/pkgs/games/frogatto/default.nix @@ -12,7 +12,7 @@ let comment = description; desktopName = "Frogatto"; genericName = "frogatto"; - categories = "Application;Game;ArcadeGame;"; + categories = "Game;ArcadeGame;"; }; version = "unstable-2018-12-18"; in buildEnv { diff --git a/third_party/nixpkgs/pkgs/games/gzdoom/default.nix b/third_party/nixpkgs/pkgs/games/gzdoom/default.nix index e6f27eedbb..fdbdda2d31 100644 --- a/third_party/nixpkgs/pkgs/games/gzdoom/default.nix +++ b/third_party/nixpkgs/pkgs/games/gzdoom/default.nix @@ -1,55 +1,85 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper -, openal, fluidsynth_1, soundfont-fluid, libGL, SDL2 -, bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 +, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 +, game-music-emu, pkgconfig }: -stdenv.mkDerivation rec { - pname = "gzdoom"; - version = "4.3.3"; - - src = fetchFromGitHub { +let + zmusic-src = fetchFromGitHub { owner = "coelckers"; - repo = "gzdoom"; - rev = "g${version}"; - sha256 = "1c4vhnvvwy1rs8xm01kqd486h5xsiccwkf95fjx7912zr49yalks"; + repo = "zmusic"; + rev = "2d0ea861174f9e2031400ab29f5bcc8425521cc6"; + sha256 = "1ac7lhbzwfr0fsyv7n70hvb8imzngxn1qyanmv9j26j0h90hhl8a"; + }; + zmusic = stdenv.mkDerivation { + pname = "zmusic"; + version = "1.1.0"; + + src = zmusic-src; + + nativeBuildInputs = [ cmake pkgconfig ]; + + preConfigure = '' + sed -i \ + -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ + -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ + source/mididevices/music_fluidsynth_mididevice.cpp + ''; + }; - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ - SDL2 libGL openal fluidsynth_1 bzip2 zlib libjpeg libsndfile mpg123 - game-music-emu - ]; + gzdoom = stdenv.mkDerivation rec { + pname = "gzdoom"; + version = "4.4.2"; - enableParallelBuilding = true; + src = fetchFromGitHub { + owner = "coelckers"; + repo = "gzdoom"; + rev = "g${version}"; + sha256 = "1xkkmbsdv64wyb9r2fv5mwyqw0bjryk528jghdrh47pndmjs9a38"; + fetchSubmodules = true; + }; - NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + buildInputs = [ + SDL2 + libGL + openal + fluidsynth_1 + bzip2 + zlib + libjpeg + libsndfile + mpg123 + game-music-emu + zmusic + ]; - preConfigure = '' - sed -i \ - -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ - -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ - libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp - ''; + enableParallelBuilding = true; - installPhase = '' - install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" - for i in *.pk3; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - for i in fm_banks/*; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - for i in soundfonts/*; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - mkdir $out/bin - makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom - ''; + NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; - meta = with stdenv.lib; { - homepage = "https://github.com/coelckers/gzdoom"; - description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; - license = licenses.gpl3; - platforms = ["x86_64-linux"]; - maintainers = with maintainers; [ lassulus ]; + installPhase = '' + install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" + for i in *.pk3; do + install -Dm644 "$i" "$out/lib/gzdoom/$i" + done + for i in fm_banks/*; do + install -Dm644 "$i" "$out/lib/gzdoom/$i" + done + for i in soundfonts/*; do + install -Dm644 "$i" "$out/lib/gzdoom/$i" + done + mkdir $out/bin + makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/coelckers/gzdoom"; + description = + "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lassulus ]; + }; }; -} + +in gzdoom diff --git a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix index d0ae0a5971..5ba4b4de2f 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.15.2"; + version = "1.16.1"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; + url = "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar"; # sha1 because that comes from mojang via api - sha1 = "bb2b6b1aefcd70dfd1892149ac3a215f6c636b07"; + sha1 = "a412fd69db1f81db3f511c1463fd304675244077"; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix index 650bb223c9..ac09b5078a 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix @@ -36,7 +36,7 @@ let icon = "minecraft-launcher"; comment = "Official launcher for Minecraft, a sandbox-building game"; desktopName = "Minecraft Launcher"; - categories = "Game;Application;"; + categories = "Game;"; }; envLibPath = stdenv.lib.makeLibraryPath [ @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.14947"; + version = "2.1.15852"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "1lsc39n1kq08sssnpr6kf4lfpy01a7i7rgvi298mmxsprjmc7a9q"; + sha256 = "06k3npsk878dh93r7fws5r438hwll3x3kxi0zslb10z634marn2x"; }; icon = fetchurl { @@ -134,6 +134,7 @@ stdenv.mkDerivation rec { makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ --prefix LD_LIBRARY_PATH : ${envLibPath} \ --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ + --set JAVA_HOME ${stdenv.lib.makeBinPath [ jre ]} \ --run "cd /tmp" \ "''${gappsWrapperArgs[@]}" ''; diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index db36b43ea2..f49ec1f4a8 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -39,7 +39,7 @@ let ] ++ optionals buildClient [ "-DOpenGL_GL_PREFERENCE=GLVND" ]; - + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 nativeBuildInputs = [ cmake doxygen graphviz ]; @@ -47,7 +47,7 @@ let buildInputs = [ irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses gmp libspatialindex - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm @@ -76,9 +76,9 @@ let }; v5 = { - version = "5.2.0"; - sha256 = "0pj9hkxwc1vzng2khbixi79557sbawf6mqkzl589jciyqa7jqkv1"; - dataSha256 = "1kjz7x3xiqqnpyrd6339a139pbdxx31c4qpg8pmns410hsm8i358"; + version = "5.3.0"; + sha256 = "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6"; + dataSha256 = "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx"; }; in { diff --git a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix new file mode 100644 index 0000000000..83a8f92769 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix @@ -0,0 +1,13 @@ +{ fetchFromGitHub, openttd, ... }: + +openttd.overrideAttrs (oldAttrs: rec { + pname = "openttd-jgrpp"; + version = "0.34.4"; + + src = fetchFromGitHub rec { + owner = "JGRennison"; + repo = "OpenTTD-patches"; + rev = "jgrpp-${version}"; + sha256 = "125mgia5hgcsn8314xyiip3z8y23rc3kdv7jczbncqlzsc75624v"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix new file mode 100644 index 0000000000..93c04e8852 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -0,0 +1,104 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs +, dotnet-sdk, dotnet-netcore, dotnetPackages +, ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins +}: + +let + runtimeDeps = [ + ffmpeg_4 alsaLib SDL2 lttng-ust numactl + ]; + + # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids + runtimeId = "linux-x64"; + +in stdenv.mkDerivation rec { + pname = "osu-lazer"; + version = "2020.714.0"; + + src = fetchFromGitHub { + owner = "ppy"; + repo = "osu"; + rev = version; + sha256 = "1dh3krvs7mfiyyr3cjkp396zaipcibw2s45smfzr9aqrznsqx64v"; + }; + + nativeBuildInputs = [ dotnet-sdk dotnetPackages.Nuget makeWrapper ]; + + nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }); + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + nuget sources Add -Name nixos -Source "$PWD/nixos" + nuget init "$nugetDeps" "$PWD/nixos" + + # FIXME: https://github.com/NuGet/Home/issues/4413 + mkdir -p $HOME/.nuget/NuGet + cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet + + dotnet restore --source nixos osu.Desktop + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + dotnet build osu.Desktop \ + --no-restore \ + --configuration Release \ + -p:Version=${version} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dotnet publish osu.Desktop \ + --no-build \ + --configuration Release \ + --no-self-contained \ + --output $out/lib/osu + shopt -s extglob + rm -r $out/lib/osu/runtimes/!(${runtimeId}) + + makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ + --set DOTNET_ROOT "${dotnet-netcore}" \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png + done + cp -r ${makeDesktopItem { + desktopName = "osu!"; + name = "osu"; + exec = "osu!"; + icon = "osu!"; + comment = meta.description; + type = "Application"; + categories = "Game;"; + }}/share/applications $out/share + + runHook postInstall + ''; + + # Strip breaks the executable. + dontStrip = true; + + meta = with lib; { + description = "Rhythm is just a *click* away"; + homepage = "https://osu.ppy.sh"; + license = with licenses; [ mit cc-by-nc-40 ]; + maintainers = with maintainers; [ oxalica ]; + platforms = [ "x86_64-linux" ]; + }; + passthru.updateScript = ./update.sh; +} diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix new file mode 100644 index 0000000000..53703652cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -0,0 +1,1492 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "Dapper"; + version = "2.0.35"; + sha256 = "0465i2p5kjj0hmadyw0xrpn43zpc4bnbid9mg561739fyjyjwmfm"; + }) + (fetchNuGet { + name = "DeltaCompressionDotNet"; + version = "2.0.0.0"; + sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; + }) + (fetchNuGet { + name = "DiffPlex"; + version = "1.6.3"; + sha256 = "0yi72afddddz0s8phx855rnjrga7n51bcma10dc91l0ffcwf5xwz"; + }) + (fetchNuGet { + name = "DiscordRichPresence"; + version = "1.0.150"; + sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79"; + }) + (fetchNuGet { + name = "FFmpeg.AutoGen"; + version = "4.3.0.1"; + sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; + }) + (fetchNuGet { + name = "Humanizer"; + version = "2.8.26"; + sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak"; + }) + (fetchNuGet { + name = "Humanizer.Core"; + version = "2.2.0"; + sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; + }) + (fetchNuGet { + name = "Humanizer.Core"; + version = "2.8.26"; + sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; + }) + (fetchNuGet { + name = "Humanizer.Core.af"; + version = "2.8.26"; + sha256 = "0znrq4frlkq1qi20301hlzxa6mdc275fa1i1a1i8ldgk9cjq94k9"; + }) + (fetchNuGet { + name = "Humanizer.Core.ar"; + version = "2.8.26"; + sha256 = "1hi7mln48p1nmxlgdq725s4cvla9nlkvbmrsql1rfjjlsy8hn6n7"; + }) + (fetchNuGet { + name = "Humanizer.Core.az"; + version = "2.8.26"; + sha256 = "0av7ycrqwvmikqia3z3qkp9967zilrhayny17zkm0d0mnjq62vs6"; + }) + (fetchNuGet { + name = "Humanizer.Core.bg"; + version = "2.8.26"; + sha256 = "13j6zk2cmk7a119azxlpjhfwykrzk0vkf5a799fb2fzkvhnj4hkg"; + }) + (fetchNuGet { + name = "Humanizer.Core.bn-BD"; + version = "2.8.26"; + sha256 = "0h619sksggfi7dnaycz6bj9aiqdgn0d8dpgjgdl73crw52lr70p9"; + }) + (fetchNuGet { + name = "Humanizer.Core.cs"; + version = "2.8.26"; + sha256 = "11bh3k15388bi5wizaihnwqk7wb4n7q636fqjllwdhjggqrsc3f6"; + }) + (fetchNuGet { + name = "Humanizer.Core.da"; + version = "2.8.26"; + sha256 = "09b3x3bw3cgby9qvaccnqz2y6d8gl3497dh7q0dk1iznsxbk4x4m"; + }) + (fetchNuGet { + name = "Humanizer.Core.de"; + version = "2.8.26"; + sha256 = "1pyp2a9my20wlwjjzv563kshl9fpjb2kd4cw41l4wvsz1bsq3l22"; + }) + (fetchNuGet { + name = "Humanizer.Core.el"; + version = "2.8.26"; + sha256 = "0v3sdcxca4dam1y5yjh9n6v711ys0zdv38hr4kij35s6277ls6lb"; + }) + (fetchNuGet { + name = "Humanizer.Core.es"; + version = "2.8.26"; + sha256 = "0wh9qvqf80cngwsz2jnrsjpmaax4xa2xp8bbk5xs480kp071z37q"; + }) + (fetchNuGet { + name = "Humanizer.Core.fa"; + version = "2.8.26"; + sha256 = "00v56ddjfv6sr6w5246gn5z0padwswvnngp8mdl7gjfg5ycmbkl1"; + }) + (fetchNuGet { + name = "Humanizer.Core.fi-FI"; + version = "2.8.26"; + sha256 = "1pgs0j5ri50a6vhljplhrlc8jj1hrd9ggxkj60d9v5kk9xibzzyd"; + }) + (fetchNuGet { + name = "Humanizer.Core.fr"; + version = "2.8.26"; + sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m"; + }) + (fetchNuGet { + name = "Humanizer.Core.fr-BE"; + version = "2.8.26"; + sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb"; + }) + (fetchNuGet { + name = "Humanizer.Core.he"; + version = "2.8.26"; + sha256 = "1ccn82aj3rhrhsa3kvkrmjw0p687icxlfja8ngbh7sby4cszx9bk"; + }) + (fetchNuGet { + name = "Humanizer.Core.hr"; + version = "2.8.26"; + sha256 = "12ii79bhai3kv7zr3k9k9dh569r6p3m4l4gj25cln2isr4wdi5r9"; + }) + (fetchNuGet { + name = "Humanizer.Core.hu"; + version = "2.8.26"; + sha256 = "0cibbdxiqhwrjmxlr805mg3l9v0fl2ydx4m50608rkysjq6vxx7y"; + }) + (fetchNuGet { + name = "Humanizer.Core.hy"; + version = "2.8.26"; + sha256 = "15aikm04f74abm4ak8rvnnkrlcz155gibn1y81pbgsyn7yrh84v3"; + }) + (fetchNuGet { + name = "Humanizer.Core.id"; + version = "2.8.26"; + sha256 = "1i9gpzdfhmbvrqg858kqz5461sp3sh60g16dmcmyi1ik0qlspijn"; + }) + (fetchNuGet { + name = "Humanizer.Core.it"; + version = "2.8.26"; + sha256 = "01j7qskmqcxsakbx3bkxcjyzrh6nxi2v6kfzsfb0vf980qqq331l"; + }) + (fetchNuGet { + name = "Humanizer.Core.ja"; + version = "2.8.26"; + sha256 = "07d19ns4a4pa2k4vdc1af7wj10gaflq1ny4mx6y574afkdi8v6d5"; + }) + (fetchNuGet { + name = "Humanizer.Core.lv"; + version = "2.8.26"; + sha256 = "1pm64sj65nmngyfa3hjcw67icfmlzr232hmgpnw7306sb7dxmnfv"; + }) + (fetchNuGet { + name = "Humanizer.Core.ms-MY"; + version = "2.8.26"; + sha256 = "1yx4cc023kc4k14abk2ycmjy6y2xaknaz4zria7xsadf0fabd1jc"; + }) + (fetchNuGet { + name = "Humanizer.Core.mt"; + version = "2.8.26"; + sha256 = "0iai35pzka9g6c3sgswki06fk6gdnq8kc88wyb4pcciivazz31px"; + }) + (fetchNuGet { + name = "Humanizer.Core.nb"; + version = "2.8.26"; + sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90"; + }) + (fetchNuGet { + name = "Humanizer.Core.nb-NO"; + version = "2.8.26"; + sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2"; + }) + (fetchNuGet { + name = "Humanizer.Core.nl"; + version = "2.8.26"; + sha256 = "067pqm4i1mk83fqqr0bvzrchrvxwdnff18z3djgagclh1i4xqlvk"; + }) + (fetchNuGet { + name = "Humanizer.Core.pl"; + version = "2.8.26"; + sha256 = "1r1bbqb990war1hiag5f88yxw0k9jiid1ihb4s5bc1lzs3vfsb6x"; + }) + (fetchNuGet { + name = "Humanizer.Core.pt"; + version = "2.8.26"; + sha256 = "1bik0vjjdzw51yl11ng9gsi3ihz50ibwh1gdhh2vd13jxjzb512p"; + }) + (fetchNuGet { + name = "Humanizer.Core.ro"; + version = "2.8.26"; + sha256 = "12f2hry6x1p1mgx6g4kpig2jpybx52ibghvhdhjbbfhy32gv8dr0"; + }) + (fetchNuGet { + name = "Humanizer.Core.ru"; + version = "2.8.26"; + sha256 = "1hri12kwymzvdqcr66l8yiqiw3pmf9fk492z10yqljm576kyshgg"; + }) + (fetchNuGet { + name = "Humanizer.Core.sk"; + version = "2.8.26"; + sha256 = "07jfgk67axw97b85dn4bwpjwf3swd74j9hdd870qps12xfp98i9j"; + }) + (fetchNuGet { + name = "Humanizer.Core.sl"; + version = "2.8.26"; + sha256 = "060xbzwb7p9ypbqfklih2zal2rh6h55gq4hv3i6alvlbd3vsx29n"; + }) + (fetchNuGet { + name = "Humanizer.Core.sr"; + version = "2.8.26"; + sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv"; + }) + (fetchNuGet { + name = "Humanizer.Core.sr-Latn"; + version = "2.8.26"; + sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi"; + }) + (fetchNuGet { + name = "Humanizer.Core.sv"; + version = "2.8.26"; + sha256 = "056h8n9i18yl78f9ppzn2kkrz2cs46aqv0j5y8xq360zarggh0nm"; + }) + (fetchNuGet { + name = "Humanizer.Core.tr"; + version = "2.8.26"; + sha256 = "0dk8ga3fpxifxxkz0n68654h65cvrx00hy7q00m5vgvmcp70gxxn"; + }) + (fetchNuGet { + name = "Humanizer.Core.uk"; + version = "2.8.26"; + sha256 = "0bnj5xqlcqp4n8i04ra78dax4854zbf2jsygvb4lpiayyyaj2bxw"; + }) + (fetchNuGet { + name = "Humanizer.Core.uz-Cyrl-UZ"; + version = "2.8.26"; + sha256 = "1bbf6mxas6brjw7rjljq5saz6v3ic6zbvm1b3c1jbk0hc0qkd7c8"; + }) + (fetchNuGet { + name = "Humanizer.Core.uz-Latn-UZ"; + version = "2.8.26"; + sha256 = "1bfgfihpynax30g9kq8kra7c4jxps2ccxsxrs9gls47xbs35cw2f"; + }) + (fetchNuGet { + name = "Humanizer.Core.vi"; + version = "2.8.26"; + sha256 = "1vm765nvkp6wyfwlcgppimjrk04lkg8lscch3n1i1i5hlqxrs9ch"; + }) + (fetchNuGet { + name = "Humanizer.Core.zh-CN"; + version = "2.8.26"; + sha256 = "1qyl12rdh4iv1k1qcivcmxxnh8y93ainf22pmch8vvw9yjhs1y7s"; + }) + (fetchNuGet { + name = "Humanizer.Core.zh-Hans"; + version = "2.8.26"; + sha256 = "1gqv3dyk236wlp5wb7kd4qnyrmp3cy36ycykl7zr91s25cdls5vy"; + }) + (fetchNuGet { + name = "Humanizer.Core.zh-Hant"; + version = "2.8.26"; + sha256 = "1rhzbiqbx04l3kvzjklix90fxyc6vvmmw0p564ajdiximivs0pbh"; + }) + (fetchNuGet { + name = "JetBrains.Annotations"; + version = "2020.1.0"; + sha256 = "13fqcr6bs4x9rn0mpx110xl5apwh8ds1h0lx208znrm178ywqm8y"; + }) + (fetchNuGet { + name = "ManagedBass"; + version = "2.0.4"; + sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003"; + }) + (fetchNuGet { + name = "ManagedBass.Fx"; + version = "2.0.1"; + sha256 = "1rbjpgpm0ri7l2gqdy691rsv3visna2nbxawgvhdqljw068r8a8d"; + }) + (fetchNuGet { + name = "managed-midi"; + version = "1.9.14"; + sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; + }) + (fetchNuGet { + name = "Markdig"; + version = "0.20.0"; + sha256 = "19qhvyj59i8zcxblpl4vqabb55y5xrk3iipmb656mid1b1m4jfkn"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.0"; + sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + }) + (fetchNuGet { + name = "Microsoft.Build.Framework"; + version = "15.3.409"; + sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; + }) + (fetchNuGet { + name = "Microsoft.Build.Locator"; + version = "1.2.6"; + sha256 = "1rnfd7wq2bkynqj767xmq9ha38mz010fmqvvvrgb4v86gd537737"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.0.0"; + sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; + version = "3.0.0"; + sha256 = "19zfz84c1860na8qpkzv6va6d7dh1md9wkrb7c6x3brhjnj859hk"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Common"; + version = "3.6.0"; + sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp"; + version = "3.6.0"; + sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; + version = "3.6.0"; + sha256 = "1zc9328invqqpisdljw5vpm1kk416prfczakakw1vwkv9r54sd73"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; + version = "3.0.0"; + sha256 = "0a17vb6jnj6kch70d7vki84728hlc3zpffsbv533yji6kf6x6d24"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer"; + version = "3.0.0"; + sha256 = "11g3hj3p885zj7bn99qzh68m1xifbwzrgmx1pkvpi10rmgkpyh8j"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Workspaces.Common"; + version = "3.6.0"; + sha256 = "176faadh1k9xcc8cc2qpkka9j1n426fdff1ax5ikmz2hbrspmigz"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; + version = "3.6.0"; + sha256 = "0hxs9x5gpi7yvqf46bxh9niipb0jif7ak5baxw5l920787vysdhc"; + }) + (fetchNuGet { + name = "Microsoft.CodeQuality.Analyzers"; + version = "3.0.0"; + sha256 = "1x3yf21m41w2iv9nlwp03q6byqgivd48h2dlm5vgv5bd53xjfz77"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.5.0"; + sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; + }) + (fetchNuGet { + name = "Microsoft.Data.Sqlite.Core"; + version = "2.2.6"; + sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k"; + }) + (fetchNuGet { + name = "Microsoft.Diagnostics.Runtime"; + version = "1.1.127808"; + sha256 = "14xhiw6h5ck444vrmj79r0ral4dvcrak02ib0v7z0qx2c69vkdmc"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "2.1.0"; + sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "2.2.6"; + sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "2.2.6"; + sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "2.2.6"; + sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Design"; + version = "2.2.6"; + sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Relational"; + version = "2.2.6"; + sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite"; + version = "2.2.6"; + sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; + version = "2.2.6"; + sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "2.2.0"; + sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "2.2.0"; + sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.2.0"; + sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.2.0"; + sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "2.2.0"; + sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "2.2.0"; + sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.2.0"; + sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "2.1.0"; + sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "2.2.0"; + sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.2.0"; + sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.ObjectPool"; + version = "3.0.3"; + sha256 = "0zxsdwh9mhy3wsbjyfr4k0r10s1h06dzw8hcck9aknv155q26zqk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "2.2.0"; + sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.2.0"; + sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; + }) + (fetchNuGet { + name = "Microsoft.Net.Compilers.Toolset"; + version = "3.1.0"; + sha256 = "1csf8hgwvyxjlxdygacrk3pp0xkzydc1kvsv68cxy8h7gd62k0w0"; + }) + (fetchNuGet { + name = "Microsoft.NetCore.Analyzers"; + version = "3.0.0"; + sha256 = "0b8biyw7nymqfbg08g2vmpf1xm6g1mm6hz4gjxc5f3g72kd2nswj"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.1.2"; + sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.1"; + sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.NetFramework.Analyzers"; + version = "3.0.0"; + sha256 = "09dqizym3bca4281714yxrhhgryxpjhjfjnyfswlhyh42qi3ix2k"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.7.0"; + sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + }) + (fetchNuGet { + name = "Mono.Cecil"; + version = "0.9.6.1"; + sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.0"; + sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.0"; + sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "NUnit"; + version = "3.12.0"; + sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; + }) + (fetchNuGet { + name = "ppy.osu.Framework"; + version = "2020.714.1"; + sha256 = "0x3f9grxi9ww151n9bppzrjf2s2bqfggv2chj0fhi9lm3ai2wvqc"; + }) + (fetchNuGet { + name = "ppy.osu.Framework.NativeLibs"; + version = "2020.213.0"; + sha256 = "1yzrx7bji2163dzvyqri42byc7lgxlm59xbwgi312dw5714snmxy"; + }) + (fetchNuGet { + name = "ppy.osu.Game.Resources"; + version = "2020.714.0"; + sha256 = "15papgd97pjvdx951hjm9w0d99rscvq2i5l98f746c6w87l1fk2n"; + }) + (fetchNuGet { + name = "ppy.osuTK.NS20"; + version = "1.0.159"; + sha256 = "0k69vc8f0vvyf49c5xb1brnw1a1g8s4k2ljw3za1dq1ilqxw7wm2"; + }) + (fetchNuGet { + name = "ppy.SDL2-CS"; + version = "1.0.15"; + sha256 = "0qld7sp7y7hwwxsdxc8m17nyb2zwfxym63j50icvf0rlawmrl7ca"; + }) + (fetchNuGet { + name = "ppy.squirrel.windows"; + version = "1.9.0.4"; + sha256 = "1m8shcmgs0fs225qd0navr1qr6csqjin9sg2x0d7xpfk04nd2hi7"; + }) + (fetchNuGet { + name = "Remotion.Linq"; + version = "2.2.0"; + sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "Sentry"; + version = "2.1.4"; + sha256 = "11pb6zpgjypfjy5g51anznngr8hcspkj1swgj9rhz8y1dcv5aba7"; + }) + (fetchNuGet { + name = "Sentry.PlatformAbstractions"; + version = "1.1.0"; + sha256 = "19grscddh2ipp1q7hx3a3bckpxgpfxfffp2shc32jryqyxsba87y"; + }) + (fetchNuGet { + name = "Sentry.Protocol"; + version = "2.1.4"; + sha256 = "0mm1a7vxl4raka1917sqshbbxvrf5sxmcba7hjwrmz13cx86l6v0"; + }) + (fetchNuGet { + name = "SharpCompress"; + version = "0.17.1"; + sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; + }) + (fetchNuGet { + name = "SharpCompress"; + version = "0.25.1"; + sha256 = "0nkfflf1wnwgx1n52scnvq38q25khimjz67nwralipgrmwnynnr9"; + }) + (fetchNuGet { + name = "SharpFNT"; + version = "2.0.0"; + sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; + }) + (fetchNuGet { + name = "SixLabors.Core"; + version = "1.0.0-beta0008"; + sha256 = "1yqcv5d2igsrmi9hf8xzikn0fms47skqpr552yzbj4z4wnraahaw"; + }) + (fetchNuGet { + name = "SixLabors.ImageSharp"; + version = "1.0.0-beta0007"; + sha256 = "1k3hrp26imyqjarkrcsrhvamlmynzv6cakzq68yx69c0h8lmscaf"; + }) + (fetchNuGet { + name = "Splat"; + version = "1.6.2"; + sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.bundle_green"; + version = "1.1.12"; + sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.core"; + version = "1.1.12"; + sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.lib.e_sqlite3.linux"; + version = "1.1.12"; + sha256 = "10mlq914d3zggdjf4bv27w6jx0gqqjf6f91y5ri6pbvaqyhi28h5"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.lib.e_sqlite3.osx"; + version = "1.1.12"; + sha256 = "1hixg6n9sqllfrcihj145lh1l38inv827808difvazd4zr3mi0z1"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.lib.e_sqlite3.v110_xp"; + version = "1.1.12"; + sha256 = "107sivk5p38dg1kyvqrxgp67dj89s8l6brf9l52k6s4vrn4hrrk7"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.provider.e_sqlite3.netstandard11"; + version = "1.1.12"; + sha256 = "0qr2d7ka6f5c7bybdhiyq7nl90c9575szmi0nfpknd9c0w024if4"; + }) + (fetchNuGet { + name = "StbiSharp"; + version = "1.0.12"; + sha256 = "044lyc6522s8q4kgvly0rsxghkiv4dwzycl2ibxf7q5dvws02qvp"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.0.0"; + sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.4.0"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.5.0"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.5.0"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }) + (fetchNuGet { + name = "System.ComponentModel.Annotations"; + version = "4.5.0"; + sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; + }) + (fetchNuGet { + name = "System.ComponentModel.Annotations"; + version = "4.7.0"; + sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; + }) + (fetchNuGet { + name = "System.Composition"; + version = "1.0.31"; + sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; + }) + (fetchNuGet { + name = "System.Composition.AttributedModel"; + version = "1.0.31"; + sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; + }) + (fetchNuGet { + name = "System.Composition.Convention"; + version = "1.0.31"; + sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r"; + }) + (fetchNuGet { + name = "System.Composition.Hosting"; + version = "1.0.31"; + sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy"; + }) + (fetchNuGet { + name = "System.Composition.Runtime"; + version = "1.0.31"; + sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws"; + }) + (fetchNuGet { + name = "System.Composition.TypedParts"; + version = "1.0.31"; + sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.5.0"; + sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Interactive.Async"; + version = "3.2.0"; + sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.IO.Packaging"; + version = "4.7.0"; + sha256 = "1vivvf158ilcpp6bq70zyafimi0lng546b34csmjb09k19wgxpiv"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Linq.Queryable"; + version = "4.0.1"; + sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.1"; + sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + name = "System.Numerics.Vectors"; + version = "4.4.0"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }) + (fetchNuGet { + name = "System.Numerics.Vectors"; + version = "4.5.0"; + sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.7.0"; + sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.1"; + sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.2"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.0"; + sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.1"; + sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.7.0"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.5.1"; + sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.7.1"; + sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) +] diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh b/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh new file mode 100755 index 0000000000..be8fa3fe71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3 +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases" | jq -r '.[0].name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 +fi + +cd ../../.. +update-source-version osu-lazer "$new_version" +store_src="$(nix-build . -A osu-lazer.src --no-out-link)" +src="$(mktemp -d /tmp/osu-src.XXX)" +echo "Temp src dir: $src" +cp -rT "$store_src" "$src" +chmod -R +w "$src" + +pushd "$src" + +# Setup empty nuget package folder to force reinstall. +mkdir ./nuget_tmp.packages +cat >./nuget_tmp.config < + + + + + + + + +EOF + +dotnet restore osu.Desktop --configfile ./nuget_tmp.config + +echo "{ fetchNuGet }: [" >"$deps_file" +while read pkg_spec; do + { read pkg_name; read pkg_version; } < <( + # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` + sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") + pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" + cat >>"$deps_file" <>"$deps_file" + +popd +rm -r "$src" diff --git a/third_party/nixpkgs/pkgs/games/pentobi/default.nix b/third_party/nixpkgs/pkgs/games/pentobi/default.nix index 909f09a0b3..2b5a86ad52 100644 --- a/third_party/nixpkgs/pkgs/games/pentobi/default.nix +++ b/third_party/nixpkgs/pkgs/games/pentobi/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "18.0"; + version = "18.1"; pname = "pentobi"; src = fetchurl { url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz"; - sha256 = "0dlvshywxijl0hrkl66szamcr77arh118f44ngr1ail8mg1fx1fy"; + sha256 = "1vfw61lk9z7dngncmx3fggy5ld7ksdk48dpwnsq2vl5fh3f71qbq"; }; nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/games/runelite/default.nix b/third_party/nixpkgs/pkgs/games/runelite/default.nix index 9b6ca4f7c0..df8a5c3e8d 100644 --- a/third_party/nixpkgs/pkgs/games/runelite/default.nix +++ b/third_party/nixpkgs/pkgs/games/runelite/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { terminal = "false"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; - categories = "Application;Game"; + categories = "Game"; startupNotify = null; }; diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix index b07402063c..4f11665c9a 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix @@ -9,13 +9,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.0b"; + version = "0.8.1"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "1qi90qw2xp56wai4gn39rpwh3gs3kx2zcpbni861f7hl9hnf87bf"; + sha256 = "1n459xdvqf974hs91xfq5fdj29s4w5w83dg3m2vp7gqmrmm2jykf"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/spring/springlobby.nix b/third_party/nixpkgs/pkgs/games/spring/springlobby.nix index e627575df9..9912675ee6 100644 --- a/third_party/nixpkgs/pkgs/games/spring/springlobby.nix +++ b/third_party/nixpkgs/pkgs/games/spring/springlobby.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "springlobby"; - version = "0.269"; + version = "0.270"; src = fetchurl { url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2"; - sha256 = "1shgrfs4ssjj8m0c7805jisjzpc60796l0vja3yjfdksrz7yxvhg"; + sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix b/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix index 70c5657508..b3a7966071 100644 --- a/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix +++ b/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper -, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype -, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet, harfbuzz }: - +{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper +, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype, glew +, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, harfbuzz +, mcpp, wiiuse, angelscript +}: let dir = "stk-code"; assets = fetchsvn { @@ -11,34 +12,62 @@ let name = "stk-assets"; }; + # List of bundled libraries in stk-code/lib to keep + # Those are the libraries that cannot be replaced + # with system packages. + bundledLibraries = [ + # Bullet 2.87 is incompatible (bullet 2.79 needed whereas 2.87 is packaged) + # The api changed in a lot of classes, too much work to adapt + "bullet" + # Upstream Libenet doesn't yet support IPv6, + # So we will use the bundled libenet which + # has been fixed to support it. + "enet" + # Internal library of STK, nothing to do about it + "graphics_utils" + # This irrlicht is bundled with cmake + # whereas upstream irrlicht still uses + # archaic Makefiles, too complicated to switch to. + "irrlicht" + # Not packaged to this date + "libraqm" + # Not packaged to this date + "libsquish" + ]; in stdenv.mkDerivation rec { + pname = "supertuxkart"; version = "1.1"; - srcs = [ - (fetchFromGitHub { - owner = "supertuxkart"; - repo = "stk-code"; - rev = version; - sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp"; - name = dir; - }) - ]; + src = fetchFromGitHub { + owner = "supertuxkart"; + repo = "stk-code"; + rev = version; + sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp"; + name = dir; + }; + + # Deletes all bundled libs in stk-code/lib except those + # That couldn't be replaced with system packages + postPatch = '' + find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {} + ''; nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ]; buildInputs = [ libX11 libXrandr - openal freealut libGLU libGL libvorbis libogg zlib freetype - curl fribidi bluez libjpeg libpng enet harfbuzz + openal freealut libGLU libGL libvorbis libogg zlib freetype glew + curl fribidi bluez libjpeg libpng harfbuzz + mcpp wiiuse angelscript ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 "-DCHECK_ASSETS=OFF" + "-DUSE_SYSTEM_WIIUSE=ON" + "-DUSE_SYSTEM_ANGELSCRIPT=ON" ]; # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds @@ -46,9 +75,9 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}" ''; - sourceRoot = dir; + enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Free 3D kart racing game"; longDescription = '' SuperTuxKart is a Free 3D kart racing game, with many tracks, diff --git a/third_party/nixpkgs/pkgs/games/tdm/default.nix b/third_party/nixpkgs/pkgs/games/tdm/default.nix index 32f91f5986..e935dab2b8 100644 --- a/third_party/nixpkgs/pkgs/games/tdm/default.nix +++ b/third_party/nixpkgs/pkgs/games/tdm/default.nix @@ -11,7 +11,7 @@ let name = pname; exec = "@out@/bin/${pname}"; icon = pname; - terminal = "False"; + terminal = "false"; comment = "The Dark Mod - stealth FPS inspired by the Thief series"; type = "Application"; categories = "Game;"; diff --git a/third_party/nixpkgs/pkgs/games/ut2004/wrapper.nix b/third_party/nixpkgs/pkgs/games/ut2004/wrapper.nix index 31d0763be4..0f70a07ca8 100644 --- a/third_party/nixpkgs/pkgs/games/ut2004/wrapper.nix +++ b/third_party/nixpkgs/pkgs/games/ut2004/wrapper.nix @@ -27,7 +27,7 @@ let desktopName = "Unreal Tournament 2004"; comment = "A first-person shooter video game developed by Epic Games and Digital Extreme"; genericName = "First-person shooter"; - categories = "Application;Game;"; + categories = "Game;"; exec = "ut2004"; }; diff --git a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix index 2eb45ded7e..ce37539204 100644 --- a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.12"; + version = "1.14.13"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "0xpypy0yfjmjp3apvlh51nm19p1cjhjw2p547kvmrckm7y6naaw8"; + sha256 = "1ka07h4sgmbc24qbaz0pbryx0yk339l4jzg32hy01qdvl2n40w3h"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix index e9fac1c73e..9dbfdd8b80 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; - NIX_CFLAGS_COMPILE = [ "-include stdio.h" "-Wno-error=stringop-truncation" ]; + NIX_CFLAGS_COMPILE = [ + "-include stdio.h" + "-Wno-error=stringop-truncation" + "-Wno-error=deprecated-declarations" + ]; meta = { description = "CUPS back-end for Canon printers"; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index 94b8407762..80aa410017 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { # To find new versions, visit @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { # some printer like for instance "WF-7210" to get to the most recent # version. # NOTE: Don't forget to update the webarchive link too! - urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" - "https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" + urls = [ + "https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200629154055if_/https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm" ]; - sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv"; + sha256 = "07g62vndn2wh9bablvdl2cxn9wq3hzn16mqji27j20h33cwqmzj1"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix index 98ced28b87..afd1f8f6fe 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -230,7 +230,7 @@ python3Packages.buildPythonApplication { # There are some binaries there, which reference gcc-unwrapped otherwise. stripDebugList = [ - "share/hplip" "lib/cups/backend" "lib/cups/filter" "lib/python3.7/site-packages" "lib/sane" + "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xow/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/xow/default.nix index 8702c48045..785f7f396e 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/xow/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/xow/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchFromGitHub, libusb1 }: +{ stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { pname = "xow"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "medusalix"; repo = "xow"; rev = "v${version}"; - sha256 = "1xkwcx2gqip9v2h3zjmrn7sgcck3midl5alhsmr3zivgdipamynv"; + sha256 = "071r2kx44k1sc49cad3i607xg618mf34ki1ykr5lnfx9y6qyz075"; + }; + + firmware = fetchurl { + url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; + sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5"; }; makeFlags = [ @@ -20,7 +25,14 @@ stdenv.mkDerivation rec { "MODPDIR=${placeholder ''out''}/lib/modprobe.d" "SYSDDIR=${placeholder ''out''}/lib/systemd/system" ]; + + postUnpack = '' + cabextract -F FW_ACC_00U.bin ${firmware} + mv FW_ACC_00U.bin source/firmware.bin + ''; + enableParallelBuilding = true; + nativeBuildInputs = [ cabextract ]; buildInputs = [ libusb1 ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ccemux/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ccemux/default.nix index fc5d4c8138..2313a63dc6 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ccemux/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ccemux/default.nix @@ -29,7 +29,7 @@ let comment = "A modular ComputerCraft emulator"; desktopName = "CCEmuX"; genericName = "ComputerCraft Emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; in diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix index b70f0e058c..160c8733ff 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = "x86 emulator with internal DOS"; desktopName = "DOSBox"; genericName = "DOS emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix new file mode 100644 index 0000000000..fb13b602b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "emu2"; + version = "unstable-2020-06-04"; + + src = fetchFromGitHub { + owner = "dmsc"; + repo = "emu2"; + rev = "f9599d347aab07d9281400ec8b214aabd187fbcd"; + sha256 = "0d8fb3wp477kfi0p4mmr69lxsbgb4gl9pqmm68g9ixzrfch837v4"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/dmsc/emu2/"; + description = "A simple text-mode x86 + DOS emulator"; + platforms = platforms.linux; + maintainers = with maintainers; [ dramaturg ]; + license = licenses.gpl2; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix index d72af71f66..a7bce74598 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "221"; + minorVersion = "222"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1pqwa5qcrk0wgbyns6fkv7j3pn7byf216cixc3phhhgvfidgr8ww"; + sha256 = "1ij08h7cflr76qzyhhj21948275lqkpzi9r4pbc7h2avrlpsijx4"; }; hardeningDisable = [ "fortify" ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix index 872fdc7138..e67549b208 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "mgba"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429"; + sha256 = "0dlwhn3hrpaqnl5hjs53y8j2i16idxrg3gy688gcwrc9z1a6bkn2"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/openmsx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/openmsx/default.nix index 68b464f4d3..f0ab48aa62 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/openmsx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/openmsx/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://openmsx.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + license = with licenses; [ bsd2 boost gpl2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/resim/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/resim/default.nix index 81acdf81f2..ba7ac62125 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/resim/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/resim/default.nix @@ -15,4 +15,6 @@ stdenv.mkDerivation { cp -v libresim/libarmsim.so $out/lib/libarmsim.so cp -v vc4emul/vc4emul $out/bin/vc4emul ''; + + meta.license = stdenv.lib.licenses.mit; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix index a9950a14b4..bfc2c33876 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix @@ -43,9 +43,6 @@ stdenv.mkDerivation rec { libXdmcp libXext libXxf86vm mesa udev wayland libxkbcommon ]; - # we use prefix-less pkg-config - PKG_CONF_PATH = "pkg-config"; - enableParallelBuilding = true; configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix index 5e26624d6c..f71420674e 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix @@ -1,5 +1,6 @@ { mkDerivation, lib, fetchgit, cmake, pkgconfig, git -, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg_3, libevdev, python3 +, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng +, ffmpeg, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib @@ -15,7 +16,7 @@ mkDerivation { src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd"; + rev = "v${majorVersion}"; sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; }; @@ -36,7 +37,8 @@ mkDerivation { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg_3 libevdev python3 + qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg + libevdev python3 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix index 591b2daaf1..4c657fc30b 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "1d97g4m686xsj6r5vy5x74ys9yk0hcpdppxh714n8hhcc9aglm19"; + sha256 = "1yhszswwg217x8d2qlcasi9l97y1z6w1pgliys4p27zv5b1ygy7p"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/vice/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/vice/default.nix index ca3149785a..c80d820059 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/vice/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/vice/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { comment = "Commodore 64 emulator"; desktopName = "VICE"; genericName = "Commodore 64 emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix index dd3cae339c..d30d4bcdc1 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -39,19 +39,22 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.10"; + version = "5.12"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "0g9k094biyjc0ng3vnncdr1psf0ykn36nqirrqdzc5y82s9a1alv"; + sha256 = "0bl4ii4h1w4z8kb6dpdc1pgwk0wrhm61c2q2nzpcckkrqra75wc7"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1nnj52g0kp7i38qw85sp5qsf7gph1hh3ywibrdfpjmjpyj30v7sw"; + sha256 = "1f6ay0khdcxxnsvp4rywg80qpcysbplyrq7qjmqjvdysi7k2wm1w"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; + + # Just keep list empty, if current release haven't broken patchsets + disabledPatchsets = [ "xactengine-initial" ]; }; winetricks = fetchFromGitHub rec { diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/staging.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/staging.nix index 48ea93a97a..f3b9fa3042 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/staging.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/staging.nix @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert stdenv.lib.getVersion wineUnstable == patch.version; (stdenv.lib.overrideDerivation wineUnstable (self: { - buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" "gitMinimal" ] self.buildInputs; name = "${self.name}-staging"; @@ -18,7 +18,7 @@ in assert stdenv.lib.getVersion wineUnstable == patch.version; chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR="$PWD/.." --all + ./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} cd .. ''; })) // { diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix index a105955918..eca15faf1a 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -99,9 +99,6 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" - mkdir -p "$doc/share/doc/ghostscript" - mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/" - ln -s "${fonts}" "$out/share/ghostscript/fonts" '' + stdenv.lib.optionalString stdenv.isDarwin '' for file in $out/lib/*.dylib* ; do diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index 9cc093f222..01ee818f25 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.63"; + name = "xlockmore-5.64"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "1qhbl6axffbajxzwg4xyf52hdxk5xvg63gxk0s9z8g0fdfj242wr"; + sha256 = "0fbh6avdzsm1prafglr2xdd8c4ibkddi6xxywvqgvzp0zb2kqimr"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 23c513ea17..74bbe18918 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -109,6 +109,19 @@ in rec { }; }; + fingers = mkDerivation rec { + pluginName = "fingers"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "Morantron"; + repo = "tmux-fingers"; + rev = version; + sha256 = "0gp37m3d0irrsih96qv2yalvr1wmf1n64589d4qzyzq16lzyjcr0"; + fetchSubmodules = true; + }; + dependencies = [ pkgs.gawk ]; + }; + fpp = mkDerivation { pluginName = "fpp"; version = "unstable-2016-03-08"; diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 1bd4dfffd8..85df90a9fe 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2020.04"; + defaultVersion = "2020.07"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy"; + sha256 = "0sjzy262x93aaqd6z24ziaq19xjjjk5f577ivf768vmvwsgbzxf1"; }; buildUBoot = { version ? null diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 5cd7df4597..60ea77c33d 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-06-20"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "834d6f9c48ce349a4c3d72e98bd0de81aaa84042"; - sha256 = "0b9606yspjvmfarjmgqcbsg9qp64gkr7b1w7py2gd1fvbmnkmac0"; + rev = "b3c6db173a019c37c83d4600c0c68872e91086dd"; + sha256 = "0il34czgidxdy8hpwn6aa3mjs4rzplixyvx58cqy7cbcbs0vk933"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -269,12 +269,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-06-15"; + version = "2020-07-07"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "0cbf6ced3c1b6cfd1ab869a46165d69018747550"; - sha256 = "0553m0v48kz2r0vasq4yd0834r066h1mha6sx5k0ls0s0074w10m"; + rev = "dec99ba2de364773f06b23b907db137f1b52a449"; + sha256 = "1c89x4a4mrbb1l0avxazcxgwqapdw1ndqjhviij69ifybpi81jrn"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -353,36 +353,36 @@ let coc-css = buildVimPluginFrom2Nix { pname = "coc-css"; - version = "2020-04-15"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-css"; - rev = "41fe3122753b62c4416eb5e4ca4bef1cb3d3ebd2"; - sha256 = "13xg0v2iwf8nrd1bba5nmwgav37fb8q4fqr5bsg3qxlbghpw0bbl"; + rev = "a8cde12697de70dddf235ada61dc3601a6c04b57"; + sha256 = "03n7czxiraa9pjcdfigmxgwyprpijbs0vhmzccxx0nwm038291y6"; }; meta.homepage = "https://github.com/neoclide/coc-css/"; }; coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2020-04-17"; + version = "2019-01-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "50a573af21a9563f331f2711f3fd7a568c33907f"; - sha256 = "06h3if5sn5sqgrq1ql1j7g5xy658mwywd7ri1hajzi8s3mb5lanq"; + rev = "f0cf609724249e662fef54169b484b7d089032f9"; + sha256 = "0jknvcf1cf53bwyhf1rhm5fa7nsp0l7sihns1qybph8hayb5rwvp"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-emmet = buildVimPluginFrom2Nix { pname = "coc-emmet"; - version = "2020-05-19"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-emmet"; - rev = "5424c10fb8c451059cdcf04b10aa7c28178ce5b0"; - sha256 = "15zfmsy7ymcp3js3y8f6wvwj3r0p9a45v1zvq07ilwri91z6nkrl"; + rev = "6e00ae0643b199ce0d037eae16affb36152ed9bd"; + sha256 = "1gr9c7vkrlnrgii66m1f56izggd4rpbnvqgff7qw7yyngr571zyi"; }; meta.homepage = "https://github.com/neoclide/coc-emmet/"; }; @@ -401,24 +401,24 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-06-20"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "c4af6c2ea44eb630049340becfc6c66ddfb8b01c"; - sha256 = "1s8vlnabkjgzs2l5rwzcx5rfhhr7lszhl7mvk6l53rylc875zmd7"; + rev = "806b44b3d223ae8e24134eaa3b5cffd210300b98"; + sha256 = "0rabc8ck1mkn0xxryzy27nq7ncqbhm6zhlg1vab8gyfm35l2zr9v"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-06-11"; + version = "2020-07-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "bbddf4a9447848cdd18a693268bffcc0fe523c08"; - sha256 = "11c5rnlf45wz0slvl0gcqcdc9xb859pxy44xynfbbsl0ii1l8zc1"; + rev = "ea1a4e35445a24147f27967dce61fb3f9f927e15"; + sha256 = "0j71qk4hybbs96gwqnkpa2i5lzkgc0v6zsmyijn0binfn37ya3dc"; }; meta.homepage = "https://github.com/neoclide/coc-git/"; }; @@ -449,12 +449,12 @@ let coc-html = buildVimPluginFrom2Nix { pname = "coc-html"; - version = "2020-03-30"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-html"; - rev = "8ae5d2832761b5868f69c67f33ce26f9edb26c65"; - sha256 = "1rf9qfimnbxjr5s55pzm8npixan5cz2v17g4j34f18i9ky6yyk0b"; + rev = "c841e3bd11d76cf0806d21f32c9cac5c9afa35e9"; + sha256 = "1xail08fb7hd43d03l79ynrp0bmcbk2hdcyk3mxl3fkizw9pd9dy"; }; meta.homepage = "https://github.com/neoclide/coc-html/"; }; @@ -473,12 +473,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2020-05-29"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "bf698c0df4d63c7c84013d58111b7b458f6b12f1"; - sha256 = "1nyswz55dg4d1nz6ff2479ibnzcdhv9ky8a4awlakwp0g0c3680s"; + rev = "54133e9f411837a54ffc838185c343e628213b29"; + sha256 = "06blp4bidz74qgb44h498jbhx4gw5g57ki0a5gwms11zm74v0k00"; }; meta.homepage = "https://github.com/neoclide/coc-java/"; }; @@ -521,12 +521,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-06-16"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "a75fb41cc7f766f048ed04ff24d2b9036c80a0c1"; - sha256 = "024mpad6cpivxpf9fjrr9mh7iy8hq64d75yazhzm4kax6f121xk0"; + rev = "3dbe29b9462a1dd910ff653564cadd72146386c8"; + sha256 = "1j2z557lzsr25s9ijdfiyg8zd7f967qnq8imacwn6qzfs1r337nj"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -557,12 +557,12 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2020-05-27"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "1fbfe34dfce455111e3eae939fc8a37d2fd1ec42"; - sha256 = "170zhsq73shykxszwwcqakrnl5cawf9kkgc1mqy0l0jqmw3jk8qy"; + rev = "47096dd3ed613abcf9f07a27e33aac37a87b5aef"; + sha256 = "1hpwyfsx09hmfn0azn2nawavkn8cjnj7nafimxmqkl0ifdmkybby"; }; meta.homepage = "https://github.com/neoclide/coc-prettier/"; }; @@ -593,24 +593,24 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2020-05-13"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "166fd05342d026759246594eb5fd8d0bc240505d"; - sha256 = "17x0h2g5791z5xmhl7kps09b9zrac2yni3r59rrx96rry50fkca5"; + rev = "71bbe50be43c886aa1ef8190cb55fa6f7fe44f59"; + sha256 = "19r0gb3qbnsg5q4ai7an7d3a1zwdzjh3vg0l4khhnkhbh5ws69m4"; }; meta.homepage = "https://github.com/neoclide/coc-rls/"; }; coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-06-18"; + version = "2020-07-07"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "2079280b12e565ae5c437b675f09b7915f1f9d92"; - sha256 = "0l4jz8mdbn352cb7gkycbdlaw18k9qf4v0vcljni7hxdqc6k1hiz"; + rev = "1599b021dbc276645f6e224423ce576a89763ca0"; + sha256 = "0n9b9fjd31kl3yd5bpc1z5i0yzj7x8rnbknas706x78mrf6bjl3z"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -713,24 +713,24 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-06-20"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "a065861bebc201b722145d3d39af76cdbaf92f46"; - sha256 = "1iwp8gs5f49chncbqv5w7x435jhwqczlmw00clf345yvx2kirngn"; + rev = "a45d50acca1c79c72485811cd9bf308b9fbf4ec3"; + sha256 = "0b8cr9xaqigs1nn7vqyvs2frawfz20pn28xp1q6fbx089rddiv0a"; }; meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2020-06-19"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "6f106f10c981fd314d6a83cab29f8a464da6b34b"; - sha256 = "1b2zac7z8ja1ymf4psd48gwm7cdkyiwyglinpqy5g2zyspc16qpg"; + rev = "37c70071a93aeacf23ac651cd6e9f7ed11582033"; + sha256 = "037p3zkavfyh75wclibd2iwd1ds8kzi72q8zy7rwdchwxw57xwhj"; }; meta.homepage = "https://github.com/neoclide/coc-vetur/"; }; @@ -761,12 +761,12 @@ let coc-yaml = buildVimPluginFrom2Nix { pname = "coc-yaml"; - version = "2020-03-06"; + version = "2020-06-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yaml"; - rev = "338192a2434b96b139fb8c07d260da00b3100997"; - sha256 = "020jpsm9ss2v3x1g43m920w2yamv8khl7mg7wm4sx6qsl3rlfq4g"; + rev = "e3db99f415a1439b44548473fbaa3f79df4f383e"; + sha256 = "0aij94s5jak5g2myd6xmcwx5aclpvgcbg9nwxqzkij5m24wpi23n"; }; meta.homepage = "https://github.com/neoclide/coc-yaml/"; }; @@ -785,12 +785,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-06-20"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "aa3647842f5bf436c8e1556667033046d83426d5"; - sha256 = "0gzm0pm3gqis7y3qpmwjgnn5g11ym6s4fj18j5qmdfshbsajh9xv"; + rev = "a6f403c0fa7a94719d3cc9f056cc56879b534295"; + sha256 = "12fgrgnyk8l50gfld8fa4ac0cibg86732xc5cnkhw9bx7waa90nv"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -844,6 +844,30 @@ let meta.homepage = "https://github.com/rhysd/committia.vim/"; }; + completion-nvim = buildVimPluginFrom2Nix { + pname = "completion-nvim"; + version = "2020-07-06"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "completion-nvim"; + rev = "2fa537d355e8e578f7ddf282e5d73b9ad76204ab"; + sha256 = "1qi37f9dvb9rqsh9sqprbhwv8fl2a5y9p1zb4jhw6n9w3mir4y4c"; + }; + meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; + }; + + completion-treesitter = buildVimPluginFrom2Nix { + pname = "completion-treesitter"; + version = "2020-06-26"; + src = fetchFromGitHub { + owner = "nvim-treesitter"; + repo = "completion-treesitter"; + rev = "45c9b2faff4785539a0d0c655440c2465fed985a"; + sha256 = "19pgdzzk7zq85b1grfjf0nncvs5vxrd4rj1p90iw2amq4mvqrx3l"; + }; + meta.homepage = "https://github.com/nvim-treesitter/completion-treesitter/"; + }; + concealedyank-vim = buildVimPluginFrom2Nix { pname = "concealedyank-vim"; version = "2013-03-24"; @@ -858,12 +882,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-06-16"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "778c8e711a23d6921a99986a00cdbb6d76e1b103"; - sha256 = "1dk0j4f4dpl21rjc7gfl2r23sf0vjajcdyrc20pfr8kan86acz18"; + rev = "9ad1c3423d4174ebff09039387eeb3c85fc848f9"; + sha256 = "1kshivd4gaq6kx2idhjndjmca2np5r3hfzq09wk4ivzxjmcwg94p"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -978,12 +1002,12 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-05-20"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "70bc2f27d579d24e4973aea19df2fdffb1a8c95d"; - sha256 = "01agwm0scg7g5l04djxmj22rd5rd3di1z9g89hp2lr3rqp8ipdrn"; + rev = "b9fd9d22d0c705e89e2cc50b993db04d824dd8aa"; + sha256 = "1m2i263ppvs8xbb5xfif5pyd5zxwhimvm373dlmlwmgn339cw0pa"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1014,12 +1038,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-06-20"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "acd68311bbb3296aa81c5799695715e85326b738"; - sha256 = "1rv8b7g6prjibl9hx5wapj71hfg0dd2ipkpdj8w1zj4b0inj5848"; + rev = "87da3129bc9bc97c24633f2343c1d249e51139a6"; + sha256 = "0lx7maacr3j4gmj2zl60crb1mgxiwxmlsb0x0nc7r7kwaj5av24f"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1062,24 +1086,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-06-11"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "6139d4cd2d6944be8b713766f92f521eaa056c18"; - sha256 = "0v64fj9jjq51h2cr1haih4ac4kffvzp6g0gli2vs4vjcbjbcil5r"; + rev = "1923d69eff4b1f9a9a70d9978a447bdccadecd4c"; + sha256 = "0h30z8zq34ps1qxp85kyhb1v8cbx3l9iz77zrjgddk6pf6hx31yh"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-06-20"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "5f23eef76ffe62ddd78a3f3318d4efc6d236f403"; - sha256 = "0gi9r8rvf725s65jafbskkn7c90ld74ckdv9xxm1d6rql0n9dsbb"; + rev = "b07a1f2a23a4e68010c53a1e4e1d2a9e46e37ec5"; + sha256 = "0dac5q55cqzl2xawfb2dnqnvbwribbbc58lsm612iz425bhv2yn3"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1172,13 +1196,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-06-20"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "9ad4cbad7e8052bab042f724c71ba10621542f2c"; - sha256 = "1hfrvgfl9av7c4v1pd04rnp5gcvnl1qwnfgq3vzh288mjs8z1yxk"; - fetchSubmodules = true; + rev = "a0e5a0630206e198380d31804bb6652e56cb3701"; + sha256 = "14lq2pv8sy4ij100blg2mkd4h0xsvba968l66hv82ad98vlnwx15"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; @@ -1293,24 +1316,24 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-06-21"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "2a44d0f331c57bc0527bef1c975153c274bd52f6"; - sha256 = "0v61734kh3zz4q2bj1085kydkviycmjv6c45qmsxnvh9vcjz7ip3"; + rev = "a57980ab9d08b11affddc30439f6975e4eb01b41"; + sha256 = "0aiq70q82w6la4969nmbqz86innm7siz420yy87g9zwadja8nx6c"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2020-01-02"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "607958520f8bd4308fe52937e211f6db4ad84cf3"; - sha256 = "0rnkmfrzsm4hg6ln8g8qj9ff8z2sk7cnf4gqrswychqhhkg1f817"; + rev = "9ced78806ce439f84d5dc264b212cd87db148c53"; + sha256 = "1ac8cy8nqqn9dz0r36w4lrwfqyv44jkd8md376v6awjfj4kn7xjc"; }; meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; @@ -1584,12 +1607,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-06-19"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "24e67a74e430da87f66fbd88acc01c9227842fde"; - sha256 = "193acbbmkl1102fyhm3kj0jais5b3f6y1rnyhzkikwl3rjjf6gaj"; + rev = "e54c1ebcec8bf4313ef04a1c5f47ecdbb6d11db3"; + sha256 = "1bs07jjj3pgwdr81w8piph6wz73n0gwj3imbnd2za0jqxbshyzry"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1668,12 +1691,12 @@ let gruvbox = buildVimPluginFrom2Nix { pname = "gruvbox"; - version = "2020-02-23"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "morhetz"; repo = "gruvbox"; - rev = "040138616bec342d5ea94d4db296f8ddca17007a"; - sha256 = "0qk2mqs04qlxkc1ldgjbiv1yisi2xl2b8svmjz0hdp9y2l5vfccw"; + rev = "bf2885a95efdad7bd5e4794dd0213917770d79b7"; + sha256 = "0576sqzljal3k8rsnbmcvlsk4ywg1vfgkxkvrv2zac2d5wwa9i8z"; }; meta.homepage = "https://github.com/morhetz/gruvbox/"; }; @@ -1752,12 +1775,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-05-15"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "bdd630fb15dca7793b04deaf1c1fb3a6af33ceae"; - sha256 = "045jm4gz8gqv7mgz04l3q42mj1ji9qv99n915zq8fgzfskc0pixj"; + rev = "8e9b8717121c1b9ce93bbf6ef3372e9a567abbcd"; + sha256 = "0rimchajc7slqid9s4dhhy5fjfspsg66b4ddfik3djgzvq088rpn"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -1896,12 +1919,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-03-07"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "e83112f9aab147ab485ee7af72e01d047c5206d3"; - sha256 = "0yj1bsfn43crmfn0ylyzyz41z0vmvapl5cgm7k1rnbj96i7vifx7"; + rev = "a0207fadf9f165adac61f01abc07db0ae898cbe6"; + sha256 = "0hdnswwp0nw8z2rm4dij958arb13rlqr4izqydbh046lh1ksc9b1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -2041,12 +2064,12 @@ let lexima-vim = buildVimPluginFrom2Nix { pname = "lexima-vim"; - version = "2019-07-22"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "aa32e972b69230625989daa09ee5fd74a2d877ef"; - sha256 = "15cc09vb0yrasz76qkcqxhj95y1m6yrsx3wsn6khx39kp1bas0jd"; + rev = "de17b1ec4009017b08d108e495c2d8d209074ad0"; + sha256 = "0ks2nyg2pvvyd3lrlhdbbf3ix48zdh839d65hglk34xl59hmnx1y"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -2077,12 +2100,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-06-03"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "448982501112f69f8edb7fb7bb61573091036366"; - sha256 = "1k4man0jm8pkvb2f8l2f743ipwiz76ljzzn1hi4pvs0wncdr7k6q"; + rev = "d704949896e56b1a54c8947abe090068ee12d8a9"; + sha256 = "0bv3036l1r1jkdwc0j9w9842n3his799ggwii3m65pvsk62ghcjf"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2101,12 +2124,12 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-05-08"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "ef674de5ca1c963ad12f04631ea58f90dbbc70da"; - sha256 = "0kdla3gmkyk77vqz6hj41alq3jmrkml7836fhsd3hb50f6wwvk11"; + rev = "77eb9c67d3d7cc14f11d68e865e3540fcc56fdbe"; + sha256 = "1c1aznfs297846f0w6f67sx4fdk9pxxalayfz1dcwabbfq785g6p"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2317,12 +2340,12 @@ let neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete-vim"; - version = "2020-01-23"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "0f83788cb67e0743a3a9c8d3a3a6e52a01bdc6c2"; - sha256 = "1ydnb576qbdbij7ipciw0m46wbj45gj7xirpmqxazgp9y6b13isf"; + rev = "5c18aacf03e210a23800775bf3585f3735d00a30"; + sha256 = "08vpfcgx88hfbmnipsg590i6fcpq5gwa6va46pd2lipmcpc4p17g"; }; meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; @@ -2341,12 +2364,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-06-12"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "1cee66fe6219f8cc698eb244ba4001bdad1d09cb"; - sha256 = "0w5hw5qc5n0i2hal91nilmxazskixv6c1rcszgqar4dfh951kazy"; + rev = "0182a798813f974f21d5779d76747fa68e9717e8"; + sha256 = "02jh8ph55bns8dhxd1rpl62b4z7i5rx8v28b1ldrrvc29y1ymqs2"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2365,12 +2388,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-04-09"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "d10e53956161176c7f8a1ef2899880d5384f47b0"; - sha256 = "0zv27bln0n687s0xm19nrk16i58hmxdhy26jmjh335zji0ydx27v"; + rev = "3193bd1c96b1071ed6c1316641acdcc977934d36"; + sha256 = "1gnnnmnzb0nsfsj2iq20dpycmfzk48vfsc06968srzpkzbpw2glf"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -2389,48 +2412,48 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-05-06"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "66abcb7de82a45be6ba8b669d5e7bdca51deafdd"; - sha256 = "0a0irlhj1skkwy1897q6dbg9zh8v6b0sx12dsgj3z37rvplfw78y"; + rev = "40494577a44c6c7cc03e70e4bb6b4e27cbd8e417"; + sha256 = "1jiva2s4bvp98kwjprk2qh47avz4nqawsl93118cwh01ys9hhdah"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-06-18"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "2c6c457e0655090639bd8c68f6eac4b01d071696"; - sha256 = "0ca8im1kmj4d1wshjjgci7v2d0szia36hhgnb2dmsg601ninkvmw"; + rev = "ad04263359412e1dbfd687e861f3d28cd702a7f9"; + sha256 = "1mlvs8wxj8d3yh8srn0zr8bz753mhcyixsrfwcr90qcibglc1ihy"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; NeoSolarized = buildVimPluginFrom2Nix { pname = "NeoSolarized"; - version = "2020-03-10"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "overcache"; repo = "NeoSolarized"; - rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4"; - sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k"; + rev = "25990b06d8ddbca74fae0bc082926419af75bdca"; + sha256 = "1z7yg0jif5bj8szvvcx9qyrgbbhhwmbf2s47dbr0i6rc0f2zs3r4"; }; meta.homepage = "https://github.com/overcache/NeoSolarized/"; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-05-30"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "d6667d8fca8425753d7da215f57e1a0e936e75de"; - sha256 = "1wmsqnhbd438xs8dp2jrkk7fhzzi7w1l66jqwfwz6sxl0ayc3k7y"; + rev = "f6596a893fc7aafa4c100feb325c2fe0a25d38ad"; + sha256 = "1qvb90688khm5czwdagm0x6zp59zlcisn9ha0n9q3jz98y088agx"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2485,12 +2508,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-06-01"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "d48ab70721d4f688ed34bd5939e2d6f4c89548c5"; - sha256 = "0rd228ks4gppskcvz6cj94gnbd9wykic8f4ilc9smaqw817gq20s"; + rev = "6571452857fd1b14f15a3886f9fffc113c36bbac"; + sha256 = "11hnzc2glnwzn24pz9fixwv87skqf024y0fpfs7jlsklvgs5pw8f"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2507,6 +2530,18 @@ let meta.homepage = "https://github.com/albfan/nerdtree-git-plugin/"; }; + neuron-vim = buildVimPluginFrom2Nix { + pname = "neuron-vim"; + version = "2020-07-05"; + src = fetchFromGitHub { + owner = "ihsanturk"; + repo = "neuron.vim"; + rev = "4ccd13f95a2c9f3dafef2d4adf633e0b18a16019"; + sha256 = "1z7i0szajykhdqckjydgh297k6b83ni9yds809skx90dlgbxwpfx"; + }; + meta.homepage = "https://github.com/ihsanturk/neuron.vim/"; + }; + nim-vim = buildVimPluginFrom2Nix { pname = "nim-vim"; version = "2019-04-26"; @@ -2521,12 +2556,12 @@ let nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2020-06-16"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "2124a5a760fb6138b10f38ceac3fce5c19056b9a"; - sha256 = "0g08kydqh58617lxjnlvbvjp0f730kzjpsz44v390sjx2a9xrk23"; + rev = "57dffa746907e8ce5c4b520146ed0d89d3c29a51"; + sha256 = "0xpz71rj74514789v6x9wrg95n8bsag8f5ygd7js40qrwpxq6b4j"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; @@ -2593,12 +2628,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-06-16"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "a82ce0ebff06ec85ddb2c61763158b8e97b9a85e"; - sha256 = "0dsg79qklb942af0qhpzd8h2j1rllk1qgm88p0s49m7rprfah3g4"; + rev = "63527c33b51cbd6decdbf9a4285fd1b05be249b2"; + sha256 = "1yrnlqci1n6xqm2k3yd0klx1gybjcd0zizn2zd3yh30h23p4ak1v"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -2615,6 +2650,18 @@ let meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; + nvim-treesitter = buildVimPluginFrom2Nix { + pname = "nvim-treesitter"; + version = "2020-07-06"; + src = fetchFromGitHub { + owner = "nvim-treesitter"; + repo = "nvim-treesitter"; + rev = "3e8b5a30e2640d47ce07e7b32af07b1e4f5e6e33"; + sha256 = "128nvivv1d5qyzy91kcgxdahfrsblj81kn1x2mj3ijr5xph6b945"; + }; + meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; + }; + nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; version = "2020-04-08"; @@ -2761,12 +2808,12 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2020-05-09"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "8dddc45f3f7ba4f0319a14e6f0167d97a703ac55"; - sha256 = "1fkls8qwkdgr5fyaml9rlrjzrbwav2zyp2xyfdyg4h6pbgchvkbl"; + rev = "eb3df3092a767c844db3f3ff355da840abd0aa97"; + sha256 = "02psvyxli5gs2cx2sha33mk98ivllb8zr1jwgv4hgi5bh6qd7wg3"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -3073,12 +3120,12 @@ let seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256-vim"; - version = "2020-03-14"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "cfc0167e546a40eb26ec2a0a0f1c141a8c1bcaf1"; - sha256 = "1z980hsmf6gcvd16ja67az131mrgv5fv6v0ivsh0ga8hwc4f9l6q"; + rev = "24ed467ca6ef9ce7ede56c9ffb1c6b30cd0ee906"; + sha256 = "0ihs5nxdyx3jr1n96l2yx4b5gc48x7qbyxv6dc53ihw2vpn783fx"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -3229,12 +3276,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-06-20"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "20e41455e1155f5989ecac007fc92c9415244822"; - sha256 = "1jzqz0pi9zaf2ivdvb2prv5k86003dswpv2n3vh5vkmwgl1r3ml4"; + rev = "f60b6c5ee3341e66373457d3d8007c8b9c2e0a74"; + sha256 = "1vyirnzswjipimc14gdxnm07wvbkw1sp3kpsggqccwjkibh3fxhh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3290,12 +3337,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-04-19"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "b3e2d8470fddc7f2b598f09023ebc5045a3fb1fd"; - sha256 = "1ljsh0npbcv9g6l23z4jpba0bk1k5n13ix0p0rr22cipgzlxsbvh"; + rev = "63b74a7473ec01548298284c210fee0a78a6156d"; + sha256 = "1xp63bfb9ln80gz4jsp4gjk9ckhlkzxmfi5sb72vvlsravw5g3v7"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3338,12 +3385,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-06-11"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "56399f446c64d187c106e112afa4d97985508eba"; - sha256 = "1bmfv09lxwq9b8hp4v2avmd979178lm60xxf5g0qiifrr4ym2gqk"; + rev = "d7063c7484f0f99bfa182b02defef7f412a9289c"; + sha256 = "0awh6p7nc9hggiazhvvaw2hhfml76yl7856ssx8ym6r2vbzqw82v"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3386,12 +3433,12 @@ let tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-04-24"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "44d04bc9ecb0188e7b1a3e6b6715b9a63dc8f3e1"; - sha256 = "059my5q6gqjdkaf7qn842h92c6y7lp5z8wpwsi2ww6anzy85506z"; + rev = "25924cb8b29a5158e56fb896a2540c70691c7a28"; + sha256 = "0mm5h5jhb6y0f1zsfhq0frvdm6s93skshi66rfrpn82l93zigw4c"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -3471,12 +3518,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-06-21"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "a1eea2431e19e441555442ce41738524042b2493"; - sha256 = "1k8sw8yr9ak4dggd51ishvnljsq3iycrnpfikhzn9h8qgclx2lfl"; + rev = "baed959ee85a3f7631a68104beee512a78233800"; + sha256 = "0nvl238fd7rnnwdf8xbzz5nzw9r74k86qhaw6khjvl5gydyzg1ah"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -3555,12 +3602,12 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2019-08-27"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "5addeca429f64130d74d2f7cb8255afdb9e309d2"; - sha256 = "03bqljjc1h43qimm81mv8ywkx5388kd6clm2f7887diiww0fgvfi"; + rev = "787c777ff2fedd46fc10e315bdfea339fe016d33"; + sha256 = "1bm48d3n07i2hy7bqz6pzyl3zb5mikhplmk5fk5x09q2i47l6bqg"; }; meta.homepage = "https://github.com/Shougo/unite.vim/"; }; @@ -3615,12 +3662,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-05-19"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "494dbe9d4effff140ffe6743b614d900a0f34dd7"; - sha256 = "0d85kgxb52xw6120q6zrksr10nj54s8qi0fl6gqw6nc08ldaq0b1"; + rev = "10932ddaaf560e1ae5bc12137515dc7007a0afc3"; + sha256 = "1h85ynngkz921zr9gshcl0kk5s9dgjk0kifz4r7v8pvnjq5kbfk8"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -3867,24 +3914,24 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-06-19"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "5ce3e636580dde6653a74535bb7b358725d1e37c"; - sha256 = "02a5nhhyi7k4645jmmgjdj28l46knv7l6219lkgixrbgdq5gc43h"; + rev = "b843321428209c892f4a1fab7a5fe473f0b7d386"; + sha256 = "143x1235p2wdnifpv637lbhi6jsxwdws07z6hrf6915qjc39zi53"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-04-01"; + version = "2020-06-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "3fb676b8729a98817f561ef1554c0ad1a514c96a"; - sha256 = "18bfw09ywmw10jiv37iw2ijf46jhj2yw5wndqdgn7k42gy1wk7p6"; + rev = "04fa4fc40f21d9490954213c1ee06c7fdea66a6d"; + sha256 = "0dzckj0449rw37v5kwmfm5wa9spfhsbfr56i30mb063zmv8wk551"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -3939,12 +3986,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-05-29"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "f116a3b86cb3e9fbcd8563cce4958759610d8f51"; - sha256 = "1vamldn3y9pima18ryrrzn2mz1czzzadkiiklcrcl104v9mhv4am"; + rev = "99f4a4159876ade1c5cfde60cdc3768f439dd702"; + sha256 = "0xmcswr6lgh26ldn7wrhp1pcfmf45r4n7sb2aa38wmdss14x0vb6"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -3997,6 +4044,18 @@ let meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; + vim-bsv = buildVimPluginFrom2Nix { + pname = "vim-bsv"; + version = "2019-07-11"; + src = fetchFromGitHub { + owner = "mtikekar"; + repo = "vim-bsv"; + rev = "dc775cb06891dd0923b5e2a882f5dcee6451540a"; + sha256 = "18wsbvypi62nwgcazw2m47d6k8ymlv1zwabs2gwl931n710ldkfc"; + }; + meta.homepage = "https://github.com/mtikekar/vim-bsv/"; + }; + vim-buffergator = buildVimPluginFrom2Nix { pname = "vim-buffergator"; version = "2018-05-02"; @@ -4021,18 +4080,6 @@ let meta.homepage = "https://github.com/bling/vim-bufferline/"; }; - vim-bsv = buildVimPluginFrom2Nix { - pname = "vim-bsv"; - version = "2019-07-11"; - src = fetchFromGitHub { - owner = "mtikekar"; - repo = "vim-bsv"; - rev = "dc775cb06891dd0923b5e2a882f5dcee6451540a"; - sha256 = "18wsbvypi62nwgcazw2m47d6k8ymlv1zwabs2gwl931n710ldkfc"; - }; - meta.homepage = "https://github.com/mtikekar/vim-bsv/"; - }; - vim-bufkill = buildVimPluginFrom2Nix { pname = "vim-bufkill"; version = "2020-04-29"; @@ -4299,12 +4346,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-06-17"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "50eb8e2d88be4e8bbcd8e5ddccbe499b3a1f473d"; - sha256 = "0hgbi7l4qlblmp28gbzzdw0bpfnw1mghyl7prk4zzf8w4m4vsrpa"; + rev = "028673dc93a978225c897b4913dd21b48dc35a7e"; + sha256 = "034nna0vaxbizg4d4pqw9qmn691fz707dxga82n9m9id1hz9wi0b"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4335,12 +4382,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-05-01"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "a19760770b810050e748de14ced589dd34c2dcb5"; - sha256 = "0iz72p992z2bkvz66x7fgyd9hpjq558h009bsjvfr4l6fpbi4ys2"; + rev = "7c4dc5945b15a6b97ebef860070d30e36da01788"; + sha256 = "0mg8fdfsr59015m309kr9v5akwc3zfwfygn36x47c8q2bwjjr052"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -4491,12 +4538,12 @@ let vim-exchange = buildVimPluginFrom2Nix { pname = "vim-exchange"; - version = "2017-01-27"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-exchange"; - rev = "05d82b87711c6c8b9b7389bfb91c24bc4f62aa87"; - sha256 = "09fa156y8pxpzdbngifa7yzg1vjg1fjsgp1h9inj818zbig8mamb"; + rev = "0e95600517aad244d947b955a2e34ec30bdd09ff"; + sha256 = "1dh8xc5szm5rrv7xp299hcfhgp1155k5kfipzz6q2r69blhwyl1d"; }; meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; @@ -4539,12 +4586,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-06-08"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "15fcf3db308ce34a12c1e41a88178c7cccea0d96"; - sha256 = "148qjhln1v4cv15idsn36n82g0g7bjq2vhf0il9a6djwycf374kb"; + rev = "237c122f34132714a55709b4af13b94a10043136"; + sha256 = "0gwc6pb5psqwma0wzn87igd3wwsc9grl48y0w47q3jvc3xj01cgs"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4597,14 +4644,26 @@ let meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; + vim-floaterm = buildVimPluginFrom2Nix { + pname = "vim-floaterm"; + version = "2020-07-02"; + src = fetchFromGitHub { + owner = "voldikss"; + repo = "vim-floaterm"; + rev = "e3fec03b10444ecd3d73342ab6db1a433cc72522"; + sha256 = "0vv2hdi8an8a56848nnghbx35p9na8m54r2n2x2l5yaq84vnk30d"; + }; + meta.homepage = "https://github.com/voldikss/vim-floaterm/"; + }; + vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2019-09-29"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "030a4e609f8f38922fa4ec9a27836d9dabaae957"; - sha256 = "0jibmr0v0pqml1cprs3qmkhhmacpb2bwpk8lhaz4dzp8jlga9g00"; + rev = "a865e5f0df4faaedfda1c2b5679b42d1a0267d44"; + sha256 = "04vl8cfk58m9p59j8hh0f9sp15dg7rm971nhmwhbbj7pq6b8dq8w"; }; meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; @@ -4635,12 +4694,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-05-31"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "27a5c3abd211c2784513dab4db082fa414ad0967"; - sha256 = "18rvp600vk0anbzxdgcw3kdswqr3100b3jgnmz6c2k5c50wz37rm"; + rev = "1da7c133b109cd329060174a104e325e4d6bcc82"; + sha256 = "0yla2m8k6mqhr8sr4s1pgh2l2dzn9kpk0955f0r0pccirfj7c9pk"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4695,12 +4754,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-06-20"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "d82f2721424762f14587240e09cfb0dc499779da"; - sha256 = "1ynl6jdnij2hi0gmpgq2b01r5g2db5582jzsqbz079ydb2kbp1jp"; + rev = "c27bfab8c51e77419ee0c4a9c4e3ba359dbc2ad4"; + sha256 = "0m4wrg2j6mdxqfv4d6sw4qcaffk0748spzqvwid5wpzrjvwg2ydp"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4731,12 +4790,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-06-19"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "4ebfb5967fa2aa3269edb3962b347a7e5e213a1b"; - sha256 = "1x8bg9c5yrfydaqkprf0cvl1jl0lncl0y1zrw1y5gvbq0cgdplqp"; + rev = "2c6bffb492f4f9b101e45610b0d7b9c328916894"; + sha256 = "1mcrs5n7l2syy5h52frv9259mw294s18czirbn3f8waf0n4b40s1"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5128,12 +5187,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-06-20"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "ca3c880f77b4cec6b14d9436b07f4152bebc2712"; - sha256 = "04sq7wips3rybmaqwpxmf7920nv4nrm82lvbr5s9jdn0594lkg9c"; + rev = "1aaa33774783630e21426ad1ffd7a389be59abd0"; + sha256 = "1d3lf1khshwp1gd0wn3jvm35qg3siz5pmbixqysz2hi130b2c3sq"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5164,24 +5223,24 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-04-11"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "496c44d89281d1e13c9bb4c75a2e69daba48b47b"; - sha256 = "09xr8pbx27qpffcr0j1857cpyxgkv5xay6mgpzvynpxq21xrmm3q"; + rev = "c665d5ca4247b696f478f91b7c97b9e44442e4b6"; + sha256 = "1p1461rh3yp0ldg4x1cb2nj9xng6scdlrkzj1q8ykspi98qnz0mm"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; vim-jsx-typescript = buildVimPluginFrom2Nix { pname = "vim-jsx-typescript"; - version = "2020-04-29"; + version = "2020-07-02"; src = fetchFromGitHub { owner = "peitalin"; repo = "vim-jsx-typescript"; - rev = "7b47d06819b5778de78cfbb28c225c3ab276f700"; - sha256 = "0pm40psql6mzrzy750vm6jk71pp467hz9231izicp0554mq6qmsn"; + rev = "f93f121335ae99bac123a6fecc9fa45a4790bb64"; + sha256 = "0a9p8d8hgd32gwp2lvzm9v354985pp0pqm36qn9cblgikgm9plgz"; }; meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; @@ -5212,12 +5271,12 @@ let vim-latex-live-preview = buildVimPluginFrom2Nix { pname = "vim-latex-live-preview"; - version = "2018-09-25"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "855c30915547c7e9c19b7e6efb528730c071d2e8"; - sha256 = "14fgbq7wyyhhzkd8832g07z97jg1b9awibzf3sn33ih7p5bb3hhp"; + rev = "32d1a911641e08c11b3f82ba886540cbae0b7513"; + sha256 = "0hnjc1jpjr6fdy9b5j85didi97f6w8p8ad5cn6b0fnxxlkykymjg"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; @@ -5284,24 +5343,24 @@ let vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2019-11-13"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "9ebc192daec70e620c22d574b5a1c1e16f89a48c"; - sha256 = "0cvcjiii5wv55n695284k520rrwi0l4gqpyiqnrpnhmsaqks0n0f"; + rev = "94bd2ea1fd45cf0a21edc3433231e7fcb7791323"; + sha256 = "0r8lisyhbzyw2w9xzbashlhnag98vws78xwmh03dpd8kbpcdiz0w"; }; meta.homepage = "https://github.com/tpope/vim-liquid/"; }; vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2020-05-20"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "7f9d254a0c46889454cc2fd2d5918b413e4cb85a"; - sha256 = "0428hbcj4w9lwmsv9jribkp5fjcbw3sg0gs81jf9n5ax0mxgnbzy"; + rev = "ac6444afb5fd11e3f7750f696a0c6b8b0b6ec116"; + sha256 = "182fvmfnpcqda0cm878lk79iprxsd7nb9r97jmr7lx5agdcvzaqb"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -5320,12 +5379,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-06-15"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "632cd869663ecccd5a309c5dbfc20e1fc881d4b7"; - sha256 = "0w04fjci16l08c76fgqxv176jarm9iiv3rx46l8a45spkyb10lm0"; + rev = "e24d328b59df69de1b594f1836b54fa1040ab4ef"; + sha256 = "0d7wrkmnz1023rz6b7cm98akph2hv543f6nid8bd1amskh4i9y4k"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; @@ -5402,6 +5461,18 @@ let meta.homepage = "https://github.com/xolox/vim-misc/"; }; + vim-monokai = buildVimPluginFrom2Nix { + pname = "vim-monokai"; + version = "2020-06-17"; + src = fetchFromGitHub { + owner = "crusoexia"; + repo = "vim-monokai"; + rev = "703a4a6ee96a5772c204c4dd852f246ce71231df"; + sha256 = "1avp4zr9sa38ygx9c9ffkdb6mmzqv7sxyb093bqq06gfdv8yzk2a"; + }; + meta.homepage = "https://github.com/crusoexia/vim-monokai/"; + }; + vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; version = "2020-05-07"; @@ -5416,12 +5487,12 @@ let vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2019-11-23"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "58049562efb0e6e077416d897b760c4dc9bb25c4"; - sha256 = "18pnk6ri73a6dq86zh510wy1s0z1dwnsyay7lxrgirjgh3s9nhhq"; + rev = "07459060d9166a19a2279740fedef2412eeee807"; + sha256 = "1xikw6cq2pp5j2w0n8sckyq6l91y8gzqs2y1cs0h3bd5qba62nna"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -5476,12 +5547,12 @@ let vim-nftables = buildVimPluginFrom2Nix { pname = "vim-nftables"; - version = "2020-02-21"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "nfnty"; repo = "vim-nftables"; - rev = "01c7b97eff12fd4b624e6efa2c0468163db61ebc"; - sha256 = "1n3mpaa60k4w0sqpkgw19aksa1sbcqz7vl8fp6bj6i63bhiprsqf"; + rev = "26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff"; + sha256 = "1z5ffgxdq8niggm18qikrh5hl8zs05gdij4z6dfnzy00xvancc40"; }; meta.homepage = "https://github.com/nfnty/vim-nftables/"; }; @@ -5512,12 +5583,12 @@ let vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2019-06-03"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "a3eed01f4de995a51dfdd06287e44fcb231f6adf"; - sha256 = "0pwdfwws1dj3705m00ghw3dvym5zbm00bfsj023gmbp6vr8wn6yi"; + rev = "d733cb96707a2a6bdc6102b6d89f947688e0e959"; + sha256 = "12k2gwm8b1n02361gpjhsldql99yd7qsh80a3lbwc5c5gz5j8jsb"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -5740,12 +5811,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-06-08"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "01aab60adef47c6606aa68c8783f5b994fda9fc4"; - sha256 = "1x5m98k20ncvhz6sngzxwhh74s2ll3d119p1g0di4vr59rkx8szq"; + rev = "c31903639623c5be2431ac86b31ce77e54eb345f"; + sha256 = "1adqzbnz9sjwv6sw1fgpd1jnlr7rff235caxygb3w26xzmfighyw"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5764,12 +5835,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-06-19"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "8b6c06e7239eb46d5b5096fd7fe9507aca88b091"; - sha256 = "1j4fg0xhnwk0hf89djv0l2gzrj5dna1a9g8vjdxgdq0pilz5hqnj"; + rev = "9c3c0bc082e0d58d15dc6f24d8a335931417e2f0"; + sha256 = "0pdfq512qh54zj24iwihr30xb8dxw67ix2yj0sb88qy07phab8k2"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -5956,12 +6027,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-04-19"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "fd49b25e08618b58db678c3f8ce6e443b1ad04e7"; - sha256 = "086pzicqal2cmvbrzy09d93c7cz5scgjcqc9xn4cw19dn55irllp"; + rev = "416be2b00de6390f05da2f60f18aa15a4397eef7"; + sha256 = "1nlda38bp67hzmp851haxs5g48kd8dav53484jzdfmxxq0lwy0mb"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -6124,12 +6195,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-04-12"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "a81139239d6447b1c021e4873e6a14b47f32b65a"; - sha256 = "0wavkm9k2vm23nm5bmc3lpm6cac7mihzjcyk4r77qgdgmnnxkm49"; + rev = "f7442cdb1fb37778ddff93649e172b0ad752c237"; + sha256 = "0xf9qj0i4jpimbk0qyzvg88s74dfxgd4kzvzcvjpcd3q6cn8sard"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -6160,12 +6231,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-02-29"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "98a5c946d6dc76528b9d9b044059b5ef1fab5a48"; - sha256 = "0xcxr658i5vzdkxfssd7zx6n3ar9b6dg4b2ddaswgnwq75xphrh9"; + rev = "afe94543bb3bb95ef9ae2a58eebcbc17d69eb304"; + sha256 = "0iaksyh77xahg5cp0q9x5c14jdklsrgy9400jp4xjb83qgg6d7qq"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -6184,12 +6255,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-06-02"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "900bf93c6680e38ce568dba26c3f48b4365ac730"; - sha256 = "1gxqmvr6hz7vblrji2dz2l1x18264ainbl70j60yfx3vjp5aa9vq"; + rev = "3f805a0101e5fdfea4eab992af5aa50e8a242459"; + sha256 = "0ybysjzxpka7lkqd9fjj1nk8byr8g96a3ykmcq0m6xwwyv8732x5"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6544,24 +6615,24 @@ let vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2019-08-28"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "a4ec206052aa347d7df90dc4b6697b7f2b7929bc"; - sha256 = "1dgykq4vl7vvj2f8lvg58rzqddm53i278g26ljwfimgqc8l6gmqd"; + rev = "897cb4eaa81a0366bc859effe14116660d4015cd"; + sha256 = "0ps9kwclqfdydk4132255i9rzcic0sp6d217arjsk1w6gm7m9lm6"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2019-12-09"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "6b7cdecff252474fe560d32c6f05641f3c5952c7"; - sha256 = "0arv1hmlw7c1rlkc00hzjyg48pg8g4cc9q9l2hy8kpmsl037akm3"; + rev = "610ca1a97c8dc85cdeb38635e5a4703317c4b94d"; + sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -6604,12 +6675,12 @@ let vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2019-11-13"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "fcce70f1403ba4101668a4c960c577bddbd00f06"; - sha256 = "0zxqdyla40xcp0ps362b85bqwl3mp4zfmfdggl0gwvgd5m949yk0"; + rev = "5fee9d230ec4a6a16c45f2c71482595e4d9a67bd"; + sha256 = "14n0mnj1lmk3bmhm0knipsw120dlxpsd98fimmchw0kd80vpph41"; }; meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; @@ -6628,12 +6699,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-06-14"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "507c498c7dac31c396ed64bfddcd92551a93669d"; - sha256 = "0jq1ywz4fwlln93qwwxl28dlq43c5vaybhi1y365hcn03nz526cc"; + rev = "d7a75cf6284d6706c77b18f86b0ce0afcddec965"; + sha256 = "0j7hdh58hizg14806r6vsq81sfy2yvqrn934xxb1hw3rzirhsjjj"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6856,12 +6927,12 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2020-01-20"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "51f4664c92f0f1b121127c84d3b1c901e1c698f0"; - sha256 = "06nzh4x7j7j3nvw2s4m1gmds0z0bldxbizja91jd43qma9xnwvlk"; + rev = "8f40d86ab938d5df8c1c9824320621ae9f0d5609"; + sha256 = "11k59lc31056lk9ndkmi9a4459lnv6hdhvw3y4gpin40xchl6d61"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -6880,12 +6951,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-06-09"; + version = "2020-07-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "49bc335fffa40a7b7b84b6110b57ebcbaaf019ea"; - sha256 = "06zdj0pgr6d8vddx87rk36lb00nngydl367g06zi8jkx4673rzz8"; + rev = "0019dc6182ef5fa232887118b46119bd6f5d4063"; + sha256 = "1p0hgrjhzlg1a5f33mj68db123m71r0icqaxbj6mhmkr97887jym"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -6928,12 +6999,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-06-21"; + version = "2020-06-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "0b5ece152b56e424b6df6ca9545517007ceb840f"; - sha256 = "1dr98fibcpq6c1adsb4bnbbgg6gpk9brfy3kkrbl49jqf2120zww"; + rev = "0cbf100215f2136aaea53386bc7f9b2aef7d7021"; + sha256 = "1vdmcwmdrfka03px7rm1hg7irmv8wfq3rzr7qgv255jv65mblvid"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7012,12 +7083,12 @@ let xptemplate = buildVimPluginFrom2Nix { pname = "xptemplate"; - version = "2020-02-08"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "drmingdrmer"; repo = "xptemplate"; - rev = "79d650bad58b9c896ec47785f8a0c7b603105c2d"; - sha256 = "1myxp0ldk0s46aipx1iswa9zx2fkc4gwqpmhbswqgg7sxl1bz30g"; + rev = "359ffe4d426bce2e95f5866b682856b25555396f"; + sha256 = "1rj5k58n1ybcc7qxsxlh09p2v4cps5xyzxmvjfrixy1qm2f85kd5"; }; meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; @@ -7048,12 +7119,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-06-20"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "7f4e88b3ba11261e6ec4c7364c5a420d48e253ac"; - sha256 = "1q98pf0cr38k1z9czm57pvb0mari57q89swsk4aq0pl6b6cvi5d5"; + rev = "e6f121561506f011d878855b66ca8116a46121ae"; + sha256 = "09241155jwrwqqifkh7a64nk5x8yf96835jkywwysl554ppjz8s5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7061,12 +7132,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-06-14"; + version = "2020-07-07"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "f9906f804b02e6b7e70a7f1a6f949e905784b5b9"; - sha256 = "0jg5g2yzaf4xs14phak7k1s5s7jfnsx5ijjgx2arddgaxbvpxlrs"; + rev = "9309f77732bde34b7ecf9c2e154b9fcdf14c5295"; + sha256 = "1m6hyqywdrprm91dkwgnp8r50la933k4a7wdnjw7knvfdiywj7sx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7110,12 +7181,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-06-18"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "fdc73a51d168677ec9a1da68afbe30c8ddb6263a"; - sha256 = "14qkrlh07qg6192m2lgbjh3dshgrlbwni2i00vm04xax8dm436j1"; + rev = "6e4e34862c82b66fd939042018b334f66ee4847c"; + sha256 = "1g1k2myhpyd58qj6amwq7ynsl2hvqmn6gd638i8k3hk7kxr1n22a"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index d9a68b9004..d389393490 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -98,8 +98,6 @@ self: super: { # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). # The linked ruby code shows generates the required '.clang_complete' for cmake based projects # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" @@ -556,6 +554,10 @@ self: super: { dependencies = with super; [ vim-maktaba ]; }); + vim-beancount = super.vim-beancount.overrideAttrs(old: { + passthru.python3Dependencies = ps: with ps; [ beancount ]; + }); + vim-codefmt = super.vim-codefmt.overrideAttrs(old: { dependencies = with super; [ vim-maktaba ]; }); diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py index 84d57133d2..b9bab293a7 100755 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -40,7 +40,6 @@ DEFAULT_IN = ROOT.joinpath("vim-plugin-names") DEFAULT_OUT = ROOT.joinpath("generated.nix") DEPRECATED = ROOT.joinpath("deprecated.json") - def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ @@ -71,6 +70,12 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa return deco_retry +def make_request(url: str) -> urllib.request.Request: + token = os.getenv("GITHUB_API_TOKEN") + headers = {} + if token is not None: + headers["Authorization"] = f"token {token}" + return urllib.request.Request(url, headers=headers) class Repo: def __init__( @@ -91,9 +96,8 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def has_submodules(self) -> bool: try: - urllib.request.urlopen( - self.url(f"blob/{self.branch}/.gitmodules"), timeout=10 - ).close() + req = make_request(self.url(f"blob/{self.branch}/.gitmodules")) + urllib.request.urlopen(req, timeout=10).close() except urllib.error.HTTPError as e: if e.code == 404: return False @@ -104,7 +108,8 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: commit_url = self.url(f"commits/{self.branch}.atom") - with urllib.request.urlopen(commit_url, timeout=10) as req: + commit_req = make_request(commit_url) + with urllib.request.urlopen(commit_req, timeout=10) as req: self.check_for_redirect(commit_url, req) xml = req.read() root = ET.fromstring(xml) diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 7b34ff4bd8..816c9872ac 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -57,6 +57,7 @@ cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim cohama/lexima.vim +crusoexia/vim-monokai ctjhoa/spacevim ctrlpvim/ctrlp.vim dag/vim-fish @@ -145,6 +146,7 @@ hsitz/VimOrganizer iamcco/coc-spell-checker ianks/vim-tsx idris-hackers/idris-vim +ihsanturk/neuron.vim Inazuma110/deoplete-greek inkarkat/vim-SyntaxRange int3/vim-extradite @@ -368,6 +370,9 @@ norcalli/nvim-terminal.lua ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 +nvim-lua/completion-nvim +nvim-treesitter/completion-treesitter +nvim-treesitter/nvim-treesitter octol/vim-cpp-enhanced-highlight Olical/conjure OrangeT/vim-csharp diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index f6414e643c..ac2da521c2 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -4,23 +4,23 @@ "dependencies": { "node-fetch": "^2.6.0", "vscode-languageclient": "7.0.0-next.1", - "@rollup/plugin-commonjs": "^12.0.0", - "@rollup/plugin-node-resolve": "^8.0.0", - "@types/glob": "^7.1.1", + "@rollup/plugin-commonjs": "^13.0.0", + "@rollup/plugin-node-resolve": "^8.1.0", + "@types/glob": "^7.1.2", "@types/mocha": "^7.0.2", - "@types/node": "^14.0.5", + "@types/node": "~12.7.0", "@types/node-fetch": "^2.5.7", - "@types/vscode": "1.45.0", - "@typescript-eslint/eslint-plugin": "^3.0.0", - "@typescript-eslint/parser": "^3.0.0", - "eslint": "^7.0.0", + "@types/vscode": "^1.44.1", + "@typescript-eslint/eslint-plugin": "^3.4.0", + "@typescript-eslint/parser": "^3.4.0", + "eslint": "^7.3.1", "glob": "^7.1.6", - "mocha": "^7.1.2", - "rollup": "^2.10.7", + "mocha": "^8.0.1", + "rollup": "^2.18.1", "tslib": "^2.0.0", - "typescript": "^3.9.3", + "typescript": "^3.9.5", "typescript-formatter": "^7.2.2", "vsce": "^1.75.0", - "vscode-test": "^1.3.0" + "vscode-test": "^1.4.0" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/spacebar/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/spacebar/default.nix index 9cbd6e62c7..449172715b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/spacebar/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/spacebar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spacebar"; - version = "0.5.0"; + version = "1.1.0"; src = fetchFromGitHub { - owner = "somdoron"; + owner = "cmacrae"; repo = pname; rev = "v${version}"; - sha256 = "0v8v4xsc67qpzm859r93ggq7rr7hmaj6dahdlg6g3ppj81cq0khz"; + sha256 = "0w0mkf4kb21aicb85zbp3m6nvk6m5306mchbd5nm988kgirmxnl4"; }; buildInputs = [ Carbon Cocoa ScriptingBridge ]; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A status bar for yabai tiling window management"; - homepage = "https://github.com/somdoron/spacebar"; + description = "A minimal status bar for macOS"; + homepage = "https://github.com/cmacrae/spacebar"; platforms = platforms.darwin; maintainers = [ maintainers.cmacrae ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix index 5d8c8f60ae..448e6865e1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, xxd }: stdenv.mkDerivation rec { pname = "yabai"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "1iq5p4k6klffglxfhmzc2jvlilwn0w97vb5v4b91spiyp39nqcfw"; + sha256 = "11rsi6z2z7ynfqs1xq3bvf187k5xnwm0d45a8ai9hrqdsf3f1j19"; }; - buildInputs = [ Carbon Cocoa ScriptingBridge ]; + buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; installPhase = '' mkdir -p $out/bin @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/koekeishiya/yabai"; platforms = platforms.darwin; - maintainers = [ maintainers.cmacrae maintainers.shardy ]; + maintainers = with maintainers; [ cmacrae shardy ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix index 335ae20483..3c5427340b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { - name = "alsa-lib-1.2.2"; + name = "alsa-lib-1.2.3"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q"; + sha256 = "13k7dx1g749z74rz71hs5j8z0pqdjgx7l69pn0vsy7jizhi0kw02"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-topology-conf/default.nix index f73bbbdba3..54340d017a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-topology-conf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-topology-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-topology-conf-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "09cls485ckdjsp4azhv3nw7chyg3r7zrqgald6yp70f7cysxcwml"; + sha256 = "1zwxc9zhfcmyffjjbibzpdvf4kx7wv9g2zl6xz7y0d6srfr9jgw3"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-ucm-conf/default.nix index 685ba3e2c3..2a9f28c855 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-ucm-conf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-ucm-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-ucm-conf-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "0364fgzdm2qrsqvgqri25gzscbma7yqlv31wz8b1z9c5phlxkgvy"; + sha256 = "000db5yla7dljidjbbwbiaxvc1a7wh1zpw694gipaymj9fh4vhhv"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index afb6799fba..66c2582603 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -30,6 +30,14 @@ let sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; }; + # See This and the + # accompanying application in prePatchCommon should be removed in 2.13.5 + gnumake43Patch = fetchpatch { + url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch"; + name = "2-23-fix-build-with-make-4.3.patch"; + sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9"; + }; + prePatchCommon = '' substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html" @@ -176,7 +184,11 @@ let buildInputs = [ libapparmor ]; - prePatch = prePatchCommon + '' + prePatch = '' + patch -p1 < ${gnumake43Patch} + chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh + patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh + '' + prePatchCommon + '' substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix index 7f95ef47ee..98de3ed1b1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "1hw02bib06fjyw61as5pmhf0qxy0wv0nw8fff2i8a9d1zcd8xf3p"; + sha256 = "1k00xbhdzdvqp4hfxpgg34bbhnx597jjhpg1x6dz2w80r7xzsj28"; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch new file mode 100644 index 0000000000..029333b57e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch @@ -0,0 +1,71 @@ +From c29b637b55c93214993f40b1a223233d40b8a7d6 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Wed, 19 Feb 2020 22:32:28 +0100 +Subject: [PATCH] Fix build with glibc 2.31 + +This is derived from the corresponding upstream patch[1], however this +one doesn't apply cleanly on busybox-1.31.1, so I rebased the patch +locally and added it directly to nixpkgs. + +[1] https://git.busybox.net/busybox/patch/?id=d3539be8f27b8cbfdfee460fe08299158f08bcd9 +--- + coreutils/date.c | 2 +- + libbb/missing_syscalls.c | 8 -------- + util-linux/rdate.c | 8 ++++++-- + 3 files changed, 7 insertions(+), 11 deletions(-) + +diff --git a/coreutils/date.c b/coreutils/date.c +index 3414d38..931b7f9 100644 +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -303,7 +303,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) + ts.tv_sec = validate_tm_time(date_str, &tm_time); + + /* if setting time, set it */ +- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { ++ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) { + bb_perror_msg("can't set date"); + } + } +diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c +index 87cf59b..dc40d91 100644 +--- a/libbb/missing_syscalls.c ++++ b/libbb/missing_syscalls.c +@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid) + return syscall(__NR_getsid, pid); + } + +-int stime(const time_t *t) +-{ +- struct timeval tv; +- tv.tv_sec = *t; +- tv.tv_usec = 0; +- return settimeofday(&tv, NULL); +-} +- + int sethostname(const char *name, size_t len) + { + return syscall(__NR_sethostname, name, len); +diff --git a/util-linux/rdate.c b/util-linux/rdate.c +index 70f829e..878375d 100644 +--- a/util-linux/rdate.c ++++ b/util-linux/rdate.c +@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) + if (!(flags & 2)) { /* no -p (-s may be present) */ + if (time(NULL) == remote_time) + bb_error_msg("current time matches remote time"); +- else +- if (stime(&remote_time) < 0) ++ else { ++ struct timespec ts; ++ ts.tv_sec = remote_time; ++ ts.tv_nsec = 0; ++ if (clock_settime(CLOCK_REALTIME, &ts) < 0) + bb_perror_msg_and_die("can't set time of day"); ++ } + } + + if (flags != 1) /* not lone -s */ +-- +2.25.0 + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix index 430066831b..cbdedaa62a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch + ./0001-Fix-build-with-glibc-2.31.patch ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/crda/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/crda/default.nix index 5811e9358b..137e88cd6e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/crda/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/crda/default.nix @@ -31,7 +31,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs utils/ - substituteInPlace Makefile --replace ldconfig true + substituteInPlace Makefile \ + --replace ldconfig true \ + --replace pkg-config $PKG_CONFIG sed -i crda.c \ -e "/\/usr\/.*\/regulatory.bin/d" \ -e "s|/lib/crda|${wireless-regdb}/lib/crda|g" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/raspberrypi.nix index b5886f6bd1..5a0d571039 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -31,6 +31,7 @@ stdenvNoCC.mkDerivation { overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; meta = with stdenvNoCC.lib; { - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + inherit (raspberrypifw.meta) platforms homepage license; + description = "DTBs for the Raspberry Pi"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix index 642d05e4be..3db9a7d300 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix @@ -11,17 +11,17 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.2.14"; + version = "5.3.1.34"; src = requireFile rec { name = "displaylink.zip"; - sha256 = "03b176y95f04rg3lcnjps9llsjbvd8yksh1fpvjwaciz48mnxh2i"; + sha256 = "1c1kbjgpb71f73qnyl44rvwi6l4ivddq789rwvvh0ahw2jm324hy"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - http://www.displaylink.com/downloads/file?id=1369 + https://www.displaylink.com/downloads/file?id=1576 Once you have downloaded the file, please use the following commands and re-run the installation: @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; - maintainers = with maintainers; [ nshalman abbradar peterhoeg ]; + maintainers = with maintainers; [ nshalman abbradar peterhoeg eyjhb ]; platforms = [ "x86_64-linux" "i686-linux" ]; license = licenses.unfree; homepage = "https://www.displaylink.com/"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix index 8ad703bdd4..aacbc3cdfb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; - version = "19.11"; + version = "20.05"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "1aqjn6bm9miv3v2rbqi1rh1c19wa8nip9fvnqaqpnrs3i2b36wa6"; + sha256 = "0h0xv2zwb91b9n29afg5ihn06a8q28in64hag2f112kc19f79jj8"; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ] ++ lib.optionals mod kernel.moduleBuildDependencies; postPatch = '' - patchShebangs config/arm + patchShebangs config/arm buildtools ''; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/e1000e/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/e1000e/default.nix index ea17c287a2..d5d6697a01 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/e1000e/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/e1000e/default.nix @@ -4,11 +4,11 @@ assert stdenv.lib.versionOlder kernel.version "4.10"; stdenv.mkDerivation rec { name = "e1000e-${version}-${kernel.version}"; - version = "3.3.5.3"; + version = "3.8.4"; src = fetchurl { url = "mirror://sourceforge/e1000/e1000e-${version}.tar.gz"; - sha256 = "1ajz3vdnf1y307k585w95r6jlh4ah8d74bq36gdkjl1z5hgiqi9q"; + sha256 = "1q8dbqh14c7r15q6k6iv5k0d6xpi74i71d5r54py60gr099m2ha4"; }; hardeningDisable = [ "pic" ]; @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { configurePhase = '' cd src kernel_version=${kernel.modDirVersion} - sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' Makefile + substituteInPlace common.mk \ + --replace "/lib/modules" "${kernel.dev}/lib/modules" export makeFlags="BUILD_KERNEL=$kernel_version" ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix index 8233c065c2..575da8aca7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "earlyoom"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${version}"; - sha256 = "0g2bjsvnqq5h4g1k3a0x6ixb334wpzbm2gafl78b6ic6j45smwcs"; + sha256 = "1cn0bgbgiq69i8mk8zxly1f7j01afm82g672qzccz6swsi2637j4"; }; nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index cb971d452d..a83e02ae6b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.31"; + version = "0.32"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "1qlpc906xd78fzxvvj2kxi3aikgnw0c0h3x620s131apax4qrnqa"; + sha256 = "07hm9lrhhb5y53l13yja2kr3xmjgs0azk3x7w2si99cplwkgxak2"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix index 2a6ce13c16..119ba22ca2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-20200222"; + version = "unstable-20200416"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "bb3038c1b10aae99feddc7354c74a5bf22341246"; - sha256 = "058f8gdma6fndg2w512l08mwl79h4hffacx4rnfkjxrb2ard3gd1"; + rev = "dc595db636845aef39490496bc075f6bf067106c"; + sha256 = "1yrny6jj9403z0rxbd3nxf49xc4w0rfpl7xsq03pq32pb3vlbqw7"; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -24,11 +24,12 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko - install -Dm755 library/libevdi.so.1.6.4 $out/lib/libevdi.so + install -Dm755 library/libevdi.so $out/lib/libevdi.so ''; meta = with stdenv.lib; { description = "Extensible Virtual Display Interface"; + maintainers = with maintainers; [ eyjhb ]; platforms = platforms.linux; license = with licenses; [ lgpl21 gpl2 ]; homepage = "https://www.displaylink.com/"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix index ef247ad956..f01c96259a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "fnotifystat"; - version = "0.02.05"; + version = "0.02.06"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "1b8pxq731sj976m2daf0hnqfaaq688vqnjffinpwh2w9nzzi4gi9"; + sha256 = "1mr2qzh8r8qq7haz4qgci2k5lcrcy493fm0m3ri40a81vaajfniy"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix index eee4691aeb..d42091085b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.14"; + version = "0.02.15"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; - sha256 = "10kibb5psb5gqdmq9lfb7qw566diwg54gdb49b5zd71qwpybk3dl"; + sha256 = "11dvg7bbklpfywx6i6vb29vvc28pbfk3mff0g18n5imxvzsd7jxs"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index d05a8c5255..d25c122947 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.05.00"; + version = "20.06.01"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "14rqm45al6w42mzi0rqpwbw1spy7iv1jhywhwkdgs4w91zzc4gaj"; + sha256 = "04wxhmibykhm7jjw3xdmbn0rn25dsr11cig77k2jkhp7nwwqdm11"; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gobi_loader/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gobi_loader/default.nix new file mode 100644 index 0000000000..b79f8af6f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/gobi_loader/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "gobi_loader"; + version = "0.7"; + + src = fetchurl { + url = "https://www.codon.org.uk/~mjg59/gobi_loader/download/${pname}-${version}.tar.gz"; + sha256 = "0jkmpqkiddpxrzl2s9s3kh64ha48m00nn53f82m1rphw8maw5gbq"; + }; + + postPatch = '' + substituteInPlace 60-gobi.rules --replace "gobi_loader" "${placeholder "out"}/lib/udev/gobi_loader" + substituteInPlace 60-gobi.rules --replace "/lib/firmware" "/run/current-system/firmware" + ''; + + makeFlags = "prefix=${placeholder "out"}"; + + meta = with stdenv.lib; { + description = "Firmware loader for Qualcomm Gobi USB chipsets"; + homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; + license = with licenses; [ gpl2 ]; + maintainers = [ maintainers."0x4A6F" ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix index 41c21502e0..d780cade78 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix @@ -5,7 +5,7 @@ , pkgconfig , portaudio , SDL2 -, ffmpeg_3 +, ffmpeg , udev , libusb1 , libv4l @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib - ffmpeg_3 + ffmpeg libusb1 libv4l portaudio diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index 2f6e6cd5cc..9b54f404f7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.316"; + version = "0.335"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb"; + sha256 = "0f8ikwfrs6xd5sywypd9rq9cln8a0rf3vj6nm0adwzn1p8mgmrb2"; }; preConfigure = "patchShebangs ./configure"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; + outputHash = "101lppd1805drwd038b4njr5czzjnqqxf3xlf6v3l22wfwr2cn3l"; meta = { homepage = "https://github.com/vcrhonek/hwdata"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix index cd290113e0..529a82e964 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ trevorj ]; downloadPage = "https://github.com/jaymzh/iptstate/releases"; + license = licenses.zlib; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index be2a4ff3e5..fd34440f60 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -13,14 +13,16 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.7"; + version = "1.8"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "1qi25qav1rv8gm5lbrip8ayq5vwynmyv2q4ar7bbmnjh6cglvyh2"; + sha256 = "0ds8nhbnkhxzhnnsi7vj3y2v8wq0nxqbmidhiac7mpxgjkc684gf"; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ autoreconfHook docutils diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix b/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix index 9e8de46edb..abf7b0dac4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.0.5"; + version = "4.0.9"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "0zfda8mbcg4mgg39shxdx5n2bq6zi9w3v8bcx03b3dp09lmq45y3"; + sha256 = "0zhdpk1sbsv1iyr9rvj94wk853684avz3zzn4cv2k4254d7n25m7"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 1272d19d8e..3c1b33bada 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -255,7 +255,7 @@ let SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions # Support configuring jack functions via fw mechanism at boot SND_HDA_PATCH_LOADER = yes; - SND_HDA_CODEC_CA0132_DSP = whenOlder "5.8" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon + SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon SND_OSSEMUL = yes; SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) @@ -269,7 +269,7 @@ let SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes; SND_SOC_SOF_CANNONLAKE_SUPPORT = yes; SND_SOC_SOF_COFFEELAKE_SUPPORT = yes; - SND_SOC_SOF_COMETLAKE_H_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_H_SUPPORT = whenOlder "5.8" yes; SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes; SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes; SND_SOC_SOF_GEMINILAKE_SUPPORT = yes; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/gpio-utils.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/gpio-utils.nix index 447704eedc..e28d838efb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/gpio-utils.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { meta = { description = "Linux tools to inspect the gpiochip interface"; - maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ kwohlfahrt ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 654615ebe5..1bb1245389 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,22 +1,27 @@ { "4.14": { - "name": "linux-hardened-4.14.184.a.patch", - "sha256": "1g12kz6ikdwp6b7000pfy3myga90mvxyl04b9267fk88jwih6yhk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.184.a/linux-hardened-4.14.184.a.patch" + "name": "linux-hardened-4.14.188.a.patch", + "sha256": "1fqd51ns2hbph57bhpcilcbjbaif55ya3h4cfzbfqwq71jlyij0c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.188.a/linux-hardened-4.14.188.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.128.a.patch", - "sha256": "19ayzx9rf4j31ypavxwamd290lm95wmi7v165avxslahnx6pdsxs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.128.a/linux-hardened-4.19.128.a.patch" + "name": "linux-hardened-4.19.133.a.patch", + "sha256": "0zlns3k60fxbilvfyqay8v5vd5gx9cyvr6dw8b4mg3zccnprqz0n", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.133.a/linux-hardened-4.19.133.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.46.a.patch", - "sha256": "0f2d53na7g6dhiba2ym09lm4fp3hwm6kw6mpm5jk46jmb6j7iwk5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.46.a/linux-hardened-5.4.46.a.patch" + "name": "linux-hardened-5.4.52.a.patch", + "sha256": "17lgwhwxafzkjwr47dj2vwy3wzbsacdw8rrg6qlwn49ixayx26m4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.52.a/linux-hardened-5.4.52.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.18.a.patch", - "sha256": "0idvgjg7kji4w3341acfqywi0qqn3pvxcmiz70cd7inhlqaqrw63", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.18.a/linux-hardened-5.6.18.a.patch" + "name": "linux-hardened-5.6.19.a.patch", + "sha256": "0gxdbcig6hpjxj6qr4lrj773gb76s0xlkrk3hclxk4ms6p82y4mm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.19.a/linux-hardened-5.6.19.a.patch" + }, + "5.7": { + "name": "linux-hardened-5.7.9.a.patch", + "sha256": "0r5qcy09h8fklmkkfsm2i69rqz36qppfbcfx0hg0knf5dmcjpl89", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.9.a/linux-hardened-5.7.9.a.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 7ee05ed47d..ff77b344e8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.184"; + version = "4.14.188"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0h6r06c1d7amkfglsr66ic89p0zxpmk7jkq1ylcbknmkiwkixx9g"; + sha256 = "0jq6cyxa0mxnvd33gi66a4x3xlfsih2aaifa6yyvgldihw9y0vvn"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 92281ffdd3..f7bdc93cd6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.128"; + version = "4.19.133"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0g31ad3wziy4xqna0yvwjcnza3jhd93syjpfvmwh0b4pkj2adar9"; + sha256 = "1i6vfzg8xds4lvvzkxaak74727iq35hx4vxr14w65bq9gpzfacxr"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index fe04062331..c5474eb2eb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.227"; + version = "4.4.230"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "196x57w740firg8zchypq4vq6a83ymmwn9amqrscym9zr0pcgm40"; + sha256 = "1qx74qli8yjc2rkb7kig79c1yv7pfqa8zi1wi0rndn4d4yk62cfa"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5be2d7ac9b..dc1503f713 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.227"; + version = "4.9.230"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pqc0wld4s4zjas95xm54mrkk00l9zkc59b6i9gq4km126s8bi1q"; + sha256 = "0z03djys7k3z6z55xrw8rj4mv5i4h763lckz2anwxwgbwdb95fnm"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index a2fbbbe373..4f0036b05f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.47"; + version = "5.4.52"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0v4d86yci4lq82nb1fgf0g3j0348v6q6m77czpm4b3cs7lwrs2wp"; + sha256 = "0fjxx8xpp0v0wwfw6zd5nc21i2r82wzcsy2yyl7w5c90259zlzh3"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.7.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.7.nix index c299cc0987..eb77023e67 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.4"; + version = "5.7.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "06mm0bmjw54aypfhhbm9aaz5bmgymvygfak587iwv901635gb95w"; + sha256 = "qH0wZqeEnNa6mgBDEanuBALSnRfxL2StfZQkRwcLQ/g="; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index e531f878d0..178534223f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17537"; - sha256 = "15fj5ba28jw515fzfp4pbrkpq5xyvxvx7r9yh1l0qsxjzs2zml8b"; + rev = "17559"; + sha256 = "0vwv15xfag6bhjxhg42lx92jgkh9j7cvy7h2rrn1qa4sccp09ff5"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 2a7a1fa934..d4c249b1d4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8-rc1"; - extraMeta.branch = "5.1"; + version = "5.8-rc5"; + extraMeta.branch = "5.8"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1gb7g2vrgg0zz281lv1ir1r0535spc40j65p0azmdxlk24fkfxfc"; + sha256 = "11g4hd3m7wjwrxhgpd0hwad07svi62hj699jdm30f7r12py5kgb9"; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index d73e0a8ac9..3a2682b2cf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio +, libelf, cpio, elfutils , utillinuxMinimal , writeTextFile }: @@ -280,8 +280,10 @@ let }; in -assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; +assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null; assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; +assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null; + stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { pname = "linux"; inherit version; @@ -291,10 +293,11 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools - ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf + ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio + ++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/shrunk.nix b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/shrunk.nix index b5b9783c6e..8b79940ed7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/shrunk.nix @@ -22,7 +22,5 @@ stdenv.mkDerivation { ''; # */ allowedReferences = ["out"]; - meta = { - platforms = stdenv.lib.platforms.linux; - }; + inherit (klibc) meta; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index e14e190cd7..17f34f9bbd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -34,5 +34,6 @@ in stdenv.mkDerivation { homepage = "https://packages.ubuntu.com/source/zesty/kmod"; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index f0f4133172..23d323f84b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { cp aliases.conf $out ''; - meta = { + meta = with lib; { homepage = "https://packages.debian.org/source/sid/kmod"; description = "Linux configuration file for modprobe"; - maintainers = with lib.maintainers; [ mathnerd314 ]; - platforms = with lib.platforms; linux; + maintainers = with maintainers; [ mathnerd314 ]; + platforms = with platforms; linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index aefb5ff683..0a98475384 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -6,13 +6,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "02vbpg9v5sjcw7ihximy63cjmz82q5izkp91i44m1qp6qj5qn4sr"; + sha256 = "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix index e54dee10c1..98ddc50e2e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl}: - + stdenv.mkDerivation { name = "libvolume_id-0.81.1"; - + src = fetchurl { url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; @@ -18,7 +18,8 @@ stdenv.mkDerivation { cp -f libvolume_id.so.0 $out/lib/ "; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix index cc25f90f24..f39f3adf50 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1c2wbbcvs58slyq0skxizx61q1lb4yvak28x4gzsbzh3yg6nscya"; + sha256 = "1rbj2rkn8cn6av74cqld3l2i5r37i6mhsxvvlvlmg724fbbr2vfm"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix index 4011b38856..31e5306ca2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-4.0.3"; + name = "lxcfs-4.0.4"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0v6c5vc3i1l4sy4iamzdqvwibj6xr1lna4w1hxkn3s6jggcbxwca"; + sha256 = "0m97h9mj23i2cb8r4bqpakhnz4a0bb7jxvr207pydq60railp7nm"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index 34f899977d..9ec42ad66b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.9.3"; + version = "0.9.6"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "0y6vbqp6x8w165q65h4n9sba1406gaz0d4744gqszbm7w9f92swm"; + sha256 = "0vmn6xwqa1nq6crfxshh049b199d0aj6hfgin7k068xhibzgvmk8"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index e195bf587e..deecc4c4a7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "440.82"; - sha256_64bit = "13km9800skyraa0s312fc4hwyw5pzb0jfkrv1yg6anppyan1bm7d"; - settingsSha256 = "15psxvd65wi6hmxmd2vvsp2v0m07axw613hb355nh15r1dpkr3ma"; - persistencedSha256 = "13izz9p2kg9g38gf57g3s2sw7wshp1i9m5pzljh9v82c4c22x1fw"; + version = "450.57"; + sha256_64bit = "04fp0p5f11hrgjzhvbvxpmvl08d3m16m4r5gn9d5qans9zy7f36m"; + settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan"; + persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5"; } else legacy_390; @@ -34,19 +34,19 @@ rec { # Last one supporting x86 legacy_390 = generic { - version = "390.132"; - sha256_32bit = "0xgjywzkmmm6a5gby67l2kx0gn7bcxksv4wam0sqym6l1s7v5bai"; - sha256_64bit = "0qgzsajrc3xkf2jjkwip3la0f2ixp45f76nmz5cphvzrb7k2slxn"; - settingsSha256 = "07nylqzhldq1gr40q7x5424p2aml3qqnvl2zvnpzc65x2way34v6"; - persistencedSha256 = "0vab5rj9b1n9yl9674q7i88w1i5p8nhvrwsayn7i1vh4wp3m840r"; + version = "390.138"; + sha256_32bit = "0y3qjygl0kfz9qs0rp9scn1k3l8ym9dib7wpkyh5gs4klcip7xkv"; + sha256_64bit = "0rnnb5l4i8s76vlg6yvlrxhm2x9wdqw7k5hgf4fyaa3cr3k1kysz"; + settingsSha256 = "0ad6hwl56nvbdv9g85lw7ywadqvc2gaq9x6d2vjcia9kg4vrmfqx"; + persistencedSha256 = "15jciyq6i3pz1g67xzqlwmc62v3xswzhjcqmfcdndvlvhcibsimr"; }; legacy_340 = generic { - version = "340.107"; - sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd"; - sha256_64bit = "0pv9yv3x0kg9hfkmc50xb54ahxkbnyy2vyy4hj2h0s6m9sb5kqz3"; - settingsSha256 = "1zf0fy9jj6ipm5vk153swpixqm75iricmx7x49pmr97kzyczaxa7"; - persistencedSha256 = "0v225jkiqk9rma6whxs1a4fyr4haa75bvi52ss3vsyn62zzl24na"; + version = "340.108"; + sha256_32bit = "1jkwa1phf0x4sgw8pvr9d6krmmr3wkgwyygrxhdazwyr2bbalci0"; + sha256_64bit = "06xp6c0sa7v1b82gf0pq0i5p0vdhmm3v964v0ypw36y0nzqx8wf6"; + settingsSha256 = "0zm29jcf0mp1nykcravnzb5isypm8l8mg2gpsvwxipb7nk1ivy34"; + persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn"; useGLVND = false; patches = [ ./vm_operations_struct-fault.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1d73ab8171..d62ade04e6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -92,7 +92,7 @@ let homepage = "https://www.nvidia.com/object/unix.html"; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; maintainers = with maintainers; [ baracoder ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix index 0da9723167..641c8b8ba8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix @@ -4,7 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.5"; + version = "0.5.1"; format = "other"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv"; + sha256 = "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix index dd3b24dd19..6020139ad4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.23"; + version = "0.02.24"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1yj8ja0hw92wscazxh9vr3qdz24wpw2fgd3w7w088srfzg2aqf3a"; + sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j"; }; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix index a837b22613..8cdf11f80a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "r8125"; # On update please verify (using `diff -r`) that the source matches the # realtek version. - version = "9.003.02"; + version = "9.003.05"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ibmibmibm"; repo = "r8125"; - rev = "${version}"; - sha256 = "09ip17x8nhcpxkkhyyawkmd10n73j2ffh1i2nmsr7l3jfq7f9zac"; + rev = version; + sha256 = "016vh997xjs01si0zzs572vgflq3czxd0v4m7h1m3qxcv2cvq7i0"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index a9cf7fe03b..b1770a4d61 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "29.0"; + version = "30.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "03r7jbhw64siyrna9mz0qzppfzp8ilwi7iqdkxgyy33rndncqqnq"; + sha256 = "1czfh6s0qz2cv2k7ha7nr9qiwcrj5lvwqnvyrvsds463m8ndpg12"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix index 3ee112126a..a24c947673 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix @@ -47,9 +47,10 @@ in stdenv.mkDerivation { cp ${rfkillHook} "$out/bin/rfkill-hook.sh" ''; - meta = { + meta = with stdenv.lib; { homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "Rules+hook for udev to catch rfkill state changes"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix index 4be4629912..cadc844ac4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8821ce-${kernel.version}-${version}"; - version = "5.2.5_1.26055.20180108"; + version = "5.5.2_34066.20200325"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "ab6154e150bbc7d12b0525d4cc1298ae196e45de"; - sha256 = "1my0hidqnv4s7hi5897m81pq0sjw05np0g27hlkg9fwb83b5kzsg"; + rev = "69765eb288a8dfad3b055b906760b53e02ab1dea"; + sha256 = "17jiw25k74kv5lnvgycvj2g1n06hbrpjz6p4znk4a62g136rhn4s"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix index 6693b37994..64525052af 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smemstat"; - version = "0.02.07"; + version = "0.02.08"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; - sha256 = "09i5n1zjw45qrfbc2vglh1xk1jwqnc91bgsq7bkp29d9dpfpzhdc"; + sha256 = "1agigvkv1868cskivzrwyiixl658x5bv7xpz4xjc8mlii4maivpp"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix index c8378f2a0c..f93e9012e0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin"; - meta = { + meta = with stdenv.lib; { description = "A system logging daemon"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix index edb951dae3..28681aed56 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix @@ -22,9 +22,15 @@ stdenv.mkDerivation { url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch"; sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni"; }) - (fetchpatch { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?h=packages/syslinux"; - sha256 = "0fbqz56hj8az8ws26m39hyp3l5fvcbzvzdddqz3x6n56hzdpz1p6"; + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + name = "0005-gnu-efi-version-compatibility.patch"; + sha256 = "1mz2idg8cwn0mvd3jixxynhkn7rhmi5fp8cc8zznh5f0ysfra446"; + }) + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0025-reproducible-build.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + name = "0025-reproducible-build.patch"; + sha256 = "0qk6wc6z3648828y3961pn4pi7xhd20a6fqn6z1mnj22bbvzcxls"; }) (fetchurl { # mbr.bin: too big (452 > 440) @@ -70,6 +76,7 @@ stdenv.mkDerivation { "DATADIR=$(out)/share" "MANDIR=$(out)/share/man" "PERL=perl" + "HEXDATE=0x00000000" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index c88d0eeeff..ab04ea9164 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From b873e4c0de3e24f2ec9370e5a217247217e90587 Mon Sep 17 00:00:00 2001 +From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index 4f94cb465d..c52a13c9a4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From bdd3ff777dd8253ff5732118dd6de0fa9a9b95fe Mon Sep 17 00:00:00 2001 +From e5b2b1e90d055068936336f6f01639bcde251b96 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store @@ -7,18 +7,18 @@ They'll still be remounted read-only. https://github.com/NixOS/nixos/issues/126 --- - src/core/mount.c | 2 ++ - src/shutdown/umount.c | 2 ++ + src/shared/fstab-util.c | 2 ++ + src/shutdown/umount.c | 2 ++ 2 files changed, 4 insertions(+) -diff --git a/src/core/mount.c b/src/core/mount.c -index 1c4aefd734..a5553226f8 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -412,6 +412,8 @@ static bool mount_is_extrinsic(Mount *m) { - - if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ - "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ +diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c +index b19127be09..f9adca1100 100644 +--- a/src/shared/fstab-util.c ++++ b/src/shared/fstab-util.c +@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { + /* Don't bother with the OS data itself */ + if (PATH_IN_SET(mount, + "/", + "/nix", + "/nix/store", "/usr", diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 73aab8dd91..e96593a593 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From c28b3b2e254433e93549ee6fe8c93b43ce455776 Mon Sep 17 00:00:00 2001 +From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/18] Fix NixOS containers @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 734dee1130..a97b1a4bc9 100644 +index 51d0c2a75b..4d3451ff3b 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5018,6 +5018,7 @@ static int run(int argc, char *argv[]) { +@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 734dee1130..a97b1a4bc9 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5032,6 +5033,7 @@ static int run(int argc, char *argv[]) { +@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index e10726a2cb..4b2c059afd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From baf52609ad18785aa1d2cd043185ae9438d59411 Mon Sep 17 00:00:00 2001 +From c87cc5b1cf9c37f195e6b362352279e14289554e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/18] Look for fsck in the right place diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index a9b60cbb2e..a8f3f0e21f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From 45f80155b7c2edb1e73c233283f1ab1582e1cfbe Mon Sep 17 00:00:00 2001 +From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/18] Add some NixOS-specific unit directories diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index 0b57dc1f9c..ac3d3b0bd6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From d52058070c0c12bb05f82460f0b4b55678b724e9 Mon Sep 17 00:00:00 2001 +From f88a9bb1e6080b539ed0116caa9781e7f6755f54 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/18] Get rid of a useless message in user sessions @@ -13,7 +13,7 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index 97e1b0004c..d3cc2ba9ec 100644 +index c306183555..3db39fa435 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index 5703c4f43f..70fc147232 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,4 +1,4 @@ -From 409fc808794942ad1736c2cc74853d9792e4ad02 Mon Sep 17 00:00:00 2001 +From e2b25ce3606d05ff8a387185c41ab32fb2a36161 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index a9bf9abee5..36d82e22f8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,4 +1,4 @@ -From b56fc7b6ae8014eb2f71924c89498f395a1a81bd Mon Sep 17 00:00:00 2001 +From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/18] Fix hwdb paths diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 12a9dd5a77..8b5c807e4a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From 4d304a321796db4de827aa39a149bea23d039214 Mon Sep 17 00:00:00 2001 +From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -79,7 +79,7 @@ index 901fbf0815..b57bdd8fbe 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index a97b1a4bc9..aed60439e3 100644 +index 4d3451ff3b..1adb91335c 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index 7e6453f2dd..b18ffb4016 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From cb3f1ec1793cbf74c4b5663e038bd49ff4576192 Mon Sep 17 00:00:00 2001 +From b5665ef8b9266c662c3a137df1ef1721cdff346e Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index 080cd4670e..bc9efaed23 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From 0ffb786d0e12a61899af448b1e4dd32a53ea5a8e Mon Sep 17 00:00:00 2001 +From be6b5c37779302384079b22b7fd767daad878fa9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir @@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index fc216d22da..078db3bb5d 100644 +index c09115e06a..62eba4186c 100644 --- a/meson.build +++ b/meson.build -@@ -3176,9 +3176,6 @@ install_data('LICENSE.GPL2', +@@ -3184,9 +3184,6 @@ install_data('LICENSE.GPL2', 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', install_dir : docdir) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index 2961a2ebe5..5d67ce0ca3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -1,4 +1,4 @@ -From 3dbcdab1ba22c4eeca6d61718c09bcb9b5551764 Mon Sep 17 00:00:00 2001 +From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Feb 2018 14:25:57 +0000 Subject: [PATCH 12/18] Install default configuration into $out/share/factory @@ -44,7 +44,7 @@ index 4df6dabf89..02d8d69095 100644 meson.add_install_script('sh', '-c', 'test -n "$DESTDIR" || @0@/systemd-hwdb update' diff --git a/meson.build b/meson.build -index 078db3bb5d..6e1a6483fc 100644 +index 62eba4186c..b0b2edbb5a 100644 --- a/meson.build +++ b/meson.build @@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') @@ -57,7 +57,7 @@ index 078db3bb5d..6e1a6483fc 100644 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') testsdir = join_paths(prefixdir, 'lib/systemd/tests') systemdstatedir = join_paths(localstatedir, 'lib/systemd') -@@ -2503,7 +2506,7 @@ if conf.get('ENABLE_BINFMT') == 1 +@@ -2511,7 +2514,7 @@ if conf.get('ENABLE_BINFMT') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(binfmtdir)) meson.add_install_script('sh', '-c', @@ -66,7 +66,7 @@ index 078db3bb5d..6e1a6483fc 100644 endif if conf.get('ENABLE_REPART') == 1 -@@ -2604,7 +2607,7 @@ executable('systemd-sleep', +@@ -2612,7 +2615,7 @@ executable('systemd-sleep', install_dir : rootlibexecdir) install_data('src/sleep/sleep.conf', @@ -75,7 +75,7 @@ index 078db3bb5d..6e1a6483fc 100644 exe = executable('systemd-sysctl', 'src/sysctl/sysctl.c', -@@ -2916,7 +2919,7 @@ if conf.get('HAVE_KMOD') == 1 +@@ -2924,7 +2927,7 @@ if conf.get('HAVE_KMOD') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(modulesloaddir)) meson.add_install_script('sh', '-c', @@ -84,7 +84,7 @@ index 078db3bb5d..6e1a6483fc 100644 endif exe = executable('systemd-nspawn', -@@ -3159,7 +3162,7 @@ install_subdir('factory/etc', +@@ -3167,7 +3170,7 @@ install_subdir('factory/etc', install_dir : factorydir) install_data('xorg/50-systemd-user.sh', diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index 5aa397afe8..11d2dc26e3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From 0b0510aa72cf8026f34f300efa3f150f45971404 Mon Sep 17 00:00:00 2001 +From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 13/18] inherit systemd environment when calling generators. @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 25afdbea04..7afd5e5a37 100644 +index 4412e7a849..b799eeca95 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3896,9 +3896,14 @@ static int manager_run_generators(Manager *m) { +@@ -3901,9 +3901,14 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch index 91c091baa9..06b00b82cb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From 4bd20cf0450455e2f9831b09ba91811ba3d58961 Mon Sep 17 00:00:00 2001 +From c70029539d0aec5df0c1e4203359335a3841a1e5 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 14/18] add rootprefix to lookup dir paths diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 2bc75e2792..6431b56ea3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From f23a1e00de028048a2a21d322493039cce7ee214 Mon Sep 17 00:00:00 2001 +From 98580b4aa34f3d2e7401f54d6561c5af27ea3437 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 15/18] systemd-shutdown: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 15e6c1799e..412bdefe74 100644 +index 523040b57c..561d91c94c 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) { +@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { _cleanup_free_ char *cgroup = NULL; char *arguments[3], *watchdog_device; int cmd, r, umount_log_level = LOG_INFO; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 97f63c02c3..c27d1a10d5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 758b8211e6e76524d62a2e0ffcf37dcf55e3be87 Mon Sep 17 00:00:00 2001 +From 3821e20966ee20f74986041f33c4934ad20385b2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 16/18] systemd-sleep: execute scripts in diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index 2a0bb0103f..9fae2d5767 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From ce9fe2249c91fdfb224eaffce63e3dbdb4a5c25d Mon Sep 17 00:00:00 2001 +From b07defe819e0f66d08563690b3a5abea5da08620 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 08b2fa056f..321817dad6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From 55b69fc1b5441e3aff8f1ab684ba8eed3718a32d Mon Sep 17 00:00:00 2001 +From 9c1ac48a7d95c09bef5a924bb5db6908596403b4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 3235fb3b95..cda9c9c066 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -31,7 +31,7 @@ let gnupg-minimal = gnupg.override { bzip2 = null; }; in stdenv.mkDerivation { - version = "245.5"; + version = "245.6"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -39,8 +39,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "9a506b7e9291d997a920af9ac299e7b834368119"; - sha256 = "19qd92hjlsljr6x5mbw1l2vdzz5y9hy7y7g0dwgpfifb0lwkxqbr"; + rev = "aa0cb635f1f6a4d9b50ed2cca7782f3f751be933"; + sha256 = "191f0r1g946bsqxky00z78wygsxi9pld11y2q4374bshnpsff2ll"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix index 65d46ad34c..854e06b98a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix @@ -2,13 +2,13 @@ python.pkgs.buildPythonApplication rec { pname = "targetcli"; - version = "2.1.51"; + version = "2.1.53"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "07i9kyr525hlk32amzgycirwgwykdbjy5fmw6ji0nnhvk2jh4arn"; + sha256 = "1qrq7y5hnghzbxgrxgl153n8jlhw31kqjbr93jsvlvhz5b3ci750"; }; propagatedBuildInputs = with python.pkgs; [ configshell rtslib ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/turbostat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/turbostat/default.nix index 4207589aaf..035dddcc4e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/turbostat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/turbostat/default.nix @@ -1,9 +1,10 @@ -{ stdenv, kernel }: +{ stdenv, kernel, libcap }: stdenv.mkDerivation { pname = "turbostat"; inherit (kernel) src version; + buildInputs = [ libcap ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix index 696625761b..2f03ee8c82 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.2.11"; + version = "0.3.0"; pname = "undervolt"; src = fetchFromGitHub { owner = "georgewhewell"; repo = "undervolt"; rev = version; - sha256 = "18mnf3x687qal7k8yk2sdxzgbyn3rqchgflbi1sksryznmksqqw5"; + sha256 = "1aybk8vbb4745raz7rvpkk6b98xrdiwjhkpbv3kwsgsr9sj42lp0"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index aa23a162a9..fafa8fe6e8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.35.1"; + version = "2.35.2"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yfpy6bkab4jw61mpx48gfy24yrqp4a7arvpis8csrkk53fkxpnr"; + sha256 = "12mm5qvkq1vpllfv99gq93lkxlvysp1yxgh1392dkg7nh8g47dr1"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index 6af465da47..b20da16f7c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200611"; + version = "1.0.20200712"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "0a8xsjxp8krmm2px07x9qw8nhvp5ispf4mnc6k59p0qp26qbva5d"; + sha256 = "04f8hh6rz6ibavvga5z2mjpccnkacj1h24y3vj2kpya132qpavfr"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix index c117293d3a..f86393cba8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; - meta = { + meta = with stdenv.lib; { homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; description = "A driver to run Xorg on top of Xorg or something else"; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix index e9e0e82a09..ac6e85b804 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zenmonitor"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "ocerman"; repo = "zenmonitor"; rev = "v${version}"; - sha256 = "1mn496iqfmhqsac7a5r0bdfddzrfiz6l34qiga0pip925g7hsm52"; + sha256 = "1g6sk2mcd7znjq6zmbf2fgn02a0yimyv2dw2143aciq2pxqjawmp"; }; buildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix index bc1d803bb1..43885027d9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zenpower"; - version = "0.1.10"; + version = "0.1.12"; src = fetchFromGitHub { owner = "ocerman"; repo = "zenpower"; rev = "v${version}"; - sha256 = "1fqqaj7fq49yi2yip518036w80r9w7mkxpbkrxqzlydpma1x9v5m"; + sha256 = "116yrw4ygh3fqwhniaqq0nps29pq87mi2q1375f1ylkfiak8n63a"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix index 54000a81b6..3260ce4f05 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Network-wide ads & trackers blocking DNS server"; platforms = platforms.linux; maintainers = with maintainers; [ numkem ]; + license = licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index f81fef3cbe..c4b3070e9f 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.4"; + version = "3.8.5"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1sa9zfd8hv5mxgnxva9sydqnyzwssxjkbba028pwpml2im97z7j5"; + sha256 = "014pfgfj90scas40lf0yjx14vhx5l5zbi3by2nnb704lg8w2n456"; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix index 64ecd981fc..1460daa95e 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.5.1"; + version = "7.6.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0lxvff0sn1kxsm599lq72hw11qnwjn2da3mz1h8mqz0rn2adhg07"; + sha256 = "1s69b19kz8z8dbac3dsj9yvkvynlygzgnlpm72fbnqg6knp95fyz"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix index fd35ef8735..81bb6a0e5d 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1rpibkp57nw084yd018924g1mdcqk8gnj99m85fmmhpppgbh9ca9"; + sha256 = "1l0kxh4cwqyciylbccd4vfmsvq9cr5sfd0v2gbs3lz41av79mlwa"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix index 4afabb858c..3dad2f1c6c 100644 --- a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix @@ -61,6 +61,12 @@ buildGoModule rec { subPackages = [ "." ]; + postInstall = '' + mkdir -p $out/share/ + cp -r $src/static/templates/ $out/share/ + cp -r $src/static/css/ $out/share/ + ''; + meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; diff --git a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix index 9521d470a0..4fd5b6c475 100644 --- a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix @@ -1,39 +1,53 @@ { stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja -, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion, gperftools -, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl -, poco, protobuf, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC +, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion +, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl +, poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC , xxHash, zstd }: stdenv.mkDerivation rec { pname = "clickhouse"; - version = "19.17.9.60"; + version = "20.5.2.7"; src = fetchFromGitHub { - owner = "yandex"; + owner = "ClickHouse"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0k1ncn7i4szpw4jlhv3zmw6mrkkm8qfs39nj1zbawjqrkgnw70kg"; + fetchSubmodules = true; + sha256 = "15b499czsv727wwdb1i1ja5wfsk6ii3pqpk6dlqic9cdmkh8c8ic"; }; nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; buildInputs = [ - boost brotli capnproto cctz clang-unwrapped double-conversion gperftools - icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl - poco protobuf rapidjson re2 rdkafka readline sparsehash unixODBC + boost brotli capnproto cctz clang-unwrapped double-conversion + icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl perl + poco protobuf python3 rapidjson re2 rdkafka readline sparsehash unixODBC xxHash zstd ]; + postPatch = '' + patchShebangs src/ + + substituteInPlace contrib/openssl-cmake/CMakeLists.txt \ + --replace '/usr/bin/env perl' perl + substituteInPlace src/Storages/System/StorageSystemLicenses.sh \ + --replace 'git rev-parse --show-toplevel' '$src' + substituteInPlace utils/check-style/check-duplicate-includes.sh \ + --replace 'git rev-parse --show-toplevel' '$src' + substituteInPlace utils/check-style/check-ungrouped-includes.sh \ + --replace 'git rev-parse --show-toplevel' '$src' + substituteInPlace utils/generate-ya-make/generate-ya-make.sh \ + --replace 'git rev-parse --show-toplevel' '$src' + substituteInPlace utils/list-licenses/list-licenses.sh \ + --replace 'git rev-parse --show-toplevel' '$src' + substituteInPlace utils/check-style/check-style \ + --replace 'git rev-parse --show-toplevel' '$src' + ''; + cmakeFlags = [ "-DENABLE_TESTS=OFF" - "-DUNBUNDLED=ON" - "-DUSE_STATIC_LIBRARIES=OFF" ]; - postPatch = '' - patchShebangs dbms/programs/clang/copy_headers.sh - ''; - postInstall = '' rm -rf $out/share/clickhouse-test @@ -46,7 +60,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = "https://clickhouse.yandex/"; + homepage = "https://clickhouse.tech/"; description = "Column-oriented database management system"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch b/third_party/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch new file mode 100644 index 0000000000..4236421a63 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch @@ -0,0 +1,13 @@ +diff --git a/src/common/env.c b/src/common/env.c +index 987846d..73d3b3b 100644 +--- a/src/common/env.c ++++ b/src/common/env.c +@@ -1941,7 +1941,7 @@ char **env_array_user_default(const char *username, int timeout, int mode, + char **env = NULL; + char *starttoken = "XXXXSLURMSTARTPARSINGHEREXXXX"; + char *stoptoken = "XXXXSLURMSTOPPARSINGHEREXXXXX"; +- char cmdstr[256], *env_loc = NULL; ++ char cmdstr[MAXPATHLEN], *env_loc = NULL; + char *stepd_path = NULL; + int fd1, fd2, fildes[2], found, fval, len, rc, timeleft; + int buf_read, buf_rem, config_timeout; diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index 1f09c98377..d93c137195 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl -, python, munge, perl, pam, openssl, zlib, shadow, coreutils +, python, munge, perl, pam, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg, lz4, rdma-core, nixosTests +, readline, freeipmi, xorg, lz4, rdma-core, nixosTests +, pmix # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + # increase string length to allow for full + # path of 'echo' in nix store + ./common-env-echo.patch + # Required for configure to pick up the right dlopen path + ./pmix-configure.patch + ]; + prePatch = '' substituteInPlace src/common/env.c \ --replace "/bin/echo" "${coreutils}/bin/echo" @@ -37,22 +46,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - curl python munge perl pam openssl zlib + curl python munge perl pam zlib libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su - ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; + pmix + ] ++ stdenv.lib.optionals enableX11 [ xorg.xauth ]; configureFlags = with stdenv.lib; [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" "--with-lz4=${lz4.dev}" "--with-munge=${munge}" - "--with-ssl=${openssl.dev}" "--with-zlib=${zlib}" "--with-ofed=${rdma-core}" "--sysconfdir=/etc/slurm" + "--with-pmix=${pmix}" ] ++ (optional (gtk2 == null) "--disable-gtktest") - ++ (optional enableX11 "--with-libssh2=${libssh2.dev}") ++ (optional (!enableX11) "--disable-x11"); diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch b/third_party/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch new file mode 100644 index 0000000000..21c2197c3f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 1cf53bc..ab68441 100755 +--- a/configure ++++ b/configure +@@ -21207,7 +21207,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext + as_fn_error $? "error processing $x_ac_cv_pmix_libdir: PMIx v3.x was already found in one of the previous paths" "$LINENO" 5 + fi + _x_ac_pmix_v3_found="1" +- PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include" ++ PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include -DPMIXP_V3_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\"" + if test "$ac_with_rpath" = "yes"; then + PMIX_V3_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir" + else diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index d550a5cb69..e979583104 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.7.4"; + version = "1.8.0"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "0yx0ry8gwgvw1mkz3nv4rn2pwslm0q7jxlk70gaw6386mxxmj0sk"; + sha256 = "1rmybh0piqlbsy5ihqy9cmg0vsgg9pnxiza2kia8ww4qx98nvh6y"; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "1lcpldkssbq6qkkq22bvx9jb5klcxr8422mpx47wz39pry8vy9b6"; + vendorSha256 = "12a2x8j4kc1vi3ip0cz81k6anfwac23iqqyz00wf7wpvgxqzcxn3"; deleteVendor = true; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/servers/coturn/default.nix b/third_party/nixpkgs/pkgs/servers/coturn/default.nix index f50a5afa81..c32ddecc7a 100644 --- a/third_party/nixpkgs/pkgs/servers/coturn/default.nix +++ b/third_party/nixpkgs/pkgs/servers/coturn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "coturn"; - version = "4.5.1.2"; + version = "4.5.1.3"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = version; - sha256 = "01y65az8qyv2kjnb4fj7rgl4zq5pc2b286gfn727x3hfhksx9zp2"; + sha256 = "1801931k4qdvc7jvaqxvjyhbh1xsvjz0pjajf6xc222n4ggar1q5"; }; buildInputs = [ openssl libevent ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index f596934a42..3466fb776f 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -16,11 +16,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e"; + sha256 = "caa4f941caf39080184554fb1310f383eba4b30d9c4c2215670d6b0a2de8f836"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix new file mode 100644 index 0000000000..15e400ebad --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix @@ -0,0 +1,41 @@ +{ lib, nixosTests, git, buildGoPackage, fetchFromGitHub, libcap }: + +buildGoPackage rec { + pname = "ncdns"; + version = "0.0.10.3"; + + goPackagePath = "github.com/namecoin/ncdns"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "namecoin"; + repo = "ncdns"; + rev = "v${version}"; + sha256 = "12q5al48mkjhgyk7z5wyklzzrdbcqhwxl79axa4gh9ld75prghbq"; + }; + + patches = [ ./fix-tpl-path.nix ]; + + buildInputs = [ libcap ]; + + preBuild = '' + go generate github.com/namecoin/x509-signature-splice/... + ''; + + postInstall = '' + mkdir -p "$out/share" + cp -r "$src/_doc" "$out/share/doc" + cp -r "$src/_tpl" "$out/share/tpl" + ''; + + meta = with lib; { + description = "Namecoin to DNS bridge daemon"; + homepage = "https://github.com/namecoin/ncdns"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ rnhmjoj ]; + }; + + passthru.tests.ncdns = nixosTests.ncdns; + +} diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/deps.nix b/third_party/nixpkgs/pkgs/servers/dns/ncdns/deps.nix new file mode 100644 index 0000000000..7ac3f2897e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dns/ncdns/deps.nix @@ -0,0 +1,309 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; + sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; + }; + } + { + goPackagePath = "github.com/btcsuite/btcd"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btcd"; + rev = "9f0179fd2c46caba343b6515602cf37172f14d5f"; + sha256 = "0cvpjsxlyzm04pwzi7nj43k9h5wfxj07jdc49qxsav5323v1nvka"; + }; + } + { + goPackagePath = "github.com/btcsuite/btclog"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btclog"; + rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; + sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; + }; + } + { + goPackagePath = "github.com/btcsuite/btcutil"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btcutil"; + rev = "b2bf7f89d674a3702182b7e15f52807896051af3"; + sha256 = "0wwykb4cbq8xj2mls2mxma5vaahdgdy3vqw1r2fi4wyj0yr4kyw9"; + }; + } + { + goPackagePath = "github.com/btcsuite/go-socks"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/go-socks"; + rev = "4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f"; + sha256 = "18cv2icj059lq4s99p6yh91hlas5f2gi3f1p4c10sjgwrs933d7b"; + }; + } + { + goPackagePath = "github.com/btcsuite/websocket"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/websocket"; + rev = "31079b6807923eb23992c421b114992b95131b55"; + sha256 = "0xpkf257ml6fpfdgv7hxxc41n0d5yxxm3njm50qpzp7j71l9cjwa"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "b51e752dd1c9c618846f8bc5b95ab524bd7b11c2"; + sha256 = "127dj1iwp69yj74nwh9ckgc0mkk1mv4yzbxmbdxix1r7j6q35z3j"; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; + sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; + }; + } + { + goPackagePath = "github.com/hlandau/buildinfo"; + fetch = { + type = "git"; + url = "https://github.com/hlandau/buildinfo"; + rev = "337a29b5499734e584d4630ce535af64c5fe7813"; + sha256 = "1kq3r1i4rr9bcvj5yg8w1l95f6sfc3kn6kgcdmlh5i3j9w2sram8"; + }; + } + { + goPackagePath = "github.com/hlandau/degoutils"; + fetch = { + type = "git"; + url = "https://github.com/hlandau/degoutils"; + rev = "8fa2440b63444dad556d76366f1c3ee070c8a577"; + sha256 = "1yj39jbrk3xx3cyl8f4asakc74lsl0brasi25xjf6219pg69q0iy"; + }; + } + { + goPackagePath = "github.com/hlandau/dexlogconfig"; + fetch = { + type = "git"; + url = "https://github.com/hlandau/dexlogconfig"; + rev = "244f29bd260884993b176cd14ef2f7631f6f3c18"; + sha256 = "1d01ghx6xawj3nk3lpk51wbbpxdnc9vzvijvlayvp7cxgsacslbc"; + }; + } + { + goPackagePath = "github.com/hlandau/xlog"; + fetch = { + type = "git"; + url = "https://github.com/hlandau/xlog"; + rev = "197ef798aed28e08ed3e176e678fda81be993a31"; + sha256 = "08rjlqnjbfgpz5rbjq89l7y5vyhk99ivr928sqdi5gnqznbqs4m8"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "4e0886370c3a67530192c6a238cff68f56c141b0"; + sha256 = "1ywbfzz1h3a3qd8rpkiqwi1dm4w8ls9ijb4x1b7567grns9f0vnp"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "702c74938df48b97370179f33ce2107bd7ff3b3e"; + sha256 = "0hf58ypz6rxsw6nx3i856whir9lvy4sdx946wbw1nfaf2rdmr9vx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "cb30d6282491c185f77d9bec5d25de1bb61a06bc"; + sha256 = "0v59mv94acd2m72q8adhigxkx1vn38l5h0d8hp0nxga2v9f3v8kd"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "203ad2480beb9330454efc215d21f16c607e8174"; + sha256 = "12i2l79whv7a8c27f1dvq4wqikx4d0l30r1ja68zfgrgik6vryxq"; + }; + } + { + goPackagePath = "github.com/namecoin/btcd"; + fetch = { + type = "git"; + url = "https://github.com/namecoin/btcd"; + rev = "69a10543311fa68737d0a77b4cd045b0b0abfb75"; + sha256 = "1zbfigs3hrjhdwp19877lpgivdcz3k80149nxdmxlmp03xcswcqy"; + }; + } + { + goPackagePath = "github.com/namecoin/ncbtcjson"; + fetch = { + type = "git"; + url = "https://github.com/namecoin/ncbtcjson"; + rev = "fa221af062c70f802db6ed66e1546cc4a41ec277"; + sha256 = "1fmz5aylsji27vj5f3f3gg9xj99735gh5prvcfz0gmk68v1mnr4i"; + }; + } + { + goPackagePath = "github.com/namecoin/ncrpcclient"; + fetch = { + type = "git"; + url = "https://github.com/namecoin/ncrpcclient"; + rev = "858e1a5acd8b2da56462f50323633cdf2fe80977"; + sha256 = "0pj951wm6fdkk2yv4bxaxka52i7rb6w3fs9ah3fy7p8wchr4smjx"; + }; + } + { + goPackagePath = "github.com/namecoin/tlsrestrictnss"; + fetch = { + type = "git"; + url = "https://github.com/namecoin/tlsrestrictnss"; + rev = "945a9f3d995fcb175fd0b19549e21a3e87ba8c13"; + sha256 = "18qphkqnjw3bwflkyyrddyzgwscs37j7y6ynm9g78bqb5skviqqy"; + }; + } + { + goPackagePath = "github.com/namecoin/x509-signature-splice"; + fetch = { + type = "git"; + url = "https://github.com/namecoin/x509-signature-splice"; + rev = "d8b4bf2df701c55239a9fe82bb1e7bea10e30599"; + sha256 = "0jlj4gb60s7b69d8yx6ljhxgvqgjz01n0h59fswblw09wfba8c4j"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag"; + rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; + sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; + }; + } + { + goPackagePath = "github.com/shiena/ansicolor"; + fetch = { + type = "git"; + url = "https://github.com/shiena/ansicolor"; + rev = "a422bbe96644373c5753384a59d678f7d261ff10"; + sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "279210d13fedf5be6d476bad5df6a015042bb905"; + sha256 = "0syi72jba84nn1z89bqpcv94wjvzj71dwg1pj30xrcixcz1zsg26"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "627f9648deb96c27737b83199d44bb5c1010cbcf"; + sha256 = "0ziz7i9mhz6dy2f58dsa83flkk165w1cnazm7yksql5i9m7x099z"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "6fdc65e7d9800cc59998e8ac0d9406a20ff5f399"; + sha256 = "0al5gzij4qkrp11i1h8j7288pg6y716zyh2v0886pv2knha7gjvj"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/hlandau/configurable.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/hlandau/configurable.v1"; + rev = "41496864a1fe3e0fef2973f22372b755d2897402"; + sha256 = "0i9jbdvi8rz12xsrzzbfxg5lwsqakjcmccsa5a32asmv26k5byqa"; + }; + } + { + goPackagePath = "gopkg.in/hlandau/easyconfig.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/hlandau/easyconfig.v1"; + rev = "c31249162931b4963bbe6e501cccb60d23271a3f"; + sha256 = "1v8j1pyzcfj1l4pmb1c6mszci6xzc4agdam2kq79kyvbsvbbw9dc"; + }; + } + { + goPackagePath = "gopkg.in/hlandau/madns.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/hlandau/madns.v2"; + rev = "26979b3e4b5aa3e0bd53cf0a014f9eaf43b578e3"; + sha256 = "09r4m4mqdgd7hvxyvss9m64lq0kk8nylnq2bgnkrclgzpi87fmmb"; + }; + } + { + goPackagePath = "gopkg.in/hlandau/service.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/hlandau/service.v2"; + rev = "b64b3467ebd16f64faec1640c25e318efc0c0d7b"; + sha256 = "0lpx88f46ylx9lf6jgwcjgklll1pc1mlakrywpa0wzhjj7a4jinc"; + }; + } + { + goPackagePath = "gopkg.in/hlandau/svcutils.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/hlandau/svcutils.v1"; + rev = "c25dac49e50cbbcbef8c81b089f56156f4067729"; + sha256 = "12b6p71mk33r44d71xizjq82fls0ykfwfl5gnmckbgpxms4bj2xf"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/fix-tpl-path.nix b/third_party/nixpkgs/pkgs/servers/dns/ncdns/fix-tpl-path.nix new file mode 100644 index 0000000000..850fb4d1b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dns/ncdns/fix-tpl-path.nix @@ -0,0 +1,27 @@ +This sets a default value for the tpl directory that works for Nixpkgs. + +diff --git a/server/web.go b/server/web.go +index d024a42..0522d02 100644 +--- a/server/web.go ++++ b/server/web.go +@@ -10,6 +10,7 @@ import "path/filepath" + import "time" + import "strings" + import "fmt" ++import "os" + + var layoutTpl *template.Template + var mainPageTpl *template.Template +@@ -44,7 +45,11 @@ func deriveTemplate(filename string) (*template.Template, error) { + } + + func (s *Server) tplFilename(filename string) string { +- td := filepath.Join(s.cfg.ConfigDir, "..", "tpl") ++ ex, err := os.Executable() ++ if err != nil { ++ panic(err) ++ } ++ td := filepath.Join(filepath.Dir(ex), "..", "share", "tpl") + if s.cfg.TplPath != "" { + td = s.cfg.TplPath + } diff --git a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix index 43c2900443..2dfdf108c4 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, openssl +{ stdenv, fetchurl, libevent, openssl, nixosTests , bind8Stats ? false , checking ? false , ipv6 ? true @@ -11,16 +11,16 @@ , rrtypes ? false , zoneStats ? false -, configFile ? "etc/nsd/nsd.conf" +, configFile ? "/etc/nsd/nsd.conf" }: stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "11w9kl99fs888f3zwx2j92i8lcp78vq91jac8s317a2icv74mczl"; + sha256 = "0ac3mbn5z4nc18782m9aswdpi2m9f4665vidw0ciyigdh0pywp2v"; }; prePatch = '' @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { sed 's@$(INSTALL_DATA) nsd.conf.sample $(DESTDIR)$(nsdconfigfile).sample@@g' -i Makefile.in ''; + passthru.tests = { + inherit (nixosTests) nsd; + }; + meta = with stdenv.lib; { homepage = "http://www.nlnetlabs.nl"; description = "Authoritative only, high performance, simple and open source name server"; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index 10a18ab1d4..02f6c2a962 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1n9gymis0h1grgg63ig3kk9cb27ayy1w6s8hcn8n4g5dzi90h8sl"; + sha256 = "1qb18mx0ci3gbm4ssdg6sf2zg1p6xqi0v061ffww6ph0snabmbpw"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix b/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix index cd4d311621..a15e1c15b1 100644 --- a/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix +++ b/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ lethalman ]; platforms = with platforms; linux; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/servers/gortr/default.nix b/third_party/nixpkgs/pkgs/servers/gortr/default.nix index c0534d0f89..5874c3320a 100644 --- a/third_party/nixpkgs/pkgs/servers/gortr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gortr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gortr"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1srwlpl8g0pzrxb2nyp6xvg10cidm2i6qb9m08k2g296hfgdqqq3"; + sha256 = "08nbvw5pqd8wdd8vrsr4d50zfqwg175brh7m0pvv4165gnv8k5bf"; }; vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; diff --git a/third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix b/third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix index 019a8dca3b..70926e3773 100644 --- a/third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "A modern user interface for hashicorp Consul & Nomad"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ numkem ]; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/servers/hitch/default.nix b/third_party/nixpkgs/pkgs/servers/hitch/default.nix index c81cd80eb7..89aa63f35b 100644 --- a/third_party/nixpkgs/pkgs/servers/hitch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hitch/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig }: +{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.6.0"; pname = "hitch"; src = fetchurl { url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz"; - sha256 = "1nnzqqigfw78nqhp81a72x1s8d6v49ayw4w5df0zzm2cb1jgv95i"; + sha256 = "01n70yf8hx42jb801jv5q1xhrpqxyjnqhd98hjf81lvxpd5fnisf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" ]; + passthru.tests.hitch = nixosTests.hitch; + meta = with stdenv.lib; { description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software"; homepage = "https://hitch-tls.org/"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch index 0b9dd3e447..7009a03613 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -1,17 +1,8 @@ -From 9d730514540929dc95a7313bdb385bab95d9a28c Mon Sep 17 00:00:00 2001 -From: Martin Weinelt -Date: Wed, 20 May 2020 23:23:23 +0200 -Subject: [PATCH] setup.py: relax dependencies - ---- - setup.py | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - diff --git a/setup.py b/setup.py -index 1473fd1f5f..149af58b3a 100755 +index 4e46f63217..b1aafee59d 100755 --- a/setup.py +++ b/setup.py -@@ -32,24 +32,24 @@ PROJECT_URLS = { +@@ -32,7 +32,7 @@ PROJECT_URLS = { PACKAGES = find_packages(exclude=["tests", "tests.*"]) REQUIRES = [ @@ -20,29 +11,15 @@ index 1473fd1f5f..149af58b3a 100755 "astral==1.10.1", "async_timeout==3.0.1", "attrs==19.3.0", - "bcrypt==3.1.7", - "certifi>=2020.4.5.1", - "ciso8601==2.1.3", -- "importlib-metadata==1.6.0", -+ "importlib-metadata>=1.5.0", - "jinja2>=2.11.1", - "PyJWT==1.7.1", - # PyJWT has loose dependency. We want the latest one. -- "cryptography==2.9.2", -+ "cryptography>=2.9", - "pip>=8.0.3", +@@ -48,8 +48,8 @@ REQUIRES = [ "python-slugify==4.0.0", -- "pytz>=2020.1", -- "pyyaml==5.3.1", -- "requests==2.23.0", + "pytz>=2020.1", + "pyyaml==5.3.1", +- "requests==2.24.0", - "ruamel.yaml==0.15.100", -+ "pytz>=2019.03", -+ "pyyaml>=5.2", -+ "requests>=2.22", ++ "requests>=2.23.0", + "ruamel.yaml>=0.15.100", "voluptuous==0.11.7", - "voluptuous-serialize==2.3.0", +- "voluptuous-serialize==2.3.0", ++ "voluptuous-serialize>=2.3.0", ] --- -2.26.2 - 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 9b4f8ae9ee..44aba8299a 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.111.4"; + version = "0.112.3"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -17,9 +17,9 @@ "airvisual" = ps: with ps; [ pyairvisual]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; - "alarmdecoder" = ps: with ps; [ alarmdecoder]; + "alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "alexa" = ps: with ps; [ aiohttp-cors]; "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage "amazon_polly" = ps: with ps; [ boto3]; @@ -46,7 +46,7 @@ "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg "aruba" = ps: with ps; [ pexpect]; - "arwn" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt @@ -57,13 +57,13 @@ "aurora" = ps: with ps; [ ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy "auth" = ps: with ps; [ aiohttp-cors]; - "automation" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "automation" = ps: with ps; [ aiohttp-cors]; "avea" = ps: with ps; [ ]; # missing inputs: avea "avion" = ps: with ps; [ ]; # missing inputs: avion - "avri" = ps: with ps; [ ]; # missing inputs: avri-api + "avri" = ps: with ps; [ pycountry]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore - "axis" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: axis + "axis" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: axis "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub "azure_service_bus" = ps: with ps; [ azure-servicebus]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip @@ -104,7 +104,7 @@ "calendar" = ps: with ps; [ aiohttp-cors]; "camera" = ps: with ps; [ aiohttp-cors]; "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -117,7 +117,7 @@ "clicksend" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend + "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa]; "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal @@ -144,18 +144,19 @@ "darksky" = ps: with ps; [ python-forecastio]; "datadog" = ps: with ps; [ datadog]; "ddwrt" = ps: with ps; [ ]; + "debugpy" = ps: with ps; [ debugpy]; "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz "decora" = ps: with ps; [ bluepy]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn "deluge" = ps: with ps; [ deluge-client]; "demo" = ps: with ps; [ aiohttp-cors]; "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ denonavr]; + "denonavr" = ps: with ps; [ denonavr getmac]; "derivative" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene - "device_automation" = ps: with ps; [ aiohttp-cors]; + "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api @@ -178,7 +179,7 @@ "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser - "dsmr_reader" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt]; "dte_energy_bridge" = ps: with ps; [ ]; "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; @@ -258,7 +259,6 @@ "folder_watcher" = ps: with ps; [ watchdog]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java - "fortigate" = ps: with ps; [ ]; # missing inputs: pyfgt "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam "foursquare" = ps: with ps; [ aiohttp-cors]; @@ -270,7 +270,7 @@ "fritzbox_callmonitor" = ps: with ps; [ fritzconnection]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip "garadget" = ps: with ps; [ ]; @@ -320,7 +320,7 @@ "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony]; - "hassio" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -337,7 +337,7 @@ "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg sqlalchemy zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash home-assistant-frontend + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip @@ -351,7 +351,9 @@ "huawei_lte" = ps: with ps; [ getmac stringcase]; # missing inputs: huawei-lte-api url-normalize "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue]; + "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi + "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser "hyperion" = ps: with ps; [ ]; "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm @@ -367,7 +369,7 @@ "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client - "influxdb" = ps: with ps; [ influxdb]; + "influxdb" = ps: with ps; [ influxdb-client influxdb]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; @@ -433,7 +435,6 @@ "local_ip" = ps: with ps; [ ]; "locative" = ps: with ps; [ aiohttp-cors]; "lock" = ps: with ps; [ ]; - "lockitron" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; @@ -453,8 +454,8 @@ "mailbox" = ps: with ps; [ aiohttp-cors]; "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; - "manual_mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; - "map" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py "matrix" = ps: with ps; [ matrix-client]; @@ -485,7 +486,7 @@ "minio" = ps: with ps; [ minio]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend + "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -494,17 +495,17 @@ "moon" = ps: with ps; [ ]; "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2]; - "mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; - "mqtt_eventstream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; - "mqtt_json" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; - "mqtt_room" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; - "mqtt_statestream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt]; "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams "mvglive" = ps: with ps; [ PyMVGLive]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ ]; # missing inputs: pymyq - "mysensors" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: pymysensors + "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: pymysensors "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 @@ -516,7 +517,7 @@ "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ ]; # missing inputs: python-nest - "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo sqlalchemy]; # missing inputs: home-assistant-frontend + "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo]; "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt @@ -535,6 +536,7 @@ "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa "norway_air" = ps: with ps; [ pymetno]; "notify" = ps: with ps; [ ]; + "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events "notion" = ps: with ps; [ ]; # missing inputs: aionotion "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents @@ -577,13 +579,13 @@ "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp]; - "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa hbmqtt paho-mqtt sqlalchemy]; # missing inputs: home-assistant-frontend - "ozw" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: python-openzwave-mqtt + "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt]; + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect]; - "panel_custom" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend - "panel_iframe" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -630,7 +632,7 @@ "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend rachiopy + "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: rachiopy "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird @@ -655,7 +657,7 @@ "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx "ring" = ps: with ps; [ ha-ffmpeg]; # missing inputs: ring_doorbell "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api - "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport + "rmvtransport" = ps: with ps; [ PyRMVtransport]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy @@ -671,7 +673,7 @@ "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket] @@ -681,7 +683,7 @@ "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate - "search" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "search" = ps: with ps; [ aiohttp-cors]; "season" = ps: with ps; [ ephem]; "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid "sense" = ps: with ps; [ ]; # missing inputs: sense_energy @@ -714,15 +716,15 @@ "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ ]; # missing inputs: pysma - "smappee" = ps: with ps; [ ]; # missing inputs: smappy + "smappee" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmappee "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab - "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend pysmartapp pysmartthings + "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg "sms" = ps: with ps; [ ]; # missing inputs: python-gammu "smtp" = ps: with ps; [ ]; "snapcast" = ps: with ps; [ snapcast]; - "snips" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "snips" = ps: with ps; [ aiohttp-cors paho-mqtt]; "snmp" = ps: with ps; [ pysnmp]; "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient @@ -815,7 +817,7 @@ "todoist" = ps: with ps; [ todoist]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ ]; # missing inputs: toonapilib + "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: toonapi "torque" = ps: with ps; [ aiohttp-cors]; "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline @@ -932,7 +934,7 @@ "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy + "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 366415dd9e..f2a75459b4 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -27,6 +27,16 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") + # Required by cast component. Can probably be removed in 0.113.x + # https://github.com/home-assistant/core/commit/86c27b50f1282658b75fe71f9f6fd2fcabc2eaa2 + (mkOverride "PyChromecast" "6.0.0" + "05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm") + + # We have 3.x in nixpkgs which is incompatible with home-assistant atm: + # https://github.com/home-assistant/core/blob/dev/requirements_all.txt + (mkOverride "pyowm" "2.10.0" + "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g") + # required by aioesphomeapi (self: super: { protobuf = super.protobuf.override { @@ -67,7 +77,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.111.4"; + hassVersion = "0.112.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -86,7 +96,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "08dkqczpmdaz8k9fsshgvgma7i7sffzgmhsi49qki7vwn20hl2hf"; + sha256 = "1azfbjnyaamdnl2f3cllh6pd3kinl1wjqb4hlb569gb8zqs5bsx2"; }; propagatedBuildInputs = [ @@ -132,6 +142,6 @@ in with py.pkgs; buildPythonApplication rec { homepage = "https://home-assistant.io/"; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; - maintainers = with maintainers; [ dotlambda globin mic92 ]; + maintainers = with maintainers; [ dotlambda globin mic92 hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index fcb68896c2..54ef4d04e1 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 = "20200603.3"; + version = "20200702.1"; src = fetchPypi { inherit pname version; - sha256 = "12bbvqckry6yr7409dir49pjcaa31z74fy6vb0mgr9xzvri5c2s8"; + sha256 = "0ikzqwwm4m15x2m5byy7r005cfdxk7ajfyz9ljv4nsa3y3g2riw4"; }; # no Python tests implemented diff --git a/third_party/nixpkgs/pkgs/servers/http/pshs/default.nix b/third_party/nixpkgs/pkgs/servers/http/pshs/default.nix index f83ab4642f..e8ecb16c0c 100644 --- a/third_party/nixpkgs/pkgs/servers/http/pshs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/pshs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pshs"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "mgorny"; repo = "pshs"; rev = "v${version}"; - sha256 = "04l03myh99npl78y8nss053gnc7k8q60vdbdpml19sshmwaw3fgi"; + sha256 = "1j8j4r0vsmp6226q6jdgf9bzhx3qk7vdliwaw7f8kcsrkndkg6p4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index ce24cc7071..10b74f6b79 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "9.0.3"; + version = "10.0.2"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "0nlfa6wwgj04xgg4ps5gpjp4iq2lmas97y5qz61lhns1p42xr4ls"; + sha256 = "1fn8yd02m0bnvwkbrfxrdnxfab30s0wzm3zxpy63wf3vak7nacma"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix index 585a619683..c895147875 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "0xcd9pmv2p4znn6bqvka19h5h2lw90inyxrm5020acd0yaf0i0g3"; + sha256 = "10b8g6xv90shhfx17cjw7p40gphwi02az1y2dd8a4sjm4z6b2bzw"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/third_party/nixpkgs/pkgs/servers/martin/default.nix b/third_party/nixpkgs/pkgs/servers/martin/default.nix new file mode 100644 index 0000000000..2c506dca6a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/martin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "martin"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "urbica"; + repo = pname; + rev = "v${version}"; + sha256 = "1i9zhmjkgid4s90n52wqmrl3lwswcaxd6d47ssycgjl1nv0jla4k"; + }; + + cargoSha256 = "08rr783qvpm1q7s60k7mh3k5npf0lg5s1x74lnxcxdgrlgpn5gcf"; + + buildInputs = with stdenv; lib.optional isDarwin Security; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Blazing fast and lightweight PostGIS vector tiles server"; + homepage = "https://martin.urbica.co/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index fbcec04e53..8dccb7a312 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.15.1"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1hfyqp5bzsqp002synxp9jcm9fwzw9p0gcklmycmv616x3flylkf"; + sha256 = "16hc82qhzb5maxp6f4xqarcv93sa6pg7i585vg97khgy6ryp3m7p"; }; patches = [ 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 fb1b515085..a2045ee15f 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 @@ -4,31 +4,40 @@ let sources = { - "@babel/code-frame-7.8.3" = { + "@babel/code-frame-7.10.3" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "3d85pd9lfbm8yrlpn6wj9g56snbnpr9fx0w1b9x26jbirc2xfrvnifwzprp0f6bhqijshgm0q35axic8d11v4j0kq493dapcyk33n3b"; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz"; + sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg=="; }; }; - "@babel/helper-validator-identifier-7.9.5" = { + "@babel/helper-validator-identifier-7.10.3" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.9.5"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; - sha512 = "3i5wlljsvjm0hxwjq4j1ddq6gcj2k518gh95wkx8qywkf90sb7l3d5aqga7hvfvz44nb2b0aq16jd3394zilmlbqcvczaq5llnapipz"; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz"; + sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw=="; }; }; - "@babel/highlight-7.9.0" = { + "@babel/highlight-7.10.3" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; - sha512 = "2qmdx9wdiv4yy36dc1ljghwd45kq6bhsddcbps8qznsrwvg3zjir6pb7nsfg4ypqrq6z2zif0ysjmwybpqp5xpz6rvymv2pbj54z5ll"; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz"; + sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw=="; + }; + }; + "@dabh/diagnostics-2.0.2" = { + name = "_at_dabh_slash_diagnostics"; + packageName = "@dabh/diagnostics"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; "@slack/logger-1.1.1" = { @@ -37,34 +46,34 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@slack/logger/-/logger-1.1.1.tgz"; - sha512 = "26482151iyqnbfawnpnqggppifriyxx1gbyyi3688j782iiq4g1rqkm7q979z9qkv0pvvjrxdbi8v0gk3prax6j7v2zy0ndr44bj01w"; + sha512 = "PAC5CMnNAv/FPtJ0le+YD2wUV+tZ7n3Bnjj9dBI+deIcHsExCnQkQmZE79cLvfuYXbz3PWyv5coti30MJQhEjA=="; }; }; - "@slack/rtm-api-5.0.4" = { + "@slack/rtm-api-5.0.5" = { name = "_at_slack_slash_rtm-api"; packageName = "@slack/rtm-api"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.4.tgz"; - sha512 = "1zx7c5wzbp2wc99lrzy0ipiil7jayn1643q0mm8bawdbi3gansd7axzn7ivcjlzgv9bn8pqlzc3lw0mwwlaqjs4z4d7zq6vnf6cw5g7"; + url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.5.tgz"; + sha512 = "x2B4hyoxjg62cxf4M5QRomx+xYp2XoajPKdd24SM2Sl4m+IrzwKzmcrysQuYmF6BMsm3IoTKymW5BBGckHGTIw=="; }; }; - "@slack/types-1.6.0" = { + "@slack/types-1.7.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.6.0.tgz"; - sha512 = "0hpy7rczl2a6379ipm7qxspq6qfh97iy2l7g0zzwn5jcmxlh5sjzl439k1hpxg7fpy66ldc455wlfyrk3wmgy8drlndw33iyq7w1fja"; + url = "https://registry.npmjs.org/@slack/types/-/types-1.7.0.tgz"; + sha512 = "aigLPmTO513JxeFyeII/74y+S5jU39tabDWPsZyMHJWCYqK3vCkRvV73NL+Ay+Tq5RC2NgSmkedk1wvQJ6oXLg=="; }; }; - "@slack/web-api-5.8.1" = { + "@slack/web-api-5.10.0" = { name = "_at_slack_slash_web-api"; packageName = "@slack/web-api"; - version = "5.8.1"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.1.tgz"; - sha512 = "065zsa2i8s2av3igs52g2r8pn2i3qw3glflwbdn28i6wzvq0f3q2gp9vx44gfp5r5q1ymjwvk8wapsaaqgz1s781pymspcf6n977qrh"; + url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.10.0.tgz"; + sha512 = "t8c2lcSrdX8LIUOS1RvslbBBKvuNaTtbEcrWai4yDGkiNIxzhk+dHPcJzd7A4A0DkAgiEwXeezR7RCELuG8WgQ=="; }; }; "@types/body-parser-1.19.0" = { @@ -73,7 +82,7 @@ let version = "1.19.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "0av4v9bdhgbq0jils3jajym9gcfddyx63g2xx8fh6vqafqb5vdcm98p1kfl70ydih9m393zp13krslmii5bmf05ngyaxn139nn0kpsv"; + sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; "@types/caseless-0.12.2" = { @@ -82,7 +91,7 @@ let version = "0.12.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"; - sha512 = "39jv2a7v9mi41wxbv242icriy5asbzyk95iy25ay3gwa1d6yi40cd6gclbzn81hig9xvvi5z7j2gq4ybirjfyihpq8wa3s160r33jg9"; + sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; "@types/chai-4.2.11" = { @@ -91,7 +100,7 @@ let version = "4.2.11"; src = fetchurl { url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz"; - sha512 = "2rkrhbd0aip5x0bqbp3az1pfnz3wx0dqwmid3ibyrvgvz9z93xbf1prkm5rcnj7j58w70fydsrrjk0rl1fj3hcxm2z36zjsw7lrdfxp"; + sha512 = "t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw=="; }; }; "@types/connect-3.4.33" = { @@ -100,16 +109,7 @@ let version = "3.4.33"; src = fetchurl { url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz"; - sha512 = "3n5gxr7z1jn60gvcnzls1c3fgzbv171acdp4shbn095wnbb8hdba3cjq1sac8aina3bg957ww5hg89swcgbdjfp9irmkkiqfs8npqfv"; - }; - }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi"; + sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; }; }; "@types/express-4.17.6" = { @@ -118,7 +118,7 @@ let version = "4.17.6"; src = fetchurl { url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz"; - sha512 = "3kwllih0493ahk6gi09pibb3c3x21r3qll2fv7vs9ixz694i6dp59w4799q8ar1yx500d03rvyc5pppf9p3rrdcw4fpkws8svvapycz"; + sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w=="; }; }; "@types/express-serve-static-core-4.17.7" = { @@ -127,7 +127,7 @@ let version = "4.17.7"; src = fetchurl { url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz"; - sha512 = "07pihlgvdmd0kkpxd77h2mcqx93c3mz0g4jcv2p511jgksqwc4wgi4qjb59gbp2ya25inn0gsh9f3wsc8dzi73w5mhamxn5y27i7j0h"; + sha512 = "EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw=="; }; }; "@types/is-stream-1.1.0" = { @@ -136,16 +136,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/is-stream/-/is-stream-1.1.0.tgz"; - sha512 = "1i12j74qq6aga8wpwbn5vmy5abb0hms26hinya0mx503dwx51iqy39rsl07kha49nfmmz0sbrjbbm4s1lrcwj3as9xb8m8hxsv5lilf"; + sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg=="; }; }; - "@types/mime-2.0.1" = { + "@types/mime-2.0.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz"; - sha512 = "35iimmp0d3zg4774qavnq9wh54dgnxfks59fks65f8q8d1008x00a1fmkdnxcs27znlc69mzbxp1frzpxx85c5w4x0ha5prgs0ks0hp"; + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.2.tgz"; + sha512 = "4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q=="; }; }; "@types/mocha-7.0.2" = { @@ -154,7 +154,7 @@ let version = "7.0.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz"; - sha512 = "3bnvharvlw03v41ibz38mhzb9h9ai3r3h46j9j6jj0g32ny0xak0ls9mnbs6bf7yfqccidc2vg1xwx16adxqngyayyci6130ysbdwv6"; + sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; "@types/nedb-1.8.9" = { @@ -163,7 +163,7 @@ let version = "1.8.9"; src = fetchurl { url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.9.tgz"; - sha512 = "1ajp6pwl4fnpr0w1bkvd7fx77amhgwm32q8wcr6r124m6fq73f88qkgbgr8r0ll2s2pn1b9kajzzvbvl7rgib0p3bsd94826kffbm63"; + sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ=="; }; }; "@types/node-13.9.3" = { @@ -181,7 +181,16 @@ let version = "1.8.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/node-emoji/-/node-emoji-1.8.1.tgz"; - sha512 = "288j4d6vcg0fbj43jaaf628f02s8zpsc0xagw0a5dr397ks6qnrcmjf91vl50b6f5xiddm6606hg3fa0va3yfpw4n56wnh5vl1mzx6i"; + sha512 = "0fRfA90FWm6KJfw6P9QGyo0HDTCmthZ7cWaBQndITlaWLTZ6njRyKwrwpzpg+n6kBXBIGKeUHEQuBx7bphGJkA=="; + }; + }; + "@types/nunjucks-3.1.3" = { + name = "_at_types_slash_nunjucks"; + packageName = "@types/nunjucks"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.3.tgz"; + sha512 = "42IiIIBdoB7ZDwCVhCWYT4fMCj+4TeacuVgh7xyT2du5EhkpA+OFeeDdYTFCUt1MrHb8Aw7ZqFvr8s1bwP9l8w=="; }; }; "@types/p-queue-2.3.2" = { @@ -190,16 +199,16 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/p-queue/-/p-queue-2.3.2.tgz"; - sha512 = "2ypziq4lf4i0kvxck1nv6l40sivqa5w95sagcihxbw8j87whz8yl80hwailygwlgyl3k3c6vca9nzn5h720l2vmhwfvz4vs17jjz83q"; + sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; - "@types/qs-6.9.2" = { + "@types/qs-6.9.3" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.2"; + version = "6.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.2.tgz"; - sha512 = "3wd0wx623wmzc5fs372ziw4zr9ay93zqd17aqbsfvs90y6jp2n9ipv0k0mpgjidvrhrzkwdhh6xpxlyy3xmzxdvw1gjdk3phs5w7mkb"; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.3.tgz"; + sha512 = "7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA=="; }; }; "@types/randomstring-1.1.6" = { @@ -208,7 +217,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/@types/randomstring/-/randomstring-1.1.6.tgz"; - sha512 = "0fx5jypv2k0dqp2wh8li9g82pylxq9d0d2qsgn55a1dkyvd8lsw31ih0n44sb9ippmiad7j21qrnq8md4bn0754j8pcb3giqhh1j4jx"; + sha512 = "XRIZIMTxjcUukqQcYBdpFWGbcRDyNBXrvTEtTYgFMIbBNUVt+9mCKsU+jUUDLeFO/RXopUgR5OLiBqbY18vSHQ=="; }; }; "@types/range-parser-1.2.3" = { @@ -217,16 +226,16 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha512 = "0w59kqlbrl9ich2pv2xqanzmg9f51404zqsba9l8aimqd77zbrdxcyq9q13xfnhr0d1dz4mx6z7n976ryc2nk2gfch5p507njm5f0bv"; + sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/request-2.48.4" = { + "@types/request-2.48.5" = { name = "_at_types_slash_request"; packageName = "@types/request"; - version = "2.48.4"; + version = "2.48.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz"; - sha512 = "21mnsvbrykpzp1f1rd2ibk3nsgr8kyqikk5rdmq4qlkpf10gnpxp414hnvnbwjp27l5hvpc5l0fx0qhw20h7zi143qw6iwq68qpansv"; + url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; + sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; }; }; "@types/request-promise-native-1.0.17" = { @@ -235,7 +244,7 @@ let version = "1.0.17"; src = fetchurl { url = "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.17.tgz"; - sha512 = "2m1kxdl06xbzf2zq8qx0kvwm6wjsxpxipyzzix8g7pvbnsi454zar84inrfm1bd5kyh1n2hj8q6ljv705r7816633nhifz6cv8xv7yk"; + sha512 = "05/d0WbmuwjtGMYEdHIBZ0tqMJJQ2AD9LG2F6rKNBGX1SSFR27XveajH//2N/XYtual8T9Axwl+4v7oBtPUZqg=="; }; }; "@types/retry-0.12.0" = { @@ -244,16 +253,16 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"; - sha512 = "2y01s1x2dh20ms4h4ih8j4rz6c66k40nj7kfl8z5bv1s77vqv4jq0ycai1gi0irx0m9y7jqcz140ica6273vrqmcvf2r2nkah58wqn1"; + sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/serve-static-1.13.3" = { + "@types/serve-static-1.13.4" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.3"; + version = "1.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz"; - sha512 = "39fm32fi9qpb1bz4q399y9rzv02ywml2m1qmclyr1ckrmy4vdn8nv5f9986ckn19yapxif0ljs0gc717xd7dmssjnh37qrxkp1d56m2"; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.4.tgz"; + sha512 = "jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug=="; }; }; "@types/tough-cookie-4.0.0" = { @@ -262,25 +271,25 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; - sha512 = "3lf0afkwkxmp6a7g8ghfbm5zjaxy2i1hqirzcr2iycxzvwwihdldbkfwgyxrc6b8b40sqfmvl5g2k6v6mdmpq5m6gs81nvn12g6rpr3"; + sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uuid-7.0.3" = { + "@types/uuid-7.0.4" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz"; - sha512 = "0xq5zlv2b74hz2yna42yd0j6p1xr1mx681x9phwl3njd8by5i82n15zc03srpkjzmhb3r12llhhwfk3k941wjw8f36q8dbbjm6nlirx"; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.4.tgz"; + sha512 = "WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g=="; }; }; - "@types/ws-5.1.2" = { + "@types/ws-7.2.5" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "5.1.2"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-5.1.2.tgz"; - sha512 = "0x1hv5p5js6n69q53qgw3qly7d1ipwz0cqfd2kr8g79kx8rm4bqak7azjwgagzm1b96xrqaydfkaw9rqr3536jd7ikpfxfqli8dfi1n"; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.5.tgz"; + sha512 = "4UEih9BI1nBKii385G9id1oFrSkLcClbwtDfcYj8HJLQqZVAtb/42vXVrYvRWCcufNF/a+rZD3MxNwghA7UmCg=="; }; }; "@types/yargs-13.0.9" = { @@ -289,7 +298,7 @@ let version = "13.0.9"; src = fetchurl { url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz"; - sha512 = "3758l5yl7cqv06qqaljs8hac31hwp4kz1nycsm1lj20dha116ylwx9kyd2dzpp8bml82ydl5r1ih31qxp9bmxc1hq1h6yyrh1ky3fy6"; + sha512 = "xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg=="; }; }; "@types/yargs-parser-13.1.0" = { @@ -298,7 +307,7 @@ let version = "13.1.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz"; - sha512 = "0mdq44p4sr9zvkcmaaa0jgyz34qirza6kl4qcln5ir9h0lg63kr9ndclj6p8gpf3mir7kv3rlr7pzkkjhhgkj96l9rsrs0r2my9naw0"; + sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg=="; }; }; "Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { @@ -311,13 +320,22 @@ let sha256 = "474e972819b3e1db3af70be75966a3d501c6b9285f4550ff5548193e031eaf9b"; }; }; + "a-sync-waterfall-1.0.1" = { + name = "a-sync-waterfall"; + packageName = "a-sync-waterfall"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz"; + sha512 = "RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA=="; + }; + }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; "accepts-1.3.7" = { @@ -326,7 +344,7 @@ let version = "1.3.7"; src = fetchurl { url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "ajv-6.12.2" = { @@ -335,7 +353,7 @@ let version = "6.12.2"; src = fetchurl { url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; - sha512 = "18zdchlpq20znwglnbc54yvqpr9m7q96qp9zvys27is5c0vxfn5fk8nmwhpnplbxyka88xqqabad0427mbgz7y7mz6azrp6723pxrck"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "another-json-0.2.0" = { @@ -353,7 +371,7 @@ let version = "3.2.3"; src = fetchurl { url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; - sha512 = "2gpv8bq9jq550ygnnm5srza0w0lfg8mr8z39702l0rgxhf35sxmdzxpppvwcp50rpk0dgjz516nbkygm0fk4675kb9qsgb5x35cfh9c"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; }; }; "ansi-regex-3.0.0" = { @@ -371,7 +389,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; "ansi-styles-3.2.1" = { @@ -380,7 +398,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; "anymatch-3.1.1" = { @@ -389,7 +407,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "2776jrfn8kh9r6qhz6s43znnwvqmbqrjsch99hdv21j53sj4njyjhrya67drxk8y7hvi28mjvdjj277jy4qd2zfayrjli3cdbdkkkwq"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; }; }; "arg-4.1.3" = { @@ -398,7 +416,7 @@ let version = "4.1.3"; src = fetchurl { url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; - sha512 = "2y8gq3qabgg6wbnvzwm79j1ncabh960rrr2qxq657mv4zsynr92l46mpfgpvk7hq416dpvqi66sy617bzgll3wcxmv7rlc6790bvi77"; + sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; }; }; "argparse-1.0.10" = { @@ -407,7 +425,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; "array-flatten-1.1.1" = { @@ -428,13 +446,22 @@ let sha1 = "5fcc373920775723cfd64d65c64bef53bf9eba6d"; }; }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "assert-options-0.6.2" = { @@ -443,7 +470,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; - sha512 = "09k5n3gb7n70yrif6qql3da1jbby6nc5g2h4lp6wbqcj14x71nyms3rgvwngl6jc1wrrw3jykiln04dr0cjs9k67i0d39jpizkm5zr8"; + sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; }; }; "assert-plus-1.0.0" = { @@ -461,7 +488,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"; - sha512 = "07swiwljqy13fyil4y9lp319zcqsgdkchaic1y4dlfi3flh5l4qlwv497g40bnspsl9h857a3ig5assmvjdwv913dppgymkvcsil2wf"; + sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="; }; }; "async-0.2.10" = { @@ -473,13 +500,13 @@ let sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "async-2.6.3" = { + "async-3.2.0" = { name = "async"; packageName = "async"; - version = "2.6.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "1g679kw2qqpqx1yd4s778r8rw3cv9qwmib5x3klk64kcl5ndw71bljcpav5jkk6grizlpvrqszsbs6fkmnlvcq5fnz2q33mrnb6zyfd"; + url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; "async-limiter-1.0.1" = { @@ -488,7 +515,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "asynckit-0.4.0" = { @@ -509,13 +536,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.9.1" = { + "aws4-1.10.0" = { name = "aws4"; packageName = "aws4"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; + sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; }; }; "axios-0.19.2" = { @@ -524,7 +551,7 @@ let version = "0.19.2"; src = fetchurl { url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; - sha512 = "0fa6ngb4rkbyp5r4ccjgs2ykdbz8i2hcr41av59jicgq6mfva739kcd6n5dqzj3hsx7d4qi201g93li3qddn14bz9qvh76irgj2cf3y"; + sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; }; }; "babel-runtime-6.26.0" = { @@ -551,7 +578,7 @@ let version = "3.0.8"; src = fetchurl { url = "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz"; - sha512 = "0j1z1n32mik68bxyihzyn0fik2lfw6msi9h22hnrdqz1x9dbsql1xyz7590vkpp54d8apf92cvnp1qzf4cqcy2fmv8zq9zqcc0zaps6"; + sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; }; }; "basic-auth-2.0.1" = { @@ -560,7 +587,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; - sha512 = "1x9j0wn0a3ia9mwgvicd30w346wzxj86zk9sly5wp07a2mpjm1sk4hk9iwrbcc8z6c72bkhvck6zrxbvcb6p8bbjhald78xw6k9wprl"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -578,7 +605,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha512 = "2izzpdg2m0av5pzbv1zyjfi15ddz5yk1d4h9cilzc8z6pzq5abcicnm2xx4b2jdrjk2l4h3zfawsxhnbzlgvlv4700q5930k796s69y"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; }; }; "binary-search-tree-0.2.5" = { @@ -614,7 +641,7 @@ let version = "3.5.5"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; - sha512 = "3gqgjzrc40ykm2hcmh2g98d09h8wh19n5psqc5b7k03aysyymfnvlak115vfi4s02ygnky872sfhdl1r077wcnyrsmyndyzg4gbmag5"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; }; }; "body-parser-1.19.0" = { @@ -623,7 +650,7 @@ let version = "1.19.0"; src = fetchurl { url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "2rl5ww96fwgmxdqhqmnknsaafw44vsr2xz7vf7nax8qz9jy8bmmdyawcy6yfny0wm7pi8m2jssakzjc1nin8z8207kv0gclpnrhy4bn"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; "brace-expansion-1.1.11" = { @@ -632,7 +659,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "braces-3.0.2" = { @@ -641,7 +668,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; "browser-request-0.3.3" = { @@ -659,7 +686,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; - sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; + sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; "bs58-4.0.1" = { @@ -677,7 +704,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-writer-2.0.0" = { @@ -686,7 +713,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha512 = "21laqrygizzy6ccv03l1af9pq07ligp755ybgfzln99lh62xnn5sxhw6qlw717g9dym9pa2cg0k9mz5r1nkb0hckxnk9mal6swnkdkb"; + sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; }; "builtin-modules-1.1.1" = { @@ -704,7 +731,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "073ccjmvxf726gcgzy0pksvi8x8r51dq6hyv69sc75ynrin7anwk9q3sqhbbbjhqjjrmq42s5f5gdbcgj2jxai6ldpyq6y2ny78payd"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; "camelcase-5.3.1" = { @@ -713,7 +740,7 @@ let version = "5.3.1"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; "caseless-0.12.0" = { @@ -731,7 +758,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "27pdhh35fbig9yxb0h8qp98cjapnpdxjnia2jc1hrhrda9ajab2hkpclrfd8b568ggrv2wrgi09bh0rf1vndc1b82nb74kf21p3f1ax"; + sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; }; }; "chalk-2.4.2" = { @@ -740,7 +767,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; "check-error-1.0.2" = { @@ -758,7 +785,16 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "3hbyi14x38mvx936wbajln4g1l8fcyi8fwvcrhf2jqn0yzcyda1d20q67k445j9bvs5kr7jdhd2s07srb2pnm7hxmjngp2k6wn8lsbl"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; + "chokidar-3.4.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; + sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; }; }; "cliui-5.0.0" = { @@ -767,7 +803,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; "color-3.0.0" = { @@ -776,7 +812,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; - sha512 = "3xh3l9zhh6dav7pp5hy88kbb6c52j0pf331ywpp6w2jaf94w25fjn4am930775mskxy75cxl90fji17cym40ivslxxlpcrlxgkmsalc"; + sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; }; }; "color-convert-1.9.3" = { @@ -785,7 +821,7 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; "color-name-1.1.3" = { @@ -803,16 +839,7 @@ let version = "1.5.3"; src = fetchurl { url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; - sha512 = "11p4cihq5874fmyvwkh0fp4dr2syliqsgg610rw46lsav41l6wcm4bgpkrl34gip3cqncw0ppmqwfknm5v02m1fj8qqk8cnlzk84bbl"; - }; - }; - "colornames-1.1.1" = { - name = "colornames"; - packageName = "colornames"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; + sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; "colors-1.4.0" = { @@ -821,7 +848,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "2saczc8hcdmgns1cp1g1p7g2sq4yksrik0ffvfkhkavmmgx8haqm034a4c9zj8im6kfjh00n2xi360yqfy7vbsi98zri0943r72mrbb"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; }; }; "colorspace-1.1.2" = { @@ -830,7 +857,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz"; - sha512 = "36j3cgfzngcjms1c0yfn487ibflffmb6hxgrknxbyrxrflc4kybm2r8a0mc1v8ljj7rbb7cjd54v2bimqb6rw0q5sqvwxznhfh8xpxy"; + sha512 = "vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ=="; }; }; "combined-stream-1.0.8" = { @@ -839,7 +866,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-2.20.3" = { @@ -848,7 +875,16 @@ let version = "2.20.3"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + }; + "commander-3.0.2" = { + name = "commander"; + packageName = "commander"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; + sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; }; }; "concat-map-0.0.1" = { @@ -866,7 +902,7 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "3976ggkw1lp21a6m3s19blb9a74kq7a0spw47v0m3vvi1k5wiamrsn20slcr9byx80x2la2sppkwjp7x10gc58142dl7412pvpv84qk"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; }; "content-type-1.0.4" = { @@ -875,7 +911,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; "cookie-0.4.0" = { @@ -884,7 +920,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "1g7bscknfpc6zgznz77hvll6cy5m9jv7zg9nkpdqzmgi0vhv75kh8iyqf6rdslkml47l3jihsz7hy0i8x5n6bfx9ba0kvvrp9y7qypq"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; }; "cookie-signature-1.0.6" = { @@ -902,7 +938,7 @@ let version = "2.6.11"; src = fetchurl { url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "1db6yjq48a8kkrfrxd0miblcf7nk2b4afgpr8dfgjl3jvz3xclvrqmz590hx2h59jh79lgl35r101lw5jqs46qybizdbpgzljjyf277"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; "core-util-is-1.0.2" = { @@ -938,7 +974,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; "debug-3.1.0" = { @@ -947,7 +983,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; "debug-3.2.6" = { @@ -956,7 +992,7 @@ let version = "3.2.6"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; "decamelize-1.2.0" = { @@ -974,7 +1010,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; - sha512 = "1rrbk0h0a836gj1x6lalzgqfs0v34d4fswq23c8lxzmb6k7pna45zd509h1r1fr312n4qml94xqlmzzga40sfa9vnzf6rkr4d1qh1zr"; + sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; }; }; "define-properties-1.1.3" = { @@ -983,7 +1019,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "delayed-stream-1.0.0" = { @@ -1010,7 +1046,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; - sha512 = "2phijq20j255bs4jjs11j5pa0x7y1084k6ch9xa8wgzp71zzgbpm23wyzbcs0mszvj971l9i5aav40sddm000484sl3ij4xzvlcgfc3"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; "destroy-1.0.4" = { @@ -1022,22 +1058,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "diagnostics-1.1.1" = { - name = "diagnostics"; - packageName = "diagnostics"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; - sha512 = "0liin689xf3v7wxk1z5l1par3dyjkg487nk3siqn6b7zqxw2rd93rgw88ifsqwhv66s8d7qjxy8fjv4gxfgiwd69ryv573fcwzga2gk"; - }; - }; "diff-3.5.0" = { name = "diff"; packageName = "diff"; version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; - sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; + sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; "diff-4.0.2" = { @@ -1046,7 +1073,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; - sha512 = "3ndiq7a8qsn2j6vlq5c6d38ynlydlhvk6q01rj321lcarrh0z7721w6cbrdw7lkx6pyfms59y1jkqcl6g2ir1rz5xr17q40lk26djg7"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; "ecc-jsbn-0.1.2" = { @@ -1073,16 +1100,16 @@ let version = "7.0.3"; src = fetchurl { url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; - "enabled-1.0.2" = { + "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"; + sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; }; "encodeurl-1.0.2" = { @@ -1094,22 +1121,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "env-variable-0.0.6" = { - name = "env-variable"; - packageName = "env-variable"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz"; - sha512 = "2v5v2dckp87kblfsmmyn76ky74yj2cvrv6kw1i7wlcidk2r7gnyhfil6i4zmw2qscgbsviv85x4840k7qgrkv8p6ssd8vj1v7sgjz3c"; - }; - }; - "es-abstract-1.17.5" = { + "es-abstract-1.17.6" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.5"; + version = "1.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; - sha512 = "2kayciqh331d3kp1l8wdsp33kzdc02rv72z6x2327w2i6yks9b7xwxbg1xdrrkhaglr06liqzdjavq9qk9d487sf572rjfv62xml7q5"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; + sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; }; }; "es-to-primitive-1.2.1" = { @@ -1118,7 +1136,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; "escape-html-1.0.3" = { @@ -1145,7 +1163,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "3xkdrhqvjj7430kp98pllh0yxbawxp4z1fnvbw5cawjr6mlbgyrd2v3b3kalrx3s515zc731a6ckmb10x9vaizf6sf4b5g84lndr72j"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; }; }; "esprima-4.0.1" = { @@ -1154,7 +1172,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "etag-1.8.1" = { @@ -1172,7 +1190,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz"; - sha512 = "3hv1mm8y1m0ayl0ds213ajdpc0xwalhi1iwvy2zdkg4kys5vdy97s8jz0sfvd91a3xwyy4946wmzk2lc1kpzww94pj307nmw8hm1yxn"; + sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; "eventemitter3-4.0.4" = { @@ -1181,7 +1199,7 @@ let version = "4.0.4"; src = fetchurl { url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; - sha512 = "2cj4h27lly85zb08gprjrkb92l8q8l1977704j7acj7rif052jiqap3l8d7zpdn9krqqi7if1f2cxp7f584045vr3l1pdviflp9ammf"; + sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; }; }; "express-4.17.1" = { @@ -1190,7 +1208,7 @@ let version = "4.17.1"; src = fetchurl { url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "3i2sxjf2x1r9wbfdyh5ll8ybbnqq6n4xfxdlc4dsqhssljrlih18csqg142lf16lcfcdgsmvf9pff0rzxjw7p0shnlmpajipwxpswlq"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; }; "extend-3.0.2" = { @@ -1199,7 +1217,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extsprintf-1.3.0" = { @@ -1211,13 +1229,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-3.1.1" = { + "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1226,7 +1244,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; "fast-safe-stringify-2.0.7" = { @@ -1235,7 +1253,7 @@ let version = "2.0.7"; src = fetchurl { url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha512 = "1ab0spv3wadhidsh9x8qar1ryn7ahv308yzc5cl32wssk99rr7vrkcs00vn2kggz6drps08vk24gi9gmqpg39jd1rnaryykvh4vmnaj"; + sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; "fecha-2.3.3" = { @@ -1244,7 +1262,16 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz"; - sha512 = "1v95kkfm8jnmrsplzk6zhsc2ngkvv2478pnvjnkl8z104b0mx3khf7xdps3dyi8d94kb73xcr5b2dmh58by9sirwcj0qk56hsf82hcm"; + sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; + }; + }; + "fecha-4.2.0" = { + name = "fecha"; + packageName = "fecha"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; + sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; "file-stream-rotator-0.4.1" = { @@ -1253,7 +1280,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.4.1.tgz"; - sha512 = "1jr6bdf22x3f4ql12ympal24yy1ggbxv5xl73ri70llghlcxr8wi9s8j40b5rf0h0sxm9m3g27qgck04aa5d7f9v19c0ws40bfrlxjv"; + sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ=="; }; }; "fill-range-7.0.1" = { @@ -1262,7 +1289,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; "finalhandler-1.1.2" = { @@ -1271,7 +1298,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "1cfqk6g78cb12b1cki4pbcspsy40d0yny513myqji716njyhc5hrj7ll539kz96m6vn27168hhyqvd52cr5x1cs85mm7igfkrdrq1b8"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; "find-up-3.0.0" = { @@ -1280,7 +1307,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; "finity-0.5.4" = { @@ -1289,7 +1316,7 @@ let version = "0.5.4"; src = fetchurl { url = "https://registry.npmjs.org/finity/-/finity-0.5.4.tgz"; - sha512 = "3420xkd0dmzdspn9mf3c8hkgfm081kahfnnn03y27ahkdf5bm8slndl5ahmypqs11gnl34s7bcmvxy5lqc41x065rxavhvfbgzvjpyy"; + sha512 = "3l+5/1tuw616Lgb0QBimxfdd2TqaDGpfCBpfX6EqtFmqUV3FtQnVEX4Aa62DagYEqnsTIjZcTfbq9msDbXYgyA=="; }; }; "flat-4.1.0" = { @@ -1298,7 +1325,16 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; - sha512 = "0bj2zrb5x98lffdcjsvaf2hns9ih2jzj4dz9yg9k8zqrak4x0i93dvf01qp458mr6d1x4dsqsxc3ag00g2mskrr23h7x71kna4d67rz"; + sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + }; + }; + "fn.name-1.1.0" = { + name = "fn.name"; + packageName = "fn.name"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"; + sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; "follow-redirects-1.5.10" = { @@ -1307,7 +1343,7 @@ let version = "1.5.10"; src = fetchurl { url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha512 = "1alfnscb0lnmf1ka8d5jrp48bizkbqrdz616r7q9yv4afqadlli1xmmf7lsvany1kmmnmwpvhbgx70mvcsnjf1ywjnzmkmk53h6apni"; + sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; }; }; "forever-agent-0.6.1" = { @@ -1325,7 +1361,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "form-data-2.5.1" = { @@ -1334,7 +1370,7 @@ let version = "2.5.1"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; - sha512 = "1aa6m5c13kybvcycjdyhr0qbb7097qs7kah89bbhynjs9r5fl6ibbhscpin31nshzhw5nszw5c6x10krrig90afh88la456cgflsvcv"; + sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; }; }; "forwarded-0.1.2" = { @@ -1370,7 +1406,7 @@ let version = "2.1.3"; src = fetchurl { url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; - sha512 = "2wj74g6h0wq34x3d4ncr7h3jkv1fdznmqpd4wdb1jfaz0icha7h65jq8sq6y6n3bc0i0z6w577z7hq4yiz8y7v5yid6ma9ih1mkvv02"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; "function-bind-1.1.1" = { @@ -1379,7 +1415,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; "generate-function-2.3.1" = { @@ -1388,7 +1424,7 @@ let version = "2.3.1"; src = fetchurl { url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; - sha512 = "0lp1r8njdds2dp6nd5drc8f3xhg0bishvbn8g54s9ka42yss4lvq84sg465vgb2bw45kww8r4cilsw629nsnn34zkkfny8dyccpkq3r"; + sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; }; }; "generate-object-property-1.2.0" = { @@ -1406,7 +1442,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; "get-func-name-2.0.0" = { @@ -1433,7 +1469,7 @@ let version = "7.1.3"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "30h0j9f3xj7mwciwmi9q9ilhlc0l391jrvv0xws0yxgh389ynin3qqrw8xiyfy5w3f667bwn9p0i3f01s2ir0ai1rwbb038ij4fxixx"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; "glob-parent-5.1.1" = { @@ -1442,7 +1478,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "1hi3ypyic536qm0jd2aw65wbaian4vxmgsnprw6p1mdfd75ks5x1mrgkgzl41xr6hnav27fqzpm227rj7qq8vcwb63m37m9cda3wwhn"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; "growl-1.10.5" = { @@ -1451,7 +1487,7 @@ let version = "1.10.5"; src = fetchurl { url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; - sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8"; + sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; }; }; "har-schema-2.0.0" = { @@ -1469,7 +1505,7 @@ let version = "5.1.3"; src = fetchurl { url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -1478,7 +1514,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-flag-3.0.0" = { @@ -1496,7 +1532,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; }; "he-1.2.0" = { @@ -1505,7 +1541,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "0dwml2q9r97ga11qbbn5sb46v4g47lx174dz9g1jgxpycknhg1d5dlsij2vja905p8h243jj51hfa5cmzh8n9rdcs8r78lg86fl7z8p"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "http-errors-1.7.2" = { @@ -1514,7 +1550,7 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "13c4825kzqlxdqfjrlrwh15ira0bjm9m3b8qcrfzaysiky1m3gb6dv6gcjgpnap9mbl0fajqiibzp1w5r8qnyn8glaj4wgzf6vh2i5r"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-signature-1.2.0" = { @@ -1532,7 +1568,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; "immediate-3.0.6" = { @@ -1568,7 +1604,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; "is-arrayish-0.3.2" = { @@ -1577,7 +1613,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha512 = "1cmy0k81vgz5z55rdyxfnx307053ksyp1lfgyj5jldkqqzmkx1z2k63fvzn7lgj8wdakmsa1mw408rm5xxfpk3avjqbnrb5yl56lm3r"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; "is-binary-path-2.1.0" = { @@ -1586,7 +1622,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "1gldm4swvg3612pg55yjza8dvpv4daf374dijjg8kcmndlq55933pdd7gw4gq4c2aa5fn9vnasz3h9spg3pd8p1rafkr91sxdhi3hb4"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; "is-buffer-2.0.4" = { @@ -1595,16 +1631,16 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"; - sha512 = "3c1f1cy2867lfdcfxpy91qxbjxizlwa2dhz3mgckg17xd4xcx284ylzvfk3v7l6mdynrk7xc2rg31avi6caj053p7bgaf4p8ni6pb9a"; + sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.2.0" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; + sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; }; }; "is-date-object-1.0.2" = { @@ -1613,7 +1649,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; "is-extglob-2.1.1" = { @@ -1640,7 +1676,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; "is-my-ip-valid-1.0.0" = { @@ -1649,7 +1685,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha512 = "1lnwwykigbkg3yqmr61cyiplxfdvpchcsi1fz67jwn55gvdrl597jpsd6jds205gjkn8c3zxbqmppmf3danpj0rrla7ffnicmwpys42"; + sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; "is-my-json-valid-2.20.0" = { @@ -1658,7 +1694,7 @@ let version = "2.20.0"; src = fetchurl { url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; - sha512 = "005dmrjrjkysq1ggcr34y7610cxy29gjkx91cv6lxl4gzk6hm9qmdqbbsx5qbcfd9b5vck824wgzk4pg5qfvq4mn44dpi0849jw2cax"; + sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; "is-number-7.0.0" = { @@ -1667,7 +1703,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; "is-property-1.0.2" = { @@ -1679,13 +1715,13 @@ let sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; }; - "is-regex-1.0.5" = { + "is-regex-1.1.0" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz"; + sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; }; }; "is-stream-1.1.0" = { @@ -1697,13 +1733,22 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; "is-symbol-1.0.3" = { name = "is-symbol"; packageName = "is-symbol"; version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; }; "is-typedarray-1.0.0" = { @@ -1748,7 +1793,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "0lwyvximqkf1q5w94x2747nj2v035is66vzalrbl3f2gdh9k1m3m29p8zw6r65ps5784x2lxwz8akmv085l4ai358rwbp84axz59lj5"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; "js-yaml-3.13.1" = { @@ -1757,7 +1802,16 @@ let version = "3.13.1"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; + "js-yaml-3.14.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; + sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; }; }; "jsbn-0.1.1" = { @@ -1784,7 +1838,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -1814,13 +1868,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "kuler-1.0.1" = { + "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; - sha512 = "20zvfs0bqxvpjlp6kx2fhafnldxfv36dqcac42qng3x9kh25vqy4w6910fs63p5d56yjghbrn36niix6wsyi9dbj3n9zmh6wx9dbn97"; + url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"; + sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; "lie-3.1.1" = { @@ -1832,13 +1886,13 @@ let sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; }; }; - "localforage-1.7.3" = { + "localforage-1.7.4" = { name = "localforage"; packageName = "localforage"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/localforage/-/localforage-1.7.3.tgz"; - sha512 = "20hynm98vq3srgz2h48290n0x06drf8avxm73rnqhkh036v5s5x2kk3phm2551p0zy3bh9hp5cjr6f0mwyhb4j0xi9fgqnwhz4safym"; + url = "https://registry.npmjs.org/localforage/-/localforage-1.7.4.tgz"; + sha512 = "3EmVZatmNVeCo/t6Te7P06h2alGwbq8wXlSkcSXMvDE2/edPmsVqTPlzGnZaqwZZDBs6v+kxWpqjVsqsNJT8jA=="; }; }; "locate-path-3.0.0" = { @@ -1847,7 +1901,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; "lodash-4.17.15" = { @@ -1856,7 +1910,7 @@ let version = "4.17.15"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; "lodash.toarray-4.4.0" = { @@ -1874,7 +1928,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; - sha512 = "2fmk82kxm1wkgm5kgxx84nsf7pvyspj47axslj3sfcyx69hx1vymrgbqj00jfnmrjc80wb87xs3kyfa37k55wzhgvk6v21vw8d0sabm"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; "logform-1.10.0" = { @@ -1883,16 +1937,16 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz"; - sha512 = "1d27lbbzad8mj23z63lca3z7y2mjwnzdcrj2zpvcdid78ds12jyc349g1yc0naxbqrl3cz2cw9lprhgwryxygzc634cgmsli266hvks"; + sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg=="; }; }; - "logform-2.1.2" = { + "logform-2.2.0" = { name = "logform"; packageName = "logform"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz"; - sha512 = "36z0bhkyb62pjrzaff6vpig94lzbaah80iq2hpy4pb49lkhxfawjlx9j8mw168wv33mb7i3lgl2xm2q82x0rc1qm95k0i24xbh62mps"; + url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; + sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; "loglevel-1.6.8" = { @@ -1901,7 +1955,7 @@ let version = "1.6.8"; src = fetchurl { url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; - sha512 = "044sm3k7yyjzkbvzw2fgqqxdbd7z7gwqsi4sz03kb9cagpnr4jn2gfsxkfrdn4m1gnxd7n0rjbrvxymzr6w3wcwma99s01x0zx3pibf"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "make-error-1.3.6" = { @@ -1910,7 +1964,7 @@ let version = "1.3.6"; src = fetchurl { url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; - sha512 = "2glh9fqac2bycfy6gmvv1r03pr484iglvv5ry3pjm6iz43h6qnkkw2l4sz9ydyadq6hip4wyjpj9jllbshxchh8k6lg5g5vsya23idk"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; "matrix-appservice-0.4.1" = { @@ -1919,7 +1973,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.4.1.tgz"; - sha512 = "0l9avxiihfhkrlwsibbl641ic15lc4gbfzs8zgrsssnlifzmbaz547yng8862rg65rp77gdyw427hci4jz7ssz1x3lxzg6ff3syn4cv"; + sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA=="; }; }; "matrix-appservice-bridge-1.12.2" = { @@ -1928,7 +1982,7 @@ let version = "1.12.2"; src = fetchurl { url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz"; - sha512 = "1avi6wrbnajmrf8il54w8zzb9ghvyqm8b09k2l2x009ixhrb1sj8k5yw5qnx03p640llnfsv2qch492vncwij40qxkh9q72qbagfq3h"; + sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ=="; }; }; "matrix-js-sdk-2.4.6" = { @@ -1937,7 +1991,7 @@ let version = "2.4.6"; src = fetchurl { url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-2.4.6.tgz"; - sha512 = "110nkrnw1667nkd00z3j6bgsl3pyvx2al4iffipy7phz88b3c7l6n2r1agd1qqxvyk7ay75ir4ycw9kr7zlxjcy9kd5hq00dkhkmmf9"; + sha512 = "ydU64WwAYFjaTJ7JTv/JM3HmSY7leHWm3x3j0J4KWVhDDxsLoQ/v8Tc6FwlVom9/B9VvGTk+AG3aY0zgNk8LQg=="; }; }; "media-typer-0.3.0" = { @@ -1973,7 +2027,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; "mime-db-1.44.0" = { @@ -1982,7 +2036,7 @@ let version = "1.44.0"; src = fetchurl { url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; - sha512 = "2k6dwvka8mhl2jrx9zhc926nvifn7jpi4fcwjr3gdqik53ifzn67h986p9wcdd4qpc3hjmqpywdwssm5kw18bdn3xg1ag7cp9y97lzw"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; "mime-types-2.1.27" = { @@ -1991,7 +2045,7 @@ let version = "2.1.27"; src = fetchurl { url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; - sha512 = "3pyj0i5wygq13w5i5i2ksjwrragi0p1dybqd5lvcd0gx21jxx1i1r567dbxklh9p50pwhaxwq9d4507hymr49ibz61xq8xc4sf6m214"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "minimatch-3.0.4" = { @@ -2000,7 +2054,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-1.2.5" = { @@ -2009,7 +2063,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "mkdirp-0.5.5" = { @@ -2018,25 +2072,25 @@ let version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "32zxwnp110xb9sm0w7xdr51v2zj4k0b07yq702phnac2l8c91mxw6va27y193m42nvnw5dhby2jzg3b24fzjzkdr8337slz8ja81a9l"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mocha-7.1.2" = { + "mocha-7.2.0" = { name = "mocha"; packageName = "mocha"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; - sha512 = "0j821z4q3x7gz52pwp0ccpwmrw4k67x07njcpbnzgiij7dnmbwvsnkbg7h7ylyhhlk9xhccbn9hr12vx9vqw6sdy728sa4c29ss9pm3"; + url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; + sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "moment-2.25.3" = { + "moment-2.27.0" = { name = "moment"; packageName = "moment"; - version = "2.25.3"; + version = "2.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; - sha512 = "1v4vcj4k5s10qp4b8r46xib1h9klyqv5y31da7w46i769dbgliqp7ff5yd6pxmfp37ghnlgkk33x10ashkg7aclszfgqrpiy782zriy"; + url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; + sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; }; }; "morgan-1.10.0" = { @@ -2045,7 +2099,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; - sha512 = "1fzbmlpmyqjjnff6sjxk5h2ffib2ldzziy9x5k6200az86l7z9gqag28s6brw9yg2q7w0yjp69ir0p5qc5kfq7djy21xciqa82s1dq1"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "ms-2.0.0" = { @@ -2063,7 +2117,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; "ms-2.1.2" = { @@ -2072,7 +2126,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; "nedb-1.8.0" = { @@ -2090,7 +2144,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; "node-emoji-1.10.0" = { @@ -2099,7 +2153,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz"; - sha512 = "2zkcpjx5cbyc76hfkbldxgkkcs4cns9n7fqfnc2cxh3fsw1dr7zgbhh5pczvg34yclih7ja68xpvvrg2dy8hiv5c20pxr0zhbrzgpb2"; + sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; "node-environment-flags-1.0.6" = { @@ -2108,7 +2162,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; - sha512 = "0gis4xp1wacn31j3p8vdd32ykzs2pskf8pgfjkm092zcx72v03dphpsayrls8bmmi91s6ic4718lgi28mm40hj96f9ywbvfxbcz4jz4"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; "nopt-3.0.6" = { @@ -2126,7 +2180,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "nunjucks-3.2.1" = { + name = "nunjucks"; + packageName = "nunjucks"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.1.tgz"; + sha512 = "LYlVuC1ZNSalQQkLNNPvcgPt2M9FTY9bs39mTCuFXtqh7jWbYzhDlmz2M6onPiXEhdZo+b9anRhc+uBGuJZ2bQ=="; }; }; "oauth-sign-0.9.0" = { @@ -2135,7 +2198,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "object-hash-1.3.1" = { @@ -2144,16 +2207,16 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz"; - sha512 = "06crm6ynp4rxakk4frrb4kjmi758r38fs5h0f6b7giyxhj0dghb6mdx7sbp0nhnk2w8cyb1bli07d9nbm086i34j8yx641qjpzawarr"; + sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; }; }; - "object-inspect-1.7.0" = { + "object-inspect-1.8.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb"; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; + sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; }; "object-keys-1.1.1" = { @@ -2162,7 +2225,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object.assign-4.1.0" = { @@ -2171,7 +2234,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; "object.getownpropertydescriptors-2.1.0" = { @@ -2180,7 +2243,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; }; }; "on-finished-2.3.0" = { @@ -2198,7 +2261,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "2n6994y8y4b146a5wpzzgw779yc227cqkmwsifc3fbn2kc9dzypjigqf72bpgsqrk7gs93l6fk4iqdk752jnsnpr89j58sbabw09455"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; }; "once-1.4.0" = { @@ -2210,13 +2273,13 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "one-time-0.0.4" = { + "one-time-1.0.0" = { name = "one-time"; packageName = "one-time"; - version = "0.0.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz"; - sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"; + sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; }; "p-cancelable-1.1.0" = { @@ -2225,7 +2288,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "2bmkd9ncr81p8w6jy9v676ajg9q27znbjk80r723ydvf8gxk000q13693dhbd22dcagrmhwyjxblmm8w4xnfn6ng5srpkkqwv2dggdk"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; "p-finally-1.0.0" = { @@ -2243,7 +2306,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "3mmng2h8sji2ah2j3f5gf0c26j2cmfwwqwck4kbpm8srxllwa8q1fd8jayhrk4f46g6zmw14lrzd4jc04079w1cqhjiy9wjanc3rzzz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-3.0.0" = { @@ -2252,7 +2315,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; "p-queue-2.4.2" = { @@ -2261,7 +2324,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/p-queue/-/p-queue-2.4.2.tgz"; - sha512 = "2gg2x51sw9m0zkdwnjpl5qldvapn19wkyf8zam8gzh2s77xnxcbxvvdhdhadavg4dcp6h1v68ni19kdbci1kd875pl1ih6943xz5kwz"; + sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng=="; }; }; "p-queue-6.4.0" = { @@ -2270,7 +2333,7 @@ let version = "6.4.0"; src = fetchurl { url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; - sha512 = "13h8pdq8v2smhrh39bf4ks1z8cdik8qcv2df1wj3bxgs3k090sxccxxg9q1qjj120lvs1ki6cj9rc9aapqdyb95zk8v5ych333mvdsz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-retry-4.2.0" = { @@ -2279,7 +2342,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz"; - sha512 = "2cdd5shqcldjwsdr9wiccvsx1f27mx7lblp872mlm16kwamgy83swzwq5w9hlr98qwbzswldxp4jq9q9l0d6am752vnx1qiygrzgwcc"; + sha512 = "jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA=="; }; }; "p-timeout-3.2.0" = { @@ -2288,7 +2351,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; - sha512 = "03cbpzps5mxhlp6hywp92mnnrj4b6ag82f8vdqyz59xrxsrpn58qbh8nzrpiix2asj2d333i81aq0pw9bhki4yw7yf05hr04x9k04mf"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; "p-try-2.2.0" = { @@ -2297,7 +2360,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; "packet-reader-1.0.0" = { @@ -2306,7 +2369,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; - sha512 = "1fkk6mw49b8mqs4rghv7bwpyvgj3qkcj4qz8zkrwcw0xcwg7q0cdd1w17i962ppxl3d6rss2a03ws5b7ihz20207g2r27mpy7ysw0hw"; + sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; }; }; "parseurl-1.3.3" = { @@ -2315,7 +2378,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "path-exists-3.0.0" = { @@ -2342,7 +2405,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-to-regexp-0.1.7" = { @@ -2372,22 +2435,22 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.1.0" = { + "pg-8.2.1" = { name = "pg"; packageName = "pg"; - version = "8.1.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.1.0.tgz"; - sha512 = "19rxgl1nvww0s9csajl3j2q04j6gw6wnlbnpq4z7scayycs7721rfga1qmgmlaxkvh3fap43qqrirsxh6wj2q31fgnkqq66si49g7r6"; + url = "https://registry.npmjs.org/pg/-/pg-8.2.1.tgz"; + sha512 = "DKzffhpkWRr9jx7vKxA+ur79KG+SKw+PdjMb1IRhMiKI9zqYUGczwFprqy+5Veh/DCcFs1Y6V8lRLN5I1DlleQ=="; }; }; - "pg-connection-string-2.2.2" = { + "pg-connection-string-2.2.3" = { name = "pg-connection-string"; packageName = "pg-connection-string"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.2.tgz"; - sha512 = "2masbrlwl4dan6y1qp1scs1y7j4qblmvdf006wslc1kj90zh2ipcqwqlmaqad1wr7dnlap7s6hybrcbn85r884w16ir0jdf67haa5zs"; + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.3.tgz"; + sha512 = "I/KCSQGmOrZx6sMHXkOs2MjddrYcqpza3Dtsy0AjIgBr/bZiPJRK9WhABXN1Uy1UDazRbi9gZEzO2sAhL5EqiQ=="; }; }; "pg-int8-1.0.1" = { @@ -2396,43 +2459,43 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; - sha512 = "2kr12hlmhrlca9f6gb14rvq93rn1z4ydmgv0ll7vak0nl5xxggq27y17346c3wj5afw3imsbvpaqcwjymb55hchj89czpdd5rnmlasq"; + sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.6.0" = { + "pg-minify-1.6.1" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.0.tgz"; - sha512 = "3v9hxw7f1r7k4lz9lkz7757anv76xclkafdk534yxfmd3qbnikn5f5f3rcfdvlkvlsg5vh8b69lyahbs9x27bpyg9bmzfj73yx5v375"; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz"; + sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g=="; }; }; - "pg-pool-3.2.0" = { + "pg-pool-3.2.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.0.tgz"; - sha512 = "20fvxybgsq315qj83xcgnii0aysl8pzr23flwzpndidax4zy48bp0f13zj32dls45jrw68m62w71c9w16vn9rnv2diz2z64s06g04pc"; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz"; + sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA=="; }; }; - "pg-promise-10.5.5" = { + "pg-promise-10.5.7" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.5.5"; + version = "10.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.5.tgz"; - sha512 = "3s3cyq162gdkgmdbc14skqwa4pyjx9cyia2148l9mlwfz2kqwfppmakzjp02q3z3bxjvlah51rlxdi5438r1fafqbsc1f3pngjs1k8i"; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.7.tgz"; + sha512 = "feCpn4J4MsNnR5Ve3fpbIlmbohwRirvZEI1Dcy72zwKvIKKRHPk7TJZFQHP4YQhaZ3sT3VGgg0o1/I+uhht/1g=="; }; }; - "pg-protocol-1.2.2" = { + "pg-protocol-1.2.4" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.2.tgz"; - sha512 = "2m49phqnmaig70q5a3ny43y8r5ks1sm3w1xrcfhwwchyrpdpgwnxmj3vhgw0i0rg49wwgwg1zj5c99rs2gi989riq6cgpd4fg24dj5g"; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.4.tgz"; + sha512 = "/8L/G+vW/VhWjTGXpGh8XVkXOFx1ZDY+Yuz//Ab8CfjInzFkreI+fDG3WjCeSra7fIZwAFxzbGptNbm8xSXenw=="; }; }; "pg-types-2.2.0" = { @@ -2441,7 +2504,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "0c38xh9gvx9z3lxphm8y090qzm5rj4n7a9a80ls7dsf772ygk52w4v1pbn8il48wrrhgsqdshhhrxqff2pn641178wcp5rcn6b00c59"; + sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; }; }; "pgpass-1.0.2" = { @@ -2459,7 +2522,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "1d2xjd4r28xk5ggmns7n33nvga0ywk30plvs17dr70qwq0jc17p8kmfsm50idvj6xdrj1fikz0yv63x1pychmz90bs6mkj7wvskyhxb"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; }; }; "postgres-array-2.0.0" = { @@ -2468,7 +2531,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; - sha512 = "2wdj5g97ilfpmjbpn3cmzhfysw77z8x3hqxvlmcknxm6488jpxvjshdqmd8m59ydhznadxcq1wlnfynh2877di58dgay0rrlm96p5jn"; + sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; }; }; "postgres-bytea-1.0.0" = { @@ -2486,7 +2549,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz"; - sha512 = "24bvdwh2jsv4xbp64ansgpqi55db9xbdv4clyh3aajxvx1lc4wm5mw8aqkf5f144szp2ram50ziy49bqqcr0c24c501f4agcklaxmm5"; + sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA=="; }; }; "postgres-interval-1.2.0" = { @@ -2495,7 +2558,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha512 = "1jy8mn5fadqlhqhznmyr55ghlzi2k9bxvvbyqbzb8rzzw101gbphlz18jyd533qqhkqf9wdyj3wc68vvdhvjbss6xs7xhzbrwl5g67m"; + sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; "process-nextick-args-2.0.1" = { @@ -2504,7 +2567,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "prom-client-11.5.3" = { @@ -2513,7 +2576,7 @@ let version = "11.5.3"; src = fetchurl { url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz"; - sha512 = "3hnz5ii2bvrrh14qkfcnxkjsxwfrcasfr34masbkwg1n4c41yvv1ir5k9ylmc806izl1xcjzyhidsb3qp832x7vva5lrdnvchbbcgcb"; + sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; }; "proxy-addr-2.0.6" = { @@ -2522,7 +2585,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; "psl-1.8.0" = { @@ -2531,7 +2594,7 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "0hn7s5bxnn3k2hiqh8fmm7bvq4vd6j0a5hwj09jk31r1ylv6q28g5hl3z70m3gycwfb40vdp04fqi59hdjih3jz0fhszg0s5b7lx1s4"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -2540,7 +2603,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; "qs-6.5.2" = { @@ -2549,7 +2612,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "qs-6.7.0" = { @@ -2558,16 +2621,16 @@ let version = "6.7.0"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "34x6fm4dnq8m0kps5ann831k8fvx7jzlrcw8vvri0ki2g2ywdrjr8j5y14bvj9c0fd01ndsyx43y6ji51bfhnxk2gr5fpsks52429sl"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "quick-lru-5.1.0" = { + "quick-lru-5.1.1" = { name = "quick-lru"; packageName = "quick-lru"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.0.tgz"; - sha512 = "00p370py6dg4v3n92n6ma2a1pn9sa2j1dq1hah5935s1fghs4x3l4aqx149i2d2ix18rgk2rmrcdkd9sqjmxj985sizmklisd1hlc2s"; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; }; }; "randomstring-1.1.5" = { @@ -2585,7 +2648,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raw-body-2.4.0" = { @@ -2594,7 +2657,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "3flyhj96ayiy8is22lwh9sp1yqq9ksym43x22yri2ikzladqqzxj6z657bc0xb5f2wl7qr2ja4byf57c9f7l2d3wqdglxih886zrv70"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; "readable-stream-2.3.7" = { @@ -2603,7 +2666,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; "readable-stream-3.6.0" = { @@ -2612,7 +2675,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; "readdirp-3.2.0" = { @@ -2621,7 +2684,16 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "0chzz12q3inpmwm6b4gi7g9n39jp24ah3mmjgss87hfsbx86vnxf49bx9wk2ng66037x2fh0cjf5rgx00c1m86lqlh7r6g9xm13ifbj"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; + "readdirp-3.4.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; "regenerator-runtime-0.11.1" = { @@ -2630,7 +2702,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; "request-2.88.2" = { @@ -2639,7 +2711,7 @@ let version = "2.88.2"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "request-promise-core-1.1.3" = { @@ -2648,7 +2720,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "00riv5nw32j70g67b1ll1h599bvdbnkgasnwl1m26pfdgdmgr6zaq500mprx5n77yrnhza27vs3c9icb4z5h6wnwmlha6f81bw3d2s0"; + sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; }; }; "request-promise-native-1.0.8" = { @@ -2657,7 +2729,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha512 = "0qx1n06bjj430fidkma2dr90dmrixiza4ymk561v1xxpd5yp7r36lwirgsdn0nvra7s4xs9gs1xhd6fxvlps6q1wh5xq7m4d8n71akm"; + sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ=="; }; }; "require-directory-2.1.1" = { @@ -2675,7 +2747,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; "resolve-1.17.0" = { @@ -2684,7 +2756,7 @@ let version = "1.17.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "3byf4g1wqfhz5vqx4rbssknblmf4hbjxijmlzvnr7z2l54yr1m4lk14bly6kk6mkdhncfzvvikzk449liiia1ilrfv5iwcmi0jvpkw9"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "retry-0.12.0" = { @@ -2702,7 +2774,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safe-buffer-5.2.1" = { @@ -2711,7 +2783,7 @@ let version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "1fq5yb2drm5x0pvp2ansqp7p3lq7q9p9z1pfhqfjgqs0ycq9zpnid55m5gx8ani9cwmjjcmn7nnn8j1f6iq3bxi56kdjwfa9six57df"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; "safer-buffer-2.1.2" = { @@ -2720,7 +2792,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "semver-4.3.2" = { @@ -2738,7 +2810,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; "semver-6.3.0" = { @@ -2747,7 +2819,7 @@ let version = "6.3.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "17wg4dv63jhss5hwqd135zz67r5c30b7a1xz33kfa7knxr0wfypyb8mj2xmc3l71qkxrz569n89xwp5d77m7adn0sr5wzfjlh2m6zvg"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; "send-0.17.1" = { @@ -2756,7 +2828,7 @@ let version = "0.17.1"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "016qgvxg1si6vn34p7piyc8mhvmav1zscm294wkcjf221y1l9zk5kwk5z6yn1ixspj12df25bpazb2h3fdclcf59xqc2h4w46r4mi86"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; "serve-static-1.14.1" = { @@ -2765,7 +2837,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "0551vv6s1vgk5krzdn9cwnybsv6g4cyqpkk1dlkyv1pd8n7m8r7pi12r16bw12dzwl6ghj4qwizjsxc8vl26lv9c61fkq9r059yzji4"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; "set-blocking-2.0.0" = { @@ -2783,7 +2855,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "01qxzb0a6jrcxa6qh776v04ihqrmcy3qfbp9drfsjhfcsmaqd21mppr3ndj970ixfh6bpm8ai45jyqyzjfjw26pcyd82y6pyrcl1xr6"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; "simple-swizzle-0.2.2" = { @@ -2801,7 +2873,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; "source-map-support-0.5.19" = { @@ -2810,7 +2882,7 @@ let version = "0.5.19"; src = fetchurl { url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; - sha512 = "0dsfcfq64jhz0vidzqf94hmh4vlzhfid0z2wnr5fdv2lkpv7dvcqbya7fpha9cwqlpkc8w2if8z9aixdkcglh87370rq8426gpyd2as"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; "spex-3.0.1" = { @@ -2819,7 +2891,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz"; - sha512 = "06c3i67lmyilbk851pqd0iy8vcd78y81p3mkbqzfcl69pmxx8n8qbjc3fpy8w3j70xsyi1hwl4761pfj93vb9ik3m7na1np99jrdf56"; + sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA=="; }; }; "split-1.0.1" = { @@ -2828,7 +2900,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; - sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; + sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; }; }; "sprintf-js-1.0.3" = { @@ -2846,7 +2918,7 @@ let version = "1.16.1"; src = fetchurl { url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "stack-trace-0.0.10" = { @@ -2882,7 +2954,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; "string-width-3.1.0" = { @@ -2891,7 +2963,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; "string.prototype.trimend-1.0.1" = { @@ -2900,25 +2972,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "3mb88v9lf22jx2d71lnxcxvixdfypq1iq7ys5f3zv0ayv2w3cij73wnfbq43yyd8gdyjn1k29pphx639shjk39pn6c9mdlk8qaz24rd"; - }; - }; - "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 = "15qfz59cpsj9svgvcs24q6h47jfy5zfhg7dy3b8ik3nvf97vhvijy8d51vrprx4z0vfyscg7i2xv9qs960h1pvnmzm1n95m6svk8840"; - }; - }; - "string.prototype.trimright-2.1.2" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha512 = "0b5kvxgqr55r745bccsjz35w9galqf42rm3lf5f4p2i21c4yq5l0fz0s03z4gq1d7yi52i3x6n8fa1n3fhlplc8d49vlaipqvp51m34"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; }; }; "string.prototype.trimstart-1.0.1" = { @@ -2927,7 +2981,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "13md9cfrlvkvbprd9svis80yjkv8glqai07nlqizqi2yhxzhw7mxza2jhb6k6mx1z67ndgf4dcf0hy5579fj8772hsi5b3g1bwnf5jz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string_decoder-1.1.1" = { @@ -2936,7 +2990,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "string_decoder-1.3.0" = { @@ -2945,7 +2999,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "1w0mz57mvmqykm0jwma6lr4i9pip8p8c1ldaax7sxnrl6j0jbrkwggs037r1psmac0w04i9mb2rc1gzj1n2f0xvy1fr332n9pqmfi46"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; "strip-ansi-4.0.0" = { @@ -2963,7 +3017,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-json-comments-2.0.1" = { @@ -2981,7 +3035,7 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; "supports-color-6.0.0" = { @@ -2990,7 +3044,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; - sha512 = "0p5l02lyminbqmcpm7257093sd8w5ca7q5xnnym2z71bwbhmisnyzn2jh5xma418sx29m8yinka6f7rphc7dl76lc88bm2w4z14lzx2"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; }; }; "tdigest-0.1.1" = { @@ -3008,7 +3062,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"; - sha512 = "1pazh99870gi3zslirzkribr37akp4zc5r73q78y89vpzjlcmpdrv7qx6wc3x2bwl20xcrq5hhs7cv3rzk8llm38nhqq9z0dhsldrds"; + sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; }; }; "through-2.3.8" = { @@ -3026,7 +3080,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; "toidentifier-1.0.0" = { @@ -3035,7 +3089,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "1bip1yxcfy4c0yl2kwmj9jyzfg1ixyj564wd1aaf46rabdiasx62yznb8bwn9cki886f353axgca42zma7q9rb4b50lhm1zz7y8g8y9"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; "tough-cookie-2.5.0" = { @@ -3044,7 +3098,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "triple-beam-1.3.0" = { @@ -3053,25 +3107,25 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"; - sha512 = "0ppdjj0px3nrh57jbdhh12f3hx0xc2zg2zn61h3sdws4glcixr2k793bkv7hakb273pw8jq4qaxn0l28z658biy4bkd59a7bsyx9cay"; + sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-8.10.1" = { + "ts-node-8.10.2" = { name = "ts-node"; packageName = "ts-node"; - version = "8.10.1"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; - sha512 = "2zyrdhgyii4klwqhy8r5pps3w0g6x6rpbqnifm75sn9ws67zlalw9fbsfwfwkbww3n729hil48a6nxkavb1x4jypa4pi40ypva77lvd"; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz"; + sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA=="; }; }; - "tslib-1.12.0" = { + "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.12.0.tgz"; - sha512 = "2l8pn1y3qicb8m0bf97jljyxbyjkarikq1z6vgh2rq527v2ah57p0rhsngsqx3ad4wzfchg8mlz2s4aylff6lvxw1gjp4zl8d145g76"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; + sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; "tslint-6.1.2" = { @@ -3080,7 +3134,7 @@ let version = "6.1.2"; src = fetchurl { url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; - sha512 = "24dh0i5b1rkxy5g1n9d0kf4rg6layq6z3l5jg2hyz11lk8zdpqx2b03s0kwnjhx4l4ywg3js616wbh00nh3cmpw3g84f4xps8nnn8sk"; + sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; }; }; "tsutils-2.29.0" = { @@ -3089,7 +3143,7 @@ let version = "2.29.0"; src = fetchurl { url = "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz"; - sha512 = "2cc8fsdfbgfcjj6y7dlr0kpmkhbw0j69cak4s21jb44w57dlwksrjx8wn1h4f1j2vx8dhj9mrqsbmmwd96mrsd59743ghq948f5b4l3"; + sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; "tunnel-agent-0.6.0" = { @@ -3116,7 +3170,7 @@ let version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; - sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; + sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; "type-is-1.6.18" = { @@ -3125,16 +3179,16 @@ let version = "1.6.18"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-3.9.2" = { + "typescript-3.9.5" = { name = "typescript"; packageName = "typescript"; - version = "3.9.2"; + version = "3.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.2.tgz"; - sha512 = "15y587awly8lrclsfw0fp2r1545332rrpf0g7cpi90jj67sryyj76hgbb1fna5bzwlg3940bmnyhd7qmll6nwi86n6vpf7zi6mjssdb"; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz"; + sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ=="; }; }; "underscore-1.4.4" = { @@ -3146,13 +3200,13 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "unhomoglyph-1.0.5" = { + "unhomoglyph-1.0.6" = { name = "unhomoglyph"; packageName = "unhomoglyph"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.5.tgz"; - sha512 = "1p3flai5dwdy5krysfl6wjvz6b3pmkkzxwwpcycfkq93k17ghw7frlc5rnm1ra43h1a6lg6q44yp9ga19zhjv2q0nw3m0m8n7d31l5c"; + url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.6.tgz"; + sha512 = "7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg=="; }; }; "unpipe-1.0.0" = { @@ -3170,7 +3224,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; }; "util-deprecate-1.0.2" = { @@ -3197,7 +3251,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; "uuid-7.0.3" = { @@ -3206,7 +3260,7 @@ let version = "7.0.3"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; - sha512 = "057la6a6bzkdwiz137vdyjaigybq0gyc3i8xvgc3gs4ja5blpjwbq9si4zmji0cgb81wzsj44q8l1nrmmjgkpazl1h3d1ap99xs9x0c"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; }; }; "vary-1.1.2" = { @@ -3233,7 +3287,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; "which-module-2.0.0" = { @@ -3251,16 +3305,16 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; - "winston-3.2.1" = { + "winston-3.3.2" = { name = "winston"; packageName = "winston"; - version = "3.2.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz"; - sha512 = "0xywwwrgdf54nfk0pzdpkgn27jwxkkfimf5s9jd04xihx03wwj71r0nafdmsdfg5brj9hsdalqj19vpl2442gx82210ax5xfj1ayknd"; + url = "https://registry.npmjs.org/winston/-/winston-3.3.2.tgz"; + sha512 = "vTOrUZlyQPS8VpCcQ1JT8BumDAUe4awCHZ9nmGgO7LqkV4atj0dKa5suA7Trf7QKtBszE2yUs9d8744Kz9j4jQ=="; }; }; "winston-compat-0.1.5" = { @@ -3269,7 +3323,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.5.tgz"; - sha512 = "3v94p4wq3xmi9d5f1gsk39fj6nc6nq8ivh7ka0whzvg7g71zplmgw9b5vkl7kqr66qm9xd5i4l0vhazmxzpgflqvhaq1lzsfiqczyqh"; + sha512 = "EPvPcHT604AV3Ji6d3+vX8ENKIml9VSxMRnPQ+cuK/FX6f3hvPP2hxyoeeCOCFvDrJEujalfcKWlWPvAnFyS9g=="; }; }; "winston-daily-rotate-file-3.10.0" = { @@ -3278,16 +3332,16 @@ let version = "3.10.0"; src = fetchurl { url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.10.0.tgz"; - sha512 = "22fkfci36zb0q6ygc6sg2x2l0886j2cayl6jbi703smf5h4iwa1g2j4dwwr30jr2zjgdyh95ig8yqfk0y8h51gnvi8zf2inn9yh5vr8"; + sha512 = "KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA=="; }; }; - "winston-transport-4.3.0" = { + "winston-transport-4.4.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz"; - sha512 = "3a2khvz9qld5b1ci486nyphyi96pg5n8xin9f0lrx0hllvvjqkj8y393rs2fiyz7afg7244vchiv3ka3klm4xgykxrzipi20nxhyv07"; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; + sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; }; }; "wrap-ansi-5.1.0" = { @@ -3296,7 +3350,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; "wrappy-1.0.2" = { @@ -3314,7 +3368,7 @@ let version = "5.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "0f6ay7yn6xslzh3h66d5krqnp48d9g3ikwk0ijiyyxfkwaqxxf3b0qdswy6ych79mj44315qd16snlnk6m6npc5l0habgy5lc7wb8cd"; + sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; "xtend-4.0.2" = { @@ -3323,7 +3377,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; "y18n-4.0.0" = { @@ -3332,7 +3386,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; "yargs-13.3.2" = { @@ -3341,7 +3395,7 @@ let version = "13.3.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "19rg5b2rhj2kg44as5vv9jxmpr39lw250885w6nlfwyhvwd5nxnnx7fc35v7h615i65cik7k3wi7ac20c91kcgfi5wy7blgk31xjz81"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; "yargs-parser-13.1.2" = { @@ -3350,7 +3404,7 @@ let version = "13.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "375nan6m28q81h8q9a8vmcxgiq7s81yn1ql7zdikac0c4j2kmxdjzmbq14fcp9jm4ilcfzkd9ym4x7c80s7r6g488wf13zz2wsyqmny"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; "yargs-unparser-1.6.0" = { @@ -3359,7 +3413,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; - sha512 = "17qgbcv8wypl4qr620558qd8ff03nqqiq84mp200mizrbsfj4nyil345iny8zx4ia5hfpjmk2mnhqp7y54qpsypd993ml57cj14mnsv"; + sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; }; }; "yn-3.1.1" = { @@ -3368,33 +3422,34 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; - sha512 = "3lq5f8c7lb89pyxhpb8nrbif4p5ganpyfzz267dgqxr6dn6yr0vgh017403bmy2v651m1wmd8k6x2fm5v37nmn1i8xngfxccn0347jk"; + sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; }; in { - "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.3.1" = nodeEnv.buildNodePackage { + "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.4.0" = nodeEnv.buildNodePackage { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.3.1"; + version = "1.4.0"; src = fetchgit { url = "https://github.com/matrix-org/matrix-appservice-slack.git"; - rev = "368c7af0c87053779d61b3c702fc533003960a99"; - sha256 = "add6a164e982cfa8837168e4a8c0b4a3fb248c9cf331ea8c6109767f6fc76cef"; + rev = "933c3a64fdff42ebc11e5385f588f981e201897d"; + sha256 = "cddcff326688ceddfd37eae44d3947ea84cf1d8fd2062e3c203ffbf35e2ea7f6"; }; dependencies = [ - sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/highlight-7.9.0" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" + sources."@dabh/diagnostics-2.0.2" sources."@slack/logger-1.1.1" - (sources."@slack/rtm-api-5.0.4" // { + (sources."@slack/rtm-api-5.0.5" // { dependencies = [ sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.6.0" - (sources."@slack/web-api-5.8.1" // { + sources."@slack/types-1.7.0" + (sources."@slack/web-api-5.10.0" // { dependencies = [ sources."p-queue-2.4.2" ]; @@ -3403,29 +3458,30 @@ in sources."@types/caseless-0.12.2" sources."@types/chai-4.2.11" sources."@types/connect-3.4.33" - sources."@types/events-3.0.0" sources."@types/express-4.17.6" sources."@types/express-serve-static-core-4.17.7" sources."@types/is-stream-1.1.0" - sources."@types/mime-2.0.1" + sources."@types/mime-2.0.2" sources."@types/mocha-7.0.2" sources."@types/nedb-1.8.9" sources."@types/node-13.9.3" sources."@types/node-emoji-1.8.1" + sources."@types/nunjucks-3.1.3" sources."@types/p-queue-2.3.2" - sources."@types/qs-6.9.2" + sources."@types/qs-6.9.3" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" - sources."@types/request-2.48.4" + sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/retry-0.12.0" - sources."@types/serve-static-1.13.3" + sources."@types/serve-static-1.13.4" sources."@types/tough-cookie-4.0.0" - sources."@types/uuid-7.0.3" - sources."@types/ws-5.1.2" + sources."@types/uuid-7.0.4" + sources."@types/ws-7.2.5" sources."@types/yargs-13.0.9" sources."@types/yargs-parser-13.1.0" sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" + sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.2" @@ -3438,6 +3494,7 @@ in sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-uniq-1.0.2" + sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-options-0.6.2" sources."assert-plus-1.0.0" @@ -3446,7 +3503,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."axios-0.19.2" sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" @@ -3480,17 +3537,16 @@ in ]; }) sources."check-error-1.0.2" - sources."chokidar-3.3.0" + sources."chokidar-3.4.0" sources."cliui-5.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" - sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-3.0.2" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" @@ -3507,15 +3563,13 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diagnostics-1.1.1" sources."diff-3.5.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-7.0.3" - sources."enabled-1.0.2" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" - sources."env-variable-0.0.6" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" @@ -3529,10 +3583,10 @@ in }) sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."file-stream-rotator-0.4.1" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -3543,6 +3597,7 @@ in sources."find-up-3.0.0" sources."finity-0.5.4" sources."flat-4.1.0" + sources."fn.name-1.1.0" sources."follow-redirects-1.5.10" sources."forever-agent-0.6.1" sources."form-data-2.5.1" @@ -3575,7 +3630,7 @@ in 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-callable-1.2.0" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -3584,7 +3639,7 @@ in 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-regex-1.1.0" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -3592,21 +3647,21 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonpointer-4.0.1" sources."jsprim-1.4.1" - sources."kuler-1.0.1" + sources."kuler-2.0.0" sources."lie-3.1.1" - sources."localforage-1.7.3" + sources."localforage-1.7.4" sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.toarray-4.4.0" sources."log-symbols-3.0.0" - (sources."logform-2.1.2" // { + (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -3629,15 +3684,18 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-7.1.2" // { + (sources."mocha-7.2.0" // { dependencies = [ + sources."chokidar-3.3.0" sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" + sources."js-yaml-3.13.1" sources."ms-2.1.1" + sources."readdirp-3.2.0" sources."supports-color-6.0.0" ]; }) - sources."moment-2.25.3" + sources."moment-2.27.0" (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" @@ -3655,16 +3713,17 @@ in }) sources."nopt-3.0.6" sources."normalize-path-3.0.0" + sources."nunjucks-3.2.1" sources."oauth-sign-0.9.0" sources."object-hash-1.3.1" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."one-time-0.0.4" + sources."one-time-1.0.0" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -3685,13 +3744,13 @@ in sources."path-to-regexp-0.1.7" sources."pathval-1.1.0" sources."performance-now-2.1.0" - sources."pg-8.1.0" - sources."pg-connection-string-2.2.2" + sources."pg-8.2.1" + sources."pg-connection-string-2.2.3" sources."pg-int8-1.0.1" - sources."pg-minify-1.6.0" - sources."pg-pool-3.2.0" - sources."pg-promise-10.5.5" - sources."pg-protocol-1.2.2" + sources."pg-minify-1.6.1" + sources."pg-pool-3.2.1" + sources."pg-promise-10.5.7" + sources."pg-protocol-1.2.4" sources."pg-types-2.2.0" sources."pgpass-1.0.2" sources."picomatch-2.2.2" @@ -3705,12 +3764,12 @@ in sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."quick-lru-5.1.0" + sources."quick-lru-5.1.1" 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."readdirp-3.4.0" sources."regenerator-runtime-0.11.1" (sources."request-2.88.2" // { dependencies = [ @@ -3753,8 +3812,6 @@ in sources."stealthy-require-1.1.1" sources."string-width-3.1.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.3.0" // { dependencies = [ @@ -3771,14 +3828,15 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - (sources."ts-node-8.10.1" // { + (sources."ts-node-8.10.2" // { dependencies = [ sources."diff-4.0.2" ]; }) - sources."tslib-1.12.0" + sources."tslib-1.13.0" (sources."tslint-6.1.2" // { dependencies = [ + sources."commander-2.20.3" sources."diff-4.0.2" sources."semver-5.7.1" ]; @@ -3788,9 +3846,9 @@ in sources."tweetnacl-0.14.5" sources."type-detect-4.0.8" sources."type-is-1.6.18" - sources."typescript-3.9.2" + sources."typescript-3.9.5" sources."underscore-1.4.4" - sources."unhomoglyph-1.0.5" + sources."unhomoglyph-1.0.6" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" @@ -3807,13 +3865,15 @@ in sources."strip-ansi-4.0.0" ]; }) - (sources."winston-3.2.1" // { + (sources."winston-3.3.2" // { dependencies = [ - sources."async-2.6.3" + sources."async-3.2.0" + sources."is-stream-2.0.0" ]; }) (sources."winston-compat-0.1.5" // { dependencies = [ + sources."fecha-2.3.3" sources."logform-1.10.0" sources."ms-2.1.2" ]; @@ -3823,7 +3883,7 @@ in sources."semver-6.3.0" ]; }) - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" 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 1807b9085b..52568eefb7 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.3.1" } + {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.4.0" } ] diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index bb129063e2..8b4d9ea553 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "0cjgyn311zvpdsagyndkw89bvdrcli5kqznss8dsh05wrllxp3x4"; + sha256 = "1qagp6jnc4n368pg4h3jr9bzpwpbnva1xyl1b1k2a7q4b5fm5yww"; }; buildInputs = [ olm ]; - vendorSha256 = "0980p9x62iav6j1w36w2i8pqyv6amnx4ngrgylq2vkjlcgihl2i8"; + vendorSha256 = "0ixfawfavv5r1d01d4gmj87vf5vv6p3f7kv4rkhfv48ys0j0437a"; overrideModAttrs = _: { postBuild = '' diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix index e559745106..c07214ce3a 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.23.1"; + version = "0.24.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0hrnlpaq32f8slgmyl629v5b46ar2mq97q0cgrxy6ahfabfw2vih"; + sha256 = "1lk9fl2h1rsqirqnz4qmapv9hl2axz7j32p9a011h0n90frabski"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix new file mode 100644 index 0000000000..c207a33848 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, fetchFromGitHub +, srt +, ffmpeg_3_4 +, bc +, pkgconfig +, perl +, openssl +, zlib +, ffmpeg +, libvpx +, libopus +, srtp +, jemalloc +, ... }: + +let + ffmpeg = ffmpeg_3_4.overrideAttrs (super: { + pname = "${super.pname}-ovenmediaengine"; + src = fetchFromGitHub { + owner = "Airensoft"; + repo = "FFmpeg"; + rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # ome/3.4 + sha256 = "0fla3940q3z0c0ik2xzkbvdfvrdg06ban7wi6y94y8mcipszpp11"; + }; + }); +in +stdenv.mkDerivation rec { + pname = "oven-media-engine"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "AirenSoft"; + repo = "OvenMediaEngine"; + rev = "v${version}"; + sha256 = "15lrlynsldlpa21ryzccf5skgiih6y5fc9qg0bfqh557wnnmml6w"; + }; + + sourceRoot = "source/src"; + makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; + enableParallelBuilding = true; + + nativeBuildInputs = [ bc pkgconfig perl ]; + buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc ]; + + preBuild = '' + patchShebangs core/colorg++ + patchShebangs core/colorgcc + patchShebangs projects/main/update_git_info.sh + + sed -i -e '/^CC =/d' -e '/^CXX =/d' -e '/^AR =/d' projects/third_party/pugixml-1.9/scripts/pugixml.make + ''; + + installPhase = '' + install -Dm0755 bin/RELEASE/OvenMediaEngine $out/bin/OvenMediaEngine + install -Dm0644 ../misc/conf_examples/Origin.xml $out/share/examples/origin_conf/Server.xml + install -Dm0644 ../misc/conf_examples/Logger.xml $out/share/examples/origin_conf/Logger.xml + install -Dm0644 ../misc/conf_examples/Edge.xml $out/share/examples/edge_conf/Server.xml + install -Dm0644 ../misc/conf_examples/Logger.xml $out/share/examples/edge_conf/Logger.xml + ''; + + meta = with stdenv.lib; { + description = "Open-source streaming video service with sub-second latency"; + homepage = "https://ovenmediaengine.com"; + license = licenses.gpl2; + maintainers = with maintainers; [ lukegb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index cb1bff7ba8..293592fc8d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.0.3"; + version = "7.0.4"; excludedPackages = [ "release_publisher" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1s5hq7icfnaiq7msk7vdz30wdhw13s115vg8ws7gqv5sl1hi0vlg"; + sha256 = "16vdbxq9vhv71jjk689xx0nn3qr4s5ybzbp41dm09pppvxzibpg7"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1wk991nvm6a18mah37dh0sdi72gdshpzdi367v7fpz2b9vd65b4g"; + sha256 = "1362rwmpv1y32w5m1fd9vqffs32244f0h7d5jm5cigiq2l7ix7n2"; }; vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix index d701a7ca00..5e51750a79 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc35"; + version = "3.0.0-rc36"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd"; + sha256 = "1xdpjzcr143f7430wl9l6zzq9yhbkirr3fbfw60f10zpglrcx8a4"; }; - vendorSha256 = "1km3ldqz35lpkglp9n332vxr38xxfqyij1fi2qq0agyyydbvakj5"; + vendorSha256 = "02fnvy897cygmipc5snza556qihjwrp1lf9qi9f5dzarphd6d0pw"; subPackages = [ "cmd/mtail" ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix index 22828e5744..435e613a98 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.63"; + version = "2.0.64"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "0p1gzy6in15d6596b260qa0a144x8n8567cxdq0x4arw18004s3a"; + sha256 = "00gvvy7s2h1kxdxss7n63ir87fn66kq48lp94ackdyj49526maz4"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix index 9a4e5d706e..dacd4e2c5b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "check-wmiplus"; - version = "1.64"; + version = "1.65"; # We fetch from github.com instead of the proper upstream as nix-build errors # out with 406 when trying to fetch the sources @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "speartail"; repo = "checkwmiplus"; rev = "v${version}"; - sha256 = "1m36rd2wnc5dk4mm9q4ch67w19144dl112p9s6lhc1sh6h25ln6r"; + sha256 = "1as0iyhy4flpm37mb7lvah7rnd6ax88appjm1icwhy7iq03wi8pl"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 0a91677011..d4622a21f6 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.19.1"; + version = "2.19.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "1isv66dnn61mm76r577qqafsn6w5msb0a6i9dykg4z7crcpsnq70"; + sha256 = "119csghjmw4lphpnnhaxwimmir5bn455g92rb40j3y9pyv0hlfsh"; }; webui = mkYarnPackage { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix new file mode 100644 index 0000000000..fdd45fdd14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "modemmanager-exporter"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mdlayher"; + repo = "modemmanager_exporter"; + rev = "v${version}"; + sha256 = "0d8z7qzk5j5jj0ixkwpi8dw9kki78mxrajdlzzcj2rcgbnwair91"; + }; + + vendorSha256 = "0f6v97cvzdz7wygswpm87wf8r169x5rw28908vqhmqk644hli4zy"; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) modemmanager; }; + + meta = with stdenv.lib; { + homepage = "https://github.com/mdlayher/modemmanager_exporter"; + description = "Prometheus exporter for ModemManager and its devices."; + license = licenses.mit; + maintainers = with maintainers; [ mdlayher ]; + }; +} 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 5f9f3b80f8..c71a07c9e8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,7 +4,7 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.20.1"; + version = "5.21.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 = "0wrcchz878sq7zhkb8p0s93k92xppihv5yyvkl363xs6519xzm7m"; + sha256 = "0zkwhr2z8yy8k2lal026i565hxxh51jrgplq83bbisc24xpcfg9s"; }; inherit subPackages postInstall; - vendorSha256 = "03lkra5vf07zicd2aipvmkrda56ys5swwj6lq5hnp324ndajfcya"; + vendorSha256 = "06yfaj9k5n3jw8a142sscaqrvdw2lq51v884lp65wjdwy5c3jbba"; buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 388d7fe379..7b284ac122 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.4"; + version = "1.14.5"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "0kbf1r9b9xylq0akmklzy94pcljayhdjm539fwazp5c1364qmbjm"; + sha256 = "1rnrg1q0dylr62cfkzspp47w818cja3hs6bbarcksmp0s23rq6lz"; }; - vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; + vendorSha256 = "1mjlakf88fa75qldkz62aja0wn0m6xqfr45vjy0lwpi0adc0fz70"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 2270851842..9970fab8ed 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.12.2"; + version = "0.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; + sha256 = "03a964myry84ig8akim6vs6izl15hdpf5ggg4z5179ydbmvnq3lq"; }; - vendorSha256 = "126rghnyjpykvjg9sr4kwpskc13qqafxgfn9ffykwc4jjz8vc07q"; + vendorSha256 = "1jpw7k76li4dlfhhzy175198921zrdm09nnhqpmh7p80z252n936"; subPackages = "cmd/thanos"; diff --git a/third_party/nixpkgs/pkgs/servers/mpd/clientlib.nix b/third_party/nixpkgs/pkgs/servers/mpd/clientlib.nix index cb02a76847..3016b7dba8 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/clientlib.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/clientlib.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { - version = "2.18"; + version = "2.19"; pname = "libmpdclient"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "libmpdclient"; rev = "v${version}"; - sha256 = "0p2dw3jwyl34azzvr9bm7q6ni8v4ix9qr5lig62xskvrrbjfc4a6"; + sha256 = "01agvjscdxagw6jcfx0wg81c4b6p8rh0hp3slycmjs2b835kvmq2"; }; nativeBuildInputs = [ meson ninja ] diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index b801020a66..d013f43189 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -4,7 +4,7 @@ # Archive support , bzip2, zziplib # Codecs -, audiofile, faad2, ffmpeg_3, flac, fluidsynth, game-music-emu +, audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu , libmad, libmikmod, mpg123, libopus, libvorbis, lame # Filters , libsamplerate @@ -46,7 +46,7 @@ let # Decoder plugins audiofile = [ audiofile ]; faad = [ faad2 ]; - ffmpeg = [ ffmpeg_3 ]; + ffmpeg = [ ffmpeg ]; flac = [ flac ]; fluidsynth = [ fluidsynth ]; gme = [ game-music-emu ]; @@ -110,29 +110,15 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.23"; + version = "0.21.25"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0jnhjhm1ilpcwb4f58b8pgyzjq3dlr0j2xyk0zck0afwkdxyj9cb"; + sha256 = "1yjp8pwr2zn0mp39ls1w0pl37zrjn5m9ycgjmcsw2wpa4709r356"; }; - # Won't be needed when 0.21.24 will be out - patches = [ - # Tests fail otherwise, see https://github.com/MusicPlayerDaemon/MPD/issues/844 - (fetchpatch { - url = "https://github.com/MusicPlayerDaemon/MPD/commit/7aea2853612743e111ae5e947c8d467049e291a8.patch"; - sha256 = "1bmxlsaiz3wlg1yyc4rkwsmgvc0pirv0s1vdxxsn91yssmh16c2g"; - excludes = [ - # The patch fails otherwise because it tries to update the NEWS - # file which doesn't have the title "ver 0.21.24" yet. - "NEWS" - ]; - }) - ]; - buildInputs = [ glib boost diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 4c43f141d1..51b73b0e6b 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -33,8 +33,8 @@ in { }; nextcloud18 = generic { - version = "18.0.6"; - sha256 = "1chmkg31jc1nr53y8r886mmd2jzb78094mrx7ggcfpjfkkv8b89s"; + version = "18.0.7"; + sha256 = "0pka87ccrds17n6n5w5a80mc1s5yrf8d4mf6wsfaypwjbm3wfb2b"; }; nextcloud19 = generic { diff --git a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix b/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix index 769a8605f0..dffe48db58 100644 --- a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix @@ -1,8 +1,8 @@ -{ buildGoPackage, fetchFromGitHub, stdenv }: +{ buildGoPackage, fetchFromGitHub, stdenv, nixosTests }: buildGoPackage rec { pname = "nginx-sso"; - version = "0.24.1"; + version = "0.25.0"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "1wij0a5ban2l6ahfra4n4dji7i5ndkqk1mgrblwm2ski7bl8yszx"; + sha256 = "0z5h92rpr1rcfk11ggsb9w4ipg93fcb9byll7vl4c0mfcqkpm2dr"; }; postInstall = '' @@ -19,6 +19,10 @@ buildGoPackage rec { cp -R $src/frontend $out/share ''; + passthru.tests = { + inherit (nixosTests) nginx-sso; + }; + meta = with stdenv.lib; { description = "SSO authentication provider for the auth_request nginx module"; homepage = "https://github.com/Luzifer/nginx-sso"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix index 8ffdbcd63c..2c058edbcc 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix @@ -102,6 +102,13 @@ in stdenv.mkDerivation rec { rm -f "$out/bin/install_compass" || true ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + "$out/bin/mongo" --version + runHook postInstallCheck + ''; + prefixKey = "--prefix="; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index 8089fa46f9..ef7740f6ca 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "6.0.3"; + version = "6.0.5"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "0fmvbhbgkrw75kqzgpklasylzff4zd0sxy2cvsrgg4pyh776v95w"; + sha256 = "15pmk3w3cjhnv40jibdavfkn446hsjn9dnpwk2w5396j2jhqdks2"; }; # Cross-compiling fixes diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index 68f86f4c19..c470dcf1fd 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,17 +2,19 @@ buildGoPackage rec { pname = "VictoriaMetrics"; - version = "1.37.0"; + version = "1.37.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0p8fk73ydnhrdxgxr4b4xl84729rkkki38227xvxspx84j2fbhci"; + sha256 = "02jr0qz130jz7ncfch1jry0prd00669j53mlmpb6ky0xiz5y2zq1"; }; goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/lib/buildinfo.Version=${version}" ]; + meta = with lib; { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; diff --git a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix b/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix index 225c221b31..ee6dafebf7 100644 --- a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "oauth2_proxy"; - version = "5.1.0"; - - goPackagePath = "github.com/pusher/${pname}"; +buildGoModule rec { + pname = "oauth2-proxy"; + version = "5.1.1"; src = fetchFromGitHub { repo = pname; @@ -13,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; }; - goDeps = ./deps.nix; + vendorSha256 = "01lf7xbhgn5l42ahym12vr1w00zx1qzy6sgwgcbvvxp48k0b271d"; doCheck = true; @@ -22,7 +20,7 @@ buildGoPackage rec { meta = with lib; { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; - homepage = "https://github.com/pusher/oauth2_proxy/"; + homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; maintainers = with maintainers; [ yorickvp knl ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix b/third_party/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix deleted file mode 100644 index 611a07c2fd..0000000000 --- a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/deps.nix +++ /dev/null @@ -1,615 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.38.0"; - sha256 = "0n6n13b7lri2fmc4bn4ifszyawj31dpbzvyv0xafsf81440z8cyh"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/alicebob/gopher-json"; - fetch = { - type = "git"; - url = "https://github.com/alicebob/gopher-json"; - rev = "5a6b3ba71ee6"; - sha256 = "0hx6n722zq51p852lv56k39yjy09lw6mnr2c3x0p23rfyyrakj2p"; - }; - } - { - goPackagePath = "github.com/alicebob/miniredis"; - fetch = { - type = "git"; - url = "https://github.com/alicebob/miniredis"; - rev = "v2.11.2"; - sha256 = "1fc6w9n1jznwj8ks2svxmjrv87pk3spjf5z3kcxpgpynp13pd55n"; - }; - } - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "v0.5.0"; - sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; - }; - } - { - goPackagePath = "github.com/bmizerany/assert"; - fetch = { - type = "git"; - url = "https://github.com/bmizerany/assert"; - rev = "b7ed37b82869"; - sha256 = "18hy1wyl9zdi7sgxafrn3m7fadh6in0rhhb8l0cvkxqzdl0jcw2s"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - 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/go-oidc"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-oidc"; - rev = "v2.2.1"; - sha256 = "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.0"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "v3.2.0"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "5f8ba28d4473"; - sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/go-redis/redis"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "v6.15.7"; - sha256 = "0fc0sfispyzn652ny05wn6bz18a60n6ryk23ki8j97xx3l24nq2g"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.2.0"; - sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/gomodule/redigo"; - fetch = { - type = "git"; - url = "https://github.com/gomodule/redigo"; - rev = "v2.0.0"; - sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "4030bb1f1f0c"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "3ea8567a2e57"; - sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "af01ea7f8024"; - sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.2.0"; - sha256 = "1ywbfzz1h3a3qd8rpkiqwi1dm4w8ls9ijb4x1b7567grns9f0vnp"; - }; - } - { - 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/mbland/hmacauth"; - fetch = { - type = "git"; - url = "https://github.com/mbland/hmacauth"; - rev = "44256dfd4bfa"; - sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1"; - }; - } - { - goPackagePath = "github.com/mreiferson/go-options"; - fetch = { - type = "git"; - url = "https://github.com/mreiferson/go-options"; - rev = "v1.0.0"; - sha256 = "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.12.0"; - sha256 = "0ly246i0ax53l6dn9f1zlhkd9gs03hvbk7aazxay2dd5fxzh9n65"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.9.0"; - sha256 = "0l69r6nbnz6b3j9zrqn8aql88jjv1pqykzkvqdbhfprss9b2dy46"; - }; - } - { - 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/pquerna/cachecontrol"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/cachecontrol"; - rev = "1555304b9b35"; - sha256 = "0nr3p9pms6jmr2s44vy2s22q1d3v6xns2kzsvkq2gg1rkx6c1hc9"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/yhat/wsutil"; - fetch = { - type = "git"; - url = "https://github.com/yhat/wsutil"; - rev = "1d66fa95c997"; - sha256 = "1agh4ss6y1laps8pg4mdl844ivmw2wrb7rnpfyag4gai4693i7bv"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "ab39c6098bdb"; - sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.21.0"; - sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "2aa609cf4a9d"; - sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "509febef88a4"; - sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "959b441ac422"; - sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0de0cce0169b"; - sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - 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 = "bd437916bb0e"; - sha256 = "1i8x26frmlin55k69k936zd1rp5sqnq14y5ms4rkxbfzhasdm2rx"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "85acf8d2951c"; - sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2c0ae7006135"; - sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.19.0"; - sha256 = "0rbwijzl91xmbr9kqhiwx4fydm7r6ci6rxsi9jsy8zap9zy120f6"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.5.0"; - sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "24fa4b261c55"; - sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.27.0"; - sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "v2.0.0"; - sha256 = "1m2sxypk7p805jvc68padvylyx5v7cwkh5klnnxxr0340kgspf08"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v2"; - rev = "v2.4.1"; - sha256 = "1y0angxwryishwd1z0q7fp2xwjjhpw70kqh4ml4ly40akfhf1f5a"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.4"; - sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "ea95bdfd59fc"; - sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix index d998784b3f..db44dbe220 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -18,22 +18,6 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; - patches = [ - # openafs 5.6 patches, included in the next release - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/34f1689b7288688550119638ee9959e453fde414.patch"; - sha256 = "0rxjqzr8c5ajlk8wrhgjc1qp1934qiriqdi0qxsnk4gj5ibbk4d5"; - }) - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/355ea43f0d1b7feae1b3af58bc33af12838db7c3.patch"; - sha256 = "1f9xn8ql6vnxglpj3dvi30sj8vkncazjab2rc13hbw48nvsvcnhm"; - }) - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/17d38e31e6f2e237a7fb4dfb46841060296310b6.patch"; - sha256 = "14dydxfm0f5fvnj0kmvgm3bgh0ajhh04i3l7l0hr9cpmwl7vrlcg"; - }) - ]; - hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.8/srcs.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/srcs.nix index 4a5591ef46..4df5bdfc38 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/srcs.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "08w5n803xm75j7daa3mr2ncfmcg0wpm7yasj6zyddqlb4f7xdppf"; + url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; + sha256 = "0i99klrw00v4bwd942n90xqfn16z6337m89xfm9dgv7ih0qrsklb"; }; srcs = [ src (fetchurl { - url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "08mg3n0q2igfas1khj18r9apyrkpbp1jick0ix5nfaal90jbifis"; + url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; + sha256 = "1s91kmxfimhdqrz7l6jgjz72j9pyalghrvg4h384fsz0ks6s4kz3"; })]; } diff --git a/third_party/nixpkgs/pkgs/servers/pounce/default.nix b/third_party/nixpkgs/pkgs/servers/pounce/default.nix index 8609648378..4ab3a4ee16 100644 --- a/third_party/nixpkgs/pkgs/servers/pounce/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pounce/default.nix @@ -1,23 +1,22 @@ -{ stdenv, libressl, fetchzip, fetchpatch }: +{ stdenv, libressl, fetchzip, fetchpatch, pkg-config }: stdenv.mkDerivation rec { pname = "pounce"; - version = "1.1"; + version = "1.3p1"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "07iyh6ikrlf7y57k462jcr00db6aijk9b2s7n7l7i49hk7kmm6wq"; + sha256 = "1ab4pz7gyvlms00hcarcmsljkn0whwqxfck8b343l4riai2rj9xv"; }; buildInputs = [ libressl ]; - configurePhase = "ln -s Linux.mk config.mk"; + nativeBuildInputs = [ pkg-config ]; buildFlags = [ "all" ]; makeFlags = [ "PREFIX=$(out)" - "LIBRESSL_BIN_PREFIX=${libressl}/bin" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix index e15efd4b47..513249cb7a 100644 --- a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix @@ -61,6 +61,11 @@ stdenv.mkDerivation rec { ++ lib.optional zeroconfSupport avahi ); + prePatch = '' + substituteInPlace bootstrap.sh \ + --replace pkg-config $PKG_CONFIG + ''; + autoreconfPhase = '' # Performs an autoreconf patchShebangs bootstrap.sh diff --git a/third_party/nixpkgs/pkgs/servers/radarr/default.nix b/third_party/nixpkgs/pkgs/servers/radarr/default.nix index b0871a99f6..a76c45c195 100644 --- a/third_party/nixpkgs/pkgs/servers/radarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "radarr"; - version = "0.2.0.1480"; + version = "0.2.0.1504"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "066kr9fk2ipid11aq057rqzy3b2kgd5qf9msq1fsmxixqg82m64h"; + sha256 = "1h7pqn39vxd0vr1fwrnvfpxv5vhh4zcr0s8h0zvgplay2z6b6bvb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/radicale/default.nix b/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix similarity index 88% rename from third_party/nixpkgs/pkgs/servers/radicale/default.nix rename to third_party/nixpkgs/pkgs/servers/radicale/2.x.nix index fc98795bbc..8d36717ec6 100644 --- a/third_party/nixpkgs/pkgs/servers/radicale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "Radicale"; - version = "2.1.11"; + version = "2.1.12"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = version; - sha256 = "1k32iy55lnyyp1r75clarhwdqvw6w8mxb5v0l5aysga07fg2mix4"; + sha256 = "14f9ql0fiwapaa4xaslwgk1ah9fzxxan2p1p2rxb4a5iqph1z0cl"; }; # We only want functional tests @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = "https://www.radicale.org/"; + homepage = "https://www.radicale.org/2.x.nix"; description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV diff --git a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix new file mode 100644 index 0000000000..7b42bd3be3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix @@ -0,0 +1,38 @@ +{ lib, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "radicale"; + version = "3.0.3"; + + # No tests in PyPI tarball + src = fetchFromGitHub { + owner = "Kozea"; + repo = "Radicale"; + rev = version; + sha256 = "170mqxlnfzx15img4wb71axq9cnxwllk5cabsv8i008q7wyjqp0n"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + defusedxml + passlib + vobject + python-dateutil + setuptools + ]; + + checkInputs = with python3.pkgs; [ + pytestrunner + pytest + pytestcov + pytest-flake8 + pytest-isort + waitress + ]; + + meta = with lib; { + homepage = "https://www.radicale.org/3.0.html"; + description = "CalDAV and CardDAV server"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/rippled/default.nix b/third_party/nixpkgs/pkgs/servers/rippled/default.nix index 69a54a1202..426b29c4b0 100644 --- a/third_party/nixpkgs/pkgs/servers/rippled/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rippled/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkgconfig -, openssl, boost, zlib }: +, openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8 }: let sqlite3 = fetchurl rec { @@ -8,21 +8,43 @@ let passthru.url = url; }; + boostSharedStatic = boost.override { + enableShared = true; + enabledStatic = true; + }; + + beast = fetchgit { + url = "https://github.com/boostorg/beast.git"; + rev = "2f9a8440c2432d8a196571d6300404cb76314125"; + sha256 = "1n9ms5cn67b0p0mhldz5psgylds22sm5x22q7knrsf20856vlk5a"; + fetchSubmodules = false; + leaveDotGit = true; + }; + docca = fetchgit { url = "https://github.com/vinniefalco/docca.git"; rev = "335dbf9c3613e997ed56d540cc8c5ff2e28cab2d"; - sha256 = "1yisdg7q2p9q9gz0c446796p3ggx9s4d6g8w4j1pjff55655805h"; - leaveDotGit = true; + sha256 = "09cb90k0ygmnlpidybv6nzf6is51i80lnwlvad6ijc3gf1z6i1yh"; fetchSubmodules = false; + leaveDotGit = true; + }; + + nudb = fetchgit rec { + url = "https://github.com/CPPAlliance/NuDB.git"; + rev = "2.0.1"; + sha256 = "10hlp2k7pc0c705f8sk0qw6mjfky0k08cjhh262bbjvp9fbdc7r4"; + leaveDotGit = true; + fetchSubmodules = true; + postFetch = "cd $out && git tag ${rev}"; }; rocksdb = fetchgit rec { url = "https://github.com/facebook/rocksdb.git"; - rev = "v5.17.2"; - sha256 = "0d9ssggjls1hc4zhng65yg8slqlcw0lr23qr6f39shg42lzr227p"; - leaveDotGit = true; + rev = "v6.5.3"; + sha256 = "11kbwqph1i3w6rbhr0kl2aq4jidhai24gw420y9qi9ab7zl0zcqg"; + deepClone = true; fetchSubmodules = false; - postFetch = "cd $out && git tag ${rev}"; + leaveDotGit = true; }; lz4 = fetchgit rec { @@ -60,19 +82,10 @@ let postFetch = "cd $out && git tag ${rev}"; }; - nudb = fetchgit rec { - url = "https://github.com/CPPAlliance/NuDB.git"; - rev = "2.0.1"; - sha256 = "0h7hmwavrxzj1v547h3z0031ckwphjayfpv1mgcr6q86wm9p5468"; - leaveDotGit = true; - fetchSubmodules = true; # submodules are needed, rocksdb is dependency - postFetch = "cd $out && git tag ${rev}"; - }; - - protobuf = fetchgit rec { - url = "https://github.com/protocolbuffers/protobuf.git"; - rev = "v3.6.1"; - sha256 = "0zl09q25ggfw95lakcs3mkq5pvsj17mx29b4nqr09g0mnbw9709c"; + cares = fetchgit rec { + url = "https://github.com/c-ares/c-ares.git"; + rev = "cares-1_15_0"; + sha256 = "1fkzsyhfk5p5hr4dx4r36pg9xzs0md6cyj1q2dni3cjgqj3s518v"; leaveDotGit = true; fetchSubmodules = false; postFetch = "cd $out && git tag ${rev}"; @@ -80,64 +93,58 @@ let google-test = fetchgit { url = "https://github.com/google/googletest.git"; - rev = "c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2"; - sha256 = "0pj5b6jnrj5lrccz2disr8hklbnzd8hwmrwbfqmvhiwb9q9p0k2k"; - fetchSubmodules = false; + rev = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"; + sha256 = "1ch7hq16z20ddhpc08slp9bny29j88x9vr6bi9r4yf5m77xbplja"; leaveDotGit = true; + fetchSubmodules = false; }; google-benchmark = fetchgit { url = "https://github.com/google/benchmark.git"; rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8"; - sha256 = "0qg70j47zqnrbszlgrzmxpr4g88kq0gyq6v16bhaggfm83c6mg6i"; - fetchSubmodules = false; + sha256 = "0kcmb83framkncc50h0lyyz7v8nys6g19ja0h2p8x4sfafnnm6ig"; leaveDotGit = true; + fetchSubmodules = false; }; - # hack to merge rocksdb revisions from rocksdb and nudb, so build process - # will find both - rocksdb-merged = runCommand "rocksdb-merged" { - buildInputs = [ git ]; - } '' - commit=$(cd ${nudb} && git ls-tree HEAD extras/rocksdb | awk '{ print $3 }') - git clone ${rocksdb} $out && cd $out - git fetch ${nudb}/extras/rocksdb $commit - git checkout $commit - ''; + date = fetchgit { + url = "https://github.com/HowardHinnant/date.git"; + rev = "fc4cf092f9674f2670fb9177edcdee870399b829"; + sha256 = "0w618p64mx2l074b6wd0xfc4h6312mabhvzabxxwsnzj4afpajcm"; + leaveDotGit = true; + fetchSubmodules = false; + }; in stdenv.mkDerivation rec { pname = "rippled"; - version = "1.4.0"; + version = "1.5.0"; - src = fetchFromGitHub { - owner = "ripple"; - repo = "rippled"; + src = fetchgit { + url = "https://github.com/ripple/rippled.git"; rev = version; - sha256 = "1z04378bg8lcyrnn7sl3j2zfxbwwy2biasg1d4fbaq4snxg5d1pq"; + sha256 = "0nh0x1ygrj3fw558vxbcp0md80qh27yrp3xhdlasrir7h1l2nplv"; + leaveDotGit = true; + fetchSubmodules = true; }; hardeningDisable = ["format"]; - cmakeFlags = [ - "-Dstatic=OFF" - "-DBOOST_LIBRARYDIR=${boost.out}/lib" - "-DBOOST_INCLUDEDIR=${boost.dev}/include" - ]; + cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; nativeBuildInputs = [ pkgconfig cmake git ]; - buildInputs = [ openssl openssl.dev zlib ]; + buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 ]; preConfigure = '' export HOME=$PWD + git config --global url."file://${rocksdb}".insteadOf "${rocksdb.url}" git config --global url."file://${docca}".insteadOf "${docca.url}" - git config --global url."file://${rocksdb-merged}".insteadOf "${rocksdb.url}" git config --global url."file://${lz4}".insteadOf "${lz4.url}" git config --global url."file://${libarchive}".insteadOf "${libarchive.url}" git config --global url."file://${soci}".insteadOf "${soci.url}" git config --global url."file://${snappy}".insteadOf "${snappy.url}" git config --global url."file://${nudb}".insteadOf "${nudb.url}" - git config --global url."file://${protobuf}".insteadOf "${protobuf.url}" git config --global url."file://${google-benchmark}".insteadOf "${google-benchmark.url}" git config --global url."file://${google-test}".insteadOf "${google-test.url}" + git config --global url."file://${date}".insteadOf "${date.url}" substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}" ''; @@ -150,7 +157,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; homepage = "https://github.com/ripple/rippled"; - maintainers = with maintainers; [ ehmry offline ]; + maintainers = with maintainers; [ ehmry offline RaghavSood ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix index 03c1a6cf77..2bdcd94fe7 100644 --- a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "06xxzvjd06r90fxpq9zh9fwylg6sbd26c08rxfd553jikyp5znsm"; + sha256 = "1jdcda6102n948l6qzhjsiylnmx5fkgjg2hn17g93x3yzwkmvn16"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/plugins/carddav/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/plugins/carddav/default.nix new file mode 100644 index 0000000000..c3745c9bcc --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/roundcube/plugins/carddav/default.nix @@ -0,0 +1,11 @@ +{ roundcubePlugin, fetchzip }: + +roundcubePlugin rec { + pname = "carddav"; + version = "3.0.3"; + + src = fetchzip { + url = "https://github.com/blind-coder/rcmcarddav/releases/download/v${version}/carddav-${version}.tar.bz2"; + sha256 = "0scqxqfwv9r4ggaammmjp51mj50qc5p4jmjliwjvcwyjr36wjq3z"; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix b/third_party/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix index 4eed1227be..a9c73874b6 100644 --- a/third_party/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix +++ b/third_party/nixpkgs/pkgs/servers/roundcube/plugins/plugins.nix @@ -5,5 +5,6 @@ roundcubePlugin = callPackage ./roundcube-plugin.nix { }; + carddav = callPackage ./carddav { }; persistent_login = callPackage ./persistent_login { }; } diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix index b622cf3447..a1ccc2092e 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.3"; + version = "10.0.4"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "0vnrpzd7gkjh4bc0lgvh5l11ym6pls4lp1pl5jjlkyx505635k8d"; + sha256 = "1gf9vqjhq89f5xqn90pwdbz7amv38j78s3pzlxd1c2q3g24wklrj"; }; 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 73aa349a51..88a84dd619 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.1"; + version = "8.5.2"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "02sa0sldsfajryyfndv587qw69q8y8igfpimg98w1g3vndrq1dj7"; + sha256 = "1kvd0vfic9h3glhz8dz5c1n8mmb9yv339pz1878wlh9j4k3xcmy4"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix index 2ce8e901e8..25e2b0ae12 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "19.1.5"; + version = "20.1.2"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1pnzzmxxb7qxiiy8qpl2sifk4qrijjbhmzy47bnjj5ssdsjjjcqy"; + sha256 = "1xmb516xr0bhkzj6yigcrxbghvh0dis85dq7n5hi49mn951ad5yn"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 2af0f149e7..265f78af89 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.16.3"; + version = "0.18.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "141wv5av7hms4wa3s4md7mnb77bbyn3854d7gj7fy6f6jvzghdny"; + sha256 = "12kvjq3z9bggfmgci3wql4v8sh491dwp6qr768k8kwncqmp3jjvx"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1kjh252p91yxq5mi0igamkwlsr50lij24wsp2ilgz6ksv3ijzfr1"; + vendorSha256 = "1lscjp4ih5kxrbqch9164bqrp7lbsir6vg4zcczhvhh0phbcbqjs"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index 0a6d1a8cf6..e824298c48 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.13.0"; + version = "1.14.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c"; + sha256 = "1rzy06hqzhnijm32vah9icgrx95pmf9iglvyzwv7wmcg2h83vhd0"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix index f57a6e8fa5..2e69444ccd 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0lwj99kdx9kfp4vfd7lfapj183mz235kj1vjfscfnkg5ypj656gz"; + sha256 = "0anlxw4j6c3rd7q34j9mgph6i0zb1nff3warcxrkwvnnd1jbb6vr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 76aa4c4ffe..7a50c45ae6 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.0.0"; + version = "3.0.1"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "101lyhhfcv3chrp2h5q04l155hr6wvx427cv1kgd4ryzk88wxx5i"; + sha256 = "13dis8yy559lkq54bdn34mllwr2yxwayqh6ff9lyd4f8hpj2ra7c"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix index 4ac74b2620..a2e319170b 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "repmgr"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "2ndQuadrant"; repo = "repmgr"; rev = "v${version}"; - sha256 = "0zrpv17zrgl8hynbzaaqj17qrchc8r9qwpqh8y10b0v3xdr22ayl"; + sha256 = "1igcy98ggwyx8zg4g4kz7xb32b7vc3h668r5wbfk4w49x9v97f4m"; }; nativeBuildInputs = [ flex ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 419bec6823..4e76fc3568 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.1"; + version = "1.7.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "11h1vvchnipcxvvbjb5y4bgkdzdsik5cq8k8yzkrqz8q33zmjvgg"; + sha256 = "0xqyq3a43j2rav5n87lv1d0f66h9kqjnlxq5nq5d54h5g5qbsr3y"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index 3e292d8740..d14252da99 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.11"; + version = "4.12"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "0z986kykx539wjqd7mr8y0abf3z6hz8byf8fmmbky9hh4ihlgnaf"; + sha256 = "05z34ysy2zn7as11vd365xxhh36bm1ysiwcbr0i0f0nwng406apl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/sslh/default.nix b/third_party/nixpkgs/pkgs/servers/sslh/default.nix index cbeacece3e..68fe9c4b08 100644 --- a/third_party/nixpkgs/pkgs/servers/sslh/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sslh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }: +{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }: stdenv.mkDerivation rec { pname = "sslh"; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + passthru.tests = { + inherit (nixosTests) sslh; + }; + meta = with stdenv.lib; { description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix index bfd00a08e6..b307f7861f 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix @@ -3,14 +3,14 @@ buildGoPackage rec { pname = "teleport"; - version = "4.2.10"; + version = "4.2.11"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "0y6qih4m8snzfj8ddbcfqx0cz4ric0i5vgz0rgqp6wpi2arwysnn"; + sha256 = "00mkh6rmdgwwhbk3jmxgwl0aisnnqw6q6i5zl1hn69hvdny9liii"; }; goPackagePath = "github.com/gravitational/teleport"; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index db31006192..7b21ed5951 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.1"; + version = "2.2.4"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; + sha256 = "1zxifwbrhxaj2pl6kwyk1ivr4in0wd0q01x9ynxzbf6w2yx4xkw2"; }; - vendorSha256 = "0rbwp0cxqfv4v5sii6kavdj73a0q0l4fnvxincvyy698qzx716kf"; + vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn"; subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; diff --git a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix index b7fac5fc47..ef830710c1 100644 --- a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "08skw3h897jb71sbnglj571h35pcb1mikzlh71sx5imjgi4hfczr"; + sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg"; }; nativeBuildInputs = [ pkgconfig cmake xxd ]; diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index a6e055dd06..29975ef5ba 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.13.29"; - sha256 = "0j1spid9q41l57gyphg8smn92iy52z4x4wy236a2a15p731gllh8"; + version = "5.13.32"; + sha256 = "0r1lz73hn4pl5jygmmfngr8sr0iybirsqlkcdkq31a36vcr567i8"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix index 0f0d2c23e4..39a3113eb4 100644 --- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "uwsgi"; - version = "2.0.18"; + version = "2.0.19.1"; src = fetchurl { url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz"; - sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9"; + sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn"; }; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix index f12a75c8e1..48eeddd5ea 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "https://www.dokuwiki.org"; platforms = platforms.all; - maintainers = [ maintainers."1000101" ]; + maintainers = with maintainers; [ maintainers."1000101" ]; }; } 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 76d1a5f0b7..152ed40871 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.5"; - sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; + version = "3.13.6"; + sha256 = "1d3s5v96mmhcxdnxi7qh822p55g9a2nxh0zcq2d8bhg0cshi9804"; }; matomo-beta = { - version = "3.13.5"; + version = "3.13.6"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; + sha256 = "1d3s5v96mmhcxdnxi7qh822p55g9a2nxh0zcq2d8bhg0cshi9804"; }; }; common = pname: { version, sha256, beta ? null }: diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix index c23fb685c6..b9e0acfedb 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.34.1"; + version = "1.34.2"; src = with stdenv.lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "0jg1ls5xy2bmvvd63lpvnkj53rfmik6sy2px14mphxba3gbcpf5c"; + sha256 = "1mi46a14b2080x6mh61mb49xq0ky27g0lbm3gqgvkgckc1zmbp0f"; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix index 62de7620c5..447a27ad08 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, writeText }: +{ lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.8.3"; + version = "3.9.1"; stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "moodle"; inherit version; src = fetchurl { - url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "1anjv4gvbb6833j04a1b4aaysnl4h0x96sr1hhm4nm5kq2fimjd1"; + url = + "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; + sha256 = "sha256-6QJDEInUQQSNj3kThQ65o2cT6JaRy0FrEKy+EcDMVvs="; }; phpConfig = writeText "config.php" '' - + ''; installPhase = '' @@ -27,11 +27,34 @@ stdenv.mkDerivation rec { cp -r . $out/share/moodle cp ${phpConfig} $out/share/moodle/config.php + ${lib.concatStringsSep "\n" (map (p: + let + dir = if p.pluginType == "mod" then + "mod" + else if p.pluginType == "theme" then + "theme" + else if p.pluginType == "block" then + "blocks" + else if p.pluginType == "question" then + "question/type" + else if p.pluginType == "course" then + "course/format" + else if p.pluginType == "report" then + "admin/report" + else + throw "unknown moodle plugin type"; + # we have to copy it, because the plugins have refrences to .. inside + in '' + mkdir -p $out/share/moodle/${dir}/${p.name} + cp -r ${p}/* $out/share/moodle/${dir}/${p.name}/ + '') plugins)} + runHook postInstall ''; meta = with stdenv.lib; { - description = "Free and open-source learning management system (LMS) written in PHP"; + description = + "Free and open-source learning management system (LMS) written in PHP"; license = licenses.gpl3Plus; homepage = "https://moodle.org/"; maintainers = with maintainers; [ aanderse ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/moodle-utils.nix b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/moodle-utils.nix new file mode 100644 index 0000000000..52fddecc66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/moodle-utils.nix @@ -0,0 +1,32 @@ +{ stdenv, unzip, ... }: + +let + buildMoodlePlugin = a@{ + name, + src, + pluginType, + configuraPhase ? ":", + buildPhase ? ":", + buildInputs ? [ ], + ... + }: + stdenv.mkDerivation (a // { + name = name; + + inherit pluginType; + inherit configuraPhase buildPhase; + + buildInputs = [ unzip ] ++ buildInputs; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + mv * $out/ + + runHook postInstall + ''; + }); +in { + inherit buildMoodlePlugin; +} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix index bcfa8a4102..dc87acddd8 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix @@ -1,37 +1,21 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, fetchpatch }: with python3Packages; buildPythonApplication rec { pname = "searx"; - version = "0.16.0"; + version = "0.17.0"; # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "0hfa4nmis98yvghxw866rzjpmhb2ln8l6l8g9yx4m79b2lk76xcs"; + sha256 = "0pznz3wsaikl8khmzqvj05kzh5y07hjw8gqhy6x0lz1b00cn5af4"; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace 'certifi==2019.3.9' 'certifi' \ - --replace 'flask==1.0.2' 'flask' \ - --replace 'flask-babel==0.12.2' 'flask-babel' \ - --replace 'jinja2==2.10.1' 'jinja2' \ - --replace 'lxml==4.3.3' 'lxml' \ - --replace 'idna==2.8' 'idna' \ - --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ - --replace 'pyopenssl==19.0.0' 'pyopenssl' \ - --replace 'python-dateutil==2.8.0' 'python-dateutil==2.8.*' \ - --replace 'pyyaml==5.1' 'pyyaml' \ - --replace 'requests[socks]==2.22.0' 'requests[socks]' - substituteInPlace requirements-dev.txt \ - --replace 'plone.testing==5.0.0' 'plone.testing' \ - --replace 'pep8==1.7.0' 'pep8==1.7.*' \ - --replace 'splinter==0.11.0' 'splinter' \ - --replace 'selenium==3.141.0' 'selenium' + sed -i 's/==.*$//' requirements.txt ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index e4f1a3009e..48afdc5c01 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -13,7 +13,15 @@ stdenv.mkDerivation rec { outputs = [ "out" ]; - patches = [ ./wallabag-data.patch ]; # exposes $WALLABAG_DATA + patches = [ + ./wallabag-data.patch # exposes $WALLABAG_DATA + (fetchurl { + # Fixes "Uncaught RuntimeException: Setting "piwik_enabled" couldn't be found."; https://github.com/wallabag/wallabag/issues/3662 + # Remove >= 2.4.0 + url = "https://github.com/wallabag/wallabag/pull/3868.patch"; + sha256 = "0pfxsv8ncaxkjkybim3v3iswmfv1vbjlzmvj50nn9blvjwc9gxjg"; + }) + ]; dontBuild = true; 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 ca4b5d832a..e1a14ca59d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "0i9ndfhm9iwilqwbqs3dngmzzjmazw4vwbyccjabs3zmzliis6vv"; + sha256 = "1pnl11yws2r2d5dfq0z85zcy5ilvm298bfs7h9z1sjakkwkh5sph"; }; installPhase = '' @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { cp -r . $out/share/wordpress ''; + passthru.tests = { + inherit (nixosTests) wordpress; + }; + meta = with stdenv.lib; { homepage = "https://wordpress.org"; description = "WordPress is open source software you can use to create a beautiful website, blog, or app"; diff --git a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix index 27fb93a880..f10c5dc1d1 100644 --- a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix @@ -5,20 +5,23 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.1.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; rev = "v${version}"; - sha256 = "12r8fciid2qpqf054584ywwh49yddyhhpkpcm6jihzyr5y2r4kn1"; + sha256 = "1b75r3ipjmk48nvc99zib8gc8xpsb3m0ssg7k0am3zmryi7i19h7"; }; propagatedBuildInputs = with python3Packages; [ + aiohttp dulwich defusedxml icalendar jinja2 + multidict + prometheus_client ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix index 146705fb3d..935993b781 100644 --- a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix @@ -78,13 +78,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.34.9"; + version = "1.34.16"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "1xvgfsm260a3v0vqgbk7m9jzayhcs4ysyadnnxajyrndjhn802ic"; + sha256 = "azQbm8EkbypBf2NjplDVCb6duEC476hhKDA0EGqxxWE="; }; patches = [ @@ -200,7 +200,7 @@ in stdenv.mkDerivation rec { description = "Video surveillance software system"; homepage = "https://zoneminder.com"; license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix index e6481aa4da..ca7361b8a1 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix @@ -17,4 +17,5 @@ patch: [ (patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx") (patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") (patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz") +(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc") ] 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 e5ef70e43a..8463b1750d 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -30,10 +30,6 @@ 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 @@ -44,7 +40,7 @@ stdenv.mkDerivation rec { # - ignore test_ls because impure logic # - ignore test_screen because it assumes vt terminals exist checkPhase = '' - pytest -n $NIX_BUILD_CORES . \ + pytest . \ ${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/dash/default.nix b/third_party/nixpkgs/pkgs/shells/dash/default.nix index f4ee68f744..c76191cfd3 100644 --- a/third_party/nixpkgs/pkgs/shells/dash/default.nix +++ b/third_party/nixpkgs/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.11"; + name = "dash-0.5.11.1"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad"; + sha256 = "048n1rbw3v1ffzsw5mkc6zzvvf1csq7pcri7jraaqag38vqq3j3k"; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix index 7cd31f14ab..3faa7f9965 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix @@ -7,6 +7,7 @@ , gnused , gnugrep , groff +, gawk , man-db , getent , libiconv @@ -165,6 +166,9 @@ let -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} + sed -e "s| awk | ${gawk}/bin/awk |" \ + -i $out/share/fish/functions/{__fish_print_packages.fish,__fish_print_addresses.fish,__fish_describe_command.fish,__fish_complete_man.fish,__fish_complete_convert_options.fish} \ + $out/share/fish/completions/{cwebp,adb,ezjail-admin,grunt,helm,heroku,lsusb,make,p4,psql,rmmod,vim-addons}.fish cat > $out/share/fish/functions/__fish_anypython.fish <> oh-my-zsh.sh <<- EOF + + # Undefine functions that don't work on Nix. + unfunction uninstall_oh_my_zsh + unfunction upgrade_oh_my_zsh + EOF + # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source # them, if found. cat >> $template <<- EOF diff --git a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index e1839d5dd0..feb82790e8 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Zsh prompt for Astronauts"; homepage = "https://github.com/denysdovhan/spaceship-prompt/"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix index 03f6146df7..89a91ad050 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-completions"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = pname; rev = version; - sha256 = "0rw23m8cqxhcb4yjhbzb9lir60zn1xjy7hn3zv1fzz700f0i6fyk"; + sha256 = "12l9wrx0aysyj62kgp5limglz0nq73w8c415wcshxnxmhyk6sw6d"; }; installPhase= '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix index 13e3bbdc03..603757c333 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-you-should-use"; - version = "1.7.0"; + version = "1.7.3"; src = fetchFromGitHub { owner = "MichaelAquilina"; repo = pname; rev = version; - sha256 = "1gcxm08ragwrh242ahlq3bpfg5yma2cshwdlj8nrwnd4qwrsflgq"; + sha256 = "1dz48rd66priqhxx7byndqhbmlwxi1nfw8ik25k0z5k7k754brgy"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix index b69de041fd..9de6ef63bf 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -90,11 +90,11 @@ in rec { inherit shell; inherit (last) stdenvNoCC; - extraPackages = lib.optional (libcxx != null) libcxx; + extraPackages = []; nativeTools = false; nativeLibc = false; - inherit buildPackages coreutils gnugrep bintools; + inherit buildPackages coreutils gnugrep bintools libcxx; libc = last.pkgs.darwin.Libsystem; isClang = true; cc = { name = "${name}-clang"; outPath = bootstrapTools; }; @@ -168,8 +168,9 @@ in rec { ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; - linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/7/libc++/setup-hook.sh; + passthru = { + isLLVM = true; + }; }; libcxxabi = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix index e17b41eab3..b579897869 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix @@ -138,8 +138,11 @@ let is32bit is64bit isAarch32 isAarch64 isMips isBigEndian; - # The derivation's `system` is `buildPlatform.system`. - inherit (buildPlatform) system; + # Override `system` so that packages can get the system of the host + # platform through `stdenv.system`. `system` is originally set to the + # build platform within the derivation above so that Nix directs the build + # to correct type of machine. + inherit (hostPlatform) system; inherit (import ./make-derivation.nix { inherit lib config stdenv; diff --git a/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix index 42444e5fca..ceb2534e07 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix @@ -2,12 +2,12 @@ libpng, libtool, libxml2, pkgconfig, which, xorg }: stdenv.mkDerivation rec { pname = "nx-libs"; - version = "3.5.99.23"; + version = "3.5.99.24"; src = fetchFromGitHub { owner = "ArcticaProject"; repo = "nx-libs"; rev = version; - sha256 = "0hcsic9bf8w4ja3xy2nka8hcjvidqzjafn1bwr34l5l47h0kbyqz"; + sha256 = "0knx4phya90ahjxaflkvnnb7w22vdwjf7r78dhzmbmlccnlvwi7q"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig which diff --git a/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix index e15bee331a..35f0d73ea0 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "xidlehook"; - version = "0.8.2"; + version = "0.9.1"; doCheck = false; @@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1zvr3vk76x0gsq6z5rrnliv2bvshsm8bhkspc41bbj4kniz4h5bw"; + sha256 = "00j2iwp25hz9jlr45qszyipljqdnh7h3ni9bkd2lmk58kkvmhf1s"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "0dxz5mbdc93xb02vnmd29i2kdh05c7vx9h28x5qgs3jvddyb3xmn"; + cargoSha256 = "050ihjhg33223x6pgvhqrjprx1clkj2x3jr6acf716vbwm3m0bmz"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix index effdd76ce9..99d695df26 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver -, pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }: +, pam, apacheHttpd, pamtester, xscreensaver }: stdenv.mkDerivation rec { pname = "xsecurelock"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver - pam apacheHttpd imagemagick pamtester + pam apacheHttpd pamtester ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index b36daefa16..30d74c14ce 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "amazon-ecr-credential-helper"; - version = "0.3.0"; + version = "0.4.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "06pcwgahcbi13ca5rs6giwdw3w364lbvmzcs4ka82igvcffxjvnd"; + sha256 = "1whwxjzlyzyvrf2mzbd7my2kdz5fdbr79g18g9h4xrg8xyzk1k5q"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws_shell/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws_shell/default.nix deleted file mode 100644 index 104c2f1e44..0000000000 --- a/third_party/nixpkgs/pkgs/tools/admin/aws_shell/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, awscli -}: - -with awscli.python.pkgs; - -buildPythonPackage rec { - pname = "aws-shell"; - version = "0.2.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2044b0ef78c7542c392f2cee4b74a4439545c63dda0a3e28b712fff53e8e5823"; - }; - - # Why does it propagate packages that are used for testing? - propagatedBuildInputs = [ - awscli - prompt_toolkit - boto3 - configobj - pygments - pyyaml - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "prompt-toolkit>=1.0.0,<1.1.0" "prompt-toolkit" - ''; - - #Checks are failing due to missing TTY, which won't exist. - doCheck = false; - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/awslabs/aws-shell"; - description = "An integrated shell for working with the AWS CLI"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 02d25b07ab..39fa0a8ca4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.80"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.93"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "0519rlc0m0888ag7s55lz516vsgif5pws6rzhmclbbw38g4wmb2k"; + sha256 = "1kl0sa125k4q4ximg0p9rriz18w90lj3nhc7racqnc3bhig7w1ih"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix new file mode 100644 index 0000000000..dc03ac2610 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -0,0 +1,84 @@ +{ lib +, python3 +, groff +, less +, fetchFromGitHub +}: +let + py = python3.override { + packageOverrides = self: super: { + botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0dev30"; + src = fetchFromGitHub { + owner = "boto"; + repo = "botocore"; + rev = "7967b9c5fb027c9962e0876f0110425da88b88f2"; + sha256 = "18yn5l1f4nr1pih392qkyidnj7z10bd2cv7yx4qrl7asxxraspr9"; + }; + }); + prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { + version = "2.0.10"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; + }; + }); + }; + }; + +in +with py.pkgs; buildPythonApplication rec { + pname = "awscli2"; + version = "2.0.26"; # N.B: if you change this, change botocore to a matching version too + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-cli"; + rev = version; + hash = "sha256:1ysmr17gbcj6vs9ywzwgvd9caxwxgg9bnfvvkyks4fii34ji5qq8"; + }; + + postPatch = '' + substituteInPlace setup.py --replace ",<0.16" "" + substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth" + substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0,<2.10" + ''; + + # No tests included + doCheck = false; + + propagatedBuildInputs = [ + bcdoc + botocore + colorama + cryptography + docutils + groff + less + prompt_toolkit + pyyaml + rsa + ruamel_yaml + s3transfer + six + wcwidth + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/zsh/site-functions + mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd + ''; + + passthru.python = py; # for aws_shell + + meta = with lib; { + homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"; + changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; + description = "Unified tool to manage your AWS services"; + license = licenses.asl20; + maintainers = with maintainers; [ bhipple davegallant ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 4cfe1beb2c..2f3c526ab2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.7.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "0g0ddg04pwcsmyyzrqllx4ladw4x5zxc5yw29q8f6q59j6jaf1zb"; + sha256 = "0szx2q11b8gk8b300z2zdd9h1jm0dmfzql4f818mar7z5x0li9z3"; }; # put packages that needs to be overriden in the py package scope diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 820659c68a..1f7a0a3974 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -121,11 +121,11 @@ let azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.1.0" "zip" "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "7.0.0" "zip" - "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n"; + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip" + "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83"; - azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" - "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" + "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.2.0" "zip" "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; @@ -136,35 +136,41 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "9.0.0" "zip" - "00bmdbr7hdwb3ibr9sfbgbmmr6626qlz19cdi84d87rcisczf4nw"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.0.0" "zip" + "0ic3409m5bn5szdzldbcv7xc4i9qd44xmlinjhr42ds2ylw3k6mx"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip" "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "5.0.0" "zip" - "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906"; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.2.0" "zip" + "1khk9jdfx7706xsqpwrnfsplv6p6wracvpyk9ki8zhc7p83kal4k"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "12.0.0" "zip" - "0vzq93g2fpnij4rykkk3391xq2knhlbz87vhim4zvj8s45sx6z8q"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "13.0.0" "zip" + "17ik8lfd74ki57rml2piswcanzbladsqy0s2m9jmvwpdrfpincvz"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; + azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" + "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.0.0" "zip" "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.14.0" "zip" - "1af2vigpmcg2mp36dqi9g2dx4589bqm4w2af9dx6l9x65zfl89b9"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.15.0" "zip" + "03ysr8kx0gavjrxsi9wqrgxpg3g17nvii7z68qfm0k2mv6ryj3z7"; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; - azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.2.1" "zip" - "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky"; + azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc7" "zip" + "1m5905mn362pn03sf89zsnylkrbgs4p1lkafrw3nxa2gnwcfpyb8"; + + azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" + "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.12.0" "zip" "187z0w5by7d9a2zsz3kidmzjw591akpc6dwhps4jyb4skcmyw86s"; @@ -184,11 +190,11 @@ let azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.6.0" "zip" - "0ffhlbd9fwx05njawhii46wqyvbhhz2xcfx0pxc7b978n7l7ylm1"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip" + "18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "10.2.0" "zip" - "1nd2rcwl83x3xq4h5brb16jwbbq57gyxz6pgvmhnign9q76p836m"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "11.0.0" "zip" + "1g39rl4p88bzhqbn1gi2nn8jyx77idxvpaw8xqz1gjv0qqqwdpvz"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip" "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; @@ -196,8 +202,8 @@ let azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.46.0" "zip" - "19n4cr8a2fwjks3485rkv31bsib9akah5b289sl5lsqyp6i8m671"; + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.47.0" "zip" + "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; @@ -208,14 +214,14 @@ let azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip" - "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx"; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.4.1" "zip" + "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r"; - azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.3.0" "zip" - "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a"; + azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip" + "09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5"; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.18.0" "zip" - "0i9lnhcx85xccddvz1wdz5j0idm6sw2cn3066dww5993nmg0ijlr"; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.19.0" "zip" + "1iiqc0kh5hygcvr3x1653cpjnf5na3j11v137xa9xy65r7a4jik9"; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; @@ -226,8 +232,8 @@ let azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; - azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip" - "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; + azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.0.0" "zip" + "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip" "1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq"; @@ -235,11 +241,11 @@ let azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip" "00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc12" "zip" - "0q7w26n53x0lvr1a944jjl9d0yn0l029brx5nzfrz7ydf3jpb2i2"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc14" "zip" + "0w9hnxvk5pcsa21g3xrr089rfwgldghrbj8akzvh0gchqlzfjg6j"; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.9.0" "zip" - "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; + azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.10.0" "zip" + "0r3l55mhd00zx8sw13d7i9l7r214946s1y3wxcswxad7q5660zfm"; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip" "1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r"; @@ -250,14 +256,14 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "9.0.0" "zip" - "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.1.0" "zip" + "073zybsxk70vg02bflbrx97pwzsxl0xyi48fpxp8dh3d3dy5h8zg"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.4.0" "zip" - "0zmmfj7z1zrayjqwqybcn3bwm47d2ngyxm1g6fh2iw5c2f9czycv"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.5.1" "zip" + "18xfq3n2i1bnai417p3q67f4bikxjcqyg6yp4f06kipx8cz4zfbn"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch b/third_party/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch deleted file mode 100644 index 789efd185c..0000000000 --- a/third_party/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0de195de31dc311976af52a7c2b547bc23af2691 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Sat, 14 Dec 2019 19:27:14 +0100 -Subject: [PATCH] Don't use distutils.StrictVersion that cannot handle certain - versions - -``` - File "setup.py", line 63, in - if StrictVersion(setuptools_version) >= StrictVersion('36.2'): -File -"/nix/store/zdh16dcvjw99ybam59zd2ijb6bx138j0-python3-3.7.5/lib/python3.7/distutils/version.py", -line 40, in __init__ - self.parse(vstring) -File -"/nix/store/zdh16dcvjw99ybam59zd2ijb6bx138j0-python3-3.7.5/lib/python3.7/distutils/version.py", -line 137, in parse - raise ValueError("invalid version number '%s'" % vstring) -ValueError: invalid version number '41.4.0.post20191022' -``` ---- - certbot/setup.py | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/certbot/setup.py b/certbot/setup.py -index d19327e5e..ac1524793 100644 ---- a/certbot/setup.py -+++ b/certbot/setup.py -@@ -1,5 +1,4 @@ - import codecs --from distutils.version import StrictVersion - import os - import re - import sys -@@ -58,20 +57,8 @@ install_requires = [ - - # Add pywin32 on Windows platforms to handle low-level system calls. - # This dependency needs to be added using environment markers to avoid its installation on Linux. --# However environment markers are supported only with setuptools >= 36.2. --# So this dependency is not added for old Linux distributions with old setuptools, --# in order to allow these systems to build certbot from sources. - pywin32_req = 'pywin32>=227' # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py --if StrictVersion(setuptools_version) >= StrictVersion('36.2'): -- install_requires.append(pywin32_req + " ; sys_platform == 'win32'") --elif 'bdist_wheel' in sys.argv[1:]: -- raise RuntimeError('Error, you are trying to build certbot wheels using an old version ' -- 'of setuptools. Version 36.2+ of setuptools is required.') --elif os.name == 'nt': -- # This branch exists to improve this package's behavior on Windows. Without -- # it, if the sdist is installed on Windows with an old version of -- # setuptools, pywin32 will not be specified as a dependency. -- install_requires.append(pywin32_req) -+install_requires.append(pywin32_req + " ; sys_platform == 'win32'") - - dev_extras = [ - 'coverage', --- -2.24.1 - diff --git a/third_party/nixpkgs/pkgs/tools/admin/certbot/default.nix b/third_party/nixpkgs/pkgs/tools/admin/certbot/default.nix index cabf335fb6..67d698a64f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/certbot/default.nix @@ -8,19 +8,15 @@ buildPythonApplication rec { pname = "certbot"; - version = "1.3.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa"; + sha256 = "1y0m5qm853i6pcpb2mrf8kjkr9wr80mdrx1qmck38ayvr2v2p5lc"; }; - patches = [ - ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch - ]; - propagatedBuildInputs = [ ConfigArgParse acme diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 4fce865573..ab309a11a6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -1,27 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "eksctl"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0pfjv5m1fly7n9hmxy8bnpblfh5rzbjkiav3dczy4hkmq226gjsa"; + sha256 = "1l7wcx89d7nil5lbr4x2w04lwranz0z83y892v290wv2l0xnmshj"; }; - vendorSha256 = "09c3a5g27aqmy4ml42c6zwzrv8yas7i04w3j9jbvp90npwvc62cz"; + vendorSha256 = "0fy9m72iciz5pjf2b3323brgi15w6a9fg1m1srpaiay3md87gagg"; subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; - postInstall = '' - mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} + buildFlagsArray = [ "-ldflags=-s -w -X github.com/weaveworks/eksctl/pkg/version.gitCommit=${src.rev} -X github.com/weaveworks/eksctl/pkg/version.buildDate=19700101-00:00:00" ]; - $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" - $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/eksctl completion $shell > eksctl.$shell + installShellCompletion eksctl.$shell + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index a408746c7f..c3c51a5605 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,17 +2,17 @@ buildGo114Package rec { pname = "exoscale-cli"; - version = "1.12.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "04ym7mfv565icj3lmd2nrvq9asawwmmzg09681pj9py61ws56bxr"; + sha256 = "10sx542m6r6yq99nqn69bjfc6rv4nr9swi74rfccxb7dbifdrqpp"; }; goPackagePath = "github.com/exoscale/cli"; - goDeps = ./deps.nix; + buildFlags = "-ldflags=-X=main.version=${version}"; # ensures only the cli binary is built and we don't clutter bin/ with submodules subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/deps.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/deps.nix deleted file mode 100644 index a67ee93a85..0000000000 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/deps.nix +++ /dev/null @@ -1,876 +0,0 @@ -# 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/google-cloud-sdk/default.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 2ecd924281..60ba024fd5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0imsshvdwd2isq58kplc27za30nabp62ypf1hq95aq94pjm2zp39"; + sha256 = "1b9pm0k298w7scsi493a2xlikiqqbb8vwcy9j71421kyvlj4g7yr"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1905rj36md5iszbxw78ylvkljr4d54i50x23r1r6k1xw7i93yfwq"; + sha256 = "1f6kkcwxg419kw58521n4ms68hspx7mj87syj4xzxdwgkwg92ws7"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "297.0.1"; + version = "301.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix index de967578d5..3af266c817 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.22"; + version = "3.3.27"; 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 = "1adwqglh3lrx04y0f6slp1l97xzbsqgw0v5i4jll3a54aqyzfz0a"; + sha256 = "0i6grrpdwh7axhnsabb0pfjhpd3prc9ji1afivi7q3c0krgvncmc"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix index 42c790d1ad..7a7022c917 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.20.1"; + version = "1.21.1"; src = fetchPypi { inherit pname version; - sha256 = "0vhwaqkx4njarm0wy8zg2hvzr2yl92y8gnwipcn7p59sazw4whfl"; + sha256 = "1q9p0yik9cpvpxjs048anvhicfcna84mpl7axv9bwgr48w40lqwg"; }; propagatedBuildInputs = [ @@ -27,6 +27,12 @@ buildPythonApplication rec { py.test ''; + # TODO: remove with next release + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" + ''; + meta = { inherit version; description = "Command-line interface for MySQL"; 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 a4d201fd4c..4657c64d33 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix @@ -1,8 +1,8 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.10"; - versionMinor = "12"; + versionMajor = "6.11"; + versionMinor = "2"; versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in @@ -17,7 +17,7 @@ in "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"; + sha256 = "1b6r9bwkr8mhaljma19ikxpkmlx8iy5r1vf5hlv27bja2zz1r8xr"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { @@ -25,7 +25,7 @@ in "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"; + sha256 = "0dl138ry9n1qh651zh0zvp88qhgxrs2kvvnq329jw0py5v70b9pm"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index cad7b97fd3..77779c39f5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,50 +1,58 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.1.0"; + version = "2.6.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-linux-x64.tar.gz"; - sha256 = "0d9bmljgf62dhj1z8h71c2pj2cbvf4ghhlbbbh2jcg55i33ks8ih"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.6.1-linux-x64.tar.gz"; + sha256 = "12f81wj8r3pmxj2l8qhcgnmy2m0a6bfzrvq9avl3444h2w29qpy2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.0-linux-amd64.tar.gz"; - sha256 = "1kf43j1b4wp39sny92dnsy1myn6wb2msli1ydds3yza81srgcfnh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.13.0-linux-amd64.tar.gz"; + sha256 = "03l7ybc9ca63vdm7a2zsvgc8zz8ip973sfxsjqf3bb277r04mnpb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.3.0-linux-amd64.tar.gz"; - sha256 = "17anj9pc90hhiknyf2yab7dzvcfbjn1803bl6ld26r701w3h1jqx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.13.0-linux-amd64.tar.gz"; + sha256 = "0ivdiib3a1c1r2ppxmj6blgq26s05s3081969j0j9jlscpa79lap"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.0.0-linux-amd64.tar.gz"; - sha256 = "0526a4ll1q9v566i313223pnx2pa3qkcjp01l49h5jmgn8qpw1fn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.2.0-linux-amd64.tar.gz"; + sha256 = "0w6ys5bmry1b8ndzj167cz3a8fc6mbl5v9v2almrmd3q6fycm4gj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-linux-amd64.tar.gz"; - sha256 = "14ya2sax2yyza3zbxp5a638y81pcbi26hv8k9y8agnjn82bgx8dy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.4.0-linux-amd64.tar.gz"; + sha256 = "0id3mji08hk76kffz46dlbl2r11kgv5jvlmw869dssg2d0wliv82"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.2.2-linux-amd64.tar.gz"; + sha256 = "07asdmmacxazg65d5hphjxzb5j5d2dcc95wjbxx3wwc1swqma4aq"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-darwin-x64.tar.gz"; - sha256 = "1d7w32wac2sc0z5i893h66fgyivf4x3mqki649vxkxc3081kpzi9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.6.1-darwin-x64.tar.gz"; + sha256 = "17jf9xwpwpbqk5r20i14j1z4i4rbbx781k0zqyc9yskmv5q4mmwr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.0-darwin-amd64.tar.gz"; - sha256 = "1smy1y2pnxnvw8zcs31q9xs80hyqhzawfzcwkkfnyamdrgasxqsi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.13.0-darwin-amd64.tar.gz"; + sha256 = "18mjf9gm8siskg9jh65x4qp4w8p4wnp19bxxk4jfbq27icdk7ws9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "03idn1livy9w3izi7qrdgnigx3ayrp8qp2q3m5ik9ffvv2g11962"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.13.0-darwin-amd64.tar.gz"; + sha256 = "14iwz1gm34irs9jlpwc4ig1wc8k4aaxq8mz3g22yrvwddrsc4rcw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.0.0-darwin-amd64.tar.gz"; - sha256 = "06m6ldqa82w82kjz7pxi0pbk9x02pzsy4x0in8fcq9gsh1p0gka9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "0zaxp2n1w5djwyq1afhd3v887dh0yj53jz449riqp19dpyfqf7h7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "0mymvn2355bq9ykvnww0si0imikzxp7mp1yh2scn8kjn2gs4nhgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.4.0-darwin-amd64.tar.gz"; + sha256 = "1kzs7k7as9r1vbj746wqz9iph13zfzzw8nsk3waq8aq1hmgh2g1q"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.2.2-darwin-amd64.tar.gz"; + sha256 = "0hwdghij7g9h58nwimfmaz91lz38wibkrdzwqhi7d426m53g6f5c"; } ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh old mode 100644 new mode 100755 index 26a4846984..cc31bce849 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -1,14 +1,19 @@ #!/usr/bin/env bash -VERSION="2.1.0" +VERSION="2.6.1" -declare -A plugins +# Bash 3 compatible for Darwin plugins=( - ["aws"]="2.2.0" - ["gcp"]="3.3.0" - ["random"]="2.1.0" - ["kubernetes"]="2.0.0" -) + # https://github.com/pulumi/pulumi-aws/releases + "aws=2.13.0" + # https://github.com/pulumi/pulumi-gcp/releases + "gcp=3.13.0" + # https://github.com/pulumi/pulumi-random/releases + "random=2.2.0" + # https://github.com/pulumi/pulumi-kubernetes/releases + "kubernetes=2.4.0" + # https://github.com/pulumi/pulumi-postgresql/releases + "postgresql=2.2.2"); function genMainSrc() { local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz" @@ -21,8 +26,9 @@ function genMainSrc() { } function genSrcs() { - for plug in "${!plugins[@]}"; do - local version=${plugins[$plug]} + for plugVers in "${plugins[@]}"; do + local plug=${plugVers%=*} + local version=${plugVers#*=} # url as defined here # https://github.com/pulumi/pulumi/blob/06d4dde8898b2a0de2c3c7ff8e45f97495b89d82/pkg/workspace/plugins.go#L197 local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-$1-amd64.tar.gz" @@ -35,7 +41,7 @@ function genSrcs() { done } -cat < data.nix # DO NOT EDIT! This file is generated automatically by update.sh { }: { @@ -43,13 +49,14 @@ cat <> data.nix +genSrcs "linux" >> data.nix +echo " ];" >> data.nix + +echo " x86_64-darwin = [" >> data.nix +genMainSrc "darwin" >> data.nix +genSrcs "darwin" >> data.nix +echo " ];" >> data.nix +echo " };" >> data.nix +echo "}" >> data.nix -echo " x86_64-darwin = [" -genMainSrc "darwin" -genSrcs "darwin" -echo " ];" -echo " };" -echo "}" diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix index f3c375a996..3cfd805d48 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -25,18 +25,19 @@ let in py.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3000.3"; + version = "3001"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "19yfjhidx93rl9s03lvrfz7kp0xxigyv4d3zb9792zb9bsc4kjpw"; + sha256 = "0m7immip3r8yffiv7qlcqibszvhlg48qpgcm16skvrn85hdhv9jw"; }; propagatedBuildInputs = with py.pkgs; [ + distro jinja2 markupsafe msgpack - pycrypto + pycryptodomex pyyaml pyzmq requests diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/third_party/nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch index f7560b1fc5..e011a15b43 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch @@ -2,13 +2,12 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py index f827cc6db8..b728595186 100644 --- a/salt/utils/rsax931.py +++ b/salt/utils/rsax931.py -@@ -47,6 +47,9 @@ def _load_libcrypto(): - lib = lib[0] if len(lib) > 0 else None - if lib: - return cdll.LoadLibrary(lib) -+ else: -+ return cdll.LoadLibrary('@libcrypto@') -+ - raise OSError('Cannot locate OpenSSL libcrypto') +@@ -74,7 +74,7 @@ + """ + Attempt to load libcrypto. + """ +- return cdll.LoadLibrary(_find_libcrypto()) ++ return cdll.LoadLibrary('@libcrypto@') + def _init_libcrypto(): diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix index 302654f771..099ccc6f4c 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.7"; + version = "8.14.9"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0k12wf37vl31w2qpj3dsmv8c4ifrsg3qa30gqsx553jw7n0f3ma2"; + sha256 = "0h4qzj9k5ng09nbkfipvr82piq68c576akjwmhsqn05rvgirmhx7"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 1987b0a87c..63ca4dc5e7 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.06.07"; + version = "2020.06.30"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "06jpawwm4zcss9mi2bjdbdkkfr8cw1q9cpzplq5r83z8pljqb12l"; + sha256 = "0pdaf9y4ag2cdpygypf11aqa52hhj1y5f7gc8lv3aa1lplxyhi9m"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/third_party/nixpkgs/pkgs/tools/audio/bpm-tools/default.nix b/third_party/nixpkgs/pkgs/tools/audio/bpm-tools/default.nix index 035fbf0953..6207cbeb9f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/bpm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/bpm-tools/default.nix @@ -1,8 +1,17 @@ { stdenv, fetchurl, + gnuplot, + sox, + flac, + id3v2, + vorbis-tools, + makeWrapper }: +let + path = stdenv.lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ]; +in stdenv.mkDerivation rec { pname = "bpm-tools"; version = "0.3"; @@ -12,15 +21,17 @@ stdenv.mkDerivation rec { sha256 = "151vfbs8h3cibs7kbdps5pqrsxhpjv16y2iyfqbxzsclylgfivrp"; }; - patchPhase = '' - patchShebangs bpm-tag - patchShebangs bpm-graph - ''; + nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; + postFixup = '' + wrapProgram $out/bin/bpm-tag --prefix PATH : "${path}" + wrapProgram $out/bin/bpm-graph --prefix PATH : "${path}" + ''; + meta = with stdenv.lib; { homepage = "http://www.pogo.org.uk/~mark/bpm-tools/"; description = "Automatically calculate BPM (tempo) of music files"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix index f95dcc8bb6..272cf90253 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix @@ -1,19 +1,36 @@ { lib, python3 }: -with python3.pkgs; +let + py = python3.override { + packageOverrides = self: super: { + loguru = super.loguru.overridePythonAttrs (oldAttrs: rec { + version = "0.4.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0j47cg3gi8in4z6z4w3by6x02mpkkfl78gr85xjn5rg0nxiz7pfm"; + }; + }); + }; + }; + +in + +with py.pkgs; buildPythonApplication rec { pname = "google-music-scripts"; - version = "4.3.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0dykjhqklbpqr1lvls0bgf6xkwvslj37lx4q8522hjbs150pwjmq"; + sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq"; }; + # pendulum pinning was to prevent PEP517 from trying to build from source postPatch = '' substituteInPlace setup.py \ - --replace "audio-metadata>=0.8,<0.9" "audio-metadata" + --replace "tomlkit>=0.5,<0.6" "tomlkit" \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum" ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix index 36d90fb806..43703cce32 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.2.7"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "1ww5q7pk269l2s7d2svkkyd7hb7g4hqmwjn09b287pmjcirnmqn9"; + sha256 = "0jr9vsmjx6dfkkl2lnk8nc3i3snivy5za0zvcazss54xpa3k0fh1"; }; - cargoSha256 = "0jdbxshvm9hdxdjr3sy1kgszhfs9v4r6gp0nwvv2n92m3z8zri9y"; + cargoSha256 = "15zz168igc255kyqd6nl9p2cm1s1hs6bp72jdxjvpzgsg990jp46"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/2_4.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/2_4.nix new file mode 100644 index 0000000000..5c9ce70e5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/2_4.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "2.4.20"; + sha256 = "0awdpkcgvx2aq7pwxy8jyzkin6cyrrh3d576x9ldm851kis9n5ii"; +}) diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix new file mode 100644 index 0000000000..2878e93fe7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -0,0 +1,14 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "8.0.13"; + sha256 = "0cj0fnjimv22ykfl0yk6w29wcjvqp8y8j2g1c6gcml65qazrswyr"; + + extraPatches = [ + ./../../../servers/sql/mysql/abi-check.patch + ]; + + extraPostInstall = '' + rm -r "$out"/docs + ''; +}) diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix deleted file mode 100644 index a610bb8e13..0000000000 --- a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig -, boost, bison, curl, ncurses, openssl, xxd -, libaio, libev, libgcrypt, libgpgerror, libtool, zlib -}: - -stdenv.mkDerivation rec { - pname = "percona-xtrabackup"; - version = "2.4.12"; - - src = fetchFromGitHub { - owner = "percona"; - repo = "percona-xtrabackup"; - rev = "${pname}-${version}"; - sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ - boost bison curl ncurses openssl xxd - libaio libev libgcrypt libgpgerror libtool zlib - ]; - - cmakeFlags = [ - "-DBUILD_CONFIG=xtrabackup_release" - "-DINSTALL_MYSQLTESTDIR=OFF" - "-DWITH_BOOST=system" - "-DWITH_SSL=system" - "-DWITH_ZLIB=system" - "-DWITH_MAN_PAGES=OFF" - "-DCMAKE_CXX_FLAGS=-std=gnu++03" - ]; - - postInstall = '' - rm -r "$out"/lib/plugin/debug - ''; - - meta = with stdenv.lib; { - description = "Non-blocking backup tool for MySQL"; - homepage = "http://www.percona.com/software/percona-xtrabackup"; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ izorkin ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix new file mode 100644 index 0000000000..9339e8155e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkgconfig +, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpgerror, lz4 +, ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib +, perlPackages +, version, sha256, extraPatches ? [], extraPostInstall ? "", ... +}: + +stdenv.mkDerivation rec { + pname = "percona-xtrabackup"; + inherit version; + + src = fetchFromGitHub { + owner = "percona"; + repo = "percona-xtrabackup"; + rev = "${pname}-${version}"; + inherit sha256; + }; + + nativeBuildInputs = [ bison boost cmake makeWrapper pkgconfig ]; + + buildInputs = [ + curl cyrus_sasl libaio libedit libev libevent libgcrypt libgpgerror lz4 + ncurses numactl openssl protobuf valgrind xxd zlib + ] ++ (with perlPackages; [ perl DBI DBDmysql ]); + + patches = extraPatches; + + cmakeFlags = [ + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DBUILD_CONFIG=xtrabackup_release" + "-DINSTALL_MYSQLTESTDIR=OFF" + "-DWITH_BOOST=system" + "-DWITH_CURL=system" + "-DWITH_EDITLINE=system" + "-DWITH_LIBEVENT=system" + "-DWITH_LZ4=system" + "-DWITH_PROTOBUF=system" + "-DWITH_SASL=system" + "-DWITH_SSL=system" + "-DWITH_ZLIB=system" + "-DWITH_VALGRIND=ON" + "-DWITH_MAN_PAGES=OFF" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. + ]; + + postInstall = '' + wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB + rm -r "$out"/lib/plugin/debug + '' + extraPostInstall; + + meta = with stdenv.lib; { + description = "Non-blocking backup tool for MySQL"; + homepage = "http://www.percona.com/software/percona-xtrabackup"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix index f366533f9b..33cac4ad22 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests}: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper +, nixosTests, rclone }: buildGoPackage rec { pname = "restic"; @@ -15,11 +16,13 @@ buildGoPackage rec { subPackages = [ "cmd/restic" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; passthru.tests.restic = nixosTests.restic; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = '' + wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $out/bin/restic generate \ --bash-completion restic.bash \ --zsh-completion restic.zsh \ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix index 5aeff6baaa..206e68ce1c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "3.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "0rki4s0jgz6vkywc6hcx9qa551r5bnjs7sw0rdh93k64l32kh644"; + sha256 = "1idjyl5dr8a72w3lg15qx03wgc5mj2ga2v2jkyb8v9gi5ahl03mn"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-heatmap/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-heatmap/default.nix new file mode 100644 index 0000000000..04d74d78cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-heatmap/default.nix @@ -0,0 +1,46 @@ +{ stdenv, lib +, fetchFromGitHub +, python3 +, installShellFiles +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "btrfs-heatmap"; + version = "8"; + + src = fetchFromGitHub { + owner = "knorrie"; + repo = "btrfs-heatmap"; + rev = "v${version}"; + sha256 = "035frvk3s7g18y81srssvm550nfq7jylr7w60nvixidxvrc0yrnh"; + }; + + # man page is currently only in the debian branch + # https://github.com/knorrie/btrfs-heatmap/issues/11 + msrc = fetchurl { + url = "https://raw.githubusercontent.com/knorrie/btrfs-heatmap/45d844e12d7f5842ebb99e65d7b968a5e1a89066/debian/man/btrfs-heatmap.8"; + sha256 = "1md7xc426sc8lq4w29gjd6gv7vjqhcwrqqcr6z39kihvi04d5f6q"; + }; + + buildInputs = [ python3 ]; + nativeBuildInputs = [ python3.pkgs.wrapPython installShellFiles ]; + + outputs = [ "out" "man" ]; + + installPhase = '' + install -Dm 0755 heatmap.py $out/sbin/btrfs-heatmap + installManPage ${msrc} + + buildPythonPath ${python3.pkgs.btrfs} + patchPythonScript $out/sbin/btrfs-heatmap + ''; + + meta = with lib; { + description = "Visualize the layout of a mounted btrfs"; + homepage = "https://github.com/knorrie/btrfs-heatmap"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 5a6dafae29..f79dc23966 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; - # The i686 case is a quick hack; I don't know what's wrong. - postConfigure = stdenv.lib.optionalString (!stdenv.isi686) '' - export LDSHARED="$LD -shared" - ''; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch index b04082537b..a117408b00 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch @@ -1,11 +1,11 @@ ---- a/cmake/modules/BuildSPDK.cmake 2018-08-09 09:22:34.950684960 +0200 -+++ b/cmake/modules/BuildSPDK.cmake 2018-08-09 09:21:59.986964224 +0200 -@@ -16,7 +16,7 @@ +--- a/cmake/modules/BuildSPDK.cmake ++++ b/cmake/modules/BuildSPDK.cmake +@@ -35,7 +35,7 @@ macro(build_spdk) # unset $CFLAGS, otherwise it will interfere with how SPDK sets # its include directory. # unset $LDFLAGS, otherwise SPDK will fail to mock some functions. -- BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} $(MAKE) EXTRA_CFLAGS="-fPIC" -+ BUILD_COMMAND env PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} $(MAKE) EXTRA_CFLAGS="-fPIC" C_OPT="-mssse3" +- BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} ${make_cmd} EXTRA_CFLAGS="${spdk_CFLAGS}" ++ BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} ${make_cmd} EXTRA_CFLAGS="${spdk_CFLAGS}" C_OPT="-mssse3" BUILD_IN_SOURCE 1 INSTALL_COMMAND "true") - ExternalProject_Get_Property(spdk-ext source_dir) + unset(make_cmd) diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index c2234404d3..767730c403 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -11,6 +11,7 @@ , rocksdb, makeWrapper , leveldb, oathToolkit , libnl, libcap_ng +, rdkafka # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -74,6 +75,26 @@ let none = [ ]; }; + getMeta = description: { + homepage = "https://ceph.com/"; + inherit description; + license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; + maintainers = with maintainers; [ adev ak johanot krav ]; + platforms = [ "x86_64-linux" ]; + }; + + ceph-common = python3Packages.buildPythonPackage rec{ + pname = "ceph-common"; + inherit src version; + + sourceRoot = "ceph-${version}/src/python-common"; + + checkInputs = [ python3Packages.pytest ]; + propagatedBuildInputs = with python3Packages; [ pyyaml six ]; + + meta = getMeta "Ceph common module for code shared by manager modules"; + }; + ceph-python-env = python3Packages.python.withPackages (ps: [ ps.sphinx ps.flask @@ -82,27 +103,33 @@ let ps.virtualenv # Libraries needed by the python tools ps.Mako + ceph-common ps.cherrypy + ps.dateutil + ps.jsonpatch ps.pecan ps.prettytable ps.pyjwt ps.webob ps.bcrypt + # scipy > 1.3 breaks diskprediction_local, leading to mgr hang on startup + # Bump (and get rid of scipy_1_3) once these issues are resolved: + # https://tracker.ceph.com/issues/42764 https://tracker.ceph.com/issues/45147 + ps.scipy_1_3 ps.six ps.pyyaml ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.9"; + version = "15.2.4"; + src = fetchurl { + url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; + sha256 = "0jy5dp4r1bqk1l7nrv8l8zpl984k61p3vkvf73ygcn03bxyjjlax"; + }; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; - inherit version; - - src = fetchurl { - url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; - }; + inherit src version; patches = [ ./0000-fix-SPDK-build-env.patch @@ -118,7 +145,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng + snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka ] ++ optionals stdenv.isLinux [ linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -172,25 +199,13 @@ in rec { doCheck = false; # uses pip to install things from the internet - meta = { - homepage = "https://ceph.com/"; - description = "Distributed storage system"; - license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; - maintainers = with maintainers; [ adev ak krav johanot ]; - platforms = [ "x86_64-linux" ]; - }; + meta = getMeta "Distributed storage system"; passthru.version = version; }; ceph-client = runCommand "ceph-client-${version}" { - meta = { - homepage = "https://ceph.com/"; - description = "Tools needed to mount Ceph's RADOS Block Devices"; - license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; - maintainers = with maintainers; [ adev ak johanot krav ]; - platforms = [ "x86_64-linux" ]; - }; + meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices"; } '' mkdir -p $out/{bin,etc,${sitePackages}} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix index f9b6a941f6..588295f779 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix @@ -11,6 +11,12 @@ perlPackages.buildPerlPackage { nativeBuildInputs = [ makeWrapper ]; + # Fix an incorrect platform test that misidentifies Darwin as Windows + postPatch = '' + substituteInPlace Makefile.PL \ + --replace '/win/i' '/MSWin32/' + ''; + postInstall = '' wrapProgram $out/bin/rename \ --prefix PERL5LIB : $out/${perlPackages.perl.libPrefix} 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 c5b02e1bdb..ba5f4a3dd7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0zrxq0s3dlgjarn8l519czwffp2s5ibykc00vfrpayg547dgj342"; + sha256 = "1ivz65nnyisha3lkk6ywx175f2sdacjz3q5vy9xddr7dixwd2b18"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index 3f0e261b18..89fa3ebe33 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "11an7cxgg3x830mwlhyx50xkcv7zpa9aziz6gz1crwp8shr4hdik"; + sha256 = "1ai1dgf07g2c08rp87kygrl67hyj7x793093wmnwaxfpylx5flv0"; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; @@ -20,6 +20,8 @@ buildGoPackage rec { ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; + buildFlagsArray = [ "-ldflags=-s -w -X main.gcsfuseVersion=${version}" ]; + meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; 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 72b95641d0..e9afa5cf19 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.1"; + version = "1.0.0"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1ilxkrqbpb5whv7xfwfvph76jwyjzf988njjpyyr99h6jv2r77q1"; + sha256 = "1dpx0a200s46s1dxp64hkn765vap0hzmyyvmq7wrmcs81mvlrd0l"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 285dd9e7d4..67afac2cdc 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "2.65"; + version = "2.66"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - sha256 = "1b40khffrvwm3nd5nx1iybhkc25zs6whrb3wynw7y3i87p3palyz"; + sha256 = "0c445j950n6nxgr1zxj7a26daa5d9f3i91506b7r7627s943b1kd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix index 0621d88569..7b7eea3d50 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix @@ -2,28 +2,22 @@ stdenv.mkDerivation rec { pname = "dpic"; - version = "2020.03.01"; + version = "2020.06.01"; src = fetchurl { url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; - sha256 = "1wa1b8m98wdyryf0czn5g3g50znrjcdhsrzpqp6zgwr5w4a086mj"; + sha256 = "1gbkpbjwjaaifxff8amm9b47dynq4l4698snjdgnn4flndw62q88"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + # The prefix passed to configure is not used. + makeFlags = [ "DESTDIR=$(out)" ]; - makeFlags = [ "CC=${stdenv.cc.outPath}/bin/cc" ]; - - installPhase = '' - mkdir -p $out/bin - cp -fv dpic $out/bin - ''; - - meta = { - homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; + meta = with stdenv.lib; { description = "An implementation of the pic little language for creating drawings"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.aespinosa ]; - platforms = stdenv.lib.platforms.all; + homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; + license = licenses.bsd2; + maintainers = with maintainers; [ aespinosa ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix index a1160fd738..6518a74512 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { $CC src/xdemos/glxgears.c -o glxgears -lGL -lX11 -lm $CC src/egl/opengles2/es2_info.c -o es2_info -lEGL -lGLESv2 -lX11 $CC src/egl/opengles2/es2gears.c src/egl/eglut/{eglut.c,eglut_x11.c} -o es2gears -Isrc/egl/eglut -lEGL -lGLESv2 -lX11 -lm + $CC src/egl/opengl/eglinfo.c -o eglinfo -lEGL -lGLESv2 -lX11 "; installPhase = " - install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} + install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} eglinfo "; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix index 3ca698f1c5..76d554457d 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-cross"; - version = "2020-05-19"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = version; - sha256 = "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd"; + sha256 = "0mnccmhlqmpdx92v495z39i07hbvjwdr5n4zbarlrr1d7rm99lx4"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 48d082564b..35e02d52b4 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "16davz397svhjb234kx7mnq2m3wdxi2fh1ryniphbczjpbwn23g6"; + sha256 = "0lb2vcnkzy64474j7306ydyw1ali0qbx07sxfms2fqv1nmh161i2"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix index 644fd5eef3..238e133495 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix @@ -16,6 +16,7 @@ , gtk2 , gtk3 , gtk-doc +, runCommand , isocodes , cldr-emoji-annotation , unicode-character-database @@ -47,6 +48,14 @@ let makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; + # make-dconf-override-db.sh needs to execute dbus-launch in the sandbox, + # it will fail to read /etc/dbus-1/session.conf unless we add this flag + dbus-launch = runCommand "sandbox-dbus-launch" { + nativeBuildInputs = [ makeWrapper ]; + } '' + makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ + --add-flags --config-file=${dbus.daemon}/share/dbus-1/session.conf + ''; in stdenv.mkDerivation rec { @@ -71,7 +80,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "installedTests" ]; postPatch = '' - echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh + patchShebangs --build data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; @@ -105,6 +114,7 @@ stdenv.mkDerivation rec { python3BuildEnv vala wrapGAppsHook + dbus-launch ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/caps2esc.nix index 994e9da3e4..7e6206eb1f 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/caps2esc.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/caps2esc.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitLab, cmake }: -let - version = "0.1.0"; - pname = "interception-tools-caps2esc"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; +stdenv.mkDerivation rec { + pname = "caps2esc"; + version = "0.1.3"; - src = fetchurl { - url = "https://gitlab.com/interception/linux/plugins/caps2esc/repository/v${version}/archive.tar.gz"; - sha256 = "1fdxqp54gwsrm2c63168l256nfwdk4mvgr7nlwdv62wd3l7zzrg8"; + src = fetchFromGitLab { + owner = "interception/linux/plugins"; + repo = pname; + rev = "v${version}"; + sha256 = "10xv56vh5h3lxyii3ni166ddv1sz2pylrjmdwxhb4gd2p5zgl1ji"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://gitlab.com/interception/linux/plugins/caps2esc"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index a29098268f..966e71bb6d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.195"; + version = "1.196"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "04dsxp6vcy9z9gh41bq970wvdnhkmbdlizsy0dyhsl5axm5i84xz"; + sha256 = "042ly91525q2qj7985qih4njhjk5ndz8jiz01v860jc38bvw595p"; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index d0cf1b4e5b..354c4b4ddf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.16.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1vhwv9yb8acz4iq9zmg1qkf072z1py84lz4ddj8gmg6rq7g8n4mb"; + sha256 = "0lmcjc08902h4mi6qx3x2v1xa4w980xvmbrbfm59lis856whaqww"; }; - cargoSha256 = "19z6d72ssqwm8i7bnfqgsndy1f2wxzkvhs8swy16gnqfqjqdf26d"; + cargoSha256 = "1bgrm6a7p7xl95ljk87g4bxv1insl14yxc895yszr0my3ksmpzqh"; nativeBuildInputs = [ installShellFiles ]; @@ -19,6 +19,11 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/' + + # Fill the version stub in the man page. We can't fill the date + # stub reproducibly. + substitute man/page man/broot.1 \ + --replace "#version" "${version}" ''; postInstall = '' @@ -28,6 +33,8 @@ rustPlatform.buildRustPackage rec { installShellCompletion --bash $OUT_DIR/{br,broot}.bash installShellCompletion --fish $OUT_DIR/{br,broot}.fish installShellCompletion --zsh $OUT_DIR/{_br,_broot} + + installManPage man/broot.1 ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index eb372b6b56..6ff736167b 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.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "0s2a0q3lgrdz7w69sacn23k4dybw6wrk63xxnylj88wss7mqnpj8"; + sha256 = "01px0nj2llas835g1hf8lvhigip4jm4innjacz18c7nf1ddwn7ss"; }; - vendorSha256 = "0hpjvpai2i9jn8hlxhx4pvvawjh6lfmlz7ffi320pp7vanzqhch1"; + vendorSha256 = "1gzg73lrx73rhb9yj6yakv95m8rz1rhjgqjl1a78c8nvaii27a9x"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix index cdd1891fb4..d5c5b0ee78 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix pname = "cloud-utils"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz"; - sha256 = "19ca9ckwwsvlqrjz19bc93rq4gv3y4ak7551li2qk95caqyxsq3k"; + url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz"; + sha256 = "07fl3dlqwdzw4xx7mcxhpkks6dnmaxha80zgs9f6wmibgzni8z0r"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix index bc4a7084cd..eea5260a98 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "codebraid"; - version = "0.5.0-unstable-2019-12-11"; + version = "0.5.0-unstable-2020-07-01"; src = fetchFromGitHub { owner = "gpoore"; repo = pname; - rev = "fac1b29"; - sha256 = "0ldfrkkip7i1fdyz1iydyik3mhm0xv0jvxnl37r7g707dl38vf3h"; + rev = "c7962587e7f1e619b5dcf9a5e901eb7042520b00"; + sha256 = "1f31yaiwc33ivjbipym7sggsqwqxn70kgf9dixi8392pk70jzq6p"; }; propagatedBuildInputs = with python3Packages; [ bespon ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix index e769cb25a7..533b4eefc2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let - version = "4.11"; + version = "4.12"; meta = with stdenv.lib; { description = "Various coreboot-related tools"; @@ -16,7 +16,7 @@ let src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "11xdm2c1blaqb32j98085sak78jldsw0xhrkzqs5b8ir9jdqbzcp"; + sha256 = "1qibds9lsk22wf1sxwg0jg32fgcvc9an39vf74y1hwwvxq0d1jpd"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpuminer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cpuminer/default.nix index 99eb6a52ca..d48dc5ec1c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cpuminer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cpuminer/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchurl, curl, jansson, perl }: +{ stdenv +, fetchFromGitHub +, curl +, jansson +, perl +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "cpuminer"; - version = "2.5.0"; + version = "2.5.1"; - src = fetchurl { - url = "mirror://sourceforge/cpuminer/pooler-${pname}-${version}.tar.gz"; - sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa"; + src = fetchFromGitHub { + owner = "pooler"; + repo = pname; + rev = "v${version}"; + sha256 = "0f44i0z8rid20c2hiyp92xq0q0mjj537r05sa6vdbc0nl0a5q40i"; }; patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null; - buildInputs = [ curl jansson ]; + buildInputs = [ curl jansson autoreconfHook ]; configureFlags = [ "CFLAGS=-O3" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix index 8d7f16b5be..2f4c117c61 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix @@ -1,21 +1,22 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - pname = "dashing-unstable"; - version = "2018-02-15"; - rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49"; + pname = "dashing"; + version = "0.4.0"; goPackagePath = "github.com/technosophos/dashing"; - src = fetchgit { - inherit rev; - url = "https://github.com/technosophos/dashing"; - sha256 = "066njyk3c1fqqr0v6aa6knp3dnksmh6hnl9d84fgd4wzyw3ma2an"; + src = fetchFromGitHub { + owner = "technosophos"; + repo = pname; + rev = version; + sha256 = "0mhv0w5q5vpynbfi21n5i3yw2165bppdlg0amvbv86n9z4c21h89"; }; goDeps = ./deps.nix; + buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + meta = with stdenv.lib; { description = "A Dash Generator Script for Any HTML"; homepage = "https://github.com/technosophos/dashing"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dashing/deps.nix b/third_party/nixpkgs/pkgs/tools/misc/dashing/deps.nix index 4ad5a10149..a87de8674f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dashing/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dashing/deps.nix @@ -1,21 +1,30 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# 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/andybalholm/cascadia"; fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "901648c87902174f774fac311d7f176f8647bdaa"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + rev = "903109d295d5"; + sha256 = "1zprh6wfyf4f5c6nw1bgyyfx3niydsnbdyvpi18fc378wmh4hlq4"; }; } { - goPackagePath = "github.com/codegangsta/cli"; + goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; - url = "https://github.com/codegangsta/cli"; - rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; - sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "f79a8a8ca69d"; + sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; }; } { @@ -23,8 +32,53 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "d896508f87298565da02ed92730e7065c3de10b8"; - sha256 = "19q0rv171wx73rwdp81rkj9ys3r5jaav94b3j06gprg59phb98bs"; + rev = "v2.0.1"; + sha256 = "1i3v0j5144iir1n31nahbq9rs2picraphyh5qx9n9rz1d5w1v8zy"; + }; + } + { + 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 = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v2.0.0"; + sha256 = "0ybpg48s08sm46xsbb42yk14zrsm7pr9808khh6f9fca7s3c7fns"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; }; } { @@ -32,8 +86,44 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"; - sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w"; + rev = "e7e4b65ae663"; + sha256 = "0phil62b9cqvllhfjqqm1jpyk2dxg1dvd88pq2044nc3sxni7w8b"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index c2eed30a70..0a2664d6a7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1r89cfw3ycqwvpfwwiqg8ykc1vyr1gf3ah30mvrmmalgmi6bnx5w"; + sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix index 445dfd6f08..930f1f59a8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.10"; + version = "4.11"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "1mj2hrwm8zr3814yig1f78hzflgih93hmy3dsyx6k0fdcfjkjvmx"; + sha256 = "0lbizfnf3qwsiz2ggia6ff7sjjj8gwhys8bm6wixdc4n0qlycp5v"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index cf5275fcfe..3c1a98a46d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "148"; + version = "151"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1fx3wq5bv12pjcpkd7lvis0vg50apzwvxa5jvcs2dv1r8385wchz"; + sha256 = "180sfk0jfajkn3w3d4bw8ai25wh1bj7ca05lpsxxj7k472w6fsg9"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix new file mode 100644 index 0000000000..dd9490b426 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "diskonaut"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "imsnif"; + repo = "diskonaut"; + rev = version; + sha256 = "125ba9qwh7j8bz74w2zbw729s1wfnjg6dg8yicqrp6559x9k7gq5"; + }; + + cargoSha256 = "0vvbrlmviyn9w8i416767vhvd1gqm3qjvia730m0rs0w5h8khiqf"; + + meta = with stdenv.lib; { + description = "Terminal disk space navigator"; + homepage = "https://github.com/imsnif/diskonaut"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index a79059dff0..91ab681b2a 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.6.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0wq6cqznbpkiy9vz3slpcnxlsxff6gx5x7fsbd67q6jv5zhkn881"; + sha256 = "0z0aqasi42wv1np2a6b0qc14a64r2h8xh025411jdxfs6vjr15am"; # 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 = "096c6i1hqyygaifnm2kg53x22a8hhfxfz22qlssh1rw79bj82q0x"; + cargoSha256 = "1g9248kqwrc46abwx6fakzfxf745jfvkywi49z7mvd4p99ysh2ir"; 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 be8134a92a..9bd9c2104f 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.5"; + version = "4.6"; src = fetchurl { url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "08gsd99w20fdi0apppmzsh06z29ga8y89nfcizidil2hkl8b7jyn"; + sha256 = "0vcflgagna2gdlpjsd6748c73j2829xlhm276mi838zl1n121phn"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix b/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix index af0fa6a76b..5bfbb53c10 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "envsubst"; - version = "1.1.0"; + version = "1.2.0"; goPackagePath = "github.com/a8m/envsubst"; src = fetchFromGitHub { owner = "a8m"; repo = "envsubst"; rev = "v${version}"; - sha256 = "1d6nipagjn40n6iw1p3r489l2km5xjd5db9gbh1vc5sxc617l7yk"; + sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 3dd7996955..1160f4158b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,28 +1,21 @@ -{ lib, python3, platformio, esptool, git, protobuf3_10, fetchpatch }: +{ lib, python3, platformio, esptool, git, protobuf3_11, fetchpatch }: let python = python3.override { packageOverrides = self: super: { protobuf = super.protobuf.override { - protobuf = protobuf3_10; + protobuf = protobuf3_11; }; - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.1.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81"; - }; - }); }; }; in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.14.4"; + version = "1.14.5"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "10krdmpbafvii0qlg5w94vdv573f3zdqm78ck79d6q0frdd9q9yn"; + sha256 = "176mi361677d5cqbi0hn52kky845byjs6gdad8pdhihyjgv7a9y9"; }; ESPHOME_USE_SUBPROCESS = ""; @@ -30,7 +23,7 @@ in python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ voluptuous pyyaml paho-mqtt colorlog tornado protobuf tzlocal pyserial ifaddr - protobuf + protobuf click ]; # remove all version pinning (E.g tornado==5.1.1 -> tornado) diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix index 731ad86e62..7203d6b57f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, pcre2 }: stdenv.mkDerivation rec { pname = "fdupes"; - version = "1.6.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "adrianlopezroche"; repo = "fdupes"; rev = "v${version}"; - sha256 = "19b6vqblddaw8ccw4sn0qsqzbswlhrz8ia6n4m3hymvcxn8skpz9"; + sha256 = "1c5hv7vkfxsii1qafhsynzp9zkwim47xkpk27sy64qdsjnhysdak"; }; - makeFlags = [ "PREFIX=$(out)" ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses pcre2 ]; meta = with stdenv.lib; { description = "Identifies duplicate files residing within specified directories"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix index 264afc68b6..8b9f79aaa7 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.64"; + version = "0.2.65"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "1fgzcw0955vjypwwx3ja8sil0vxwvhsnspn1bjl869ccbnx2x4hs"; + sha256 = "02yw129rw072jlf36k60jbhfdv9ayx2wb5il61fc0v07h1nd7i0d"; }; - cargoSha256 = "0svmbay9waaq9fpc8lg1nys6l35xsjvkri5v1frlgxida5dzghpq"; + cargoSha256 = "04waki61b5pjlgznbhbrjpi9rxgdwg9mjbx2apfh9swvfip602r6"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix index 71e547d843..8e284b25c0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix @@ -2,16 +2,22 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.38"; + version = "5.39"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "0d7s376b4xqymnrsjxi3nsv3f5v89pzfspzml2pcajdk5by2yg2r"; + sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh"; }; + patches = [ + # https://github.com/file/file/commit/85b7ab83257b3191a1a7ca044589a092bcef2bb3 + # Without the RCS id change to avoid conflicts. Remove on next bump. + ./webassembly-format-fix.patch + ]; + nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; diff --git a/third_party/nixpkgs/pkgs/tools/misc/file/webassembly-format-fix.patch b/third_party/nixpkgs/pkgs/tools/misc/file/webassembly-format-fix.patch new file mode 100644 index 0000000000..5eca833e4d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/file/webassembly-format-fix.patch @@ -0,0 +1,13 @@ +diff --git a/src/funcs.c b/src/funcs.c +index 299b8f022..ecbfa28c5 100644 +--- a/src/funcs.c ++++ b/src/funcs.c +@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt) + if (*++p == '%') + continue; + // Skip uninteresting. +- while (strchr("0.'+- ", *p) != NULL) ++ while (strchr("#0.'+- ", *p) != NULL) + p++; + if (*p == '*') { + if (msg) diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix index 5e59d34fe4..668fa463ad 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fsmon"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = version; - sha256 = "18p80nmax8lniza324kvwq06r4w2yxcq90ypk2kqym3bnv0jm938"; + sha256 = "0i7irqs4100j0g19jh64p2plbwipl6p3ld6w4sscc7n8lwkxmj03"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix new file mode 100644 index 0000000000..61430c3e41 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake, libXxf86vm, wrapQtAppsHook }: + +let + pname = "gammy"; + version = "0.9.58"; +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "Fushko"; + repo = pname; + rev = "v${version}"; + sha256 = "02f19b7acrzip4kbfjgqk06xv1c257rq77khpdg5gz0ai6ayvwm8"; + }; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + buildInputs = [ libXxf86vm ]; + + # FIXME remove when https://github.com/Fushko/gammy/issues/45 is fixed + installPhase = '' + runHook preInstall + + install gammy -Dt $out/bin/ + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "GUI tool for manual- of auto-adjusting of brightness/temperature"; + homepage = "https://github.com/Fushko/gammy"; + license = licenses.gpl3; + maintainers = with maintainers; [ atemu ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix index 9c250390e1..78d2e947e3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1rvzll57igivhlxp058mhmcbq07q2zr52xbi1wyn85qr9ihrhx08"; + sha256 = "0hmb3ibza2jycnzw2hd1pjzz7hfx0m2m86v4s7zs9vjw00w4r1j9"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix index 8530d04b49..6b2059cafd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1jcv2dqm49vbz810ypv024r3lqgz804l06yhhwshrih61xzj7dvh"; + sha256 = "0mw0nwj6i681bfsp3psjq377bha2qskkw955pp9h1p8xdyy8cx32"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix index 2ebaf7cf25..de52909a81 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.8"; + version = "0.1.10"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "1farcijm5s1836vi7h36yh0i9v48q4l98s4wprmr28z37c3l3n0b"; + sha256 = "0vdla0vhvgj1yrg631jdm3kwdm1q0acw8sh2nz57dp3x7chq6ipx"; }; - cargoSha256 = "1kvrra5i1g1inxpmn4shd8kgkljrk3ymfnpnhwrsnfxrqidi0h2z"; + cargoSha256 = "1yl1chh243ixa9lhkmgi94w6mvnrnr7xmsh4kvj7ax693249pzjv"; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix index ba509d945e..e30a5e6228 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "0z8banifsp6325j572grpghf69j92zz9cxdnvb6pqjsknc96mrf6"; + sha256 = "1c81xcjzfp4fd2zbq3jbknkqlrn0l5wkr08sgvcsxxvqa80338xv"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix index 46d75e5086..6f8dbb21e1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.2"; + version = "3.1.4"; src = fetchFromGitHub { - owner = "geek1011"; + owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; + sha256 = "0d71d1ra7lk4ayypq3fcigd9lpb2dafa8ci14h0g7rivm4lz8l1j"; }; - vendorSha256 = "04qpxl4j6v6w25i7r6wghd9xi7jzpy7dynhs9ni35wflq0rlczax"; + vendorSha256 = "0jzx5midawvzims9ghh8fbslvwcdczvlpf0k6a9q0bdf4wlp2z5n"; 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/libgen-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix index 7d66941c99..51e390f6c0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "libgen-cli"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "ciehanski"; repo = pname; rev = "v${version}"; - sha256 = "1ahqwrlsvgiig73dwlbjgkarf3a0z3xaihj8psd2ci5i0i07nm5v"; + sha256 = "15nzdwhmgpm36dqx7an5rjl5sw2r4p66qn2y3jzl6fc0y7224ns1"; }; - vendorSha256 = "15ch0zfl4a7qvwszsfkfgw5v9492wjk4l4i324iq9b50g70lgyhd"; + vendorSha256 = "0smb83mq711b2pby57ijcllccn7y2l10zb4fbf779xibb2g09608"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock index e01cf81c61..d98402b0a5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - lolcat (100.0.0) + lolcat (100.0.1) manpages (~> 0.6.1) - optimist (~> 3.0.0) - paint (~> 2.1.0) + optimist (~> 3.0.1) + paint (~> 2.2.0) manpages (0.6.1) - optimist (3.0.0) - paint (2.1.1) + optimist (3.0.1) + paint (2.2.0) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix b/third_party/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix index 2c2bc9cead..421e1874db 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k1m2ihcprjq9jdmq2v3xlf27hqbpr2vjnnyfwp3z2zspzbl0nys"; + sha256 = "13p8i08vdqfg2bqyjkl8jsp7gw8cf6r68i8plp9zqavlqadqlg4q"; type = "gem"; }; - version = "100.0.0"; + version = "100.0.1"; }; manpages = { groups = ["default"]; @@ -25,19 +25,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; paint = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rrb2p2yk6ffhm0gz8ba431mf63kq7w27gwavxl7n8qd2splj4mh"; + sha256 = "014b5rkbg6qri0cwkq972bfi93zvqdgswgvphjrgjl0pr6hywlkl"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix index 73907e233a..3cc0466d80 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { - name = "loop-unstable-2018-12-04"; + pname = "loop"; + version = "unstable-2020-07-08"; src = fetchFromGitHub { owner = "Miserlou"; repo = "Loop"; - rev = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf"; - sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; + rev = "944df766ddecd7a0d67d91cc2dfda8c197179fb0"; + sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix"; }; - cargoSha256 = "1ydd0sd4lvl6fdl4b13ncqcs03sbxb6v9dwfyqi64zihqzpblshv"; + cargoSha256 = "0a3l580ca23vx8isd1qff870ci3p7wf4qrm53jl7nhfjh7rg5a4w"; meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix index 7829a677b4..002a6e2eae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix @@ -4,7 +4,7 @@ , rustPlatform # Updater script , runtimeShell -, writeScript +, writers # Tests , nixosTests # Apple dependencies @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "lorri"; - version = "1.0"; + version = "1.1"; meta = with stdenv.lib; { description = "Your project's nix-env"; @@ -27,11 +27,12 @@ rustPlatform.buildRustPackage rec { owner = "target"; repo = pname; # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - rev = "88c680c9abf0f04f2e294436d20073ccf26f0781"; - sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv"; + # ALSO don’t forget to update the cargoSha256! + rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601"; + sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5"; }; - cargoSha256 = "1iwd0cad8dp8q5xz2mm7zn1wphr5brkw937dfygc88afj6bv3d68"; + cargoSha256 = "1a3n1ylyp63x6v7b07nnqpfxjzmsgwmgraza23lx8z4gh167gv46"; doCheck = false; BUILD_REV_COUNT = src.revCount or 1; @@ -42,8 +43,7 @@ rustPlatform.buildRustPackage rec { stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; passthru = { - updater = with builtins; writeScript "copy-runtime-nix.sh" '' - #!${runtimeShell} + updater = writers.writeBash "copy-runtime-nix.sh" '' set -euo pipefail cp ${src}/nix/runtime.nix ${toString ./runtime.nix} cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template} diff --git a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix index 7b8835622c..f5cbef8b02 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -15,18 +15,17 @@ stdenv.mkDerivation rec { buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; + patches = [ ./systemwide-man-db-conf.patch ]; + postPatch = '' # Remove all mandatory manpaths. Nixpkgs makes no requirements on # these directories existing. sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in - # Add Nixpkgs and NixOS-related manpaths - echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in - echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in + # Add Nix-related manpaths echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in # Add mandb locations for the above - echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in ''; @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { "--disable-setuid" "--disable-cache-owner" "--localstatedir=/var" - # Don't try /etc/man_db.conf by default, so we avoid error messages. "--with-config-file=${placeholder "out"}/etc/man_db.conf" "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" diff --git a/third_party/nixpkgs/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch b/third_party/nixpkgs/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch new file mode 100644 index 0000000000..2d4477776b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch @@ -0,0 +1,39 @@ +commit 9089291006a4258c39c75a920ad536b61504251a +Author: rnhmjoj +Date: Fri May 1 19:32:15 2020 +0200 + + check for systemwide man_db.conf before the bundled one + +diff --git a/src/manp.c b/src/manp.c +index 5441339..0bbf566 100644 +--- a/src/manp.c ++++ b/src/manp.c +@@ -841,18 +841,24 @@ void read_config_file (bool optional) + } + + if (getenv ("MAN_TEST_DISABLE_SYSTEM_CONFIG") == NULL) { +- config_file = fopen (CONFIG_FILE, "r"); ++ const char *config_filepath; ++ if (access ("/etc/man_db.conf", F_OK) != -1) { ++ config_filepath = "/etc/man_db.conf"; ++ } else { ++ config_filepath = CONFIG_FILE; ++ } ++ config_file = fopen (config_filepath, "r"); + if (config_file == NULL) { + if (optional) + debug ("can't open %s; continuing anyway\n", +- CONFIG_FILE); ++ config_filepath); + else + error (FAIL, 0, + _("can't open the manpath " + "configuration file %s"), +- CONFIG_FILE); ++ config_filepath); + } else { +- debug ("From the config file %s:\n", CONFIG_FILE); ++ debug ("From the config file %s:\n", config_filepath); + + add_to_dirlist (config_file, 0); + fclose (config_file); diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix index f206c54a00..7feb2fce71 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -1,27 +1,26 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "1g3n7ll0yg7w7hb3jgp25mlnqwsdzv0608f41z7q5gmsskdm3v1j"; + sha256 = "01rw7gdvpr2s3yj7wphsm5gfrgzf5jkrci4mpqiw7xp8d5k87nzl"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preInstall = '' install -Dm644 -t $out/share/mcfly mcfly.bash + install -Dm644 -t $out/share/mcfly mcfly.zsh ''; - cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; + cargoSha256 = "1q1mi69prn9q1nk4021c69vq160ls6md6gpqxk7zyf25r5ckdd98"; meta = with stdenv.lib; { homepage = "https://github.com/cantino/mcfly"; - description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; + description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix index 0a887531fb..aedaa36488 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix @@ -1,30 +1,40 @@ -{ stdenv, fetchFromGitHub, glib, readline -, bison, flex, pkgconfig, autoreconfHook -, txt2man, which }: +{ stdenv, lib, fetchFromGitHub, glib, readline +, bison, flex, pkgconfig, autoreconfHook, libxslt, makeWrapper +, txt2man, which +# withUi currently doesn't work. It compiles but fails to run. +, withUi ? false, gtk2, gnome2 +}: -let version = "0.7.1"; -in stdenv.mkDerivation { +let + uiDeps = [ gtk2 ] ++ (with gnome2; [ GConf libglade libgnomeui gnome-doc-utils ]); + +in +stdenv.mkDerivation rec { pname = "mdbtools"; - inherit version; + version = "0.8.2"; src = fetchFromGitHub { - owner = "brianb"; + owner = "cyberemissary"; repo = "mdbtools"; rev = version; - sha256 = "0gwcpp9y09xhs21g7my2fs8ncb8i6ahlyixcx8jd3q97jbzj441l"; + sha256 = "12rhf6rgnws6br5dn1l2j7i77q9p4l6ryga10jpax01vvzhr26qc"; }; - nativeBuildInputs = [ pkgconfig bison flex autoreconfHook txt2man which ]; - buildInputs = [ glib readline ]; + configureFlags = [ "--disable-scrollkeeper" ]; - preConfigure = '' - sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c - ''; + nativeBuildInputs = [ + pkgconfig bison flex autoreconfHook txt2man which + ] ++ lib.optional withUi libxslt; - meta = with stdenv.lib; { + buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps; + + enableParallelBuilding = true; + + meta = with lib; { description = ".mdb (MS Access) format tools"; - homepage = "http://mdbtools.sourceforge.net"; - platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + inherit (src.meta) homepage; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index 6137abd929..b2b6651516 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,24 +1,38 @@ -{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql -, withLuaJIT ? false, lua, luajit }: +{ stdenv +, fetchFromGitHub +, cmake +, expat +, proj +, bzip2 +, zlib +, boost +, postgresql +, withLuaJIT ? false +, lua +, luajit +, libosmium +, protozero +}: stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "1ysan01lpqzjxlq3y2kdminfjs5d9zksicpf9vvzpdk3fzq51fc9"; + sha256 = "1j35aa8qinhavliqi5pdm0viyi7lm5xyk402rliaxxs1r2hbsafn"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql ] + buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ] ++ stdenv.lib.optional withLuaJIT luajit ++ stdenv.lib.optional (!withLuaJIT) lua; - cmakeFlags = stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] + ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; @@ -27,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openstreetmap/osm2pgsql"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ jglukasik ]; + maintainers = with maintainers; [ jglukasik das-g ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index da2e1a9cbe..9323ea0b9e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "03c4v24ql9p38m0hmgq5ya9cnvhmdhv2zjxxrxpb2338cxajs4mh"; + sha256 = "1prhzmxrvypqdbxjr9c3207w1c88z3kwsrr2rcbh1y7fx5rrspxv"; }; vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; 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 83e96d8f9e..bea73610dd 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.6.1"; + version = "9.8.0"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "1qnci0bipzq68mwfgmm7kcxjxcpfdrqf705am2jsj1mfd82y7yla"; + sha256 = "05q01cr4a2mmyski50pqna9sgw2jy93fgfpjwkhbkc09na6400sq"; }; buildInputs = [ php ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index cb8cf1ec0a..5b139bf492 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.12"; + version = "1.2020.15"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0c0270kjw8vg8nphharap2p66yl72j5k4k3s5r9klafgp3sg4sjj"; + sha256 = "0dvm24ihdr71giz0mihg7wjqf2nrkk7a52vbbzimrvbilaih6s8v"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix b/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix index bbde732aad..a43101f607 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "progress"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl"; + sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/qt5ct/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qt5ct/default.nix index 97793b0255..c83ba0afa4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qt5ct/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (lib) getDev; in mkDerivation rec { pname = "qt5ct"; - version = "0.41"; + version = "1.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1p2p6116wg5bc0hcbi2sygwlgk0g9idxpci0qdh3p4lb1plk0h7j"; + sha256 = "118sjzhb0z4vxfmvz93hpmsyqyav1z9k97m4q4wcx0l1myypnb59"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix b/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix index aad63b66ec..8d94873446 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib, bzip2 }: +{ stdenv, fetchurl, fetchpatch, perl, zlib, bzip2 }: stdenv.mkDerivation rec { pname = "routino"; @@ -9,12 +9,26 @@ stdenv.mkDerivation rec { sha256 = "1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab"; }; + patchFlags = [ "-p0" ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-Makefile_conf.diff"; + sha256 = "1b7hpa4sizansnwwxq1c031nxwdwh71pg08jl9z9apiab8pjsn53"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-src_Makefile_dylib_extension.diff"; + sha256 = "1kigxcfr7977baxdsfvrw6q453cpqlzqakhj7av2agxkcvwyilpv"; + }) + ]; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib bzip2 ]; outputs = [ "out" "doc" ]; + CLANG = stdenv.lib.optionalString stdenv.cc.isClang "1"; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { @@ -22,6 +36,6 @@ stdenv.mkDerivation rec { description = "OpenStreetMap Routing Software"; license = licenses.agpl3; maintainers = with maintainers; [ dotlambda ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix index eed9516d09..fc834c65a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python, utillinux, fetchpatch, json_c }: +, lvm2, pam, python, utillinux, fetchpatch, json_c, nixosTests }: stdenv.mkDerivation rec { pname = "snapper"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1flqhfpx9dipim22wq7wh1590ra4gydwii1jjp99pi03mdhavlbn"; + sha256 = "0bw8aal3a9823zcwini3an9zdxmf7vm912jbyb95rjac0wilqfw7"; }; nativeBuildInputs = [ @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { lvm2 pam python utillinux json_c ]; + passthru.tests.snapper = nixosTests.snapper; + patches = [ # Don't use etc/dbus-1/system.d (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix new file mode 100644 index 0000000000..fbed27a244 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, buildPackages +, fetchgit +, autoreconfHook +, gmp +, ncurses +, halibut +, perl +}: + +stdenv.mkDerivation rec { + pname = "spigot"; + version = "20200101"; + src = fetchgit { + url = "https://git.tartarus.org/simon/spigot.git"; + rev = "b1b0b202b3523b72f0638fb31fd49c47f4abb39c"; + sha256 = "0lh5v42aia1hvhsqzs515q0anrjc6c2s9bjklfaap5gz0cg59wbv"; + }; + + nativeBuildInputs = [ autoreconfHook halibut perl ]; + + configureFlags = [ "--with-gmp" ]; + + buildInputs = [ gmp ncurses ]; + + strictDeps = true; + + meta = with lib; { + description = "A command-line exact real calculator"; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ mcbeth ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 3fec20f95b..142caea705 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, installShellFiles , libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.42.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "17wc9f07308a97dsmrkq74w2r639sqms0hwh8gavwxycj7wq7xz2"; + sha256 = "1pxrg5sfqqkvqww3fabq64j1fg03v5fj5yvm2xg2qa5n2f2qwnhi"; }; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -22,14 +22,29 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "1nvs68qxygi2l43vxw890r40px35dvzbcg6qmrm09g60ykd8pjv2"; - checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; + postInstall = '' + for shell in bash fish zsh; do + $out/bin/starship completions $shell > starship.$shell + installShellCompletion starship.$shell + done + ''; + + cargoSha256 = "1b5gsw7jpiqjc7kbwf2kp6h6ks7jcgygrwzvn2akz86z40sskyg3"; + + preCheck = '' + substituteInPlace tests/testsuite/common.rs \ + --replace "./target/debug/starship" "./$releaseDir/starship" + substituteInPlace tests/testsuite/python.rs \ + --replace "#[test]" "#[test] #[ignore]" + ''; + + checkFlagsArray = [ "--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 Frostman ]; + maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman marsam ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 21e464c6d2..af3b126614 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.7.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1hg03mj3rd778hq1856139nwz7y5gykwvg7xhxlsiabv7gr06m2m"; + sha256 = "0cnzla5x4y4j658zihlnrghry4c3695gi0marwygh7vcfxqh0vlh"; }; - cargoSha256 = "14qv2157jhj7hilvqi3c00p11rzv0vvimr4d34nyspgzxz2si6sm"; + cargoSha256 = "16y71dd775knkq04x6qjs6zf3b9z12vz5xhqm18sl2bm3sbsq4pc"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix b/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix index 6013dc1c26..ded409754b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txt2man"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "06jf8hqav095db1v3njavx0rphmpmi3mgki4va6qkxjnvmdx4742"; + sha256 = "0ka3krmblsprv0v6h6wnm8lv08w30z0ynfnbwns6alks5gx1p6sd"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix index 6a9a12b2a0..6be05cf53a 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 = "20200420"; + version = "20200610"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "03li63v9mbsqn4cw6d769r1a6iaixi80m2c32y32vc9i5k3ik43c"; + sha256 = "0181lk999gfqk8pkd4yx0qrz9r3k9a0z0i50wcayp7z1n1ivqllb"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix index 01993ebed6..8e3db232fe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1idyr3h9dhb67xlhd5bsa7866i75w4jzjbbchq6fd9lqd488bsj7"; + sha256 = "0nvd8x60nkk8izqy8m8m1fi0x48s9sjh4zfl8d2ig46lqc8n5cpm"; }; - cargoSha256 = "14lkvfr1yz8g15ffc8j1vvy7q1nwqbkhz2y0fnskwqfzpd17f9gl"; + cargoSha256 = "08pv7nr471apzy77da1pffdmx2dgf5mbj09302cfmf8sj49saal6"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix index 7870974531..b0e069f309 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "websocat"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "vi"; repo = "websocat"; rev = "v${version}"; - sha256 = "1lmra91ahpk4gamhnbdr066hl4vzwfh5i09fbabzdnxcvylbx8zf"; + sha256 = "0iilq96bxcb2fsljvlgy47pg514w0jf72ckz39yy3k0gwc1yfcja"; }; cargoBuildFlags = [ "--features=ssl" ]; - cargoSha256 = "09chj0bgf4r8v5cjq0hvb84zvh98nrzrh1m0wdqjy5gi7zc30cis"; + cargoSha256 = "1hsms8rlnds8npr8m0dm21h04ci5ljda09pqb598v7ny3j2dldiq"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix index 00cfd27d2e..c07de47e47 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix @@ -1,15 +1,22 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, udev, wooting-udev-rules }: - +{ appimageTools +, fetchurl +, lib +, gsettings-desktop-schemas +, gtk3 +, libxkbfile +, udev +, wooting-udev-rules +}: let pname = "wootility"; - version = "3.4.6"; + version = "3.5.10"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; - sha256 = "02ivbgnzr657iqb9hviaylmsym2kki2c84xmqfix3b0awsphn05q"; + sha256 = "1bhk4jcziis01lyn8dmx93abd6p41gmbrysphcd5810l7zcfz59y"; }; profile = '' @@ -19,7 +26,11 @@ appimageTools.wrapType2 rec { multiPkgs = extraPkgs; extraPkgs = - pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules ]); + pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ + udev + wooting-udev-rules + libxkbfile + ]); extraInstallCommands = "mv $out/bin/{${name},${pname}}"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytree/default.nix new file mode 100644 index 0000000000..0400e59d22 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/ytree/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, fetchurl +, ncurses +, readline +}: + +stdenv.mkDerivation rec { + pname = "ytree"; + version = "2.02"; + + src = fetchurl { + url = "https://han.de/~werner/${pname}-${version}.tar.gz"; + sha256 = "1v70l244rc22f20gac1zha1smrhqkag45jn0iwgcyngfdfml3gz5"; + }; + + buildInputs = [ + ncurses readline + ]; + + # don't save timestamp, in order to improve reproducibility + postPatch = '' + substituteInPlace Makefile --replace 'gzip' 'gzip -n' + ''; + + preBuild = '' + makeFlagsArray+=(CC="cc" + ADD_CFLAGS="" + COLOR="-DCOLOR_SUPPORT" + CLOCK="-DCLOCK_SUPPORT" + READLINE="-DREADLINE_SUPPORT" + CFLAGS="-D_GNU_SOURCE -DWITH_UTF8 $(ADD_CFLAGS) $(COLOR) $(CLOCK) $(READLINE)" + LDFLAGS="-lncursesw -lreadline") + ''; + + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "A curses-based file manager similar to DOS Xtree(TM)"; + homepage = "https://www.han.de/~werner/ytree.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} +# TODO: X11 support diff --git a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 7d8e760a8d..59149506e6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.4"; + version = "1.8.7"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "1whh2gzxhx4c24mwh5yifnpah56bzb6v7barp727pjw4whpflg1s"; + sha256 = "14n1abv7gh4zajq471bgzpcv8l1159g00h9x83h719i9kxxsa2ba"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix index ee15786d40..f6c018f4e0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -1,28 +1,31 @@ -{ stdenv +{ lib , fetchFromGitHub , rustPlatform -, withFzf ? true, fzf +, withFzf ? true +, fzf }: - -rustPlatform.buildRustPackage rec { +let + version = "0.4.3"; +in +rustPlatform.buildRustPackage { pname = "zoxide"; - version = "0.4.1"; + inherit version; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "1zfk9y5f12h2d5zwf2z8c95xwhbhc6ayv971875fbxgz1nd8vqb6"; + sha256 = "1ghdal6pqkp56rqawhj26ch1x4cvnjj032xz3626aiddqgn134zj"; }; - postPatch = stdenv.lib.optionalString withFzf '' + postPatch = lib.optionalString withFzf '' substituteInPlace src/fzf.rs \ --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "0z0p3cxxazw19bmk3zw7z2q93p00ywsa2cz1jhy78mn5pq1v95rd"; + cargoSha256 = "0klnjmda77bq9i9f0rz48jzaw4rcf7hafcjjpb0i570d7hlxnwsr"; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix index e2bc592f7a..99376cc58a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "amass"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1acjqpa9xg9ji2mzxag57yq589cdq3rh78a8vz8wnkkkp7b8why8"; + sha256 = "083c59yig9z0ksvcm9dvy0mv13k79rgnvqrr5qhbhzjz3bgzy1dq"; }; vendorSha256 = "1s8g0qqg3m6hdvc5v3s86l3ba5grmyhx0lf2ymi39k5dpcg8l19s"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix index 7b796a52e3..3ba57db51a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -1,11 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: +{ stdenv, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "assh"; - version = "2.7.0"; + version = "2.10.0"; - goPackagePath = "github.com/moul/advanced-ssh-config"; - subPackages = [ "cmd/assh" ]; + src = fetchFromGitHub { + repo = "advanced-ssh-config"; + owner = "moul"; + rev = "v${version}"; + sha256 = "0qsb5p52v961akshgs1yla2d7lhcbwixv2skqaappdmhj18a23q2"; + }; + + vendorSha256 = "03ycjhal4g7bs9fhzrq01ijj48czvs272qcqkd9farsha5gf0q0b"; nativeBuildInputs = [ makeWrapper ]; @@ -14,16 +20,15 @@ buildGoPackage rec { --prefix PATH : ${openssh}/bin ''; - src = fetchFromGitHub { - repo = "advanced-ssh-config"; - owner = "moul"; - rev = "v${version}"; - sha256 = "0jfpcr8990lb7kacadbishdkz5l8spw24ksdlb79x34sdbbp3fm6"; - }; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/assh --help > /dev/null + ''; meta = with stdenv.lib; { description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts"; - homepage = "https://github.com/moul/advanced-ssh-config"; + homepage = "https://github.com/moul/assh"; + changelog = "https://github.com/moul/assh/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ zzamboni ]; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 5f7c862371..31efdaddb7 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.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "09qr8s136ilqa9r5yjys2mnyyprhancn5n4maqmlfbjrz590g6nb"; + sha256 = "074bgdgv6flg5xjzk7sxgqsy89ygnx7swhaqz75vvrcpx9ldysvz"; }; - cargoSha256 = "0awm79gbip3p2k3qr08n0p9lmmbnibnhvz06qzcj27gvmdxs8xvz"; + cargoSha256 = "0aq3k64g04l03h42cnnpljqffkkl1gdg6r5rqi237h0jrhci8c7w"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bully/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bully/default.nix index c951239234..4117932550 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bully/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bully/default.nix @@ -1,33 +1,32 @@ -{ stdenv, fetchFromGitHub, openssl, libpcap }: +{ stdenv, fetchFromGitHub, libpcap }: stdenv.mkDerivation rec { - pname = "bully"; - version = "1.1"; + version = "1.4-00"; src = fetchFromGitHub { - sha256 = "1qvbbf72ryd85bp4v62fk93ag2sn25rj7kipgagbv22hnq8yl3zd"; - rev = version; + owner = "kimocoder"; repo = "bully"; - owner = "aanarchyy"; + rev = version; + sha256 = "1n2754a5z44g414a0hj3cmi9q5lwnzyvmvzskrj2nci8c8m2kgnf"; }; - buildInputs = [ openssl libpcap ]; - buildPhase = '' - cd src - make - ''; + buildInputs = [ libpcap ]; + + enableParallelBuilding = true; + + sourceRoot = "./source/src"; installPhase = '' - mkdir -p $out/bin - mv bully $out/bin + install -Dm555 -t $out/bin bully + install -Dm444 -t $out/share/doc/${pname} ../*.md ''; meta = with stdenv.lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = "https://github.com/aanarchyy/bully"; - maintainers = with maintainers; [ edwtjo ]; + homepage = "https://github.com/kimocoder/bully"; license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix index 9a74344d29..13388d3377 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }: -let version = "20.6"; in -stdenv.mkDerivation { - name = "cjdns-"+version; +stdenv.mkDerivation rec { + pname = "cjdns"; + version = "20.7"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "1d5rrnqb5dcmm5cg2ky1cgxz6ncb23n1j797j9zzw6xxdvkf3kgi"; + sha256 = "09gpqpzc00pp3cj7lyq9876p7is4bcndpdi5knqbv824vk4bj3k0"; }; buildInputs = [ which python27 nodejs ] ++ diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index af21e9d4fe..17592ec336 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.20.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "1nb4hl9x2lj0hy8byz14c2xn6yhrb6pqmhzl002k83qd3zrc6s3p"; + sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny"; }; goPackagePath = "github.com/Dreamacro/clash"; - vendorSha256 = "0nh3cn31p7yhnhjzqp84dnhzy3hag253bjp70w8q03lw7mkhdgz3"; + vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh"; 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/connman/connmanui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix deleted file mode 100644 index 51c97e6cb7..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: - -stdenv.mkDerivation rec { - pname = "connmanui"; - rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516"; - version = "22062015-${rev}"; - - src = fetchgit { - inherit rev; - url = "git://github.com/tbursztyka/connman-ui.git"; - sha256 = "0ixx8c9cfdp480z21xfjb7n1x27sf1g8gmgbmcfhr0k888dmziyy"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool glib gtk3 dbus file intltool connman ]; - - preConfigure = '' - rm m4/intltool.m4 - ln -s ${intltool}/share/aclocal/intltool.m4 m4/ - set -e - ./autogen.sh - sed -i "s/\/usr\/bin\/file/file/g" ./configure - ''; - - configureScript = "./configure"; - - meta = { - description = "A full-featured GTK based trayicon UI for ConnMan"; - homepage = "https://github.com/tbursztyka/connman-ui"; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix b/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix index bbdb98ae49..2b1e94d2c1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -1,24 +1,34 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "corerad"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "16rwydvqkzi0jlgwpl3d4f8zd35y4lv4h5xa30ybqmwwp1k5ymf0"; + sha256 = "073hjbwra8ihh11ha5ajqq2r98cc5li4k0xs4p4s055q197zj3aa"; }; - vendorSha256 = "1431fvi9b0id3zhgkxhiampc5avvp998lncyd5l2gn5py3qz6sdl"; + vendorSha256 = "19hp8xqr50v8h9vblihalvkb9ll8c0v4p071j9j1zkbjhnb07rca"; - buildFlagsArray = '' - -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1591474872 - -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + # Since the tarball pulled from GitHub doesn't contain git tag information, + # we fetch the expected tag's timestamp from a file in the root of the + # repository. + preBuild = '' + buildFlagsArray=( + -ldflags=" + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=$(<.gittagtime) + -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + " + ) ''; + passthru.tests = { + inherit (nixosTests) corerad; + }; + 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 8fe208c98b..632eacdf1f 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.11"; + version = "8.0.12"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "09yx7xjhvpyvzwsf859b9yfrxzg01ak3dfavfhmx3h97lrdxprgi"; + sha256 = "0j0cdxblh0h68a55jvljzahj851yba354xv2w5gg9hjzjd38769x"; }; - vendorSha256 = "1lqlrsd90475b1wp1krfppi635q5gw1ka8x4d8haanmnlnxkniqf"; + vendorSha256 = "1d6gg7c0rb45zy9rilacn2xyr3kcb7acsh389hk6lppipmhpzr5a"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index 11a928a3ef..68de066107 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -29,14 +29,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.70.0"; + version = "7.71.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "1l19b2xmzwjl2fqlbv46kwlz1823miaxczyx2a5lz8k7mmigw2x5"; + sha256 = "0hfkbp51vj51s28sq2wnw5jn2f6r7ycdy78lli49ba414jn003v0"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix index 20d2545e50..dcb05eb848 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2019.78"; + name = "dropbear-2020.80"; src = fetchurl { url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "19242qlr40pbqfqd0gg6h8qpj38q6lgv03ja6sahj9vj2abnanaj"; + sha256 = "0jbrbpdzyv11x5rkljdimzq9p6a7da5siw9k405ibnpjj4dr89yr"; }; dontDisableStatic = enableStatic; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix index 4fe381cdd7..50de41b921 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix @@ -14,7 +14,7 @@ let }; pcap = symlinkJoin { inherit (libpcap) name; - paths = [ libpcap ]; + paths = [ (libpcap.overrideAttrs(old: { dontDisableStatic = true; })) ]; postBuild = '' cp -rs $out/include/pcap $out/include/net # prevent references to libpcap diff --git a/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix index 6a63a2047b..137bead064 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-4.2"; + name = "fping-4.3"; src = fetchurl { url = "https://www.fping.org/dist/${name}.tar.gz"; - sha256 = "0jmnf4vmr43aiwk3h2b5qdsb95gxar8gz1yli8fswnm9nrs9ccvx"; + sha256 = "0b9ppwibc0dx2ns95m0z1b28939af1c8yvgjbhnr9f7p8bl0l14j"; }; configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix index 6bae95298f..2fc95c7621 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,20 @@ buildGoModule rec { pname = "grpcui"; - version = "0.2.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "0dcah6bamjqyp9354qrd1cykdr5k5l93hh7qcy5b4nkag9531gl0"; + sha256 = "0b6rc294v8jagk79hcjbaldfi7y7idx8bknsbdi3djym5rspdg6s"; }; - vendorSha256 = "0m9nn8x0ji0n9v3d5w5z3grwv0zh8ijvh92jqjpcfv4bcjr5vsjr"; + vendorSha256 = "0wih9xvpgqqd82v1pxy5rslrsd6wsl0ys1bi1mf373dnfq5vh5a9"; + + subPackages = [ "cmd/grpcui" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; @@ -20,4 +24,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/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index c43edd040e..09b228c0b8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1pyz4gckdn8982vpb1iiw9agwp2s5p8wc0nn1qh1ic0wq3lrnpg6"; + sha256 = "0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir"; }; buildInputs = [ openssl zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix index 01986bf932..bf80cd48ff 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchFromGitHub, python3Packages, docutils, }: +{ stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "httpie"; rev = version; - sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2"; + sha256 = "0caazv24jr0844c4mdx77vzwwi5m869n10wa42cydb08ppx1xxj6"; }; outputs = [ "out" "doc" "man" ]; propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; dontUseSetuptoolsCheck = true; - patches = [ ./strip-venv.patch ]; + patches = [ + ./strip-venv.patch + + # Fix `test_ciphers_none_can_be_selected` + # TODO: remove on next release + (fetchpatch { + url = "https://github.com/jakubroztocil/httpie/commit/49e71d252f54871a6bc49cb1cba103d385a543b8.patch"; + sha256 = "13b2faf50gimj7f17dlx4gmd8ph8ipgihpzfqbvmfjlbf1v95fsj"; + }) + ]; checkInputs = with python3Packages; [ mock diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix index f39b061c34..f4fb4fe960 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "httplab"; - version = "0.3.0"; + version = "0.4.0"; rev = "v${version}"; goPackagePath = "github.com/gchaincl/httplab"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "gchaincl"; repo = "httplab"; inherit rev; - sha256 = "1q9rp43z59nryfm79gci5a1gmqw552rqd4cki81rymbj3f6xvrf9"; + sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix b/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix index 9ce1183d06..818d500d1e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "1sphd30jplii58y2zmw365bckm6pszmapcy905zhjll1sm1ldjv8"; + sha256 = "01g8hk9gisz67204k8ad7w7i3zp9vg2c68lscld44bwiii1d21li"; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netifd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netifd/default.nix index 38591f38fc..36d1ec7a42 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netifd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netifd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "netifd"; - version = "unstable-2020-01-18"; + version = "unstable-2020-07-11"; src = fetchgit { url = "https://git.openwrt.org/project/netifd.git"; - rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543"; - sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3"; + rev = "3d9bd73e8c2d8a1f78effbe92dd2495bbd2552c4"; + sha256 = "085sx1gsigbi1jr19l387rc5p6ja1np6q2gb84khjd4pyiqwk840"; }; buildInputs = [ libnl libubox uci ubus json_c ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix index 109c4c8cce..9f92fcfa1a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"; + sha256 = "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx"; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix index f84ef027f7..4204ba1fcd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -4,13 +4,13 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "networkmanager_dmenu"; - version = "1.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "v${version}"; - sha256 = "1z6151z7c4jv5k2i50zr7ld4k3m07dgpmss9f3hsav95cv55dcnb"; + rev = "${version}"; + sha256 = "1msk4zkm4042av61rgbwc62i62vnv9py93fm1bczmw0b1f54qpmk"; }; buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix b/third_party/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix index 727c18e92c..7d7889f9a5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.8.28"; + version = "1.8.30"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"; + sha256 = "1d5gzn7ss5vi0bhc8s4i5gsrck1ajslajam5jxfqazg094mffcys"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix index f17849ef75..d9c1acc374 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelfUnstable }: +{ stdenv, fetchurl }: with stdenv.lib; @@ -24,8 +24,6 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = optionals stdenv.isLinux [ patchelfUnstable ]; - unpackPhase = "cp $src ngrok"; buildPhase = "chmod a+x ngrok"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix index d118227c32..a7deaf7b69 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p14"; + name = "ntp-4.2.8p15"; src = fetchurl { url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "1dsfbrad5adwjnm3k0y0ip8dzs7r2nmw66vjil8gvapnh7qf8q0r"; + sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; }; # The hardcoded list of allowed system calls for seccomp is diff --git a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix new file mode 100644 index 0000000000..d087e92f05 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "oneshot"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "raphaelreyna"; + repo = "oneshot"; + rev = "v${version}"; + sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2"; + }; + + goPackagePath = "github.com/raphaelreyna/oneshot"; + vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "A first-come-first-serve single-fire HTTP server"; + homepage = "https://github.com/raphaelreyna/oneshot"; + license = licenses.mit; + maintainers = with maintainers; [ edibopp ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 08163bd8a9..710f7dedb9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "gtk-gnutella"; # NOTE: Please remove hardeningDisable on the next release, see: # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19 - version = "1.1.15"; + version = "1.2.0"; src = fetchFromGitHub { owner = "gtk-gnutella"; repo = "gtk-gnutella"; rev = "v${version}"; - sha256 = "1g7w6ywwp2g4qdgmfqkrl1rldk1b4rx50yb7h75hh15mh6nr159r"; + sha256 = "0j596dpajk68bkry0gmpqawsi61rphfciy4vji1dh890jyhkhdgy"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix b/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix index 63e2af48c1..ecceed2166 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix @@ -6,22 +6,24 @@ , pyqt5 , requests , setproctitle +, setuptools , sound-theme-freedesktop +, wrapQtAppsHook , youtube-dl }: buildPythonApplication rec { pname = "persepolis"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "persepolisdm"; repo = "persepolis"; rev = version; - sha256 = "0xngk8wgj5k27mh3bcrf2wwzqr8a3g0d4pc5i5vcavnnaj03j44m"; + sha256 = "1rh7q432ynbysapsd075nif975ync71icpb71x2mb4j8jx1vzs45"; }; - # see: https://github.com/persepolisdm/persepolis/blob/3.1.0/setup.py#L130 + # see: https://github.com/persepolisdm/persepolis/blob/3.2.0/setup.py#L130 doCheck = false; preBuild='' @@ -36,10 +38,17 @@ buildPythonApplication rec { postInstall = '' mkdir -p $out/share/applications cp $src/xdg/com.github.persepolisdm.persepolis.desktop $out/share/applications - wrapProgram $out/bin/persepolis --prefix PATH : "${lib.makeBinPath [aria libnotify ]}" ''; - buildInputs = [ makeWrapper ]; + # prevent double wrapping + dontWrapQtApps = true; + nativeBuildInputs = [ wrapQtAppsHook ]; + + # feed args to wrapPythonApp + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [aria libnotify ]}" + ''''${qtWrapperArgs[@]}'' + ]; propagatedBuildInputs = [ pulseaudio @@ -47,6 +56,7 @@ buildPythonApplication rec { pyqt5 requests setproctitle + setuptools sound-theme-freedesktop youtube-dl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix index 861c44ef70..4019926375 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix @@ -22,14 +22,14 @@ assert withMysql -> libmysqlclient != null; let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "1.7.3"; + version = "1.7.5"; pname = "pmacct"; src = fetchFromGitHub { owner = "pmacct"; repo = pname; rev = "v${version}"; - sha256 = "0j5qmkya67q7jvaddcj00blmaac37bkir1zb3m1xmm95gm5lf2p5"; + sha256 = "17p5isrq5w58hvmzhc6akbd37ins3c95g0rvhhdm0v33khzxmran"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix index ff01fc89f0..21b6bd346f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.5"; + name = "siege-4.0.6"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "0c82h0idkvfbzspy7h6w97wyk671694nl1ir94zhzn54mw0p0jrv"; + sha256 = "03w0iska74nb6r8wnljn7inasbq7qflf55vjmxnb9jrc4pi7mpnw"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/slack-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/slack-cli/default.nix index bdd650494b..25e426dc43 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/slack-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/slack-cli/default.nix @@ -5,7 +5,8 @@ # for token storage, except that it would make the Nix package inconsistent with # upstream and other distributions. -{ stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }: +{ stdenv, lib, fetchFromGitHub, curl, jq, coreutils, gnugrep, gnused +, runtimeShell }: stdenv.mkDerivation rec { pname = "slack-cli"; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { MESSAGE - export PATH=${lib.makeBinPath [ curl jq ]}:"\$PATH" + export PATH=${lib.makeBinPath [ curl jq coreutils gnugrep gnused ]}:"\$PATH" exec "$out/bin/.slack-wrapped" "\$@" WRAPPER diff --git a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 6f8446d224..93367ea267 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "0zwaa7lqf8vh4c9mx0ganyz15a6qkisyxyxggmshfsxw77k6djxy"; + sha256 = "13hlljkqss9abjpwaa5gcn6qnax0ws03zzh45c4rv1if7rwk6nbl"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index d6d7b45364..b40df721c8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "0ld9v88g5xs2rykimksmhlkwbv2r97575c4aqmqdxbvc37crnisg"; + sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d"; }; buildInputs = [ libpcap ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix index 216a2863f8..285a3764e0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix @@ -1,26 +1,31 @@ -{ lib, pythonPackages, fetchgit, fetchFromGitHub, makeWrapper, git +{ lib, pythonPackages, fetchFromGitHub, makeWrapper, git , sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils , iptables, bash }: let - sshuttle-telepresence = lib.overrideDerivation sshuttle (p: { - src = fetchgit { - url = "https://github.com/datawire/sshuttle.git"; - rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; - sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3"; - }; + sshuttle-telepresence = + let + sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; + in + lib.overrideDerivation sshuttle (p: { + src = fetchFromGitHub { + owner = "datawire"; + repo = "sshuttle"; + rev = sshuttleTelepresenceRev; + sha256 = "1lp5b0h9v59igf8wybjn42w6ajw08blhiqmjwp4r7qnvmvmyaxhh"; + }; - nativeBuildInputs = p.nativeBuildInputs ++ [ git ]; + SETUPTOOLS_SCM_PRETEND_VERSION="${sshuttleTelepresenceRev}"; - postPatch = "rm sshuttle/tests/client/test_methods_nat.py"; - postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence"; - }); + postPatch = "rm sshuttle/tests/client/test_methods_nat.py"; + postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence"; + }); in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.104"; + version = "0.105"; src = fetchFromGitHub { - owner = "datawire"; + owner = "telepresenceio"; repo = "telepresence"; rev = version; sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 4c0f87efbc..31cbd1515d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,17 +2,21 @@ buildGoModule rec { pname = "tendermint"; - version = "0.33.5"; + version = "0.33.6"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "0a6wm1gnr75mdfhzb9cgg4an655vln525slgp10r5abg9j3l8202"; + sha256 = "17zy18s9373f3fp6bqjgj02irzasfv3b6axi84kw7da17mq68vnv"; }; vendorSha256 = "0i0n89lal99fqnzva51kp9f7wzqsfmncpshwxhq26kvykp7ji7sw"; + subPackages = [ "cmd/tendermint" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" ]; + meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; homepage = "https://tendermint.com/"; @@ -20,4 +24,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/tunnelto/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix index c61da53c6a..c774888d04 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.6"; + version = "0.1.9"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "0yigjg8kjl8v0636hjr3sg33p4v963vzq7wbfi986ymxfx47jqp7"; + sha256 = "11v06w0mq9l6rcgbm0wx47a5x3n7js8f07g43xfjv0qf0ra4w2xj"; }; - cargoSha256 = "0603b0hn84shl9wdg7zg7kf9050gh33d8ghscwsby1vqanakms9j"; + cargoSha256 = "0pq0ril8lm6y8pz0jj49zwcbb1yw3hjbpk4m9vp1vfbj3hvjcbp3"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix index 0f0c5961c0..ab3f5eb3ef 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -3,20 +3,22 @@ , ... } @ args: callPackage ./generic.nix (rec { - version = "4.23.3"; + version = "4.26.0"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1b0cxrpgkmgas7pwxglsvgcig8rnhffkf990b42z7awji5lw055v"; + sha256 = "069wm0n44i4l9pnrhwf60ssld65p6gfj4wfc68hrhj4zi4jvlyds"; }; + vendorSha256 = "1520h69z0inbsrw5505cxbinqakvwcrdx3pisrwnp9lv4jsrzzsr"; + assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202005270003"; - geoipSha256 = "10gf69hr32p4bpl5j8r46v8xzhpcgm70xbcdxm1a8l0jwyj0infs"; + geoipRev = "202007080004"; + geoipSha256 = "1j4qg831dhxdy7brgxn4ca69cvwr3zsgizidlzasbkdn2rwai17y"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -24,8 +26,8 @@ callPackage ./generic.nix (rec { # MIT licensed "geosite.dat" = let - geositeRev = "202005292154"; - geositeSha256 = "0w6l0q8y14in5f4a406blpprqq6p438gpclnlfz7y2hkh5zf36cr"; + geositeRev = "20200708125309"; + geositeSha256 = "1pr4137ri3v3r880yx5sqf2p7qfn8g7s555q51x3smkjzkyrskcy"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix index e8f4d278c3..a6b98c4ee8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix @@ -1,7 +1,7 @@ { lib, linkFarm, buildGoModule, runCommand, makeWrapper # Version specific args -, version, src, assets +, version, src, assets, vendorSha256 , ... }: let @@ -13,7 +13,7 @@ let pname = "v2ray-core"; inherit version src; - vendorSha256 = "0d2qmnmlkl884ccg0qcd2yhfj0dwxnb9dz3cih7rcipz85w2f2rs"; + inherit vendorSha256; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/update.sh b/third_party/nixpkgs/pkgs/tools/networking/v2ray/update.sh index 38ad77e98f..56a148444c 100755 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/update.sh +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/update.sh @@ -1,11 +1,13 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" -version_nix=$(dirname "$0")/default.nix -deps_nix=$(dirname "$0")/deps.nix +version_nix=./default.nix +deps_nix=./deps.nix +nixpkgs=../../../.. -old_core_rev="v$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix")" +old_core_rev=$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix") old_geoip_rev=$(sed -En 's/.*\bgeoipRev = "(.*?)".*/\1/p' "$version_nix") old_geosite_rev=$(sed -En 's/.*\bgeositeRev = "(.*?)".*/\1/p' "$version_nix") echo "Current version:" >&2 @@ -17,6 +19,7 @@ function fetch_latest_rev { } core_rev=$(fetch_latest_rev 'v2ray-core') +core_rev=${core_rev:1} geoip_rev=$(fetch_latest_rev 'geoip') geosite_rev=$(fetch_latest_rev 'domain-list-community') echo "Latest version:" >&2 @@ -25,12 +28,13 @@ echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2 if [[ $core_rev != $old_core_rev ]]; then echo "Prefetching core..." >&2 { read hash; read store_path; } < <( - nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/$core_rev.zip" + nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/v$core_rev.zip" ) sed --in-place \ - -e "s/\bversion = \".*\"/version = \"$(echo "$core_rev" | tail -c+2)\"/" \ + -e "s/\bversion = \".*\"/version = \"$core_rev\"/" \ -e "s/\bsha256 = \".*\"/sha256 = \"$hash\"/" \ + -e "s/\bvendorSha256 = \".*\"/vendorSha256 = \"0000000000000000000000000000000000000000000000000000\"/" \ "$version_nix" fi @@ -51,3 +55,17 @@ if [[ $geosite_rev != $old_geosite_rev ]]; then -e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \ "$version_nix" fi + +echo "Prebuilding..." >&2 +set +o pipefail +vendorSha256=$( + nix-build "$nixpkgs" -A v2ray --no-out-link 2>&1 | + tee /dev/stderr | + sed -nE 's/.*got:\s*sha256:(\w+)$/\1/p' +) +[[ "$vendorSha256" ]] +sed --in-place \ + -e "s/vendorSha256 = \".*\"/vendorSha256 = \"$vendorSha256\"/" \ + "$version_nix" + +echo "vendorSha256 updated" >&2 diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix new file mode 100644 index 0000000000..33c08636e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, lua, openssl, pkg-config, zlib }: + +stdenv.mkDerivation rec { + pname = "apk-tools"; + version = "2.10.5"; + + src = fetchurl { + url = "https://dev.alpinelinux.org/archive/apk-tools/apk-tools-${version}.tar.xz"; + sha256 = "00z3fqnv8vk2czdm4p2q4sldq0n8sxyf2qfwppyk7wj59d2sq8dp"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ lua openssl zlib ]; + + makeFlags = [ + "SBINDIR=$(out)/bin" + "LIBDIR=$(out)/lib" + "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}" + "MANDIR=$(out)/share/man" + "DOCDIR=$(out)/share/doc/apk" + "INCLUDEDIR=$(out)/include" + "PKGCONFIGDIR=$(out)/lib/pkgconfig" + ]; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools"; + description = "Alpine Package Keeper"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} 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 0ccad30131..92407e6399 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.3.3"; + version = "0.3.5"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0zw7lbm6ly2c607ha9gbriknzqbgh3hkqb83507hah1hanzp7zq9"; + sha256 = "0l68pcln18hgvqayhdnjv70fcs2y7j3fpiyfm3kl0gpykj7l969r"; }; - cargoSha256 = "166nsk3v3w5ji7k8hflvjylz8hkgbxqrdwb03m7l8ak8wgkycxzx"; + cargoSha256 = "0j953c2h5asvr6fvklbdkk7vkdzdbp9zbzxxiic1gjv953gmw0qq"; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix index 6914f1af5f..39b34bf153 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.11.3"; + version = "1.12.0"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "1kdv0xyrbd942if82yvm9ykcskziq2xhw5cpb3xv4wx32a9kc8yz"; + sha256 = "070zgay0cbw6jrkcfp4qql9f9ydd41ilwk39xdrp939b23gp112d"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 4c04f24b26..17fa6fad83 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "14083sxim17nwmq7w7wvq9sq9pai860v8a2q14vz16hd2i427aqp"; + sha256 = "1z6z4ad5id6bcxzd8p76akxwvf5jzr54w81798ri9lysf4hdi6sh"; }; - vendorSha256 = "0v86fwi1i6b8ngf60ag31mrbah45f0ncqhrjdk5494f139c26067"; + vendorSha256 = "0v14j4vsp7f29xajym2dd2zlfv0sqhb04qfs76bcnn0ys6j1xkny"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; 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 a7eca67978..007fda7e15 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -42,14 +42,14 @@ common = nativeBuildInputs = [ pkgconfig ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt - docbook5 docbook_xsl_ns jq gmock ]; + docbook5 docbook_xsl_ns jq ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json brotli boost editline ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive ] + ++ lib.optionals is24 [ libarchive gmock ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { @@ -119,7 +119,8 @@ common = # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - makeFlags = [ "profiledir=$(out)/etc/profile.d" ]; + makeFlags = [ "profiledir=$(out)/etc/profile.d" ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; installFlags = [ "sysconfdir=$(out)/etc" ]; @@ -182,10 +183,10 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.6"; + name = "nix-2.3.7"; src = fetchurl { url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "05e90529c9dc9f4bf656cbceae61cafdca49935bb79cd291c8f078a095701d89"; + sha256 = "dd8f52849414e5a878afe7e797aa4e22bab77c875d9da5a38d5f1bada704e596"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix index c097674135..9195804a43 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.3"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "01p1a7hw9q9ixfk01djyy9axs71z1x9dkdnqz7zysmrlqi97i246"; + sha256 = "06278gmb26b9nl8l328cc2c2mhfi0dhac65syws17kf09f2m596x"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix index 3ca55ddbbf..980f0d1e0c 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix @@ -3,11 +3,11 @@ lzma, curl, runtimeShell }: stdenv.mkDerivation rec { pname = "pacman"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.gz"; - sha256 = "04pkb8qvkldrayfns8cx4fljl4lyys1dqvlf7b5kkl2z4q3w8c0r"; + sha256 = "1829jcc300fxidr3cahx5kpnxkpg500daqgn2782hg5m5ygil85v"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/afl/default.nix b/third_party/nixpkgs/pkgs/tools/security/afl/default.nix index e32aa03487..091b52bfcf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/afl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/afl/default.nix @@ -9,13 +9,13 @@ let else throw "afl: no support for ${stdenv.hostPlatform.system}!"; afl = stdenv.mkDerivation rec { pname = "afl"; - version = "2.56b"; + version = "2.57b"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1q1g59gkm48aa4cg9h70jx4i2gapmypgp5rzs156b2avd95vwkn1"; + sha256 = "0fqj3g6ds1f21kxz7m9mc1fspi9r4jg9jcmi60inwxijrc5ncvr6"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/age/default.nix b/third_party/nixpkgs/pkgs/tools/security/age/default.nix index c3756b545e..429a8689a1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/age/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/age/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "age"; - version = "unstable-2020-03-25"; + version = "1.0.0-beta4"; goPackagePath = "github.com/FiloSottile/age"; vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; @@ -14,8 +14,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; - rev = "f0f8092d60bb96737fa096c29ec6d8adb5810390"; - sha256 = "079kfc8d1pr39hr4qnx48kviyzwg4p8m4pz0bdkypns4aq8ppbfk"; + rev = "v${version}"; + sha256 = "0pp6zn4rdypyxn1md9ppisiwiapkfkbh08rzfl3qwn0998wx6gnb"; }; meta = with lib; { @@ -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/aws-okta/default.nix b/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix index fe7d5e69f4..909c822374 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-okta"; - version = "0.26.3"; + version = "1.0.2"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,13 +10,13 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "0n6xm3yv0lxfapchzfrqi05hk918n4lh1hcp7gq7hybam93rld96"; + sha256 = "0rqkbhprz1j9b9bx3wvl5zi4p02q1qza905wkrvh42f9pbknajww"; }; - goDeps = ./deps.nix; - buildFlags = [ "--tags" "release" ]; + buildFlagsArray = [ "-ldflags=-X main.Version=${version}" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 libiconv ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/aws-okta/deps.nix b/third_party/nixpkgs/pkgs/tools/security/aws-okta/deps.nix deleted file mode 100644 index 180aa69d56..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/aws-okta/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus.git"; - rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f"; - sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj"; - }; - } - { - goPackagePath = "golang.org/x/sys/unix"; - fetch = { - type = "git"; - url = "https://github.com/golang/sys.git"; - rev = "b699b7032584f0953262cb2788a0ca19bb494703"; - sha256 = "172sw1bm581qwal9pbf9qj1sgivr74nabbj8qq4q4fhgpzams9ix"; - }; - } - { - goPackagePath = "github.com/marshallbrekka/go-u2fhost"; - fetch = { - type = "git"; - url = "https://github.com/marshallbrekka/go-u2fhost"; - rev = "72b0e7a3f583583996b3b382d2dfaa81fdc4b82c"; - sha256 = "0apzmf0bjpr58ynw55agyjsl74zyg5qjk19nyyy4zhip3s9b1d0h"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/security/b3sum/add-cargo-lock.patch b/third_party/nixpkgs/pkgs/tools/security/b3sum/add-cargo-lock.patch index 309e0f147e..ecbb2b0bab 100644 --- a/third_party/nixpkgs/pkgs/tools/security/b3sum/add-cargo-lock.patch +++ b/third_party/nixpkgs/pkgs/tools/security/b3sum/add-cargo-lock.patch @@ -1,585 +1,501 @@ ---- /dev/null 2020-01-18 15:11:39.204798767 +0100 -+++ b3sum/Cargo.lock 2020-01-24 14:27:29.593356345 +0100 -@@ -0,0 +1,582 @@ +diff --git a/b3sum/Cargo.lock b/b3sum/Cargo.lock +new file mode 100644 +index 0000000..1ce7abc +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,495 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] -+name = "anyhow" -+version = "1.0.26" ++name = "ansi_term" ++version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" + +[[package]] +name = "arrayref" -+version = "0.3.5" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" + +[[package]] -+name = "assert_cmd" -+version = "0.12.0" ++name = "atty" ++version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi", +] + +[[package]] +name = "autocfg" -+version = "0.1.7" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "b3sum" -+version = "0.1.3" ++version = "0.3.4" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake3 0.1.3", -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "duct 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "blake3", ++ "clap", ++ "duct", ++ "hex", ++ "memmap", ++ "rayon", ++ "tempfile", ++ "wild", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "blake3" -+version = "0.1.3" ++version = "0.3.4" +dependencies = [ -+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayref", ++ "arrayvec", ++ "cc", ++ "cfg-if", ++ "constant_time_eq", ++ "crypto-mac", ++ "digest", ++ "rayon", +] + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "clap" -+version = "2.33.0" ++version = "2.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "crossbeam-deque" -+version = "0.7.2" ++version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +dependencies = [ -+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++ "maybe-uninit", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.8.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "cfg-if", ++ "crossbeam-utils", ++ "lazy_static", ++ "maybe-uninit", ++ "memoffset", ++ "scopeguard", +] + +[[package]] +name = "crossbeam-queue" -+version = "0.2.1" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-utils", ++ "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" -+version = "0.7.0" ++version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "cfg-if", ++ "lazy_static", +] + +[[package]] -+name = "difference" -+version = "2.0.0" ++name = "crypto-mac" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" ++dependencies = [ ++ "generic-array", ++ "subtle", ++] + +[[package]] -+name = "doc-comment" -+version = "0.3.1" ++name = "digest" ++version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" ++dependencies = [ ++ "generic-array", ++] + +[[package]] +name = "duct" -+version = "0.13.3" ++version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f90a9c3a25aafbd538c7d40a53f83c4487ee8216c12d1c8ef2c01eb2f6ea1553" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "shared_child 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "once_cell", ++ "os_pipe", ++ "shared_child", +] + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + +[[package]] -+name = "escargot" -+version = "0.5.0" ++name = "generic-array" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typenum", +] + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", +] + +[[package]] -+name = "hermit-abi" -+version = "0.1.6" ++name = "glob" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "hex" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "itoa" -+version = "0.4.4" ++version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" -+version = "0.2.66" ++version = "0.2.71" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" + +[[package]] -+name = "log" -+version = "0.4.8" ++name = "maybe-uninit" ++version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] +name = "memoffset" -+version = "0.5.3" ++version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +dependencies = [ -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", +] + +[[package]] +name = "num_cpus" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", +] + +[[package]] +name = "once_cell" -+version = "1.3.1" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" + +[[package]] +name = "os_pipe" -+version = "0.9.1" ++version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] +name = "ppv-lite86" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "predicates" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "predicates-core" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "predicates-tree" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", +] + +[[package]] +name = "rand_chacha" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ -+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", ++ "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core", +] + +[[package]] +name = "rayon" -+version = "1.3.0" ++version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +dependencies = [ -+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", +] + +[[package]] +name = "rayon-core" -+version = "1.7.0" ++version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +dependencies = [ -+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque", ++ "crossbeam-queue", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + +[[package]] +name = "remove_dir_all" -+version = "0.5.2" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "scopeguard" -+version = "1.0.0" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "serde" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.45" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "shared_child" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] -+name = "syn" -+version = "1.0.14" ++name = "strsim" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "subtle" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + +[[package]] +name = "tempfile" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] -+name = "treeline" -+version = "0.1.0" ++name = "typenum" ++version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" + +[[package]] +name = "unicode-width" -+version = "0.1.7" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] -+name = "unicode-xid" -+version = "0.2.0" ++name = "vec_map" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wild" ++version = "2.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020" ++dependencies = [ ++ "glob", ++] + +[[package]] +name = "winapi" -+version = "0.3.8" ++version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[metadata] -+"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" -+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -+"checksum assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6283bac8dd7226470d491bc4737816fea4ca1fba7a2847f2e9097fd6bfb4624c" -+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" -+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" -+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" -+"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" -+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -+"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -+"checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" -+"checksum duct 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1607fa68d55be208e83bcfbcfffbc1ec65c9fbcf9eb1a5d548dc3ac0100743b0" -+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+"checksum escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d" -+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" -+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" -+"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" -+"checksum once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b" -+"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22" -+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4" -+"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" -+"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" -+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" -+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" -+"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" -+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -+"checksum serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "eab8f15f15d6c41a154c1b128a22f2dfabe350ef53c40953d84e36155c91192b" -+"checksum shared_child 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2" -+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" -+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" -+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/third_party/nixpkgs/pkgs/tools/security/b3sum/default.nix b/third_party/nixpkgs/pkgs/tools/security/b3sum/default.nix index 6f783d07ce..dd6a538d11 100644 --- a/third_party/nixpkgs/pkgs/tools/security/b3sum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/b3sum/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "0.1.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; rev = version; - sha256 = "1aigwwv576ybb3x3fppq46kbvd3k4fc4w1hh2hkzyyic6fibwbpy"; + sha256 = "02yyv91wvy5w7i05z6f3kzxm5x34a4xgkgmcqxnb0ivsxnnld73h"; }; sourceRoot = "source/b3sum"; - cargoSha256 = "1rqhz2r60603mylazn37mkm783qb7qhjcg8cqss0iy1g752f3f2i"; + cargoSha256 = "0ycn5788dc925wx28sgfs121w4x7yggm4mnmwij829ka8859bymk"; cargoPatches = [ ./add-cargo-lock.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix index d3cc3c7cad..b6cec239f1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "bettercap"; - version = "2.27.1"; + version = "2.28"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0jb78c3s6p210mj28qg4aacd8ly6d6k5h9c48y88vmcyllzjvbhl"; + sha256 = "0aihinn3i3jj350l2rqph7nv3wy4nh4f8syidf77zybjcp9nmcys"; }; - vendorSha256 = "1j272w0zdndcz4fmh9fzbk2q8wmyfi70vn0p6d8cg0r0l231sbyx"; + vendorSha256 = "0yfs1f18d8frbkrshsajzzbj4wh2azd89g2h35wm6wqknvlipwr0"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix index 2da8840eee..ff55ad6691 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.18.0"; + x86_64-linux = "1.19.0"; }.${system} or ""; sha256 = { - x86_64-linux = "04rry33jccf65smzpjp1dhcirffdb7y36yn8whqaikhsavsawx3j"; + x86_64-linux = "16qlgnqyi0jwzlz8wg2628jhh83xsk46bl6p4dnwi0ay07lhab9w"; }.${system} or ""; meta = with stdenv.lib; { 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 256bf458b3..7c71506c88 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.14.0"; + version = "2.15.1"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "16620md9lsxw6s0qzv5vj9kfkgxnlaxfrax6s2h3h39skza80x2c"; + sha256 = "1wvpg2awdbpbzhxhrf1iv1mjjc1ah54kswnznc7w5zbh9512dyx8"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/ccid/default.nix b/third_party/nixpkgs/pkgs/tools/security/ccid/default.nix index e74e1b6143..b7f408e748 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.32"; + version = "1.4.33"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "0f8nzk7379ip4x2ii5vn6h67jyx733pq0ywnnsj2llbxi2vllpsl"; + sha256 = "0974h2v9wq0j0ajw3c7yckaw8wqcppb2npfhfhmv9phijy9xlmjj"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix index 9b58aa97dd..4f286badeb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2 -, libmspack, systemd +, libmspack, systemd, Foundation }: stdenv.mkDerivation rec { @@ -20,13 +20,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack - systemd - ]; + ] ++ stdenv.lib.optional stdenv.isLinux systemd + ++ stdenv.lib.optional stdenv.isDarwin Foundation; configureFlags = [ "--libdir=$(out)/lib" "--sysconfdir=/etc/clamav" - "--with-systemdsystemunitdir=$(out)/lib/systemd" "--disable-llvm" # enabling breaks the build at the moment "--with-zlib=${zlib.dev}" "--with-xml=${libxml2.dev}" @@ -34,7 +33,8 @@ stdenv.mkDerivation rec { "--with-libcurl=${curl.dev}" "--with-system-libmspack" "--enable-milter" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux + "--with-systemdsystemunitdir=$(out)/lib/systemd"; postInstall = '' mkdir $out/etc @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom robberer qknight fpletz globin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix b/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix index cad5bb244f..46dcec1a48 100644 --- a/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "eid-mw"; - version = "4.4.16"; + version = "4.4.27"; src = fetchFromGitHub { - sha256 = "1q82fw63xzrnrgh1wyh457hal6vfdl6swqfq7l6kviywiwlzx7kd"; rev = "v${version}"; + sha256 = "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1"; repo = "eid-mw"; owner = "Fedict"; }; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { ln -s ${openssl.bin}/bin openssl ln -s ${openssl.dev}/include openssl export SSL_PREFIX=$(realpath openssl) + substituteInPlace plugins_tools/eid-viewer/Makefile.in \ + --replace "c_rehash" "openssl rehash" ''; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix b/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix index 15b8820bfd..68536a519a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix @@ -1,4 +1,4 @@ -{ coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: +{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: stdenv.mkDerivation rec { pname = "gen-oath-safe"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { let path = stdenv.lib.makeBinPath [ coreutils + file libcaca.bin openssl.bin python diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix index c7a5a99855..b59cef1394 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.0.6"; + version = "6.0.7"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf"; + sha256 = "14w4f63nrcwhqj753rjif9cgs1xh1r1619827p69dz0v2x3xdvn1"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix index 5634ee6cff..a81c1ef75c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "0a36184igdgs2h83zr4zihc5acps91ipmgph37jakvzwrsn64ma6"; + sha256 = "0s9l5mvzcv6hnj7h28piabnm66b09hk2l57vb85ny35w99hzpkc0"; }; buildInputs = [ curl openssl zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix b/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix new file mode 100644 index 0000000000..ce86e11710 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, callPackage, makeWrapper +, clang, llvm, libbfd, libopcodes, libunwind, libblocksruntime +}: + +let + honggfuzz = stdenv.mkDerivation rec { + pname = "honggfuzz"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "${version}"; + sha256 = "0ycpx087mhv5s7w01chg2b6rfb3zgfpp9in0x73kpv7y4dcvg7gw"; + }; + enableParallelBuilding = true; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ llvm ]; + propagatedBuildInputs = [ libbfd libopcodes libunwind libblocksruntime ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer"; + longDescription = '' + Honggfuzz is a security oriented, feedback-driven, evolutionary, + easy-to-use fuzzer with interesting analysis options. It is + multi-process and multi-threaded, blazingly fast when the persistent + fuzzing mode is used and has a solid track record of uncovered security + bugs. + + Honggfuzz uses low-level interfaces to monitor processes and it will + discover and report hijacked/ignored signals from crashes. Feed it + a simple corpus directory (can even be empty for the feedback-driven + fuzzing), and it will work its way up, expanding it by utilizing + feedback-based coverage metrics. + ''; + homepage = "https://honggfuzz.dev/"; + license = stdenv.lib.licenses.asl20; + platforms = ["x86_64-linux"]; + maintainers = with stdenv.lib.maintainers; [ cpu ]; + }; + }; +in honggfuzz diff --git a/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix b/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix index af88fd6270..c4b7706c26 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, gradle, makeDesktopItem, perl, writeText, runtimeShell }: +{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, perl, writeText, runtimeShell }: let pname = "jd-gui"; @@ -15,7 +15,7 @@ let name = "${pname}-deps"; inherit src; - nativeBuildInputs = [ jdk perl gradle ]; + nativeBuildInputs = [ jdk perl gradle_5 ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d); @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { inherit pname version src; name = "${pname}-${version}"; - nativeBuildInputs = [ jdk gradle ]; + nativeBuildInputs = [ jdk gradle_5 ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix new file mode 100644 index 0000000000..8a2b645229 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }: + +rustPlatform.buildRustPackage rec { + pname = "kbs2"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "woodruffw"; + repo = pname; + rev = "v${version}"; + sha256 = "1zsqc57dvdn6v0xxb0vf78f50p08km983qhlsf79sr73ch0r3nji"; + }; + + cargoSha256 = "0hz99s5i60r8c1jgpb7j7z42j8ad4zzi94z2c0aiddq916z0xcsf"; + + nativeBuildInputs = [ installShellFiles ] + ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; + + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ libxcb ] + ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/kbs2 --completions $shell > kbs2.$shell + installShellCompletion kbs2.$shell + done + ''; + + meta = with stdenv.lib; { + description = "A secret manager backed by age"; + homepage = "https://github.com/woodruffw/kbs2"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix b/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix index bbed166d75..d7f42479d0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix @@ -1,17 +1,17 @@ -{ stdenv, makeWrapper, fetchFromGitHub, gawk }: +{ stdenv, makeWrapper, fetchFromGitHub, gawk, installShellFiles }: stdenv.mkDerivation rec { pname = "lynis"; - version = "2.7.5"; + version = "3.0.0"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0"; + sha256 = "05p8h2ww4jcc6lgxrm796cbvlfmw26rxq5fmw0xxavbpadiw752j"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; postPatch = '' grep -rl '/usr/local/lynis' ./ | xargs sed -i "s@/usr/local/lynis@$out/share/lynis@g" @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { cp -r include db default.prf $out/share/lynis/ cp -a lynis $out/bin wrapProgram "$out/bin/lynis" --prefix PATH : ${stdenv.lib.makeBinPath [ gawk ]} + + installManPage lynis.8 + installShellCompletion --bash --name lynis.bash \ + extras/bash_completion.d/lynis ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsctools/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsctools/default.nix index c9c677e64c..b2ef4e7e03 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pcsctools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pcsctools/default.nix @@ -5,11 +5,11 @@ let deps = lib.makeBinPath [ wget coreutils ]; in stdenv.mkDerivation rec { - name = "pcsc-tools-1.5.6"; + name = "pcsc-tools-1.5.7"; src = fetchurl { url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2"; - sha256 = "1a2zd06c6s4sqlpm5801gj41gh5g62jb8srd7vhlcm70hg3l3nsy"; + sha256 = "17b9jxvcxmn007lavan20l25v4jvm6dqc4x9dlqzbg6mjs28zsp0"; }; buildInputs = [ udev dbus perlPackages.perl pcsclite ]; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/scriptor \ --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" wrapProgram $out/bin/gscriptor \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl Glib Gtk2 Pango Cairo ]}" + --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}" wrapProgram $out/bin/ATR_analysis \ --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" wrapProgram $out/bin/pcsc_scan \ diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix index d315752921..144ac3a95c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.26.1"; + version = "2.26.2"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "09b217x10mn3y244rwym0fcqr4ly6n83wnykb77488kn960b0pqb"; + sha256 = "0y5gvdrdr6i9spdwsxvzs1bxs32icxpkqxnglp1bf4gglc580d87"; }; hid = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0xc7b8mwha64j7l2fr2g5zy8pz7cqi0vrxx60gii52b6ii31xncx"; }; - vendorSha256 = "0mns5clykvj33krf29yjh8lkf05nih42ka5ji7miq0iaikqyyc78"; + vendorSha256 = "0f81nrg8v3xh2hcx7g77p3ahr4gyj042bwr1knf2phpahgz9n9rn"; overrideModAttrs = (_: { postBuild = '' cp -r --reflink=auto ${hid}/libusb vendor/github.com/karalabe/hid diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix index e6081fbf47..0700988adb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - sha256 = "0iwzi2ylrwz56s77cd4vcf89ig6ipy4w6kp2pfwqvd2d00x54dhk"; + sha256 = "1rf9q67qmjfkgy6r3mz1h9ibfmc04r4j8nzacqv2l75x4mwvf6xb"; }; - cargoSha256 = "0jsmvs6hr9mhapz3a74wpfgkjkq3w10014j3z30bm659mxqrknha"; + cargoSha256 = "074bbr7dfk8cqdarrjy4sm37f5jmv2l5gwwh3zcmy2wrfg7vi1h6"; nativeBuildInputs = [ pkgconfig @@ -56,6 +56,10 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + # Please check if this is still needed when updating. + # Exlude tests for sequoia-store, they often error with 'Too many open files' Hydra. + CARGO_TEST_ARGS = " --all --exclude sequoia-store"; + postPatch = '' # otherwise, the check fails because we delete the `.git` in the unpack phase substituteInPlace openpgp-ffi/Makefile \ diff --git a/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix b/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix index 91d3ea356d..17c65d2888 100644 --- a/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix @@ -13,14 +13,14 @@ let ]; in stdenv.mkDerivation rec { pname = "signing-party"; - version = "2.10"; + version = "2.11"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "signing-party-team"; repo = "signing-party"; rev = "v${version}"; - sha256 = "0lq8nmwjmysry0n4jg6vb7bh0lagbyb9pa11ii3s41p1mhzchf2r"; + sha256 = "1aig5ssabzbk4mih7xd04vgr931bw0flbi8dz902wlr610gyv5s5"; }; # TODO: Get this patch upstream... @@ -87,6 +87,8 @@ in stdenv.mkDerivation rec { install -D -m444 gpgparticipants/gpgparticipants.1 $out/share/man/man1/gpgparticipants.1; install -D -m555 gpgparticipants/gpgparticipants-prefill $out/bin/gpgparticipants-prefill; install -D -m444 gpgparticipants/gpgparticipants-prefill.1 $out/share/man/man1/gpgparticipants-prefill.1; + install -D -m555 gpgparticipants/gpgparticipants-filter $out/bin/gpgparticipants-filter; + install -D -m444 gpgparticipants/gpgparticipants-filter.1 $out/share/man/man1/gpgparticipants-filter.1; # gpgwrap: a passphrase wrapper install -D -m555 gpgwrap/bin/gpgwrap $out/bin/gpgwrap; @@ -153,6 +155,9 @@ in stdenv.mkDerivation rec { # wrapProgram $out/bin/gpgparticipants-prefill + wrapProgram $out/bin/gpgparticipants-filter --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg ]}" + wrapProgram $out/bin/gpgsigs --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ diff --git a/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix b/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix index 9e9cbe2bb3..8b99649e0c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchFromGitHub, rustPlatform, - libsodium, libseccomp, sqlite, pkgconfig }: +{ lib, fetchFromGitHub, rustPlatform, libsodium, libseccomp, sqlite, pkgconfig +}: rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.18.2"; + version = "0.19.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "0b21b0ryq03zrhqailg2iajirn30l358aj3k44lfnravr4h9zwkj"; + sha256 = "10f1wblczxlww09f4dl8i9zzgpr14jj7s329wkvm7lafmwx3qrn5"; }; - cargoSha256 = "1pvn0sc325b5fh29m2l6cack4qfssa4lp3zhyb1qzkb3fmw3lgcy"; + cargoSha256 = "1v0q751ylsfpdjwsbl20pvn7g75w503jwjl5kn5kc8xq3g0lnp65"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix b/third_party/nixpkgs/pkgs/tools/security/sops/default.nix index 55dde8438c..74f455af6a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sops"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "mozilla"; repo = pname; - sha256 = "1515bk0fl0pvdkp402l51gdg63bmqlh89sglss6prc1qqvv5v2xy"; + sha256 = "01skk6vdfki4a88z0snl1pby09im406qhnsfa0d2l8gp6nz8pq6j"; }; - vendorSha256 = "0yryc799k4563wy53z7amraj89cyprklj0lfv207530hwv5i5gm6"; + vendorSha256 = "0475y95qma5m346ng898n80xv2rxzndx89c9ygjcvjs513yzcba2"; meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; diff --git a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix index 4d0ae5e051..b5538d3781 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix @@ -1,29 +1,33 @@ -{ stdenv, python3Packages, fetchurl, makeWrapper -, coreutils, iptables, nettools, openssh, procps }: +{ stdenv +, python3Packages +, makeWrapper +, coreutils +, iptables +, nettools +, openssh +, procps +}: python3Packages.buildPythonApplication rec { pname = "sshuttle"; - version = "0.78.5"; + version = "1.0.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8"; + sha256 = "02c3r27alch7dfy39v40n9g7mccsrj5hwnb1s0gkw4iwxkx2lzg1"; }; patches = [ ./sudo.patch ]; nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ]; - buildInputs = - [ coreutils openssh procps nettools ] - ++ stdenv.lib.optionals stdenv.isLinux [ iptables ]; checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; - postInstall = let - mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); - in '' - wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${mapPath (x: "${x}/bin") buildInputs}" \ + runtimeDeps = [ coreutils openssh procps ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools ]; + + postInstall = '' + wrapProgram $out/bin/sshuttle \ + --prefix PATH : "${stdenv.lib.makeBinPath runtimeDeps}" \ ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index e1b6ef8086..82d5022f90 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0aschysngs6f50plqkqbnhgl6zryd0bpypr50zd45cgww7jvvqd4"; + sha256 = "145zvkh3n503l7zkqkw8laqmqcwd0igd42s4xj0nw78xj2ppj9b8"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix b/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix index e1e5e100bd..a3f3132aa3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix @@ -1,35 +1,29 @@ { lib , fetchgit -, buildGoPackage +, buildGoModule , pigeon }: -buildGoPackage rec { +buildGoModule rec { pname = "verifpal"; - version = "0.7.5"; - - goPackagePath = "github.com/SymbolicSoft/verifpal"; - goDeps = ./deps.nix; + version = "0.13.7"; src = fetchgit { url = "https://source.symbolic.software/verifpal/verifpal.git"; - rev = version; - sha256 = "0njgn6j5qg5kgid6ddv23axhw5gwjbayhdjkj4ya08mnxndr284m"; + rev = "v${version}"; + sha256 = "1ia3mxwcvcxghga2vvhf6mia59cm3jl7vh8laywh421bfj42sh9d"; }; + vendorSha256 = "0cmj6h103igg5pcs9c9wrcmrsf0mwp9vbgzf5amsnj1206ryb1p2"; + nativeBuildInputs = [ pigeon ]; - postPatch = '' - sed -e 's|/bin/echo |echo |g' -i Makefile - ''; + subPackages = [ "cmd/verifpal" ]; - buildPhase = '' - make -C go/src/$goPackagePath parser linux - ''; - - installPhase = '' - mkdir -p $out/bin - cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/ + # goversioninfo is for Windows only and can be skipped during go generate + preBuild = '' + substituteInPlace cmd/verifpal/main.go --replace "go:generate goversioninfo" "(disabled goversioninfo)" + go generate verifpal.com/cmd/verifpal ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/security/verifpal/deps.nix b/third_party/nixpkgs/pkgs/tools/security/verifpal/deps.nix deleted file mode 100644 index aaa4269416..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/verifpal/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/logrusorgru/aurora"; - fetch = { - type = "git"; - url = "https://github.com/logrusorgru/aurora"; - rev = "94edacc10f9b"; - sha256 = "0bhwy3rrd8mwb8xjwf44nj6vmxaj5hdvayvszr1rskkmz08l5v01"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix b/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix index 59d8b8c087..d4a3a0c621 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix @@ -1,12 +1,16 @@ -{ stdenv, python3Packages, nix, ronn }: +{ stdenv +, python3Packages +, nix +, ronn +}: python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.9.4"; + version = "1.9.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "06dpdsnz1ih0syas3x25s557qpw0f4kmypvxwaffm734djg8klmi"; + sha256 = "0anyxmqgn4kx102l3qjhh1f2b0cg7mnlapfhriyjw0zyy5gyqvng"; }; outputs = [ "out" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock index 1b84a550e4..d138a167ce 100644 --- a/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: clocale (0.0.4) - colorls (1.3.3) + colorls (1.4.2) clocale (~> 0) filesize (~> 0) manpages (~> 0) diff --git a/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix b/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix index c16f87f457..2e4a26ff91 100644 --- a/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07rvm3g65slnqzal718qwfmgsjnkysx00jn8dnv96317yx0mxfx6"; + sha256 = "0sw377wklld5zn1la0smxc2bg4rph2xf9d0h3zmxhmds06lb92db"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.2"; }; filesize = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix b/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix index 839e14a20d..fd0cc5f582 100644 --- a/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchgit, fetchpatch }: stdenv.mkDerivation { pname = "datefudge"; @@ -10,15 +10,20 @@ stdenv.mkDerivation { sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv"; }; - patchPhase = '' + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/datefudge/raw/master/f/datefudge_1.23-tz.patch"; + sha256 = "19c2fvhm06wnp3059b0rnd7dqdchkan8iycjh8jk8y25j870zkvn"; + }) + ]; + + postPatch = '' substituteInPlace Makefile \ --replace "/usr" "/" \ --replace "-o root -g root" "" substituteInPlace datefudge.sh \ --replace "@LIBDIR@" "$out/lib/" - ''; - - preInstallPhase = "mkdir -P $out/lib/datefudge"; + ''; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/efibootmgr/default.nix b/third_party/nixpkgs/pkgs/tools/system/efibootmgr/default.nix index 3323ac2489..dd898de0fc 100644 --- a/third_party/nixpkgs/pkgs/tools/system/efibootmgr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/efibootmgr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # We have no LTO here since commit 22284b07. postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null; - makeFlags = [ "EFIDIR=nixos" ]; + makeFlags = [ "EFIDIR=nixos" "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" ]; installFlags = [ "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix index b6a04f808a..01fd10d677 100644 --- a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.11"; + version = "3.14.12"; src = fetchFromGitHub { - sha256 = "1x7m11bda86xkr8mncy50nga9q3gnvnklcvwwpa7frka99kgai26"; + sha256 = "1n0m2w133bpbbpc1imp89xlinmny7xaz1w87cs18p1lnk2w043lc"; rev = version; repo = pname; owner = "puppetlabs"; }; - CXXFLAGS = "-fpermissive -Wno-error=catch-value"; - NIX_LDFLAGS = "-lblkid"; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lblkid"; cmakeFlags = [ - "-DFACTER_RUBY=${ruby}/lib/libruby.so" + "-DFACTER_RUBY=${ruby}/lib/libruby${stdenv.hostPlatform.extensions.sharedLibrary}" "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "A system inventory tool"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix index bb3ba6ec37..8842c97902 100644 --- a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.03-1"; + version = "3.1.04-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6"; + sha256 = "1mirnrrqfjyl2r7fwnpjlk37i5hf8f7lxv2yxcbdfjf2b3dfbpvl"; }; buildInputs = [ perl makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix b/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix index 3e357d37d8..4c891e3e5b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "logrotate"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "0dsz9cfh9glicrnh1rc3jrc176mimnasslihqnj0aknkv8ajq1jh"; + sha256 = "133k4y24p918v4dva6dh70bdfv13jvwl2vlhq0mybrs3ripvnh4h"; }; # Logrotate wants to access the 'mail' program; to be done. diff --git a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix index 7cec79ff25..8be921b385 100644 --- a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.26.0"; + name = "monit-5.27.0"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1hpk0agxi7g9vmfqvrwr5wk7pr52wdlv3vs0j3l2p6mgldl4bz47"; + sha256 = "197w59wkg6izlj6p7xbx0n6ksvm6pym9pzh24nakl6agcbpxxh6q"; }; nativeBuildInputs = [ bison flex ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index 5d856e7953..722df46c05 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.22.1"; + version = "1.23.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1hliv4d3pa8c3inz0bcl6nngfmp8vwnvh7smbwqiq7isfjijbpr6"; + sha256 = "04x53hr2d086y4q990h7lazaykaizb5g45nmfvahqzxj72b0hvdf"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; 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 2e397da8a8..3e38b7bfdf 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 @@ -2,16 +2,16 @@ buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.18.0"; + version = "0.19.2"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b"; + sha256 = "03a67kvhickzg96jvzxhg1jih48m96rl4mkg0wgmbi7a676dl7lq"; }; - vendorSha256 = "1pw9pb3rdjzf2dx1p1jiqxs7qhlpjki7fy74nyxza5wzrv4317sj"; + vendorSha256 = "0mmnkkzpv8lmxn11idikddmjinxv1y823ny0wxp271agiinyfpn8"; 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/psensor/default.nix b/third_party/nixpkgs/pkgs/tools/system/psensor/default.nix index 49d2747a33..afbab36344 100644 --- a/third_party/nixpkgs/pkgs/tools/system/psensor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/psensor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "psensor"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; - sha256 = "1smbidbby4rh14jnh9kn7y64qf486aqnmyxcgacjvkz27cqqnw4r"; + sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix new file mode 100644 index 0000000000..159b41fd1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonApplication, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "rocm-smi"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "ROC-smi"; + rev = "rocm-${version}"; + sha256 = "189mpvmcv46nfwshyc1wla6k71kbraldik5an20g4v9s13ycrpx9"; + }; + + format = "other"; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + install -Dm0755 rocm_smi.py $out/bin/rocm-smi + ''; + + meta = with lib; { + description = "System management interface for AMD GPUs supported by ROCm"; + homepage = "https://github.com/RadeonOpenCompute/ROC-smi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 1739e0ad78..7be7e5b3d3 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.2004.0"; + version = "8.2006.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "1n97kx6cyyzd4zh6q01fyqi2wq1ah68h95kdc109m1zhfnvxghsz"; + sha256 = "15wfhw2nmpiyjpp82jxqgcjy7wgbc2fswk5g6rbdqbvghrj9wn6r"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix b/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix index 2875bca4a2..1192a17626 100644 --- a/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonPackage rec { pname = "s-tui"; - version = "1.0.0"; + version = "1.0.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n"; + sha256 = "1gqrb2xxii43j7kszy7kvv4f6hr8ac4p0m9q8i1xs5fhsqcx186i"; }; propagatedBuildInputs = with python3Packages; [ 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 5e50c3c875..d9953b7cdb 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.10"; + version = "0.11.14"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0x46shnwllv5knpbxj1vj2aqmxgnfhz582crlacwsinc22n1j18i"; + sha256 = "0sqka2ns9xqma9wa67in4vrd15q0rz62gblmzniq5i4xppykc55j"; }; 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 238c9ac1f6..eeb2a99740 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.27.1"; + version = "3.28.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1cv1kn4jpqyhlhx8w5v557jyc4b2ly2dgkv1hbb8vzgpjwy66k65"; + sha256 = "1s56q8k69sdrqsh3y9lr4di01fqw7xb49wr0dz75jmz084yg8kmg"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix index 51a443b9bd..c0a94457e6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1k8svy03k57ld6p5d29i0ccrd1gics6kbyx1bkfmw9fh1bbljyf7"; + sha256 = "1nrhv3bypyc48h9smj5cpq63rawm6vqyg3cwkhpz69rgjnf1283m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix index b7912f44cd..6e3024a3f7 100644 --- a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "1yfbr8zmcy7zp9s9cqv7qypj2vvhpq09r0398gr7ckjk6v70hhfg"; + sha256 = "04nd5gq49y1k9xxrc9ll155k9j42ivscjzx405qyyxv7dpgyw131"; }; - cargoSha256 = "1l4cjcpfghis983y31s54fzjppdnh3wa4anwi7bdsbyvqz3n3ywj"; + cargoSha256 = "0ggpr2skl3d47y771npmbbqb9vga4y4iyry3qn0xj2hg9d7msf4l"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix b/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix index 8ebb5cfd05..00c8c075ed 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost lua ]; + postPatch = '' + substituteInPlace src/makefile --replace "CC=g++" "CC=c++" + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "conf_dir=/etc/ansifilter" @@ -26,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.php"; license = licenses.gpl3; maintainers = [ maintainers.Adjective-Object ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix b/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix index 914fe00673..b40769e552 100644 --- a/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "4.2.2"; + version = "4.2.4"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "0vz7k6i6y60ml20pbw2p9iqy6kxw4ziqszg6hbgz102x1jk8788d"; + sha256 = "02iy62b9wa5shxggflx99kv2q9xkilcsq94s0gbfq4m2aqjgzfwx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix index f41de9baff..9c0526c3e6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0s5vsm1avzv88b6mf2pp20c2sz0srrj52iiqpnwi3p4ihivm8wgv"; + sha256 = "1awb62y09kbkjhz22mdkrppd6w5aihd3l0ssvpil8c9hg8syjd9g"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix index fccd2174a6..0dd01d382e 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.1"; + version = "5.0"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh"; + sha256 = "1jyd4z62ldwhqx9r7v4b9k4pl300wr4b7ggj4f0yjf0gpwg7l9p7"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix index 9ca92a21db..7d5020f63b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.3.7"; + version = "0.4.0"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "0a5i842aqa5xaii5lfrnks0ldavbhbd3bl4f2d442i1ahbin5b32"; + sha256 = "13m23cky8axi7i4s1bvdjcdfr4v8mbxfvz4fy3q8b8gkd6abm3sf"; }; - cargoSha256 = "1qx3447y684b7y18lgk9cc37if2ld42jnmy1kak191q6rjh5ssh7"; + cargoSha256 = "0q1kf810494njd5ai2v4qsaq9w3b7120yaymhgxjpcmig8s86zhr"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix index 66d1105770..5724317526 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -2,30 +2,31 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-/ZhhDiiUc+swXr3IuuQD4YqIIdgh8PeRWm/ko9Lc0rM="; + hash = "sha256-1qxz6p7VaJ9eMcLQaTW/M4+Xo0WLihzyEAycbkjjPyA="; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-SGX94XY7e38xySvTO+CDTUBDTfYybPy12iWFoFc2Nto="; + cargoSha256 = "sha256-/mAwlxed1MOFUA1jDSrgPzJuURbKzwucBWORVVHlrt8="; checkInputs = [ ansi2html ]; checkPhase = '' # Skip tests that use the network and that include files. - cargo test -- --skip terminal::iterm2 \ - --skip magic::tests::detect_mimetype_of_svg_image \ - --skip magic::tests::detect_mimetype_of_png_image \ + cargo test -- \ --skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \ --skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \ + --skip magic::tests::detect_mimetype_of_png_image \ + --skip magic::tests::detect_mimetype_of_svg_image \ --skip resources::tests::read_url_with_http_url_fails_when_status_404 \ - --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 + --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 \ + --skip iterm2_tests_render_md_samples_images_md ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix index 874dc59c7f..84e0bfb78d 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.8.2"; + version = "10.2.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0zff9gsbfaf72p8zbjamn6513czpr7papyh1jy0fz1z2a9h7ya0g"; + sha256 = "1dkxhy3bjl48948jj2k6d684sd76xw1q427qc4hmxncr0wxj0ljp"; }; nativeBuildInputs = with python3Packages; [ @@ -49,8 +49,10 @@ buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ cffi chardet + coloredlogs img2pdf pdfminer + pluggy pikepdf pillow reportlab @@ -66,7 +68,7 @@ buildPythonApplication rec { pytestcov pytestrunner python-xmp-toolkit - setuptools + pytestCheckHook ] ++ runtimeDeps; patches = [ @@ -76,25 +78,6 @@ buildPythonApplication rec { }) ]; - # The tests take potentially 20+ minutes, depending on machine - doCheck = false; - - # These tests fail and it might be upstream problem... or packaging. :) - # development is happening on macos and the pinned test versions are - # significantly newer than nixpkgs has. Program still works... - # (to the extent I've used it) -- Kiwi - checkPhase = '' - export HOME=$TMPDIR - pytest -k 'not test_force_ocr_on_pdf_with_no_images \ - and not test_tesseract_crash \ - and not test_tesseract_crash_autorotate \ - and not test_ghostscript_pdfa_failure \ - and not test_gs_render_failure \ - and not test_gs_raster_failure \ - and not test_bad_utf8 \ - and not test_old_unpaper' - ''; - makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix index 251f6224b4..43c945ac76 100644 --- a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -2,17 +2,18 @@ buildGoModule rec { pname = "shfmt"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8"; + sha256 = "03zgi0rlra3gz8cbqwmhpjxsg5048anfc6ccd2w50fjhx6farsnv"; }; vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8"; - subPackages = ["cmd/shfmt"]; + + subPackages = [ "cmd/shfmt" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix index ba46d36814..0d2e8004f5 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.3.0"; + version = "2.3.1"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "1hmra1pg79hj9kqbj6702y5b03vyvfzqf6hq65jg1vxjqlq7h3xx"; + sha256 = "0gp45vwm0hl8590014qrxlpw2rycxm7ir819d242mh38v3hdjgkz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index c0ae6b8e18..1a71ae04d4 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -46,7 +46,7 @@ let }; in fetchurl { name = "pdftoepdf-poppler${popplerVersion}.cc"; - url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co"; + url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959"; sha256 = "0pngvw1jgnm4cqskrzf5a3z8rj4ssl10007n3wbblj50hvvzjph3"; postFetch = '' # The trunk added some extra arguments to certain functions so we need to revert that @@ -56,7 +56,7 @@ let }; pdftosrc = fetchurl { name = "pdftosrc-poppler${popplerVersion}.cc"; - url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co"; + url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959"; sha256 = "0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g06380"; }; in '' diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index ee4d0dfe58..fb3e6668a4 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -49,6 +49,10 @@ in buildEnv { ignoreCollisions = false; paths = pkgList.nonbin; + pathsToLink = [ + "/" + "/tex/generic/config" # make it a real directory for scheme-infraonly + ]; buildInputs = [ makeWrapper ] ++ pkgList.extraInputs; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix new file mode 100644 index 0000000000..08d37a1d53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper +, apk-tools, coreutils, e2fsprogs, findutils, gnugrep, gnused, kmod, qemu-utils +, utillinux +}: + +stdenv.mkDerivation rec { + pname = "alpine-make-vm-image"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "alpinelinux"; + repo = "alpine-make-vm-image"; + rev = "v${version}"; + sha256 = "0955kd2ddqfynjwk2xfzys96l7abxp30hhrs2968hl78rhmkvpnq"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/alpine-make-vm-image --set PATH ${lib.makeBinPath [ + apk-tools coreutils e2fsprogs findutils gnugrep gnused kmod qemu-utils + utillinux + ]} + ''; + + meta = with lib; { + homepage = "https://github.com/alpinelinux/alpine-make-vm-image"; + description = "Make customized Alpine Linux disk image for virtual machines"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix index 433da1b07f..08999aca97 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.23.0"; + version = "0.23.1"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "05nb5xd90kbazdx4l9bw72729dh5hrcaqdi9wpf5ma7bz7mw9wzi"; + sha256 = "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1"; }; meta = { 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 c16eb003d8..47953d21df 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,21 +13,21 @@ let spec = fetchurl { - url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.63.1/openapi.yaml"; - sha256 = "03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0"; + url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.67.0/openapi.yaml"; + sha256 = "0vsblprkqlr9508x5rkm0wj6lc3w72xiwiqxia9asgr5k45hhfnr"; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "1hpdmbzs182iag471yvq3kwd1san04a58sczzbmw6vjv2kswn1c2"; + sha256 = "06iz9xjj6h1ry176558488fl9j18a5vf724zh4cxlcksdy72dnna"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl index dc05c974bd..02ad6af90d 100755 --- a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -5,7 +5,7 @@ use POSIX; use File::Path; use File::Slurp; use Fcntl ':flock'; -use Getopt::Long qw(:config gnu_getopt); +use Getopt::Long qw(:config gnu_getopt no_bundling); use Cwd 'abs_path'; use Time::HiRes; @@ -68,6 +68,22 @@ my $localAddress; my $flake; my $flakeAttr = "container"; +# Nix passthru flags. +my @nixFlags; +my @nixFlags2; + +sub copyNixFlags0 { push @nixFlags, "--$_[0]"; } +sub copyNixFlags1 { push @nixFlags, "--$_[0]", $_[1]; } + +# Ugly hack to handle flags that take two arguments, like --option. +sub copyNixFlags2 { + if (scalar(@nixFlags2) % 3 == 0) { + push @nixFlags2, "--$_[0]", $_[1]; + } else { + push @nixFlags2, $_[1]; + } +} + GetOptions( "help" => sub { showHelp() }, "ensure-unique-name" => \$ensureUniqueName, @@ -82,8 +98,22 @@ GetOptions( "host-address=s" => \$hostAddress, "local-address=s" => \$localAddress, "flake=s" => \$flake, + # Nix passthru options. + "log-format=s" => \©NixFlags1, + "option=s{2}" => \©NixFlags2, + "impure" => \©NixFlags0, + "update-input=s" => \©NixFlags1, + "override-input=s{2}" => \©NixFlags2, + "commit-lock-file" => \©NixFlags0, + "no-registries" => \©NixFlags0, + "no-update-lock-file" => \©NixFlags0, + "no-write-lock-file" => \©NixFlags0, + "no-allow-dirty" => \©NixFlags0, + "recreate-lock-file" => \©NixFlags0, ) or exit 1; +push @nixFlags, @nixFlags2; + if (defined $hostAddress and !defined $localAddress or defined $localAddress and !defined $hostAddress) { die "With --host-address set, --local-address is required as well!"; } @@ -144,7 +174,7 @@ EOF } sub buildFlake { - system("nix", "build", "-o", "$systemPath.tmp", "--", + system("nix", "build", "-o", "$systemPath.tmp", @nixFlags, "--", "$flake#nixosConfigurations.\"$flakeAttr\".config.system.build.toplevel") == 0 or die "$0: failed to build container from flake '$flake'\n"; $systemPath = readlink("$systemPath.tmp") or die; @@ -251,7 +281,7 @@ if ($action eq "create") { system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF", - "--set", "-A", "system") == 0 + "--set", "-A", "system", @nixFlags) == 0 or do { clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile); die "$0: failed to build initial container configuration\n" @@ -400,7 +430,7 @@ elsif ($action eq "update") { my $nixenvF = $nixosPath // ""; system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", $nixenvF, - "--set", "-A", "system") == 0 + "--set", "-A", "system", @nixFlags) == 0 or die "$0: failed to build container configuration\n"; } diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 64392f49a5..c77e06f2eb 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -77,7 +77,6 @@ mapAliases ({ clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 - conkerorWrapper = conkeror; # added 2015-01 compton = picom; # added 2019-12-02 compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 @@ -128,17 +127,6 @@ mapAliases ({ firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 - firefox-esr-52 = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff - firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff - firefox-esr-60 = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff - firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff - icecat = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff - icecat-unwrapped = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff - conkeror-unwrapped = conkeror; # 2020-02, remove after 20.03 branchoff - conkeror = throw '' - Conkeror doesn't work with any secure firefox release. - Please move to some of the alternatives at http://conkeror.org/Alternatives - ''; # 2020-02, remove after 20.03 branchoff firestr = throw "firestr has been removed."; # added 2019-12-08 flameGraph = flamegraph; # added 2018-04-25 @@ -264,6 +252,7 @@ mapAliases ({ libudev = udev; # added 2018-04-25 libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 + libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; @@ -459,6 +448,8 @@ mapAliases ({ rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; + riot-desktop = element-desktop; # added 2020-07-15 + riot-web = element-web; # added 2020-07-15 rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 @@ -566,6 +557,7 @@ mapAliases ({ telepathy_idle = telepathy-idle; # added 2018-02-25 telepathy_logger = telepathy-logger; # added 2018-02-25 telepathy_mission_control = telepathy-mission-control; # added 2018-02-25 + telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # added 2020-07-02 telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 @@ -626,6 +618,7 @@ mapAliases ({ xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 x11 = xlibsWrapper; # added 2015-09 + xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPlugins; # added 2018-04-25 @@ -701,23 +694,6 @@ mapAliases ({ # added 2020-02-09 dina-font-pcf = dina-font; - /* Cleanup before 20.09 */ - llvm_4 = throw '' - The LLVM versions 3.5, 3.9 and 4.0 have been removed in NixOS 20.03 - due to a lack of compatibility with glibc 2.30! - ''; - llvm_39 = llvm_4; - llvm_35 = llvm_4; - lld_4 = llvm_4; - - llvmPackages_4 = llvm_4; - llvmPackages_39 = llvm_4; - llvmPackages_35 = llvm_4; - - clang_39 = llvm_4; - clang_35 = llvm_4; - clang_4 = llvm_4; - # added 2019-04-13 # *-polly pointed to llvmPackages_latest llvm-polly = throw "clang is now built with polly-plugin by default"; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 452df605ce..20c2ed3cac 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -183,6 +183,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + glade = callPackage ../development/tools/glade { }; hobbes = callPackage ../development/tools/hobbes { }; @@ -213,7 +215,9 @@ in grsync = callPackage ../applications/misc/grsync { }; - dockerTools = callPackage ../build-support/docker { }; + dockerTools = callPackage ../build-support/docker { + writePython3 = writers.writePython3; + }; snapTools = callPackage ../build-support/snap { }; @@ -331,6 +335,7 @@ in then buildPackages.fetchurl # No need to do special overrides twice, else makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC buildPackages; + inherit cacert; curl = buildPackages.curl.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; @@ -564,6 +569,8 @@ in adlplug = callPackage ../applications/audio/adlplug { }; + tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; }; + opnplug = callPackage ../applications/audio/adlplug { adlplugChip = "-DADLplug_CHIP=OPN2"; pname = "OPNplug"; @@ -599,6 +606,8 @@ in stdenv = clangStdenv; }; + honggfuzz = callPackage ../tools/security/honggfuzz { }; + aflplusplus = callPackage ../tools/security/aflplusplus { clang = clang_9; llvm = llvm_9; @@ -645,6 +654,8 @@ in almanah = callPackage ../applications/misc/almanah { }; + alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; + amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; @@ -672,6 +683,10 @@ in apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apk-tools = callPackage ../tools/package-management/apk-tools { + lua = lua5_3; + }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -732,6 +747,8 @@ in asciiquarium = callPackage ../applications/misc/asciiquarium {}; + asls = callPackage ../development/tools/misc/asls { }; + asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo; }; gsl = gsl_1; @@ -757,6 +774,8 @@ in awscli = callPackage ../tools/admin/awscli { }; + awscli2 = callPackage ../tools/admin/awscli2 { }; + awsebcli = callPackage ../tools/virtualization/awsebcli {}; awslogs = callPackage ../tools/admin/awslogs { }; @@ -769,8 +788,6 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws_shell = callPackage ../tools/admin/aws_shell { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; aws-vault = callPackage ../tools/admin/aws-vault { }; @@ -854,6 +871,8 @@ in boulder = callPackage ../tools/admin/boulder { }; + btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; + buildbot = with python3Packages; toPythonApplication buildbot; buildbot-ui = with python3Packages; toPythonApplication buildbot-ui; buildbot-full = with python3Packages; toPythonApplication buildbot-full; @@ -919,6 +938,8 @@ in detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { }; + diskonaut = callPackage ../tools/misc/diskonaut { }; + diskus = callPackage ../tools/misc/diskus { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -971,6 +992,8 @@ in gamecube-tools = callPackage ../development/tools/gamecube-tools { }; + gammy = qt5.callPackage ../tools/misc/gammy { }; + gams = callPackage ../tools/misc/gams (config.gams or {}); git-fire = callPackage ../tools/misc/git-fire { }; @@ -1737,7 +1760,7 @@ in dua = callPackage ../tools/misc/dua { }; - inherit (ocamlPackages) dune dune_2; + inherit (ocamlPackages) dune dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1768,6 +1791,12 @@ in eksctl = callPackage ../tools/admin/eksctl { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; + + element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { + conf = config.element-web.conf or {}; + }; + elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; ell = callPackage ../os-specific/linux/ell { }; @@ -1788,6 +1817,8 @@ in eschalot = callPackage ../tools/security/eschalot { }; + espanso = callPackage ../applications/office/espanso { }; + esphome = callPackage ../tools/misc/esphome { }; esptool = callPackage ../tools/misc/esptool { }; @@ -1850,6 +1881,12 @@ in futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + tllist = callPackage ../development/libraries/tllist { }; + + fcft = callPackage ../development/libraries/fcft { }; + + fuzzel = callPackage ../applications/misc/fuzzel { }; + fwup = callPackage ../tools/misc/fwup { }; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; @@ -2028,6 +2065,8 @@ in ir-standard-fonts = callPackage ../data/fonts/ir-standard-fonts { }; + kaggle = with python3Packages; toPythonApplication kaggle; + lynis = callPackage ../tools/security/lynis { }; mapproxy = callPackage ../applications/misc/mapproxy { }; @@ -2126,6 +2165,8 @@ in onboard = callPackage ../applications/misc/onboard { }; + oneshot = callPackage ../tools/networking/oneshot { }; + onnxruntime = callPackage ../development/libraries/onnxruntime { }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -2146,7 +2187,9 @@ in pbzx = callPackage ../tools/compression/pbzx { }; - persepolis = python3Packages.callPackage ../tools/networking/persepolis { }; + persepolis = python3Packages.callPackage ../tools/networking/persepolis { + wrapQtAppsHook = qt5.wrapQtAppsHook; + }; pev = callPackage ../development/tools/analysis/pev { }; @@ -2228,12 +2271,6 @@ in ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; - riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; - - riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { - conf = config.riot-web.conf or {}; - }; - ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -2363,6 +2400,8 @@ in bdsync = callPackage ../tools/backup/bdsync { }; + beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { }; + beanstalkd = callPackage ../servers/beanstalkd { }; beets = callPackage ../tools/audio/beets { @@ -2482,7 +2521,7 @@ in libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost167.override { enablePython = true; python = python37; }; + boost = boost16x.override { enablePython = true; python = python38; }; }) ceph ceph-client; @@ -2522,38 +2561,24 @@ in clementineUnfree = clementine.unfree; + mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circus = callPackage ../tools/networking/circus { }; - citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; - citrix_workspace_unwrapped_20_04_0 = citrix_workspace_unwrapped.override { version = "20.04.0"; }; - citrix_workspace_unwrapped_19_12_0 = citrix_workspace_unwrapped.override { version = "19.12.0"; }; - citrix_workspace_unwrapped_19_10_0 = citrix_workspace_unwrapped.override { version = "19.10.0"; }; - citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; - citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; }; - citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; + citrix_workspace = citrix_workspace_20_06_0; - citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped; - }; - citrix_workspace_19_12_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_12_0; - }; - citrix_workspace_19_10_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_10_0; - }; - citrix_workspace_19_8_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_8_0; - }; - citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_6_0; - }; - citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_3_0; - }; + inherit (callPackage ../applications/networking/remote/citrix-workspace { }) + citrix_workspace_19_6_0 + citrix_workspace_19_8_0 + citrix_workspace_19_10_0 + citrix_workspace_19_12_0 + citrix_workspace_20_04_0 + citrix_workspace_20_06_0 + ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -2589,8 +2614,6 @@ in connman-notify = callPackage ../tools/networking/connman/connman-notify { }; - connmanui = callPackage ../tools/networking/connman/connmanui { }; - connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { }; convertlit = callPackage ../tools/text/convertlit { }; @@ -2720,7 +2743,9 @@ in ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clamav = callPackage ../tools/security/clamav { }; + clamav = callPackage ../tools/security/clamav { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; clex = callPackage ../tools/misc/clex { }; @@ -2750,6 +2775,8 @@ in conda = callPackage ../tools/package-management/conda { }; + console-bridge = callPackage ../development/libraries/console-bridge { }; + convmv = callPackage ../tools/misc/convmv { }; convoy = callPackage ../tools/filesystems/convoy { }; @@ -2891,6 +2918,8 @@ in ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; + ddcui = libsForQt5.callPackage ../applications/misc/ddcui { }; + ddcutil = callPackage ../tools/misc/ddcutil { }; ddclient = callPackage ../tools/networking/ddclient { }; @@ -3183,6 +3212,8 @@ in vorta = python3Packages.callPackage ../applications/backup/vorta { }; + utahfs = callPackage ../applications/networking/utahfs { }; + wallutils = callPackage ../tools/graphics/wallutils { }; wev = callPackage ../tools/misc/wev { }; @@ -3404,6 +3435,8 @@ in fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; + chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; @@ -3570,7 +3603,13 @@ in fprintd = callPackage ../tools/security/fprintd { }; - franz = callPackage ../applications/networking/instant-messengers/franz { }; + ferdi = callPackage ../applications/networking/instant-messengers/ferdi { + mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; + }; + + franz = callPackage ../applications/networking/instant-messengers/franz { + mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; + }; freedroidrpg = callPackage ../games/freedroidrpg { }; @@ -3626,6 +3665,8 @@ in fusee-launcher = callPackage ../development/tools/fusee-launcher { }; + fverb = callPackage ../applications/audio/fverb { }; + fwknop = callPackage ../tools/security/fwknop { }; exfat = callPackage ../tools/filesystems/exfat { }; @@ -3874,6 +3915,8 @@ in google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + gdown = with python3Packages; toPythonApplication gdown; + gopro = callPackage ../tools/video/gopro { }; gource = callPackage ../applications/version-management/gource { }; @@ -4317,6 +4360,8 @@ in incron = callPackage ../tools/system/incron { }; + industrializer = callPackage ../applications/audio/industrializer { }; + inetutils = callPackage ../tools/networking/inetutils { }; inform7 = callPackage ../development/compilers/inform7 { }; @@ -4525,6 +4570,10 @@ in kbdd = callPackage ../applications/window-managers/kbdd { }; + kbs2 = callPackage ../tools/security/kbs2 { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; keepalived = callPackage ../tools/networking/keepalived { }; @@ -4704,6 +4753,10 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; + martin = callPackage ../servers/martin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails (https://github.com/NixOS/nixpkgs/issues/76093) */ matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; @@ -4718,9 +4771,7 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mcfly = callPackage ../tools/misc/mcfly { }; mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -5099,7 +5150,7 @@ in mailhog = callPackage ../servers/mail/mailhog {}; mailnag = callPackage ../applications/networking/mailreaders/mailnag { - pythonPackages = python2Packages; + pythonPackages = python3Packages; }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -5526,6 +5577,8 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; + nimmm = callPackage ../applications/misc/nimmm { }; + nitrogen = callPackage ../tools/X11/nitrogen {}; nms = callPackage ../tools/misc/nms { }; @@ -5594,6 +5647,8 @@ in nwdiag = with python3Packages; toPythonApplication nwdiag; + nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { }; + nyancat = callPackage ../tools/misc/nyancat { }; nylon = callPackage ../tools/networking/nylon { }; @@ -5748,6 +5803,8 @@ in oppai-ng = callPackage ../tools/misc/oppai-ng { }; + operator-sdk = callPackage ../development/tools/operator-sdk { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; @@ -5860,9 +5917,13 @@ in perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup { + percona-xtrabackup = percona-xtrabackup_8_0; + percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { boost = boost159; }; + percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { + boost = boost170; + }; pick = callPackage ../tools/misc/pick { }; @@ -5938,9 +5999,7 @@ in brickd = callPackage ../servers/brickd { }; - bully = callPackage ../tools/networking/bully { - openssl = openssl_1_0_2; - }; + bully = callPackage ../tools/networking/bully { }; pcapc = callPackage ../tools/networking/pcapc { }; @@ -6124,6 +6183,8 @@ in pmacct = callPackage ../tools/networking/pmacct { }; + pmix = callPackage ../development/libraries/pmix { }; + polygraph = callPackage ../tools/networking/polygraph { }; progress = callPackage ../tools/misc/progress { }; @@ -6733,6 +6794,8 @@ in sshping = callPackage ../tools/networking/sshping {}; + ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; + suricata = callPackage ../applications/networking/ids/suricata { python = python3; }; @@ -6762,6 +6825,8 @@ in spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; + spigot = callPackage ../tools/misc/spigot { }; + spiped = callPackage ../tools/networking/spiped { }; sqliteman = callPackage ../applications/misc/sqliteman { }; @@ -7189,7 +7254,7 @@ in tryton = callPackage ../applications/office/tryton { }; - trytond = callPackage ../applications/office/trytond { }; + trytond = with python3Packages; toPythonApplication trytond; omapd = callPackage ../tools/security/omapd { }; @@ -7290,6 +7355,10 @@ in uqmi = callPackage ../tools/networking/uqmi { }; + urdfdom = callPackage ../development/libraries/urdfdom {}; + + urdfdom-headers = callPackage ../development/libraries/urdfdom-headers {}; + uriparser = callPackage ../development/libraries/uriparser {}; urlscan = callPackage ../applications/misc/urlscan { }; @@ -7467,7 +7536,9 @@ in woof = callPackage ../tools/misc/woof { }; - wootility = callPackage ../tools/misc/wootility { }; + wootility = callPackage ../tools/misc/wootility { + inherit (xorg) libxkbfile; + }; wpscan = callPackage ../tools/security/wpscan { }; @@ -7689,6 +7760,8 @@ in whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + wiiuse = callPackage ../development/libraries/wiiuse { }; + woeusb = callPackage ../tools/misc/woeusb { }; chase = callPackage ../tools/system/chase { }; @@ -7798,9 +7871,7 @@ in libxml2 = libxml2Python; }; - xsecurelock = callPackage ../tools/X11/xsecurelock { - xset = xorg.xset; - }; + xsecurelock = callPackage ../tools/X11/xsecurelock { }; xsel = callPackage ../tools/misc/xsel { }; @@ -7841,6 +7912,8 @@ in yank = callPackage ../tools/misc/yank { }; + yamllint = with python3Packages; toPythonApplication yamllint; + yaml-merge = callPackage ../tools/text/yaml-merge { }; yeshup = callPackage ../tools/system/yeshup { }; @@ -7849,6 +7922,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + ytree = callPackage ../tools/misc/ytree { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { }; # To expose more packages for Yi, override the extraPackages arg. @@ -8017,6 +8092,7 @@ in grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { }; + powerline = with python3Packages; toPythonApplication powerline; ### DEVELOPMENT / COMPILERS @@ -8192,7 +8268,6 @@ in computecpp = wrapCCWith rec { cc = computecpp-unwrapped; extraPackages = [ - libstdcxxHook llvmPackages.compiler-rt ]; extraBuildCommands = '' @@ -8334,14 +8409,6 @@ in stripped = false; })); - libstdcxxHook = makeSetupHook - { substitutions = { - gcc = gcc-unwrapped; - targetConfig = stdenv.targetPlatform.config; - }; - } - ../development/compilers/gcc/libstdc++-hook.sh; - crossLibcStdenv = overrideCC stdenv (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages_8.lldClangNoLibc @@ -8471,6 +8538,8 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc_latest = gcc10; + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { @@ -8744,6 +8813,13 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); + go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go = go_1_14; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -9037,6 +9113,8 @@ in llvmPackages_latest = llvmPackages_10; + llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; + lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -9063,6 +9141,8 @@ in mkcl = callPackage ../development/compilers/mkcl {}; + mlkit = callPackage ../development/compilers/mlkit {}; + inherit (callPackage ../development/compilers/mlton {}) mlton20130715 mlton20180207Binary @@ -9167,21 +9247,48 @@ in rgbds = callPackage ../development/compilers/rgbds { }; + rocclr = callPackage ../development/libraries/rocclr { + inherit (llvmPackages_rocm) clang; + }; + + rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { }; + + rocm-comgr = callPackage ../development/libraries/rocm-comgr { + inherit (llvmPackages_rocm) clang lld llvm; + device-libs = rocm-device-libs; + }; + + rocm-device-libs = callPackage ../development/libraries/rocm-device-libs { + inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; + }; + + rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd { }; + + rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime { + stdenv = overrideCC stdenv llvmPackages_rocm.clang; + inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; + }; + + rocm-runtime = callPackage ../development/libraries/rocm-runtime { }; + + rocm-runtime-ext = callPackage ../development/libraries/rocm-runtime-ext { }; + + # Python >= 3.8 still gives a bunch of warnings. + rocm-smi = python37.pkgs.callPackage ../tools/system/rocm-smi { }; + + rocm-thunk = callPackage ../development/libraries/rocm-thunk { }; + rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; - rust_1_42 = callPackage ../development/compilers/rust/1_42.nix { + rust_1_44 = callPackage ../development/compilers/rust/1_44.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust_1_43 = callPackage ../development/compilers/rust/1_43.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; - rust = rust_1_43; + rust = rust_1_44; - rustPackages_1_42 = rust_1_42.packages.stable; - rustPackages_1_43 = rust_1_43.packages.stable; - rustPackages = rustPackages_1_43; + rustPackages_1_44 = rust_1_44.packages.stable; + rustPackages = rustPackages_1_44; inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rust) makeRustPlatform; @@ -9245,7 +9352,7 @@ in }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-make = callPackage ../development/tools/rust/cargo-make { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; @@ -9398,6 +9505,10 @@ in # provide the default choice, avoiding infinite recursion. bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils , libc ? bintools.libc + , # libc++ from the default LLVM version is bound at the top level, but we + # want the C++ library to be explicitly chosen by the caller, and null by + # default. + libcxx ? null , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross , ... } @ extraArgs: @@ -9410,7 +9521,7 @@ in isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit cc bintools libc extraPackages zlib; + inherit cc bintools libc libcxx extraPackages zlib; } // extraArgs; in self); wrapCC = cc: wrapCCWith { @@ -9494,7 +9605,7 @@ in beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22 + erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; @@ -10111,6 +10222,8 @@ in bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; + bazel-kazel = callPackage ../development/tools/bazel-kazel { }; + bazelisk = callPackage ../development/tools/bazelisk { }; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; @@ -10180,6 +10293,8 @@ in cbrowser = callPackage ../development/tools/misc/cbrowser { }; + cc-tool = callPackage ../development/tools/misc/cc-tool { }; + ccache = callPackage ../development/tools/misc/ccache { }; # Wrapper that works as gcc or g++ @@ -10235,6 +10350,8 @@ in cloud-nuke = callPackage ../development/tools/cloud-nuke { }; + cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {}; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; coan = callPackage ../development/tools/analysis/coan { }; @@ -10270,7 +10387,9 @@ in cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { }; + cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { + inherit (pkgs) cmake; + }; # Does not actually depend on Qt 5 inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools; @@ -10413,6 +10532,8 @@ in drush = callPackage ../development/tools/misc/drush { }; + easypdkprog = callPackage ../development/tools/misc/easypdkprog { }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -10521,8 +10642,8 @@ in gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = gnum4; + gnumake = callPackage ../development/tools/build-managers/gnumake { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = gnumake42; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); @@ -10545,6 +10666,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; + gradle_6 = res.gradleGen.gradle_6_5; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -10603,7 +10725,7 @@ in }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_8; + llvmPackages = llvmPackages_10; }; indent = callPackage ../development/tools/misc/indent { }; @@ -10662,6 +10784,8 @@ in kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubespy = callPackage ../applications/networking/cluster/kubespy { }; + kubicorn = callPackage ../development/tools/kubicorn { }; kubie = callPackage ../development/tools/kubie { @@ -10919,6 +11043,8 @@ in redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; + redo-c = callPackage ../development/tools/build-managers/redo-c { }; + redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; reno = callPackage ../development/tools/reno { }; @@ -11259,6 +11385,8 @@ in allegro4 = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; + amdvlk = callPackage ../development/libraries/amdvlk {}; + amrnb = callPackage ../development/libraries/amrnb { }; amrwb = callPackage ../development/libraries/amrwb { }; @@ -11292,6 +11420,8 @@ in arrayfire = callPackage ../development/libraries/arrayfire {}; arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ + # Workaround until #91984 is in, this will need to be removed later. + zstd = zstd.override { enableShared = false; }; } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' }); @@ -12596,6 +12726,7 @@ in lasso = callPackage ../development/libraries/lasso { }; LASzip = callPackage ../development/libraries/LASzip { }; + LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; lcms = lcms1; @@ -12844,7 +12975,9 @@ in libGL = null; }; - libdigidoc = callPackage ../development/libraries/libdigidoc { }; + libdigidoc = callPackage ../development/libraries/libdigidoc { + inherit (darwin.apple_sdk.frameworks) Security; + }; libdigidocpp = callPackage ../development/libraries/libdigidocpp { }; @@ -12881,6 +13014,8 @@ in inherit (callPackage ../development/libraries/libdwarf { }) libdwarf dwarfdump; + libe57format = callPackage ../development/libraries/libe57format { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { }; libeb = callPackage ../development/libraries/libeb { }; @@ -13156,6 +13291,9 @@ in libplist = callPackage ../development/libraries/libplist { }; libre = callPackage ../development/libraries/libre {}; + + libredwg = callPackage ../development/libraries/libredwg {}; + librem = callPackage ../development/libraries/librem {}; librelp = callPackage ../development/libraries/librelp { }; @@ -13427,6 +13565,10 @@ in libpqxx = callPackage ../development/libraries/libpqxx { }; + inherit (callPackages ../development/libraries/prometheus-client-c { + stdenv = gccStdenv; # Required for darwin + }) libprom libpromhttp; + libproxy = callPackage ../development/libraries/libproxy { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; }; @@ -13595,7 +13737,7 @@ in libva = callPackage ../development/libraries/libva { }; libva-minimal = libva.override { minimal = true; }; - libva-utils = callPackage ../development/libraries/libva-utils { }; + libva-utils = callPackage ../development/libraries/libva/utils.nix { }; libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; libva1-minimal = libva1.override { minimal = true; }; @@ -14149,6 +14291,8 @@ in pcre2 = callPackage ../development/libraries/pcre2 { }; + pdal = callPackage ../development/libraries/pdal { } ; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; inherit (callPackage ../development/libraries/physfs { }) @@ -14375,6 +14519,8 @@ in kdiagram = callPackage ../development/libraries/kdiagram { }; + kdsoap = callPackage ../development/libraries/kdsoap { }; + kproperty = callPackage ../development/libraries/kproperty { }; kreport = callPackage ../development/libraries/kreport { }; @@ -14937,8 +15083,6 @@ in telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; - telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; - termbox = callPackage ../development/libraries/termbox { }; tevent = callPackage ../development/libraries/tevent { }; @@ -15451,6 +15595,9 @@ in buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; + buildGo115Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_15; + }; buildGoPackage = buildGo114Package; @@ -15460,6 +15607,9 @@ in buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; + buildGo115Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_15; + }; buildGoModule = buildGo114Module; @@ -15666,7 +15816,7 @@ in clickhouse = callPackage ../servers/clickhouse { # clickhouse doesn't build on llvm8. - inherit (llvmPackages_7) clang-unwrapped lld lldClang llvm; + inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -15916,6 +16066,8 @@ in moodle = callPackage ../servers/web-apps/moodle { }; + moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { }; + morty = callPackage ../servers/web-apps/morty { }; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; @@ -15932,6 +16084,8 @@ in unit = callPackage ../servers/http/unit { }; + ncdns = callPackage ../servers/dns/ncdns { }; + nginx = nginxStable; nginxStable = callPackage ../servers/http/nginx/stable.nix { @@ -15985,6 +16139,8 @@ in osrm-backend = callPackage ../servers/osrm-backend { }; + oven-media-engine = callPackage ../servers/misc/oven-media-engine { }; + p910nd = callPackage ../servers/p910nd { }; petidomo = callPackage ../servers/mail/petidomo { }; @@ -16244,6 +16400,7 @@ in prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; + prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; @@ -16300,9 +16457,10 @@ in }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; - radicale2 = callPackage ../servers/radicale { }; + radicale2 = callPackage ../servers/radicale/2.x.nix { }; + radicale3 = callPackage ../servers/radicale/3.x.nix { }; - radicale = radicale2; + radicale = radicale3; rake = callPackage ../development/tools/build-managers/rake { }; @@ -16720,6 +16878,8 @@ in fwts = callPackage ../os-specific/linux/fwts { }; + gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; + libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; libuuid = if stdenv.isLinux @@ -17288,7 +17448,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_6; # TODO: Update to linux_latest + linux_latest_for_hardened = pkgs.linux_latest; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -17888,6 +18048,10 @@ in albatross = callPackage ../data/themes/albatross { }; + alegreya = callPackage ../data/fonts/alegreya { }; + + alegreya-sans = callPackage ../data/fonts/alegreya-sans { }; + amber-theme = callPackage ../data/themes/amber { }; amiri = callPackage ../data/fonts/amiri { }; @@ -17955,7 +18119,7 @@ in cascadia-code = callPackage ../data/fonts/cascadia-code { }; - cde-gtk-theme = callPackage ../data/themes/cde-motif-theme { }; + cde-gtk-theme = callPackage ../data/themes/cdetheme { }; charis-sil = callPackage ../data/fonts/charis-sil { }; @@ -18171,10 +18335,7 @@ in inriafonts = callPackage ../data/fonts/inriafonts { }; - - iosevka = callPackage ../data/fonts/iosevka { - nodejs = nodejs-10_x; - }; + iosevka = callPackage ../data/fonts/iosevka {}; iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {}; ipafont = callPackage ../data/fonts/ipafont {}; @@ -18264,6 +18425,8 @@ in manrope = callPackage ../data/fonts/manrope { }; + marwaita = callPackage ../data/themes/marwaita { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -18750,6 +18913,8 @@ in amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility + amfora = callPackage ../applications/networking/browsers/amfora { }; + AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; @@ -18799,6 +18964,10 @@ in arora = callPackage ../applications/networking/browsers/arora { }; + asuka = callPackage ../applications/networking/browsers/asuka { + inherit (darwin.apple_sdk.frameworks) Security; + }; + artha = callPackage ../applications/misc/artha { }; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; @@ -18818,8 +18987,8 @@ in aucatctl = callPackage ../applications/audio/aucatctl { }; - audacious = callPackage ../applications/audio/audacious { }; - audaciousQt5 = libsForQt5.callPackage ../applications/audio/audacious/qt-5.nix { }; + audacious = libsForQt5.callPackage ../applications/audio/audacious { }; + audaciousQt5 = audacious; audacity = callPackage ../applications/audio/audacity { }; @@ -18903,6 +19072,8 @@ in batik = callPackage ../applications/graphics/batik { }; + batsignal = callPackage ../applications/misc/batsignal { }; + baudline = callPackage ../applications/audio/baudline { }; bb = callPackage ../applications/misc/bb { }; @@ -19066,8 +19237,6 @@ in inherit (python3Packages) python wrapPython pygments markdown; }; - cgminer = callPackage ../applications/misc/cgminer { }; - chirp = callPackage ../applications/radio/chirp { }; browsh = callPackage ../applications/networking/browsers/browsh { }; @@ -19164,6 +19333,8 @@ in codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; + convos = callPackage ../applications/networking/irc/convos { }; + comical = callPackage ../applications/graphics/comical { }; containerd = callPackage ../applications/virtualization/containerd { }; @@ -19174,7 +19345,9 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { + python3Packages = python37Packages; + }; cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; @@ -19544,6 +19717,7 @@ in inherit (gnome3) evince; evolution-data-server = gnome3.evolution-data-server; + evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; keepass = callPackage ../applications/misc/keepass { }; @@ -19796,7 +19970,7 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; firefox = wrapFirefox firefox-unwrapped { }; - firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; }; + firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; firefox-esr = firefox-esr-68; @@ -19862,7 +20036,11 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecad = qt5.callPackage ../applications/graphics/freecad { + mpi = openmpi; + # pyside2 5.12 is broken under python 3.8 + python3Packages = python37Packages; + }; freemind = callPackage ../applications/misc/freemind { }; @@ -20412,7 +20590,7 @@ in inherit (nodePackages) imapnotify; - img2pdf = callPackage ../applications/misc/img2pdf { }; + img2pdf = with python3Packages; toPythonApplication img2pdf; imgcat = callPackage ../applications/graphics/imgcat { }; @@ -20453,6 +20631,16 @@ in j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { }; + jabcode = callPackage ../development/libraries/jabcode { }; + + jabcode-writer = callPackage ../development/libraries/jabcode { + subproject = "writer"; + }; + + jabcode-reader = callPackage ../development/libraries/jabcode { + subproject = "reader"; + }; + jabref = callPackage ../applications/office/jabref { }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -20529,13 +20717,15 @@ in recurseIntoAttrs (makeOverridable mkApplications attrs); inherit (kdeApplications) - akonadi akregator ark dolphin dragon elisa ffmpegthumbs filelight gwenview k3b - kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog + akonadi akregator ark bovo dolphin dragon elisa ffmpegthumbs filelight gwenview k3b + kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake - kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; + kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; + k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { }; @@ -20884,6 +21074,8 @@ in magnetico = callPackage ../applications/networking/p2p/magnetico { }; + mastodon-bot = nodePackages.mastodon-bot; + matchbox = callPackage ../applications/window-managers/matchbox { }; matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { @@ -21091,6 +21283,8 @@ in normalize = callPackage ../applications/audio/normalize { }; + mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; + mm = callPackage ../applications/networking/instant-messengers/mm { }; mm-common = callPackage ../development/libraries/mm-common { }; @@ -21209,6 +21403,8 @@ in partio = callPackage ../development/libraries/partio {}; + pc-ble-driver = callPackage ../development/libraries/pc-ble-driver {}; + pbis-open = callPackage ../tools/security/pbis { }; pcmanfm = callPackage ../applications/misc/pcmanfm { }; @@ -21443,6 +21639,8 @@ in obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obsidian = callPackage ../applications/misc/obsidian { }; + octoprint = callPackage ../applications/misc/octoprint { }; octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; @@ -21501,6 +21699,11 @@ in osmium-tool = callPackage ../applications/misc/osmium-tool { }; + osu-lazer = callPackage ../games/osu-lazer { + dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-netcore = dotnetCorePackages.netcore_3_1; + }; + owamp = callPackage ../applications/networking/owamp { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -21529,6 +21732,8 @@ in stdenv = gcc7Stdenv; }; + webbrowser = callPackage ../applications/networking/browsers/webbrowser {}; + pamix = callPackage ../applications/audio/pamix { }; pamixer = callPackage ../applications/audio/pamixer { }; @@ -22172,9 +22377,9 @@ in dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; - maestral = callPackage ../applications/networking/maestral { }; + maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; }; + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; insync = callPackage ../applications/networking/insync { }; @@ -22287,6 +22492,8 @@ in git = gitMinimal; }; + sslyze = with python3Packages; toPythonApplication sslyze; + ssr = callPackage ../applications/audio/soundscape-renderer {}; ssrc = callPackage ../applications/audio/ssrc { }; @@ -22478,7 +22685,6 @@ in thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (rustPackages_1_42) rustc; libpng = libpng_apng; gtk3Support = true; }; @@ -22505,7 +22711,9 @@ in tint2 = callPackage ../applications/misc/tint2 { }; - tiny = callPackage ../applications/networking/irc/tiny { }; + tiny = callPackage ../applications/networking/irc/tiny { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; tipp10 = qt5.callPackage ../applications/misc/tipp10 { }; @@ -22707,6 +22915,8 @@ in neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; + olifant = callPackage ../applications/misc/olifant { }; + gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { gtk = pkgs.gtk3; }; @@ -23110,8 +23320,6 @@ in libpng = libpng12; }; - xara = callPackage ../applications/graphics/xara { }; - xastir = callPackage ../applications/misc/xastir { rastermagick = imagemagick; inherit (xorg) libXt; @@ -23435,6 +23643,8 @@ in bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; }; + cgminer = callPackage ../applications/blockchains/cgminer { }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; @@ -23553,6 +23763,8 @@ in quorum = callPackage ../applications/blockchains/quorum.nix { }; + whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; @@ -24063,6 +24275,11 @@ in static = true; }; }; + openttd-jgrpp = callPackage ../games/openttd/jgrpp.nix { + zlib = zlib.override { + static = true; + }; + }; opentyrian = callPackage ../games/opentyrian { }; @@ -24524,6 +24741,7 @@ in dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; + emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; @@ -25652,6 +25870,8 @@ in dosbox = callPackage ../misc/emulators/dosbox { }; + emu2 = callPackage ../misc/emulators/emu2 { }; + dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { }; @@ -26028,7 +26248,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - nix-linter = haskellPackages.callPackage ../development/tools/analysis/nix-linter { }; + nix-linter = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/tools/analysis/nix-linter { }); nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -26349,6 +26569,7 @@ in terraform_0_11 terraform_0_11-full terraform_0_12 + terraform_0_13 terraform_plugins_test ; @@ -26777,7 +26998,7 @@ in simplehttp2server = callPackage ../servers/simplehttp2server { }; - diceware = callPackage ../tools/security/diceware { }; + diceware = with python3Packages; toPythonApplication diceware; xml2rfc = with python3Packages; toPythonApplication xml2rfc; diff --git a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix index f6fe58a83d..84d2a4e311 100644 --- a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix @@ -13,17 +13,57 @@ rec { erlang_odbc_javac = erlangR22_odbc_javac; erlang_nox = erlangR22_nox; - # These are standard Erlang versions, using the generic builder. - erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { + # Standard Erlang versions, using the generic builder. + + # R23 + erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { wxGTK = wxGTK30; - openssl = openssl_1_0_2; + # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 + parallelBuild = true; }; - erlangR18_odbc = erlangR18.override { odbcSupport = true; }; - erlangR18_javac = erlangR18.override { javacSupport = true; }; - erlangR18_odbc_javac = erlangR18.override { + erlangR23_odbc = erlangR23.override { odbcSupport = true; }; + erlangR23_javac = erlangR23.override { javacSupport = true; }; + erlangR23_odbc_javac = erlangR23.override { javacSupport = true; odbcSupport = true; }; - erlangR18_nox = erlangR18.override { wxSupport = false; }; + erlangR23_nox = erlangR23.override { wxSupport = false; }; + + # R22 + erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { + wxGTK = wxGTK30; + # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 + parallelBuild = true; + }; + erlangR22_odbc = erlangR22.override { odbcSupport = true; }; + erlangR22_javac = erlangR22.override { javacSupport = true; }; + erlangR22_odbc_javac = erlangR22.override { + javacSupport = true; odbcSupport = true; + }; + erlangR22_nox = erlangR22.override { wxSupport = false; }; + + # R21 + erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { + wxGTK = wxGTK30; + }; + erlangR21_odbc = erlangR21.override { odbcSupport = true; }; + erlangR21_javac = erlangR21.override { javacSupport = true; }; + erlangR21_odbc_javac = erlangR21.override { + javacSupport = true; odbcSupport = true; + }; + erlangR21_nox = erlangR21.override { wxSupport = false; }; + + # R20 + erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { + wxGTK = wxGTK30; + }; + erlangR20_odbc = erlangR20.override { odbcSupport = true; }; + erlangR20_javac = erlangR20.override { javacSupport = true; }; + erlangR20_odbc_javac = erlangR20.override { + javacSupport = true; odbcSupport = true; + }; + erlangR20_nox = erlangR20.override { wxSupport = false; }; + + # R19 erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; @@ -34,33 +74,18 @@ rec { javacSupport = true; odbcSupport = true; }; erlangR19_nox = erlangR19.override { wxSupport = false; }; - erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { + + # R18 + erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; + openssl = openssl_1_0_2; }; - erlangR20_odbc = erlangR20.override { odbcSupport = true; }; - erlangR20_javac = erlangR20.override { javacSupport = true; }; - erlangR20_odbc_javac = erlangR20.override { + erlangR18_odbc = erlangR18.override { odbcSupport = true; }; + erlangR18_javac = erlangR18.override { javacSupport = true; }; + erlangR18_odbc_javac = erlangR18.override { javacSupport = true; odbcSupport = true; }; - erlangR20_nox = erlangR20.override { wxSupport = false; }; - erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { - wxGTK = wxGTK30; - }; - erlangR21_odbc = erlangR21.override { odbcSupport = true; }; - erlangR21_javac = erlangR21.override { javacSupport = true; }; - erlangR21_odbc_javac = erlangR21.override { - javacSupport = true; odbcSupport = true; - }; - erlangR21_nox = erlangR21.override { wxSupport = false; }; - erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { - wxGTK = wxGTK30; - }; - erlangR22_odbc = erlangR22.override { odbcSupport = true; }; - erlangR22_javac = erlangR22.override { javacSupport = true; }; - erlangR22_odbc_javac = erlangR22.override { - javacSupport = true; odbcSupport = true; - }; - erlangR22_nox = erlangR22.override { wxSupport = false; }; + erlangR18_nox = erlangR18.override { wxSupport = false; }; # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { @@ -85,10 +110,12 @@ rec { packages = { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; - erlangR18 = packagesWith interpreters.erlangR18; - erlangR19 = packagesWith interpreters.erlangR19; - erlangR20 = packagesWith interpreters.erlangR20; - erlangR21 = packagesWith interpreters.erlangR21; + + erlangR23 = packagesWith interpreters.erlangR23; erlangR22 = packagesWith interpreters.erlangR22; + erlangR21 = packagesWith interpreters.erlangR21; + erlangR20 = packagesWith interpreters.erlangR20; + erlangR19 = packagesWith interpreters.erlangR19; + erlangR18 = packagesWith interpreters.erlangR18; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index c1015aa939..c64fed8fac 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -19,7 +19,6 @@ let coq-bits = callPackage ../development/coq-modules/coq-bits {}; coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; - coq-extensible-records = callPackage ../development/coq-modules/coq-extensible-records {}; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; coqhammer = callPackage ../development/coq-modules/coqhammer {}; coqprime = callPackage ../development/coq-modules/coqprime {}; diff --git a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix index 6bb243879e..5e307305af 100644 --- a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix +++ b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix @@ -108,6 +108,7 @@ releaseTools.sourceTarball { echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages + rm tmp echo "file json-br $packages" >> $out/nix-support/hydra-build-products ''; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index d5d7a81a08..b723bd8739 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -42,8 +42,6 @@ let atdgen = callPackage ../development/ocaml-modules/atdgen { }; - base64_2 = callPackage ../development/ocaml-modules/base64/2.0.nix { }; - base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { @@ -54,6 +52,8 @@ let bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; + bigarray-overlap = callPackage ../development/ocaml-modules/bigarray-overlap { }; + bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; bigstring = callPackage ../development/ocaml-modules/bigstring { }; @@ -170,11 +170,9 @@ let cstruct = if lib.versionAtLeast ocaml.version "4.2" then callPackage ../development/ocaml-modules/cstruct {} - else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { lwt = ocaml_lwt; }; + else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { }; - cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { - lwt = ocaml_lwt; - }; + cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { }; cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {}; @@ -232,6 +230,10 @@ let dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; + dune-release = callPackage ../development/tools/ocaml/dune-release { + inherit (pkgs) opam git mercurial coreutils gnutar bzip2; + }; + duration = callPackage ../development/ocaml-modules/duration { }; earley = callPackage ../development/ocaml-modules/earley { }; @@ -328,6 +330,10 @@ let ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + ipaddr-cstruct = callPackage ../development/ocaml-modules/ipaddr/cstruct.nix { }; + + ipaddr-sexp = callPackage ../development/ocaml-modules/ipaddr/sexp.nix { }; + irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; @@ -344,11 +350,15 @@ let gg = callPackage ../development/ocaml-modules/gg { }; - git = callPackage ../development/ocaml-modules/git { inherit (pkgs) git; }; + git = callPackage ../development/ocaml-modules/git { + git-binary = pkgs.git; + }; git-http = callPackage ../development/ocaml-modules/git-http { }; - git-unix = callPackage ../development/ocaml-modules/git-unix { }; + git-unix = callPackage ../development/ocaml-modules/git-unix { + git-binary = pkgs.git; + }; gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; @@ -459,47 +469,39 @@ let llvm = pkgs.llvm_8; }; - logs = callPackage ../development/ocaml-modules/logs { - lwt = ocaml_lwt; - }; + logs = callPackage ../development/ocaml-modules/logs { }; lru = callPackage ../development/ocaml-modules/lru { }; lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; - lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { }; + lwt = callPackage ../development/ocaml-modules/lwt { }; - lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { }; - - ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2; + ocaml_lwt = lwt; lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; - lwt_log = callPackage ../development/ocaml-modules/lwt_log { - lwt = lwt4; - }; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; - lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { - lwt = ocaml_lwt; - }; + lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { }; - lwt_react = callPackage ../development/ocaml-modules/lwt_react { - lwt = ocaml_lwt; - }; + lwt_react = callPackage ../development/ocaml-modules/lwt_react { }; - lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { - lwt = ocaml_lwt; - }; + lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { }; macaddr = callPackage ../development/ocaml-modules/macaddr { }; + macaddr-cstruct = callPackage ../development/ocaml-modules/macaddr/cstruct.nix { }; + + macaddr-sexp = callPackage ../development/ocaml-modules/macaddr/sexp.nix { }; + macaque = callPackage ../development/ocaml-modules/macaque { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; magick = callPackage ../development/ocaml-modules/magick { }; - markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; + markup = callPackage ../development/ocaml-modules/markup { }; mdx = callPackage ../development/ocaml-modules/mdx { }; @@ -569,9 +571,7 @@ let nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; - notty = callPackage ../development/ocaml-modules/notty { - lwt = ocaml_lwt; - }; + notty = callPackage ../development/ocaml-modules/notty { }; npy = callPackage ../development/ocaml-modules/npy { inherit (pkgs.python3Packages) numpy; @@ -686,8 +686,24 @@ let omd = callPackage ../development/ocaml-modules/omd { }; + opam-core = callPackage ../development/ocaml-modules/opam-core { + inherit (pkgs) opam unzip; + }; + opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; + opam-format = callPackage ../development/ocaml-modules/opam-format { + inherit (pkgs) unzip; + }; + + opam-repository = callPackage ../development/ocaml-modules/opam-repository { + inherit (pkgs) unzip; + }; + + opam-state = callPackage ../development/ocaml-modules/opam-state { + inherit (pkgs) unzip; + }; + opium = callPackage ../development/ocaml-modules/opium { }; opium_kernel = callPackage ../development/ocaml-modules/opium_kernel { }; @@ -822,6 +838,8 @@ let ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { }; + ppx_yojson_conv_lib = callPackage ../development/ocaml-modules/ppx_yojson_conv_lib {}; + printbox = callPackage ../development/ocaml-modules/printbox { }; process = callPackage ../development/ocaml-modules/process { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index b3e44398f6..86cc2a29ad 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -11,8 +11,8 @@ , perl, overrides, buildPerl, shortenPerlShebang }: -# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.2 or above -assert stdenv.lib.versionAtLeast perl.version "5.28.2"; +# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.3 or above +assert stdenv.lib.versionAtLeast perl.version "5.28.3"; let inherit (stdenv.lib) maintainers; self = _self // (overrides pkgs); @@ -162,10 +162,10 @@ let AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "1.98"; + version = "2.26"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.98.tar.gz"; - sha256 = "12w9da57616gmcj69yv7cjv423cj957dm0f84cn2q093g64kjmif"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.26.tar.gz; + sha256 = "0wfgfj6rvscqs3ixpybgrdmmnpxvf194iwbnl89jkqc25ipmc15i"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; @@ -177,13 +177,13 @@ let AlienGMP = buildPerlPackage { pname = "Alien-GMP"; - version = "1.14"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz"; - sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.16.tar.gz; + sha256 = "199x24pl6jnqshgnl066lhdf2fkqa6l1fml9g3qn5grmwn7d8309"; }; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ pkgs.gmp DevelChecklib HTMLParser SortVersions Test2Suite URI ]; + buildInputs = [ pkgs.gmp Alienm4 DevelChecklib IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Alien package for the GNU Multiple Precision library."; license = with stdenv.lib.licenses; [ lgpl3Plus ]; @@ -192,10 +192,10 @@ let AlienLibxml2 = buildPerlPackage { pname = "Alien-Libxml2"; - version = "0.12"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.12.tar.gz"; - sha256 = "0b3dj1510fxldhicijvw390gnh5j1k6rjzcc2jzs9f8nwfkqh6r2"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.16.tar.gz; + sha256 = "15rvllspikyr8412v8dpl2f2w5vxnjgnddnkz378sy2g0mc6mw2n"; }; propagatedBuildInputs = [ AlienBuild ]; buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ]; @@ -273,6 +273,36 @@ let buildInputs = [ LWPProtocolHttps ]; }; + Alienm4 = buildPerlPackage { + pname = "Alien-m4"; + version = "0.19"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.19.tar.gz; + sha256 = "1xnh8qa99dcvqcqzbpy0s5jrxvn7wa5ydz3lfd56n358l5jfzns9"; + }; + propagatedBuildInputs = [ AlienBuild ]; + buildInputs = [ Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI pkgs.gnum4 ]; + meta = { + description = "Find or build GNU m4"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + Alienpatch = buildPerlPackage { + pname = "Alien-patch"; + version = "0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-patch-0.15.tar.gz; + sha256 = "1l00mq56596wn09nn7fv552j2aa7sgh46bvx5xlncsnrn8jp5mpy"; + }; + propagatedBuildInputs = [ AlienBuild ]; + buildInputs = [ IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; + meta = { + description = "Find or build patch"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AnyEvent = buildPerlPackage { pname = "AnyEvent"; version = "7.17"; @@ -316,10 +346,10 @@ let AnyEventHTTP = buildPerlPackage { pname = "AnyEvent-HTTP"; - version = "2.24"; + version = "2.25"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz"; - sha256 = "0358a542baa45403d81c0a70e43e79c044ddfa1371161d043f002acef63121dd"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.25.tar.gz; + sha256 = "5cfa53416124176f6f4cd32b00ea8ca79a2d5df51258683989cd04fe86e25013"; }; propagatedBuildInputs = [ AnyEvent commonsense ]; }; @@ -340,12 +370,12 @@ let AnyEventRabbitMQ = buildPerlPackage { pname = "AnyEvent-RabbitMQ"; - version = "1.19"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.19.tar.gz"; - sha256 = "a440ec2fa5a4018ad44739baaa9601cc460ad497282e89110ba8e3cf23312f0a"; + url = mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.22.tar.gz; + sha256 = "98c52a1fe700710f3e5bc55a38b25de625e9b2e8341d278dcf9e1b3f3d19acee"; }; - buildInputs = [ TestException ]; + buildInputs = [ FileShareDirInstall TestException ]; propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; @@ -378,10 +408,10 @@ let ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; - version = "3.28"; + version = "3.30"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.28.tar.gz"; - sha256 = "bcd795a7f654a94ae0a6bd734ba4d8ba1085371fca486229dba49f1c2d62142b"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.30.tar.gz; + sha256 = "1f71b94d3d55a950a4b32dae4e90f6e76c8157508a7e2aee50621b179aadb1fb"; }; buildInputs = [ ApacheTest ]; propagatedBuildInputs = [ ClassLoad HTTPBody HashMultiValue WWWFormUrlEncoded ]; @@ -456,10 +486,10 @@ let AppClusterSSH = buildPerlModule { pname = "App-ClusterSSH"; - version = "4.14"; + version = "4.15"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.14.tar.gz"; - sha256 = "020p28xl9507blvr8lr7hdxk1cl8jjkz5rkrkh7g538g52sa2cmi"; + url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.15.tar.gz; + sha256 = "1apk4yi9wfxrvspsfxr74jl1zr5z56ghknnmx8k5648zga1mn9z1"; }; propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ]; @@ -585,13 +615,13 @@ let }; AppSqitch = buildPerlModule { - version = "1.0.0"; + version = "1.1.0"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz"; - sha256 = "f46466c1e9ad8bbabf6844fed4f6e534ea475731de61b775ad7c331db1ca9c5c"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz; + sha256 = "ee146cd75d6300837e6ca559bb0bde247d42123c96b2c5d4b2800f38d3e3d1ab"; }; - buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; + buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { @@ -720,10 +750,10 @@ let ArchiveTar = buildPerlPackage { pname = "Archive-Tar"; - version = "2.32"; + version = "2.36"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.32.tar.gz"; - sha256 = "92783780731ab0c9247adf43e70f4801e8317e3915ea87e38b85c8f734e8fca2"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.36.tar.gz; + sha256 = "16ba52e0babe54f8c4deb11b103a46186763173607d59649130d0fffdd36968e"; }; meta = { description = "Manipulates TAR archives"; @@ -746,10 +776,10 @@ let ArchiveZip = buildPerlPackage { pname = "Archive-Zip"; - version = "1.67"; + version = "1.68"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.67.tar.gz"; - sha256 = "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my"; + url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.68.tar.gz; + sha256 = "0l663s3a68p8r2qjy4pn1g05lx0i8js8wpz7qqln3bsvg1fihklq"; }; buildInputs = [ TestMockModule ]; meta = { @@ -803,6 +833,49 @@ let }; }; + AuthenKrb5 = buildPerlModule { + pname = "Authen-Krb5"; + version = "1.905"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IO/IOANR/Authen-Krb5-1.905.tar.gz"; + sha256 = "0kgpl0x1qxq1p2ccxy8qqkrvqba2gq6aq6p931qnz9812nxh0yyp"; + }; + perlPreHook = "export LD=$CC"; + propagatedBuildInputs = [ pkgs.libkrb5 DevelChecklib FileWhich PkgConfig ]; + meta = { + description = "XS bindings for Kerberos 5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + AuthenKrb5Admin = buildPerlPackage rec { + pname = "Authen-Krb5-Admin"; + version = "0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SJ/SJQUINNEY/${pname}-${version}.tar.gz"; + sha256 = "5dd49cacd983efd61a8c3f1a56571bb73785eb155908b5d7bec97eed78df0c54"; + }; + propagatedBuildInputs = [ pkgs.krb5Full.dev AuthenKrb5 ]; + # The following ENV variables are required by Makefile.PL to find + # programs in krb5Full.dev. It is not enough to just specify the + # path to krb5-config as this tool returns the prefix of krb5Full, + # which implies a working value for KRB5_LIBDIR, but not the others. + perlPreHook = '' + export KRB5_CONFTOOL=${pkgs.krb5Full.dev}/bin/krb5-config + export KRB5_BINDIR=${pkgs.krb5Full.dev}/bin + export KRB5_INCDIR=${pkgs.krb5Full.dev}/include + ''; + # Tests require working Kerberos infrastructure so replace with a + # simple attempt to exercise the module. + checkPhase = '' + perl -I blib/lib -I blib/arch -MAuthen::Krb5::Admin -e 'print "1..1\nok 1\n"' + ''; + meta = { + description = "Perl extension for MIT Kerberos 5 admin interface"; + license = stdenv.lib.licenses.bsd3; + }; + }; + AuthenModAuthPubTkt = buildPerlPackage { pname = "Authen-ModAuthPubTkt"; version = "0.1.1"; @@ -906,7 +979,7 @@ let sha256 = "45108c239a7373d00941dcf0d171acd03e7c16a63ce6f7d9568ff052b17cf5a8"; }; buildInputs = [ TestFailWarnings TestFatal ]; - propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TryTiny TypeTiny namespaceclean ]; + propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TypeTiny namespaceclean ]; meta = { homepage = "https://github.com/dagolden/Authen-SCRAM"; description = "Salted Challenge Response Authentication Mechanism (RFC 5802)"; @@ -1019,10 +1092,10 @@ let BCOW = buildPerlPackage { pname = "B-COW"; - version = "0.002"; + version = "0.004"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.002.tar.gz"; - sha256 = "0z2px2x15vr1y5rxsv7d80kh186ld7a45nbm4lsbs07g8y0p7rzw"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz; + sha256 = "0lazb25jzhdha4dmrkdxn1pw1crc6iqzspvcq315p944xmsvgbzw"; }; meta = { description = "B::COW additional B helpers to check COW status"; @@ -1042,6 +1115,20 @@ let }; }; + BeanstalkClient = buildPerlPackage { + pname = "Beanstalk-Client"; + version = "1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GB/GBARR/Beanstalk-Client-1.07.tar.gz"; + sha256 = "3188ab1127f2caba97df65c84f69db0ec70c64e5d70f296f9a2674fa79c112cc"; + }; + propagatedBuildInputs = [ ClassAccessor YAMLSyck ]; + meta = { + description = "Client to communicate with beanstalkd server"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + BerkeleyDB = buildPerlPackage { pname = "BerkeleyDB"; version = "0.63"; @@ -1236,10 +1323,10 @@ let BusinessISSN = buildPerlPackage { pname = "Business-ISSN"; - version = "1.003"; + version = "1.004"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz"; - sha256 = "1272456c19937a24bc5f9a0db9dc447043591137719ee4dc955a63be544b99d1"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.004.tar.gz; + sha256 = "97ecab15d24d11e2852bf0b28f84c8798bd38402a0a69e17be0e6689b272715e"; }; meta = { description = "Work with International Standard Serial Numbers"; @@ -1275,10 +1362,10 @@ let CacheFastMmap = buildPerlPackage { pname = "Cache-FastMmap"; - version = "1.48"; + version = "1.49"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz"; - sha256 = "118y5lxwa092zrii7mcwnqypff7424w1dpgfkg8zlnz7h2mmnd9c"; + url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.49.tar.gz; + sha256 = "1azz66d4syk6b6gc95drkglajvf8igiy3449hpsm444inis9mscm"; }; }; @@ -1310,10 +1397,10 @@ let CacheMemcachedFast = buildPerlPackage { pname = "Cache-Memcached-Fast"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz"; - sha256 = "0ijw5hlzas1aprp3s6wzabch426m1d8cvp1wn9qphrn4jj82aakq"; + url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.26.tar.gz; + sha256 = "16m0xafidycrlcvbv3zmbr5pzvqyqyr2qb0khpry99nc4bcld3jy"; }; meta = { description = "Perl client for B, in C language"; @@ -1618,10 +1705,10 @@ let CatalystDevel = buildPerlPackage { pname = "Catalyst-Devel"; - version = "1.39"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz"; - sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Devel-1.40.tar.gz; + sha256 = "8c5f064b01fa58dce395ae46f33a0d37c4cb03472dde7c5076b6df1f99e116bb"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; @@ -2087,10 +2174,10 @@ let Catmandu = buildPerlModule { pname = "Catmandu"; - version = "1.2011"; + version = "1.2012"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2011.tar.gz"; - sha256 = "0awl5qhciphnr1ihq66ssd2hzxvh1ddbr016sxb0qhxbzqv77sb9"; + url = mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2012.tar.gz; + sha256 = "1dn5bqfg9vswwmvpgfziirqbjlm3gzswhknnmvg07igv1jcrk3d0"; }; propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ]; buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; @@ -2117,10 +2204,10 @@ let CGI = buildPerlPackage { pname = "CGI"; - version = "4.45"; + version = "4.49"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.45.tar.gz"; - sha256 = "f6c1513740ee502e947d30131da18a5595dbcd19962d3dd0ff5dedf3cd1ed407"; + url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.49.tar.gz; + sha256 = "dd5e9ce69c6e6ed9b42f0a0daeaead1c6caad3fbba2b2a4977b076bc29556b5e"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; @@ -2211,10 +2298,10 @@ let CGIMinimal = buildPerlModule { pname = "CGI-Minimal"; - version = "1.29"; + version = "1.30"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz"; - sha256 = "36c785ffacf5cdee4f1a7219ca1848b7e1700bdd71cd9116e1f00545ec88475d"; + url = mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.30.tar.gz; + sha256 = "b94d50821b02611da6ee5423193145078c4dbb282f2b162a4b0d58094997bc47"; }; meta = { description = "A lightweight CGI form processing package"; @@ -2248,10 +2335,10 @@ let CGISimple = buildPerlModule { pname = "CGI-Simple"; - version = "1.22"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.22.tar.gz"; - sha256 = "13c7iwnnavky10ab87pi8jc1kqph03s0rhvj7myn7szhbfisc4gn"; + url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.25.tar.gz; + sha256 = "0zpl7sa8jvv3zba2vcxf3qsrjk7kk2vcznfdpmxydw06x8vczrp5"; }; propagatedBuildInputs = [ IOStringy ]; meta = { @@ -2308,6 +2395,19 @@ let }; }; + CiscoIPPhone = buildPerlPackage { + pname = "Cisco-IPPhone"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MR/MRPALMER/Cisco-IPPhone-0.05.tar.gz"; + sha256 = "b03ca263f8f41a6ec545c5393213a3146d36bd45335ade99af51dd42ab6ee16d"; + }; + meta = { + description = "Package for creating Cisco IPPhone XML objects"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + CLASS = buildPerlPackage { pname = "CLASS"; version = "1.00"; @@ -2562,6 +2662,19 @@ let }; }; + ClassLoader = buildPerlPackage rec { + pname = "Class-Loader"; + version = "2.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPUL/${pname}-${version}.tar.gz"; + sha256 = "4fef2076ead60423454ff1f4e82859a9a9b9942b5fb8eee0c98b9c63c9f2b8e7"; + }; + meta = { + description = "Load modules and create objects on demand"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ClassMakeMethods = buildPerlPackage { pname = "Class-MakeMethods"; version = "1.01"; @@ -2775,10 +2888,10 @@ let Clipboard = buildPerlModule { pname = "Clipboard"; - version = "0.22"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.22.tar.gz"; - sha256 = "9fdb4dfc2e9bc2f3990b5b71649094dfe83aa12172c5a1809cf7e8b3be295ca7"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.26.tar.gz; + sha256 = "886ae43dc8538f9bfc4e07fdbcf09b7fbd6ee59c31f364618c859de14953c58a"; }; meta = { description = "Clipboard - Copy and Paste with any OS"; @@ -2795,10 +2908,10 @@ let Clone = buildPerlPackage { pname = "Clone"; - version = "0.43"; + version = "0.45"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz"; - sha256 = "1npf5s4b90ds6lv8gn76b2w4bdh0z5ni5zk4skgc2db5d12560lr"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz; + sha256 = "1rm9g68fklni63jdkrlgqq6yfj95fm33p2bq90p475gsi8sfxdnb"; }; meta = { description = "Recursively copy Perl datatypes"; @@ -2835,10 +2948,10 @@ let CodeTidyAll = buildPerlPackage { pname = "Code-TidyAll"; - version = "0.75"; + version = "0.78"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.75.tar.gz"; - sha256 = "0gplkyds3zmiqpvw8x8kg3g81jcm58kcxvwg5yk4dm2fdkl77xqf"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz; + sha256 = "1dmr6zkgcnc6cam204f00g5yly46cplbn9k45ginw02rv10vnpij"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -2864,10 +2977,10 @@ let commonsense = buildPerlPackage { pname = "common-sense"; - version = "3.74"; + version = "3.75"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz"; - sha256 = "1wxv2s0hbjkrnssvxvsds0k213awg5pgdlrpkr6xkpnimc17s7vp"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.75.tar.gz; + sha256 = "0zhfp8f0czg69ycwn7r6ayg6idm5kyh2ai06g5s6s07kli61qsm8"; }; meta = { description = "Implements some sane defaults for Perl programs"; @@ -2877,10 +2990,10 @@ let CompressBzip2 = buildPerlPackage { pname = "Compress-Bzip2"; - version = "2.26"; + version = "2.27"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz"; - sha256 = "5132f0c5f377a54d77ee36d332aa0ece585c22a40f2c31f2619e40262f5c4f0c"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.27.tar.gz; + sha256 = "a284c506ac8ef5b02136a15814271dcba10400b5ce818359cf3325ccde7bb3d3"; }; meta = { description = "Interface to Bzip2 compression library"; @@ -2984,10 +3097,10 @@ let ConfigGitLike = buildPerlPackage { pname = "Config-GitLike"; - version = "1.17"; + version = "1.18"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz"; - sha256 = "674a07b814fdcf9d323088d093245bcd066aaee24ec0914cb4decc9a943de54e"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.18.tar.gz; + sha256 = "f7ae7440f3adab5b9ff9aa57216d84fd4a681009b9584e32da42f8bb71e332c5"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; @@ -3044,10 +3157,10 @@ let ConfigIniFiles = buildPerlModule { pname = "Config-IniFiles"; - version = "3.000002"; + version = "3.000003"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz"; - sha256 = "d92ed6ed2db98d5addf732c96d2a9c15d9f878c7e8b355bb7a5c1668e3f8ba09"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000003.tar.gz; + sha256 = "3c457b65d98e5ff40bdb9cf814b0d5983eb0c53fb8696bda3ba035ad2acd6802"; }; propagatedBuildInputs = [ IOStringy ]; meta = { @@ -3380,18 +3493,11 @@ let CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.27"; + version = "2.28"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz"; - sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f"; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.28.tar.gz"; + sha256 = "39d357489283d479695027640d7fc25b42ec3c52003071d1ec94496e34af5974"; }; - patches = [ - (fetchpatch { - url = "https://github.com/andk/cpanpm/commit/10da44f1757aff6971e3bc4ed38ab115e738c740.diff"; - name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false"; - sha256 = "0sr2nxkr1cwavpvpxsqcsryfd5fjv4fkxfihd03jzavv5awj79hp"; - }) - ]; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; @@ -3483,10 +3589,10 @@ let CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "5.20200120"; + version = "5.20200607"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200120.tar.gz"; - sha256 = "0xhn05aiyrdcxhmps0qg9ivr9p7278mjix7719rv2k5kd2nf1jg8"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200607.tar.gz; + sha256 = "0x09ghg5s69kajpw19qs8bhdzma900ipry4zizi37qcdby3kadf1"; }; meta = { homepage = "https://github.com/bingos/cpan-perl-releases"; @@ -3497,10 +3603,10 @@ let CPANPLUS = buildPerlPackage { pname = "CPANPLUS"; - version = "0.9906"; + version = "0.9908"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9906.tar.gz"; - sha256 = "0w1gi4w7xriqhh44ssgg2abk5dfxchshqfab4cs3j4ab6p8vf9j5"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9908.tar.gz; + sha256 = "1m4xas67fax947kahvg4jsnsr2r1i58c5g3f1bixh7krgnsarxjq"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { @@ -3512,10 +3618,10 @@ let CPANUploader = buildPerlPackage { pname = "CPAN-Uploader"; - version = "0.103013"; + version = "0.103014"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz"; - sha256 = "07k8ia8gvj9mrz7a2lckgd3vxjsahfr43lgrb85474dkhz94f5pq"; + url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103014.tar.gz; + sha256 = "1pi15yj06yyzx6xzhhclfhnbssrrpj27ncya2bh21mxnjmy52kqy"; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { @@ -3595,10 +3701,10 @@ let CryptECB = buildPerlPackage { pname = "Crypt-ECB"; - version = "2.21"; + version = "2.22"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.21.tar.gz"; - sha256 = "890f8b3040220ea705ee5ca4f9bd23435a1779bc3ffa75533736e6c9c21d1015"; + url = mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.22.tar.gz; + sha256 = "f5af62e908cd31a34b2b813135a0718016fd003ffa0021ffbdd84c50158267aa"; }; meta = with stdenv.lib; { description = "Use block ciphers using ECB mode"; @@ -3628,12 +3734,12 @@ let CryptJWT = buildPerlPackage { pname = "Crypt-JWT"; - version = "0.025"; + version = "0.028"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.025.tar.gz"; - sha256 = "2def87936645723de70fcc11cb380b1faddf9c5678832e4fc6116f267987087d"; + url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.028.tar.gz; + sha256 = "af819a620fa9b2d0432f718fecc3e4d8458d04b932f27fcb6217e0f39027e633"; }; - propagatedBuildInputs = [ CryptX JSONMaybeXS ]; + propagatedBuildInputs = [ CryptX JSON ]; meta = { description = "JSON Web Token"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3679,6 +3785,20 @@ let }; }; + CryptRandom = buildPerlPackage rec { + pname = "Crypt-Random"; + version = "1.52"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPUL/${pname}-${version}.tar.gz"; + sha256 = "a93c06de409e6f2eb2e9868ea6d4e653d99f2f7900b2c1831e1f65ace0c4ef84"; + }; + propagatedBuildInputs = [ ClassLoader MathPari StatisticsChiSquare ]; + meta = { + description = "Interface to /dev/random and /dev/urandom"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CryptRandomSource = buildPerlModule { pname = "Crypt-Random-Source"; version = "0.14"; @@ -3942,7 +4062,7 @@ let url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { description = "XS based CSS minifier"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3994,10 +4114,10 @@ let CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.066"; + version = "0.068"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.066.tar.gz"; - sha256 = "e7e823ac4db0b452e885b0e0d5adfc8a9c5f688938f1adf3f1d91432b3238335"; + url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.068.tar.gz; + sha256 = "b1806a1fa4d4b8c9265f44ac706eb0b05107d644edb24ffea1b507168e88fd59"; }; meta = { description = "Crypto toolkit"; @@ -4205,14 +4325,14 @@ let }; }; - DataMessagePack = buildPerlPackage { + DataMessagePack = buildPerlModule { pname = "Data-MessagePack"; - version = "1.00"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.00.tar.gz"; - sha256 = "c9f0eeaf56ee4dfd509eccba2dd838921aebdf186ba60de166443ffc4b0ba1a2"; + url = mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.01.tar.gz; + sha256 = "8fa0ed0101d04e661821a7b78e8d62ce3e19b299275bbfed178e2ba8912663ea"; }; - buildInputs = [ FileCopyRecursive TestRequires ]; + buildInputs = [ DevelPPPort ModuleBuildXSUtil TestRequires ]; meta = { homepage = "https://github.com/msgpack/msgpack-perl"; description = "MessagePack serializing/deserializing"; @@ -4318,10 +4438,10 @@ let DataSerializer = buildPerlModule { pname = "Data-Serializer"; - version = "0.60"; + version = "0.65"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz"; - sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk"; + url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.65.tar.gz; + sha256 = "048zjy8valnil8yawa3vrxr005rz95gpfwvmy2jq0g830195l58j"; }; meta = { description = "Modules that serialize data structures"; @@ -4402,7 +4522,7 @@ let url = "mirror://cpan/authors/id/B/BA/BALDUR/Data-ULID-1.0.0.tar.gz"; sha256 = "4d757475893dbad5165f0a65c446d38b47f39019d36f77da9d29c98cbf27206f"; }; - propagatedBuildInputs = [ DateTime EncodeBase32GMP MathRandomSecure MathBigIntGMP ]; + propagatedBuildInputs = [ DateTime EncodeBase32GMP MathRandomSecure ]; meta = { homepage = "https://metacpan.org/release/Data-ULID"; description = "Universally Unique Lexicographically Sortable Identifier"; @@ -4450,10 +4570,10 @@ let DataUUID = buildPerlPackage { pname = "Data-UUID"; - version = "1.224"; + version = "1.226"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz"; - sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.226.tar.gz; + sha256 = "0lv4k4ibxwkw7zz9hw97s34za9nvjxb4kbmgmx5sj4fll3zmfg89"; }; }; @@ -4551,10 +4671,10 @@ let DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.79"; + version = "6.82"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.79.tar.gz"; - sha256 = "0fllcvsd08wz71wyppyhgb6mingfihhsf5raraildggdwhnc9a3i"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz; + sha256 = "0ak72kpydwhq2z03mhdfwm3ganddzb8gawzh6crpsjvb9kwvr5ps"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -4581,10 +4701,10 @@ let DateTime = buildPerlPackage { pname = "DateTime"; - version = "1.51"; + version = "1.52"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz"; - sha256 = "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.52.tar.gz; + sha256 = "1z1xpifh2kpyw7rlc8ivg9rl0qmabjq979gjp0s9agdjf9hqp0k7"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; @@ -4733,10 +4853,10 @@ let DateTimeFormatNatural = buildPerlModule { pname = "DateTime-Format-Natural"; - version = "1.08"; + version = "1.09"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.08.tar.gz"; - sha256 = "0hfk9cqfy0j49vqllhxfikbkqjhf7jrm6zb9i2bxq2ywm8qnz1rj"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.09.tar.gz; + sha256 = "0mxhzib3wq408mqa8wgdlvxxjrmv2fn07ydbpyx6qny1867kczbc"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; @@ -4777,10 +4897,10 @@ let DateTimeFormatStrptime = buildPerlPackage { pname = "DateTime-Format-Strptime"; - version = "1.76"; + version = "1.77"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.76.tar.gz"; - sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.77.tar.gz; + sha256 = "2fa43c838ecf5356f221a91a41c81dba22e7860c5474b4a61723259898173e4a"; }; buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTime ]; @@ -4849,10 +4969,10 @@ let DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.38"; + version = "2.39"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.38.tar.gz"; - sha256 = "0e5c99ef22471f4d262ac590ce5ce8177094d7a92f380d8eea6219f5a12dc0cd"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.39.tar.gz; + sha256 = "65a49083bf465b42c6a65df575efaceb87b5ba5a997d4e91e6ddba57190c8fca"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -4947,12 +5067,12 @@ let DevelCheckOS = buildPerlPackage { pname = "Devel-CheckOS"; - version = "1.81"; + version = "1.83"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz"; - sha256 = "f3c17b56b79283b62616f938d36c57adc9df06bfaa295ff98be21e9014a23b10"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.83.tar.gz; + sha256 = "b20fb5ab55d2cf8539fdc7268d77cdbf944408e620c4969023e687ddd28c9972"; }; - propagatedBuildInputs = [ DataCompare ]; + propagatedBuildInputs = [ FileFindRule ]; }; DevelLeak = buildPerlPackage rec { @@ -4971,10 +5091,10 @@ let DevelPatchPerl = buildPerlPackage { pname = "Devel-PatchPerl"; - version = "1.84"; + version = "2.00"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.84.tar.gz"; - sha256 = "1nlil7mq8vc3lbsr5p3zr7jqaclkr0blhmb8sgkyc7mbvhml9jzp"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.00.tar.gz; + sha256 = "07yy02v86ia7j8qbn46jqan8c8d6xdqigvv5a4wmkqwln7jxmhrr"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { @@ -5000,10 +5120,10 @@ let DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.56"; + version = "3.58"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.56.tar.gz"; - sha256 = "628476dbfeb7be92471e48f75fe0d36659b92493669ebd02cf04e3a13429521b"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.58.tar.gz; + sha256 = "531ff79f9e74962df2dba7b2e526b8a5208cfb6bcdc01d85732fda8c1fde0c00"; }; meta = { description = "Perl/Pollution/Portability"; @@ -5064,7 +5184,7 @@ let url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.54.tgz"; sha256 = "bc597cd7195e5a023e2b3413d8dc614602b9b3f279f436027881796464d4f0be"; }; - propagatedBuildInputs = [ DBI TextCSV_XS SQLStatement ModuleRuntime ParamsUtil ]; + propagatedBuildInputs = [ DBI SQLStatement TextCSV_XS ]; }; DBDMock = buildPerlModule { @@ -5149,11 +5269,11 @@ let DBDPg = buildPerlPackage { pname = "DBD-Pg"; - version = "3.10.3"; + version = "3.12.3"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.3.tar.gz"; - sha256 = "0swj2pkga92z15rnq9f0j9s84j5ancgas0ncd4k230bd8advlgn6"; + url = mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.12.3.tar.gz; + sha256 = "0rrlg2rwgkpcx67qf7081g7mj2shpqhj2iyxrq5fixf32nb0ad4v"; }; buildInputs = [ pkgs.postgresql ]; @@ -5209,10 +5329,10 @@ let DBI = buildPerlPackage { pname = "DBI"; - version = "1.642"; + version = "1.643"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.642.tar.gz"; - sha256 = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz; + sha256 = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI @@ -5352,10 +5472,10 @@ let DBIxClassHelpers = buildPerlPackage { pname = "DBIx-Class-Helpers"; - version = "2.034002"; + version = "2.036000"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.034002.tar.gz"; - sha256 = "08ab0eae514653b7f59444a0a19188ef65351889e9aefb19a2ea5a159fe2574b"; + url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.036000.tar.gz; + sha256 = "b7b8b4891a983c034ef0b45f4112404a0a40550c4e217daeb7a22ca16861efdb"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; propagatedBuildInputs = [ CarpClan DBIxClassCandy DBIxIntrospector SafeIsa TextBrew ]; @@ -5504,10 +5624,10 @@ let DevelDeclare = buildPerlPackage { pname = "Devel-Declare"; - version = "0.006019"; + version = "0.006022"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz"; - sha256 = "ac719dc289cbf53fbb3b090ccd3a55a9d207f24e09480423c96f7185af131808"; + url = mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006022.tar.gz; + sha256 = "72f29ca35646a593be98311ffddb72033ae1e8a9d8254c62aa248bd6260e596e"; }; buildInputs = [ ExtUtilsDepends TestRequires ]; propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; @@ -5558,10 +5678,10 @@ let DevelHide = buildPerlPackage { pname = "Devel-Hide"; - version = "0.0010"; + version = "0.0013"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0010.tar.gz"; - sha256 = "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0013.tar.gz; + sha256 = "1jvyy3yasiwyjsn9ay9sja3ch4wcjc4wk5l22vjsclq29z7vphvg"; }; }; @@ -5794,13 +5914,13 @@ let DistZilla = buildPerlPackage { pname = "Dist-Zilla"; - version = "6.012"; + version = "6.015"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz"; - sha256 = "0w1hhvxcdf52ln940f8i37adv2gp7l8ryf2nm6m7haynyrsk0n37"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.015.tar.gz; + sha256 = "06w9mdk46y4n2dshkx6laphkqk08wfw6bqpsa5q2yb4lky0yb212"; }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; - propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ]; + propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; meta = { homepage = "http://dzil.org/"; description = "Distribution builder; installer not included!"; @@ -6247,10 +6367,10 @@ let EmailMIME = buildPerlPackage { pname = "Email-MIME"; - version = "1.946"; + version = "1.949"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz"; - sha256 = "68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.949.tar.gz; + sha256 = "3b0adf6bb413cfe51d75f8ba79aca80deafc98dc1179aa7b2d7a79aff5a6ab9c"; }; propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; meta = { @@ -6278,16 +6398,17 @@ let EmailMIMEContentType = buildPerlPackage { pname = "Email-MIME-ContentType"; - version = "1.022"; + version = "1.024"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz"; - sha256 = "9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.024.tar.gz; + sha256 = "42d164ac7ff4dc2ea848e710fe21fa85509a3bcbb91ed2d356e4aba951ed8835"; }; meta = { homepage = "https://github.com/rjbs/Email-MIME-ContentType"; description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ TextUnidecode ]; }; EmailMIMEEncodings = buildPerlPackage { @@ -6329,6 +6450,7 @@ let sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb"; }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; + preCheck = "rm t/internals.t t/plain_jpeg_attached.t"; # these tests expect EmailMIME version 1.946 and fail with 1.949 (the output difference in benign) meta = with stdenv.lib; { homepage = "https://www.matijs.net/software/msgconv/"; description = "A .MSG to mbox converter"; @@ -6401,10 +6523,10 @@ let Encode = buildPerlPackage { pname = "Encode"; - version = "3.02"; + version = "3.06"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.02.tar.gz"; - sha256 = "5865be4951870f62f43722818d076d7724306c75c8f268346b282351cbc820a8"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.06.tar.gz; + sha256 = "5b2dcd6861287880584e63b2e518840d483aa38da70194cf64d9957282851eea"; }; meta = { description = "Character encodings in Perl"; @@ -6574,10 +6696,10 @@ let EV = buildPerlPackage { pname = "EV"; - version = "4.32"; + version = "4.33"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.32.tar.gz"; - sha256 = "b82a8b89bb9cca475f6242c8621dc2c48f24851ca61558e1bd592b8506752936"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.33.tar.gz; + sha256 = "4aee8391b88113b42187f91fd49245fdc8e9b193a15ac202f519caae2aa8ea35"; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; @@ -6676,10 +6798,10 @@ let ExporterTiny = buildPerlPackage { pname = "Exporter-Tiny"; - version = "1.002001"; + version = "1.002002"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz"; - sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002002.tar.gz; + sha256 = "00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101"; }; meta = { description = "An exporter with the features of Sub::Exporter but only core dependencies"; @@ -6996,10 +7118,10 @@ let FFICheckLib = buildPerlPackage { pname = "FFI-CheckLib"; - version = "0.26"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.26.tar.gz"; - sha256 = "0rbzm4cisn4vdj1kc0sa6v8m1b3mjkryi5w14hk1d13zh3q3pqq6"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.27.tar.gz; + sha256 = "0x1dk4hlhvcbgwivf345phbqz0v5hawxxnby21h8bkagq93jfi4d"; }; buildInputs = [ Test2Suite ]; meta = { @@ -7063,10 +7185,10 @@ let FileBOM = buildPerlModule { pname = "File-BOM"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz"; - sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf"; + url = mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.18.tar.gz; + sha256 = "28edc43fcb118e11bc458c9ae889d56d388c1d9bc29997b00b1dffd8573823a3"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Readonly ]; @@ -7220,6 +7342,19 @@ let }; }; + FileGrep = buildPerlPackage { + pname = "File-Grep"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MN/MNEYLON/File-Grep-0.02.tar.gz"; + sha256 = "462e15274eb6278521407ea302d9eea7252cd44cab2382871f7de833d5f85632"; + }; + meta = { + description = "Find matches to a pattern in a series of files and related functions"; + maintainers = [ maintainers.limeytexan ]; + }; + }; + FileHandleUnget = buildPerlPackage { pname = "FileHandle-Unget"; version = "0.1634"; @@ -7279,12 +7414,12 @@ let FileLibMagic = buildPerlPackage { pname = "File-LibMagic"; - version = "1.16"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz"; - sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.22.tar.gz; + sha256 = "93639bd076849e93a020fea1507f0a2b3467b8792eb5c306f2aacbbfb4d080d6"; }; - buildInputs = [ pkgs.file TestFatal ]; + buildInputs = [ pkgs.file ConfigAutoConf TestFatal ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; preCheck = '' substituteInPlace t/oo-api.t \ @@ -7330,6 +7465,21 @@ let }; }; + FileMap = buildPerlModule { + pname = "File-Map"; + version = "0.66"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.66.tar.gz; + sha256 = "12d540v47jscjizcry2ir5vpp5q797vmd3gn9p91brqdbk5swfz7"; + }; + propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ]; + buildInputs = [ TestFatal TestWarnings ]; + meta = { + description = "Memory mapping made simple and safe."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileModified = buildPerlPackage { pname = "File-Modified"; version = "0.10"; @@ -7511,10 +7661,10 @@ let FileSlurp = buildPerlPackage { pname = "File-Slurp"; - version = "9999.29"; + version = "9999.30"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.29.tar.gz"; - sha256 = "1iqr7qi6rg45f4xa3fp48b30mnbw30xs9izxa5zf6fd6pgh4fvhf"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.30.tar.gz; + sha256 = "0irpx72dk27d7c4cjr08dq4bwwbmq8gsr39hxd44widrn0yicdra"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; @@ -7769,10 +7919,10 @@ let Future = buildPerlModule { pname = "Future"; - version = "0.43"; + version = "0.45"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.43.tar.gz"; - sha256 = "191qvn3jz5pk5zxykwsg1i17s45kc82rfd6kgzsv9nki1c04dzaf"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Future-0.45.tar.gz; + sha256 = "1h5609wd1m774h8brgm5vinz6pfmdszp2ms6ybxlyhs0p5msp36f"; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; meta = { @@ -7783,13 +7933,13 @@ let GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; - version = "0.2202"; + version = "0.2403"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz"; - sha256 = "14fe240613b41c9d3e7cc560eaabd78bd13ded66d2838b738b74f7d1811d9263"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2403.tar.gz; + sha256 = "e5ab475c82ba1cb088ad28f423ca514d46944d6ae3c3eb55e9636e9e7f1dc893"; }; buildInputs = [ DirManifest TestDifferences ]; - propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils PathTiny ]; + propagatedBuildInputs = [ ClassXSAccessor ExceptionClass PathTiny ]; meta = { description = "Verify solutions for solitaire games"; license = stdenv.lib.licenses.mit; @@ -7904,10 +8054,10 @@ let GetoptLongDescriptive = buildPerlPackage { pname = "Getopt-Long-Descriptive"; - version = "0.104"; + version = "0.105"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.104.tar.gz"; - sha256 = "878bc1782c5e196a08a52fa252bbfce1aeb0546d073eac164fc6b80b4cea1e28"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.105.tar.gz; + sha256 = "a71cdbcf4043588b26a42a13d151c243f6eccf38e8fc0b18ffb5b53651ab8c15"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; @@ -7943,7 +8093,7 @@ let }; GitAutofixup = buildPerlPackage rec { - pname = "GitAutofixup"; + pname = "App-Git-Autofixup"; version = "0.002007"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-${version}.tar.gz"; @@ -8003,10 +8153,10 @@ let Glib = buildPerlPackage { pname = "Glib"; - version = "1.3291"; + version = "1.3293"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz"; - sha256 = "0whz5f87wvzq8zsva85h06mkfqim2ciq845ixlvmafwxggccv0xr"; + url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz; + sha256 = "005m3inz12xcsd5sr056cm1kbhmxsx2ly88ifbdv6p6cwz0s05kk"; }; buildInputs = [ pkgs.glib ]; doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 @@ -8104,10 +8254,10 @@ let GnuPGInterface = buildPerlPackage { pname = "GnuPG-Interface"; - version = "0.52"; + version = "1.00"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz"; - sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; + url = mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-1.00.tar.gz; + sha256 = "97e9c809491a061b2e99fb4e50c7bf74eb42e1deb11c64b081b21b4dbe6aec2f"; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; propagatedBuildInputs = [ MooXHandlesVia MooXlate ]; @@ -8347,10 +8497,10 @@ let Gtk3 = buildPerlPackage { pname = "Gtk3"; - version = "0.036"; + version = "0.037"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.036.tar.gz"; - sha256 = "1rxzhahrncv58z0n93bzlagxd8swqxiafq4qn4zv9i9jbfql8mwq"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.037.tar.gz; + sha256 = "0l9zis8l9jall1m48mgd5g4f85lsz4hcp22spal8r9wlf9af2nmz"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { @@ -8361,10 +8511,10 @@ let Gtk3SimpleList = buildPerlPackage { pname = "Gtk3-SimpleList"; - version = "0.18"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.18.tar.gz"; - sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; + url = mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.21.tar.gz; + sha256 = "1158mnr2ldq02098hqbkwfv64d83zl3a8scll9s09g7k1c86ai0x"; }; meta = { description = "A simple interface to Gtk3's complex MVC list widget"; @@ -8552,10 +8702,10 @@ let HTMLForm = buildPerlPackage { pname = "HTML-Form"; - version = "6.05"; + version = "6.07"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.05.tar.gz"; - sha256 = "14i4ldyvdvhdhvfhh9kiq6z853q2f84biq8vcpv1k5w2r80wdiin"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz; + sha256 = "09v29cdzwjm139c67y1np3kvx2ymg3s8n723qc0ma07lmxz8rakx"; }; propagatedBuildInputs = [ HTMLParser HTTPMessage ]; meta = { @@ -8656,10 +8806,10 @@ let HTMLMason = buildPerlPackage { pname = "HTML-Mason"; - version = "1.58"; + version = "1.59"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz"; - sha256 = "81dc9b199f0f3b3473c97ba0ebee4b9535cd633d4e9c1ca3818615dc03dff948"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz; + sha256 = "95bed2a6c488370046aa314be4b592bd65a6522f8845da8b36a6aff9a8b439d0"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ]; @@ -9036,13 +9186,13 @@ let HTTPMessage = buildPerlPackage { pname = "HTTP-Message"; - version = "6.18"; + version = "6.24"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz"; - sha256 = "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.24.tar.gz; + sha256 = "554a1acf2daa401091f7012f5cb82d04d281db43fbd8f39a1fcbb7ed56dde16d"; }; buildInputs = [ TryTiny ]; - propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; + propagatedBuildInputs = [ Clone Encode EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { homepage = "https://github.com/libwww-perl/HTTP-Message"; description = "HTTP style message (base class)"; @@ -9185,10 +9335,10 @@ let HTTPTinyish = buildPerlPackage { pname = "HTTP-Tinyish"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.15.tar.gz"; - sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.16.tar.gz; + sha256 = "1a3318b89987c2aa5dd18990a109e8af63049f87e4e1a9357583beed1c3bfbda"; }; propagatedBuildInputs = [ FileWhich IPCRun3 ]; meta = { @@ -9213,10 +9363,10 @@ let Imager = buildPerlPackage { pname = "Imager"; - version = "1.011"; + version = "1.012"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.011.tar.gz"; - sha256 = "a3aea2f0c172c2c094baeced4a3bdaa9f54e3e85c97eea2e5f8f994ba2beedfc"; + url = mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz; + sha256 = "a321c728e3277fd15de842351e69bbef0e2a5a608a31d089e5029b8381e23f21"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; @@ -9353,13 +9503,14 @@ let IOAsync = buildPerlModule { pname = "IO-Async"; - version = "0.75"; + version = "0.77"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.75.tar.gz"; - sha256 = "1mi6gfbl11rimvzgzyj8kiqf131cg1w9nwxi47fwm9sbs0x6rkjb"; + url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz; + sha256 = "153rfnbs2xwvx559h0ilfr0g9pg30avjad3cad659is9bdmfipri"; }; + preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; - buildInputs = [ TestFatal TestIdentity TestRefcount ]; + buildInputs = [ TestFatal TestIdentity TestMetricsAny TestRefcount ]; meta = { description = "Asynchronous event-driven programming"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9476,11 +9627,11 @@ let }; IOPager = buildPerlPackage { - version = "1.01"; + version = "1.03"; pname = "IO-Pager"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.01.tgz"; - sha256 = "19fslzb11wn8s9hwnwpnwymnw040nmychza2dpbbcqpgnk4k5zpa"; + url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.03.tgz; + sha256 = "13mmykrb391584wkw907zrmy4hg1fa9hj3zw58whdq5bjc66r1mc"; }; propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests }; @@ -9525,10 +9676,10 @@ let IOSocketSSL = buildPerlPackage { pname = "IO-Socket-SSL"; - version = "2.066"; + version = "2.068"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz"; - sha256 = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd"; + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz; + sha256 = "4420fc0056f1827b4dd1245eacca0da56e2182b4ef6fc078f107dc43c3fb8ff9"; }; propagatedBuildInputs = [ MozillaCA NetSSLeay ]; # Fix path to default certificate store. @@ -9640,10 +9791,10 @@ let IPCRun = buildPerlPackage { pname = "IPC-Run"; - version = "20180523.0"; + version = "20200505.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz"; - sha256 = "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q"; + url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz; + sha256 = "00f9wjvhn55zbk3n9il76xvsqy7ddk60lg6phg2rkpx0gwhvyvl1"; }; doCheck = false; /* attempts a network connection to localhost */ meta = { @@ -9674,10 +9825,10 @@ let IPCSystemSimple = buildPerlPackage { pname = "IPC-System-Simple"; - version = "1.26"; + version = "1.30"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.26.tar.gz"; - sha256 = "57177f21d8e8625bba32ea454f10a1fda16f93c1baf1aa80d106ab1951b465fd"; + url = mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.30.tar.gz; + sha256 = "22e6f5222b505ee513058fdca35ab7a1eab80539b98e5ca4a923a70a8ae9ba9e"; }; meta = { description = "Run commands simply, with detailed diagnostics"; @@ -9698,6 +9849,21 @@ let }; }; + IRCUtils = buildPerlPackage { + pname = "IRC-Utils"; + version = "0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HI/HINRIK/IRC-Utils-0.12.tar.gz"; + sha256 = "c7d6311eb6c79e983833c9e6b4e8d426d07a9874d20f4bc641b313b99c9bc8a0"; + }; + meta = { + homepage = "http://metacpan.org/release/IRC-Utils"; + description = "Common utilities for IRC-related tasks"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + # TODO: use CPAN version ImageExifTool = buildPerlPackage { pname = "Image-ExifTool"; @@ -9824,7 +9990,7 @@ let url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { description = "XS based JavaScript minifier"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9879,15 +10045,16 @@ let JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; - version = "1.004000"; + version = "1.004002"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz"; - sha256 = "09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar"; + url = mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004002.tar.gz; + sha256 = "1dbpdlrk4pjwbn3wzawwsj57jqzdvi01h4kqpknwbl1n7gf2z3iv"; }; meta = { description = "Use L with a fallback to L and L"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestNeeds ]; }; JSONPP = buildPerlPackage { @@ -9918,10 +10085,10 @@ let JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.55"; + version = "0.56"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz"; - sha256 = "0mnjypkiga8zdxr5kbd7sf49pcbn55ivndn01p5ln4amqgdmd66w"; + url = mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.56.tar.gz; + sha256 = "1d8ir74sgf8kw1a7459ghdhh92kzrzaysapjbw1sb859sfsirkqw"; }; meta = { description = "Read JSON into a Perl variable"; @@ -9931,10 +10098,10 @@ let JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "3.23"; + version = "4.00"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.23.tar.gz"; - sha256 = "1fzy2z7mkg5vgcjvykh5ay8yg6q496wi14x9wp5hc9agplsq7f0s"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.00.tar.gz"; + sha256 = "09p6n5ahsa13fmxb01siz9hcmyswgb05ac2njbhzim6cnx9d6cwj"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; @@ -10302,6 +10469,23 @@ let doCheck = false; }; + LinkEmbedder = buildPerlPackage { + pname = "LinkEmbedder"; + version = "1.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.12.tar.gz"; + sha256 = "1fd25bd6047b45cdcb1ab71a3d3bb0b36c71ec844a8742dee0bb34f8587fbd08"; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/jhthorsen/linkembedder"; + description = "Embed / expand oEmbed resources and other URL / links"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; + }; + LinuxACL = buildPerlPackage { pname = "Linux-ACL"; version = "0.05"; @@ -10376,10 +10560,10 @@ let ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz"; - sha256 = "3711fac729321d3aad8356a756fd9272094f227aa048866a3751f9d8ea6cc95d"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.16.tar.gz; + sha256 = "559b3aa911c73003a3a1ebd860d3b16e171137de8203d86be63a2390364c63dd"; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { @@ -10469,10 +10653,10 @@ let LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.62"; + version = "3.64"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.62.tar.gz"; - sha256 = "11a6d343e9c321d8ee9eee4479954a4e9c1ff2145187e74fd64952092f9dfab7"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.64.tar.gz; + sha256 = "4ed9ef810b68cbb3417e28b34606c1b73c205ce2128535e53b4c9bf612c3e861"; }; meta = { description = "A distribution of modules to handle locale codes"; @@ -10786,10 +10970,10 @@ let MCE = buildPerlPackage { pname = "MCE"; - version = "1.865"; + version = "1.872"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.865.tar.gz"; - sha256 = "1fhrc0mig5rzywz3lki0gkpvm9l9693cwaljzwxkprdkxnvk709c"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.872.tar.gz; + sha256 = "0ydih6w1di5fppcr2s9lxbyf8av7ksgqg0mirrw5mfcr92924p90"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; @@ -10878,10 +11062,10 @@ let LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.43"; + version = "6.45"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz"; - sha256 = "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d"; + url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.45.tar.gz; + sha256 = "4391cec148d83c32482350c8ee1bc88f1b42d33921584b83017eba1591a42954"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) @@ -11044,10 +11228,10 @@ let MailAuthenticationResults = buildPerlPackage { pname = "Mail-AuthenticationResults"; - version = "1.20200108"; + version = "1.20200331.1"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200108.tar.gz"; - sha256 = "1j003bzqh7nax604f93k1s70b1im97986p6g58a6ynv92fbnhjq5"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200331.1.tar.gz; + sha256 = "0qpairi9gmwinws4ay46pjnckib6217k0ig604ppkmjzilwjvf2c"; }; buildInputs = [ TestException ]; meta = { @@ -11098,10 +11282,10 @@ let MailMessage = buildPerlPackage { pname = "Mail-Message"; - version = "3.008"; + version = "3.009"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz"; - sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.009.tar.gz; + sha256 = "06ngjxnw0r5s6fnwc6qd2710p5v28ssgjkghkw8nqy2glacczlir"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { @@ -11112,14 +11296,14 @@ let MailDKIM = buildPerlPackage { pname = "Mail-DKIM"; - version = "0.58"; + version = "1.20200513.1"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.58.tar.gz"; - sha256 = "0cgkal65qqcy57b21lgij90ba36wl66byw9i76g5yhwaa8ms8hqa"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20200513.1.tar.gz; + sha256 = "1gbnzxns4gy02lrgfmzdvr7bc0kxgxiq850mdj2y7k75nnv28iak"; }; - propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNSResolverMock YAMLLibYAML ]; + propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNS ]; doCheck = false; # tries to access the domain name system - buildInputs = [ TestRequiresInternet ]; + buildInputs = [ NetDNSResolverMock TestRequiresInternet YAMLLibYAML ]; }; MailIMAPClient = buildPerlPackage { @@ -11270,6 +11454,22 @@ let }; }; + MathCalcParser = buildPerlPackage { + pname = "Math-Calc-Parser"; + version = "1.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Math-Calc-Parser-1.005.tar.gz"; + sha256 = "afc3eb496ab3a3a301b3437af07e197eb743c06090f0101dacf820302f2b7f75"; + }; + buildInputs = [ TestNeeds ]; + meta = { + homepage = "https://github.com/Grinnz/Math-Calc-Parser"; + description = "Parse and evaluate mathematical expressions"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; + }; + MathCalcUnits = buildPerlPackage { pname = "Math-Calc-Units"; version = "1.07"; @@ -11427,6 +11627,27 @@ let }; }; + MathPari = buildPerlPackage rec { + pname = "Math-Pari"; + version = "2.030518"; + nativeBuildInputs = [ pkgs.unzip ]; + pariversion = "2.1.7"; + pari_tgz = fetchurl { + url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/2.1/pari-${pariversion}.tgz"; + sha256 = "1yjml5z1qdn258qh6329v7vib2gyx6q2np0s5ybci0rhmz6z4hli"; + }; + preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz"; + makeMakerFlags = "pari_tgz=pari-${pariversion}.tgz"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/${pname}-${version}.zip"; + sha256 = "dc38955a9690be6bafa8de2526212377c3ec9fe8da5ec02263a9caf94b58bb91"; + }; + meta = { + description = "Perl interface to PARI"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MathPlanePath = buildPerlPackage { pname = "Math-PlanePath"; version = "127"; @@ -11637,6 +11858,31 @@ let }; }; + MetaCPANClient = buildPerlPackage { + pname = "MetaCPAN-Client"; + version = "2.026000"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.026000.tar.gz"; + sha256 = "ee711619d59655dac1bd2e4b894ffeb3171bd73b1ed38ba4b7b07d3690f94465"; + }; + + # Most tests are online, so we only include offline tests + postPatch = '' + substituteInPlace Makefile.PL \ + --replace '"t/*.t t/api/*.t"' \ + '"t/00-report-prereqs.t t/api/_get.t t/api/_get_or_search.t t/api/_search.t t/entity.t t/request.t t/resultset.t"' + ''; + + buildInputs = [ LWPProtocolhttps TestFatal TestNeeds ]; + propagatedBuildInputs = [ IOSocketSSL JSONMaybeXS Moo NetSSLeay RefUtil SafeIsa TypeTiny URI ]; + meta = { + homepage = "https://github.com/metacpan/metacpan-client"; + description = "A comprehensive, DWIM-featured client to the MetaCPAN API"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + MethodSignaturesSimple = buildPerlPackage { pname = "Method-Signatures-Simple"; version = "1.07"; @@ -11651,6 +11897,20 @@ let }; }; + MetricsAny = buildPerlModule { + pname = "Metrics-Any"; + version = "0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.05.tar.gz; + sha256 = "1xg7y8szbfwmh72y8l1w0rz4jrd66hisl6hh3hyq31f52cs6hwvr"; + }; + buildInputs = [ TestFatal ]; + meta = { + description = "abstract collection of monitoring metrics"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + # TODO: use CPAN version MHonArc = buildPerlPackage rec { pname = "MHonArc"; @@ -11737,7 +11997,7 @@ let sha256 = "db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da"; }; doCheck = false; - propagatedBuildInputs = [ HTMLParser LWP MIMELite URI ]; + propagatedBuildInputs = [ LWP MIMELite ]; meta = { description = "Provide routine to transform a HTML page in a MIME-Lite mail"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11831,11 +12091,11 @@ let ModernPerl = buildPerlPackage { pname = "Modern-Perl"; - version = "1.20190727"; + version = "1.20200211"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz"; - sha256 = "2e69d7ab7e4a53153e686c25547ad914e7464d4e5604b8851931a6e63fc51b21"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20200211.tar.gz; + sha256 = "da1c83cee84fab9edb9e31d7f7abac43e1337b2e66015191ec4b6da59298c480"; }; meta = { homepage = "https://github.com/chromatic/Modern-Perl"; @@ -12285,16 +12545,32 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.32"; + version = "8.55"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.32.tar.gz"; - sha256 = "11fyz534syihisl8498655bqq4y8c73a6xhvl1wlq4axdgkm0d2h"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.55.tar.gz"; + sha256 = "116f79a8jvdk0zfj34gp3idhxgk4l8qq4ka6pwhdp8pmks969w0x"; }; meta = { homepage = "https://mojolicious.org"; description = "Real-time web framework"; license = stdenv.lib.licenses.artistic2; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice sgo ]; + }; + }; + + MojoliciousPluginAssetPack = buildPerlPackage { + pname = "Mojolicious-Plugin-AssetPack"; + version = "2.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-AssetPack-2.08.tar.gz"; + sha256 = "585d9e056258b00590da109b4d5ee573fa3eb2248425247aebbfedac5a157152"; + }; + propagatedBuildInputs = [ FileWhich IPCRun3 Mojolicious JavaScriptMinifierXS CSSMinifierXS ]; + meta = { + homepage = "https://github.com/jhthorsen/mojolicious-plugin-assetpack"; + description = "Compress and convert css, less, sass, javascript and coffeescript files"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; }; }; @@ -12316,10 +12592,10 @@ let MojoliciousPluginOpenAPI = buildPerlPackage { pname = "Mojolicious-Plugin-OpenAPI"; - version = "2.21"; + version = "3.33"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.21.tar.gz"; - sha256 = "34b1f42d846c26d8be3a3556dc5a02dd7ab47c5612b41d3caf1ce6bc16101dc2"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.33.tar.gz"; + sha256 = "0lccvanc3cici83j6fx7gg3wdcsvgv8d7hzd06r0q1mp8329sbv4"; }; propagatedBuildInputs = [ JSONValidator ]; meta = { @@ -12332,12 +12608,12 @@ let MojoliciousPluginStatus = buildPerlPackage { pname = "Mojolicious-Plugin-Status"; - version = "1.01"; + version = "1.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.01.tar.gz"; - sha256 = "08hvwg395sibjjkwc9fg31ngpmzf7z0467p6b0il355xqbwjpdf6"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.12.tar.gz; + sha256 = "1hn333220ba3hxl9aks0ywx933zv6klyi3a0iw571q76z5a8r2jn"; }; - propagatedBuildInputs = [ BSDResource IPCShareLite Mojolicious Sereal ]; + propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap FileTemp Mojolicious ]; meta = { homepage = "https://github.com/mojolicious/mojo-status"; description = "Mojolicious server status plugin"; @@ -12362,6 +12638,22 @@ let }; }; + MojoliciousPluginWebpack = buildPerlPackage { + pname = "Mojolicious-Plugin-Webpack"; + version = "0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.12.tar.gz"; + sha256 = "2a0856e68446fc22b46692d9a6737f78467654f31e58ad1935e708bddf806d2c"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack"; + description = "Mojolicious <3 Webpack"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; + }; + MojoRedis = buildPerlPackage { pname = "Mojo-Redis"; version = "3.24"; @@ -12397,12 +12689,13 @@ let Mojomysql = buildPerlPackage rec { pname = "Mojo-mysql"; - version = "1.18"; + version = "1.19"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TE/TEKKI/Mojo-mysql-1.18.tar.gz"; - sha256 = "cc023f068f1ed158b5788758ea175aabe646b06d2f86049552bd7307457396bd"; + url = mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.19.tar.gz; + sha256 = "8695494db239e6bbec67cc686e15a60a3424b9f71af5e9936729dfd2be8a3530"; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; + buildInputs = [ TestDeep ]; meta = { homepage = "https://github.com/jhthorsen/mojo-mysql"; description = "Mojolicious and Async MySQL/MariaDB"; @@ -12444,13 +12737,13 @@ let MojoPg = buildPerlPackage { pname = "Mojo-Pg"; - version = "4.18"; + version = "4.19"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.18.tar.gz"; - sha256 = "31baacc0d6693886b3580e4b3ec6f2d053be8578809c9c1750753576bd1bda3c"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.19.tar.gz; + sha256 = "5061eaddddb52c9daf2cbc34bb21e9aeea6ae58a22775fdf1ffa747905ebc992"; }; - buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ]; + buildInputs = [ TestDeep ]; meta = { homepage = "https://github.com/mojolicious/mojo-pg"; description = "Mojolicious <3 PostgreSQL"; @@ -12491,10 +12784,10 @@ let Moo = buildPerlPackage { pname = "Moo"; - version = "2.003006"; + version = "2.004000"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz"; - sha256 = "bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472"; + url = mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004000.tar.gz; + sha256 = "323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassMethodModifiers ModuleRuntime RoleTiny SubQuote ]; @@ -12600,10 +12893,10 @@ let MooXStrictConstructor = buildPerlPackage { pname = "MooX-StrictConstructor"; - version = "0.010"; + version = "0.011"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz"; - sha256 = "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr"; + url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.011.tar.gz; + sha256 = "1qjkqrmzgz7lxhv14klsv0v9v6blf8js86d47ah24kpw5y12yf6s"; }; propagatedBuildInputs = [ Moo strictures ]; buildInputs = [ TestFatal ]; @@ -12743,13 +13036,13 @@ let MooXlate = buildPerlPackage { pname = "MooX-late"; - version = "0.016"; + version = "0.100"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.016.tar.gz"; - sha256 = "1fb6393e8b77c0ec1e99229bc6f5b9db362eedc172fa940b37defd9bb3415e4e"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.100.tar.gz; + sha256 = "2ae5b1e3da5abc0e4006278ecbcfa8fa7c224ea5529a6a688acbb229c09e6a5f"; }; buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = [ Moo TypeTiny ]; + propagatedBuildInputs = [ Moo SubHandlesVia ]; meta = { description = "Easily translate Moose code to Moo"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -13384,10 +13677,10 @@ let Mouse = buildPerlModule { pname = "Mouse"; - version = "2.5.9"; + version = "2.5.10"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.9.tar.gz"; - sha256 = "0wqcnm6xl7fv9r8izc9c43kr83qsr60i7y53hkickcqhxx38vmxr"; + url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz; + sha256 = "1vijm8wkyws1jhnqmx104585q3srw9z1crcpy1zlcfhm8qww53ff"; }; buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; @@ -13412,10 +13705,10 @@ let MozillaCA = buildPerlPackage { pname = "Mozilla-CA"; - version = "20180117"; + version = "20200520"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz"; - sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406"; + url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz; + sha256 = "b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726"; }; postPatch = '' @@ -13599,10 +13892,10 @@ let NetAmazonS3 = buildPerlPackage { pname = "Net-Amazon-S3"; - version = "0.87"; + version = "0.89"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.87.tar.gz"; - sha256 = "77d803477a0c635f311f538e163c5f10e471882c5153398012c93f4284376b8f"; + url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.89.tar.gz; + sha256 = "466b4d02b5b17790f1df22df92b22a3879423b3b33317388f0975a13e74b4eea"; }; buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; @@ -13717,6 +14010,10 @@ let sha256 = "19nf4xn9xhyd0sd2az9iliqldjj0k6ah2dmkyqyvq4rp2d9k5jgb"; }); + postPatch = '' + substituteInPlace Makefile.PL --replace pkg-config $PKG_CONFIG + ''; + meta = { homepage = "http://www.freedesktop.org/wiki/Software/dbus"; description = "Extension for the DBus bindings"; @@ -13726,10 +14023,10 @@ let NetDNS = buildPerlPackage { pname = "Net-DNS"; - version = "1.21"; + version = "1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.21.tar.gz"; - sha256 = "ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a"; + url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.24.tar.gz; + sha256 = "11a6c2ba6cb1c6640f01c9bbf2036bcbe3974232e9b939ab94985230c92cde63"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; @@ -13741,16 +14038,17 @@ let NetDNSResolverMock = buildPerlPackage { pname = "Net-DNS-Resolver-Mock"; - version = "1.20171219"; + version = "1.20200215"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz"; - sha256 = "0m3rxpkv1b9121srvbqkrgzg4m8mnydiydqv34in1i1ixwrl6jn9"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz; + sha256 = "1rv745c16l3m3w6xx2hjmmgzkdklmzm9imdfiddmdr9hwm8g3xxy"; }; propagatedBuildInputs = [ NetDNS ]; meta = { description = "Mock a DNS Resolver object for testing"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestException ]; }; NetDomainTLD = buildPerlPackage { @@ -13946,10 +14244,10 @@ let NetPing = buildPerlPackage { pname = "Net-Ping"; - version = "2.72"; + version = "2.73"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz"; - sha256 = "555af602f54229cd81fef7da1a81516800f3155c6dc4d07dc71be1de3253dd6a"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.73.tar.gz; + sha256 = "a5fbeafd3e65778364bead8800ae6a06d468ed68208619b5d4c1debd4d197cf2"; }; meta = { description = "Check a remote host for reachability"; @@ -13972,13 +14270,13 @@ let NetPrometheus = buildPerlModule { pname = "Net-Prometheus"; - version = "0.07"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz"; - sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.11.tar.gz; + sha256 = "0skjkz6q68y8g9blm7i03k4wprac3djq15akmlv1kmgag3i0ky12"; }; - propagatedBuildInputs = [ RefUtil StructDumb ]; - buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ RefUtil StructDumb URI ]; + buildInputs = [ HTTPMessage TestFatal ]; meta = { description = "export monitoring metrics for F"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -14390,7 +14688,7 @@ let url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.24.tar.gz"; sha256 = "2420a2d1a9bc24a644c9ba12d77f1252ac2209ef0ac5a432153fe49c840faf28"; }; - propagatedBuildInputs = [ JSONValidator MojoliciousPluginOpenAPI ]; + propagatedBuildInputs = [ MojoliciousPluginOpenAPI ]; meta = { homepage = "https://github.com/jhthorsen/openapi-client"; description = "A client for talking to an Open API powered server"; @@ -14447,10 +14745,10 @@ let NetOpenSSH = buildPerlPackage { pname = "Net-OpenSSH"; - version = "0.78"; + version = "0.79"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.78.tar.gz"; - sha256 = "8f10844542a2824389decdb8edec7561d8199dc5f0250e849a0bb56f7aee880c"; + url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.79.tar.gz; + sha256 = "4210fa64b50820f91ab4b6c0e02a579543fc071e73fbdec0f476447ca11172cc"; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; @@ -14698,10 +14996,10 @@ let Parent = buildPerlPackage { pname = "parent"; - version = "0.237"; + version = "0.238"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz"; - sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h"; + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.238.tar.gz; + sha256 = "1lfjqjxsvgpsn6ycah4z0qygkykj4v8ca3cdki61k2p2ygg8zx9q"; }; }; @@ -14718,6 +15016,21 @@ let }; }; + ParseIRC = buildPerlPackage { + pname = "Parse-IRC"; + version = "1.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BI/BINGOS/Parse-IRC-1.22.tar.gz"; + sha256 = "457b09897f37d38a7054f9563247365427fe24101622ed4c7f054723a45b58d5"; + }; + meta = { + homepage = "https://github.com/bingos/parse-irc"; + description = "A parser for the IRC protocol"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + ParseLocalDistribution = buildPerlPackage { pname = "Parse-LocalDistribution"; version = "0.19"; @@ -14799,7 +15112,7 @@ let }; ParseYapp = buildPerlPackage { - pname = "Parser-Yapp"; + pname = "Parse-Yapp"; version = "1.21"; src = fetchurl { url = "mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz"; @@ -14842,10 +15155,10 @@ let PathTiny = buildPerlPackage { pname = "Path-Tiny"; - version = "0.112"; + version = "0.114"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.112.tar.gz"; - sha256 = "813df2d140c65f795daefd8eca18e61194ecac7050c5406a069db86dea31cc3a"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.114.tar.gz; + sha256 = "cd0f88f37a58fc3667ec065767fe01e73ee6efa18a112bfd3508cf6579ca00e1"; }; meta = { description = "File path utility"; @@ -14910,10 +15223,10 @@ let PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.036"; + version = "2.037"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.036.tar.gz"; - sha256 = "070444e9fef8beb6f115994a6ac89533fe8ba02d5e240a35bb07adcbcb511774"; + url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.037.tar.gz; + sha256 = "142803d1886d2a2919d374fb6c25681630aa26740e3f8023337f996fa6c6297e"; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -14925,10 +15238,10 @@ let Pegex = buildPerlPackage { pname = "Pegex"; - version = "0.74"; + version = "0.75"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/Pegex-0.74.tar.gz"; - sha256 = "31f0889695d79a3ab79a6315a8a08baeb1268592bc6596c3feffb424d982dfdf"; + url = mirror://cpan/authors/id/I/IN/INGY/Pegex-0.75.tar.gz; + sha256 = "4dc8d335de80b25247cdb3f946f0d10d9ba0b3c34b0ed7d00316fd068fd05edc"; }; buildInputs = [ TestPod TieIxHash ]; meta = { @@ -14952,10 +15265,10 @@ let Perlosnames = buildPerlPackage { pname = "Perl-osnames"; - version = "0.11"; + version = "0.122"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.11.tar.gz"; - sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b"; + url = mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.122.tar.gz; + sha256 = "7075939d747e375178d00348d00c52ff9db2cebb18bae7473dcb09df825118a0"; }; meta = { description = "List possible $^O ($OSNAME) values, with description"; @@ -14971,7 +15284,7 @@ let sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; + propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = "http://perlcritic.com"; description = "Critique Perl source code for best-practices"; @@ -14990,6 +15303,19 @@ let }; }; + PerlIOLayers = buildPerlModule { + pname = "PerlIO-Layers"; + version = "0.012"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz; + sha256 = "1psaq3kwlk7g9rxvgsacfjk2mh6cscqf4xl7ggfkzfrnz91aabal"; + }; + meta = { + description = "Querying your filehandle's capabilities"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PerlIOeol = buildPerlPackage { pname = "PerlIO-eol"; version = "0.17"; @@ -15204,10 +15530,10 @@ let PlackMiddlewareDebug = buildPerlModule { pname = "Plack-Middleware-Debug"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.17.tar.gz"; - sha256 = "a30b62f1bb94e641f7b60b5ea5335e140c553b4131ec4003b56db37f47617a26"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.18.tar.gz; + sha256 = "192ef79e521c90c6eff6f4149ad2e4bfc911d2c95df78935855e90d659e9ac9a"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ ClassMethodModifiers DataDump DataDumperConcise Plack TextMicroTemplate ]; @@ -15341,14 +15667,10 @@ let POE = buildPerlPackage { pname = "POE"; - version = "1.367"; - patches = [ - ../development/perl-modules/perl-POE-1.367-pod_linkcheck.patch - ../development/perl-modules/perl-POE-1.367-pod_no404s.patch - ]; + version = "1.368"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz"; - sha256 = "0b9s7yxaa2lgzyi56brgygycfjk7lz33d1ddvc1wvwwvm45p4wmp"; + url = mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz; + sha256 = "08g1vzxamqg0gmkirdcx7fycq3pwv9vbajc30qwqpm1n3rvdrcdp"; }; # N.B. removing TestPodLinkCheck from buildInputs because tests requiring # this module don't disable themselves when "run_network_tests" is @@ -15414,12 +15736,12 @@ let PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.008"; + version = "0.011"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.008.tar.gz"; - sha256 = "0dzlcddvfzn7s8z1jj12ghsbzf9wm5dq84361v4vx5p6j8zhsaz4"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.011.tar.gz; + sha256 = "0yi0rx8nf3pz1g5d9z7mi6pzbd4y2kqj61vsgmyllk6rfyjcgmsf"; }; - propagatedBuildInputs = [ PPI ]; + propagatedBuildInputs = [ PPI Readonly ]; meta = { description = "Parse Perl string literals and string-literal-like things."; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15428,12 +15750,12 @@ let PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.068"; + version = "0.072"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.068.tar.gz"; - sha256 = "b5444b699a3c7ad79506c796559449c6f858dc62deb60e08249f96782636e5f4"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.072.tar.gz; + sha256 = "84a050b3b65c98a4b95f9df94fa0d8db9a931b000bb6e2946f0f8874cc2bac5c"; }; - propagatedBuildInputs = [ ListMoreUtils PPI ]; + propagatedBuildInputs = [ PPI ]; meta = { description = "Parse regular expressions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15649,10 +15971,10 @@ let PerlPrereqScannerNotQuiteLite = buildPerlPackage { pname = "Perl-PrereqScanner-NotQuiteLite"; - version = "0.9909"; + version = "0.9911"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9909.tar.gz"; - sha256 = "09sa86maxrqnxf84wa0cgkcs8p6xvpsv0x5dny3hz0300zgrqmq5"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9911.tar.gz; + sha256 = "1h8sv5df7736sr7vasl6hkcvqlsqz9y61wiky6bvqa7fnlfhcyp0"; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; @@ -16055,10 +16377,10 @@ let Redis = buildPerlModule { pname = "Redis"; - version = "1.995"; + version = "1.996"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz"; - sha256 = "a0b07b284ff12bb852a3120723f1e63ab279df575d6c52a78f914565a9f0b906"; + url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.996.tar.gz; + sha256 = "5c196d56a4d771abb2042fd52f252096497fc86f35910581e0956b5710ea74b6"; }; buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; @@ -16119,10 +16441,10 @@ let RegexpGrammars = buildPerlModule { pname = "Regexp-Grammars"; - version = "1.052"; + version = "1.057"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz"; - sha256 = "d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.057.tar.gz; + sha256 = "af53c19818461cd701aeb57c49dffdb463edc4bf8f658d9ea4e6d534ac177041"; }; meta = { description = "Add grammatical parsing features to Perl 5.10 regexes"; @@ -16294,10 +16616,10 @@ let RTClientREST = buildPerlModule { pname = "RT-Client-REST"; - version = "0.56"; + version = "0.60"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz"; - sha256 = "798baccf11eaecbb7d2d27be0b5e4fa9cb80b34cc51cab12eb7b88facf39fd4b"; + url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.60.tar.gz; + sha256 = "0e6f2da3d96903491b43b19c61221cbeea88414264f907312f277daaf144248b"; }; buildInputs = [ CGI HTTPServerSimple TestException ]; meta = { @@ -16322,10 +16644,10 @@ let ScalarListUtils = buildPerlPackage { pname = "Scalar-List-Utils"; - version = "1.53"; + version = "1.55"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.53.tar.gz"; - sha256 = "bd4086b066fb3b18a0be2e7d9bc100a99aa0f233ad659492340415c7b2bdae99"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.55.tar.gz; + sha256 = "4d2bdc1c72a7bc4d69d6a5cc85bc7566497c3b183c6175b832784329d58feb4b"; }; meta = { description = "Common Scalar and List utility subroutines"; @@ -16420,12 +16742,12 @@ let SerealDecoder = buildPerlPackage { pname = "Sereal-Decoder"; - version = "4.008"; + version = "4.014"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.008.tar.gz"; - sha256 = "1vxgwlya7sj9mb6y278qblrjl2708d0agy7cryyqj7qf08d056rv"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.014.tar.gz; + sha256 = "0ph5k99ssm5anwsdjal7sw96pjs65lirfanfsw8gh6k40w0w6f44"; }; - buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; + buildInputs = [ TestDeep TestDifferences TestLongString TestMemoryGrowth TestWarn ]; preBuild = ''ls''; meta = { homepage = "https://github.com/Sereal/Sereal"; @@ -16437,10 +16759,10 @@ let SerealEncoder = buildPerlPackage { pname = "Sereal-Encoder"; - version = "4.008"; + version = "4.014"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.008.tar.gz"; - sha256 = "0vzk6d2h034qks4lby53xrfljsrx4cvkaqi7gz9frba17lvl01rq"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.014.tar.gz; + sha256 = "0044pkjkdg8y0ljmfj0bx68wf7jpfyy98kxi4z36kxarz2hcf462"; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; meta = { @@ -16453,12 +16775,12 @@ let Sereal = buildPerlPackage { pname = "Sereal"; - version = "4.008"; + version = "4.014"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.008.tar.gz"; - sha256 = "1ima428v8mi509crr3b1rnh67ki8vbcd7iignw68mf2iaw5wmb58"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.014.tar.gz; + sha256 = "02qpl3x6sh0xfby38gr80dndkah9m5r0xhk7d4a24i9hqljjaing"; }; - buildInputs = [ TestLongString TestWarn ]; + buildInputs = [ TestDeep TestLongString TestMemoryGrowth TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; meta = { homepage = "https://github.com/Sereal/Sereal"; @@ -16712,10 +17034,10 @@ let Specio = buildPerlPackage { pname = "Specio"; - version = "0.45"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.45.tar.gz"; - sha256 = "1xk1skzvmqjgk7dqfkcmp6g7fc493cyk2hp94fzpdc43cg78ifg4"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz; + sha256 = "15lmxffbzj1gq7n9m80a3ka8nqxmmk3p4azp33y6wv872shjmx0b"; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; buildInputs = [ TestFatal TestNeeds ]; @@ -16780,10 +17102,10 @@ let SQLAbstract = buildPerlPackage { pname = "SQL-Abstract"; - version = "1.86"; + version = "1.87"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.86.tar.gz"; - sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf"; + url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.87.tar.gz; + sha256 = "e926a0a83da7efa18e57e5b2952a2ab3b7563a51733fc6dd5c89f12156481c4a"; }; buildInputs = [ TestDeep TestException TestWarn ]; propagatedBuildInputs = [ HashMerge MROCompat Moo ]; @@ -16822,8 +17144,8 @@ let url = "mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz"; sha256 = "65c870883379c11b53f19ead10aaac241ccc86a90bbab77f6376fe750720e5c8"; }; - buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil TextSoundex MathBaseConvert ]; + buildInputs = [ MathBaseConvert TestDeep TextSoundex ]; + propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil ]; }; SQLTokenizer = buildPerlPackage { @@ -16837,10 +17159,10 @@ let SQLTranslator = buildPerlPackage { pname = "SQL-Translator"; - version = "1.60"; + version = "1.61"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz"; - sha256 = "6bb0cb32ca25da69df65e5de71f679f3ca90044064526fa336cabd342f220e87"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Translator-1.61.tar.gz; + sha256 = "840e3c77cd48b47e1343c79ae8ef4fca46d036356d143d33528900740416dfe8"; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; @@ -16937,6 +17259,19 @@ let }; }; + StatisticsChiSquare = buildPerlPackage rec { + pname = "Statistics-ChiSquare"; + version = "1.0000"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${pname}-${version}.tar.gz"; + sha256 = "255a5a38336d048ddb9077222691e000984e907aae09a4ea695a9cfd49a1ddd0"; + }; + meta = { + description = "Implements the Chi Squared test, using pre-computed tables"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + StatisticsDescriptive = buildPerlModule { pname = "Statistics-Descriptive"; version = "3.0702"; @@ -17112,6 +17447,7 @@ let description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine."; license = licenses.gpl1Plus; }; + propagatedBuildInputs = [ PadWalker SafeHole ]; }; StringMkPasswd = buildPerlPackage { @@ -17241,10 +17577,10 @@ let StructDumb = buildPerlModule { pname = "Struct-Dumb"; - version = "0.09"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz"; - sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.12.tar.gz; + sha256 = "0wvzcpil9xc2wkibq3sj8i5bgq4iadx2k7hfqb8jm5p66g271kjj"; }; buildInputs = [ TestFatal ]; meta = { @@ -17312,6 +17648,21 @@ let }; }; + SubHandlesVia = buildPerlPackage { + pname = "Sub-HandlesVia"; + version = "0.013"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.013.tar.gz; + sha256 = "1q5lqjnqw29ywkiv0iqidc88ydqp1cywrgfd8mi7yarksc296a3l"; + }; + propagatedBuildInputs = [ ClassMethodModifiers ClassTiny RoleTiny ScalarListUtils TypeTiny ]; + buildInputs = [ TestFatal TestRequires ]; + meta = { + description = "alternative handles_via implementation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SubIdentify = buildPerlPackage { pname = "Sub-Identify"; version = "0.14"; @@ -17415,6 +17766,20 @@ let propagatedBuildInputs = [ (pkgs.subversionClient.override { inherit perl; }) ]; }; + SafeHole = buildPerlModule { + pname = "Safe-Hole"; + version = "0.14"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz; + sha256 = "01gc2lfli282dj6a2pkpxb0vmpyavs323cbdw15gxi06pn5nxxgl"; + }; + meta = { + description = "lib/Safe/Hole.pm"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://github.com/toddr/Safe-Hole"; + }; + }; + Swim = buildPerlPackage { pname = "Swim"; version = "0.1.48"; @@ -17495,10 +17860,10 @@ let SysMmap = buildPerlPackage { pname = "Sys-Mmap"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz"; - sha256 = "1yh0170xfw3z7n3lynffcb6axv7wi6zb46cx03crj1cvrhjmwa89"; + url = mirror://cpan/authors/id/T/TO/TODDR/Sys-Mmap-0.20.tar.gz; + sha256 = "1kz22l7sh2mibliixyshc9958bqlkzsb13agcibp7azii4ncw80q"; }; meta = with stdenv.lib; { description = "Use mmap to map in a file as a Perl variable"; @@ -17583,25 +17948,26 @@ let SystemCommand = buildPerlPackage { pname = "System-Command"; - version = "1.119"; + version = "1.121"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.119.tar.gz"; - sha256 = "c8c9fb1e527c52463cab1476500efea70396a0b62bea625d2d6faea994dc46e7"; + url = mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.121.tar.gz; + sha256 = "43de5ecd20c1da46e8a6f4fceab29e04697a2890a99bf6a91b3ca004a468a241"; }; propagatedBuildInputs = [ IPCRun ]; meta = { description = "Object for running system commands"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ PodCoverageTrustPod TestCPANMeta TestPod TestPodCoverage ]; }; SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "6.2.0"; + version = "6.3.0"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = "git://libvirt.org/libvirt-perl.git"; - rev = "799b243230163ff4f8dde6293da8a0e31e7c900e"; - sha256 = "1k38d1ycx3ibgfzcr1iym7cvpwvygh6a2i5548m4qjb47vfi12rz"; + rev = "v${version}"; + sha256 = "0m75g0kf2dmllx5c1wxzszm1zakiqjighcsjbgq66674pvqf5mk7"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -17645,7 +18011,7 @@ let sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; }; buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; - propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; + propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC ListMoreUtils MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; meta = { description = "Install the CPAN dependencies of the Freecell Solver test suite"; license = stdenv.lib.licenses.mit; @@ -17780,16 +18146,18 @@ let TemplateToolkit = buildPerlPackage { pname = "Template-Toolkit"; - version = "3.007"; + version = "3.008"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.007.tar.gz"; - sha256 = "1jh953f1v4r494mdvzfqs1ay1bh453dmp10z4qmv0makwarjsnfp"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.008.tar.gz; + sha256 = "14m6kl9zrs6ycr440an7zswrmcimv2747qq0r87inwznprl0yh2j"; }; doCheck = !stdenv.isDarwin; meta = { description = "Comprehensive template processing system"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ AppConfig ]; + buildInputs = [ CGI TestLeakTrace ]; }; TemplateGD = buildPerlPackage { @@ -18063,10 +18431,10 @@ let Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000128"; + version = "0.000130"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000128.tar.gz"; - sha256 = "f8e4e76900f5fb748d085aa5d18b916e07273e9ca50fb671ab8be1301cfae08c"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000130.tar.gz; + sha256 = "d462cb95024c0735fc0fdb22f92fda4f852bf85d92d89bd95e4fa212730d534a"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -18244,10 +18612,10 @@ let TestCompile = buildPerlModule { pname = "Test-Compile"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.3.1.tar.gz"; - sha256 = "1174cff010011ae43e6462755ccd8a6cf0372ca506705c60586f7b1748ff4ddf"; + url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.0.tar.gz; + sha256 = "eff7e320527d7a33d9b27443871c1e9d5dbeb11408fb9843c56496f67b99ad78"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { @@ -18300,10 +18668,10 @@ let TestDeep = buildPerlPackage { pname = "Test-Deep"; - version = "1.128"; + version = "1.130"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz"; - sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.130.tar.gz; + sha256 = "0mkw18q5agr30djxr1y68rcfw8aq20ws872hmv88f9gnynag8r20"; }; meta = { }; @@ -18584,10 +18952,10 @@ let TestLWPUserAgent = buildPerlPackage { pname = "Test-LWP-UserAgent"; - version = "0.033"; + version = "0.034"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz"; - sha256 = "03fjjj65fpjr4pv1532kwci1llfbsv4g9an0h7k723yqfx1wgdsb"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz; + sha256 = "1ybhl9zpxkz77d25h96kbgh16zy9f27n95p6j9jg52kvdg0r2lbp"; }; propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ]; @@ -18660,6 +19028,33 @@ let }; }; + TestMemoryGrowth = buildPerlModule { + pname = "Test-MemoryGrowth"; + version = "0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Test-MemoryGrowth-0.03.tar.gz; + sha256 = "0z6lmalhq3k3p303qahs0ijp6sarf3ij88m39yhzizzf9abapvsz"; + }; + meta = { + description = "assert that code does not cause growth in memory usage"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + TestMetricsAny = buildPerlModule { + pname = "Test-Metrics-Any"; + version = "0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Test-Metrics-Any-0.01.tar.gz; + sha256 = "0s744lv997g1wr4i4vg1d7zpzjfw334hdy45215jf6xj9s6wh1i5"; + }; + propagatedBuildInputs = [ MetricsAny ]; + meta = { + description = "assert that code produces metrics via L"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestMockClass = buildPerlModule { pname = "Test-Mock-Class"; version = "0.0303"; @@ -18692,10 +19087,10 @@ let TestMockModule = buildPerlModule { pname = "Test-MockModule"; - version = "0.171.0"; + version = "0.173.0"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.171.0.tar.gz"; - sha256 = "1arqgb1773zym5dqlwm6kz48bfrccjhb5bjfsif0vkalwq2gvm7b"; + url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.173.0.tar.gz; + sha256 = "0hnv2ziyasrri58ys93j5qyyzgxw3jx5hvjhd72nsp4vqq6lhg6s"; }; propagatedBuildInputs = [ SUPER ]; buildInputs = [ TestWarnings ]; @@ -18784,10 +19179,10 @@ let TestMost = buildPerlPackage { pname = "Test-Most"; - version = "0.35"; + version = "0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz"; - sha256 = "0zv5dyzq55r28plffibcr7wd00abap0h2zh4s4p8snaiszsad5wq"; + url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.37.tar.gz; + sha256 = "1isg8z6by113zn08l044w6k04y5m5bnns3rqmks8rwdr3qa70csk"; }; propagatedBuildInputs = [ ExceptionClass ]; meta = { @@ -18882,10 +19277,10 @@ let TestPerlTidy = buildPerlModule { pname = "Test-PerlTidy"; - version = "20190402"; + version = "20200412"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz"; - sha256 = "e9cb9b23ed62e8c6a47a1e18b55328aa3bfa467e05cd93e7e12b2738dd1e025f"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20200412.tar.gz; + sha256 = "905240447edb1930192000db659556cbf5ad5710f4376bb0a5abcd8716a4592c"; }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; meta = { @@ -18975,10 +19370,10 @@ let TestRequires = buildPerlPackage { pname = "Test-Requires"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz"; - sha256 = "1d9f481lj12cw1ciil46xq9nq16p6a90nm7yrsalpf8asn8s6s17"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.11.tar.gz; + sha256 = "03q49vi09b4n31kpnmq4v2dga5ja438a8f1wgkgwvvlpjmadx22b"; }; meta = { description = "Checks to see if the module can be loaded"; @@ -19202,10 +19597,10 @@ let TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302171"; + version = "1.302175"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302171.tar.gz"; - sha256 = "e27f90d2b2a6bc6ffa7675a072c2f41d5caffd99858dc69b2030940cc138368a"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302175.tar.gz; + sha256 = "c8c8f5c51ad6d7a858c3b61b8b658d8e789d3da5d300065df0633875b0075e49"; }; meta = { description = "Basic utilities for writing tests"; @@ -19321,10 +19716,10 @@ let TestTrailingSpace = buildPerlModule { pname = "Test-TrailingSpace"; - version = "0.0302"; + version = "0.0600"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0302.tar.gz"; - sha256 = "c48a6377d84576512b47652798d9d4bb4467adacf0e6afc3df1f880f2c03b612"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0600.tar.gz; + sha256 = "f09d263adec06700a43a24e29f5484cf6d2939914c607dec51590f4bb8fa5a11"; }; propagatedBuildInputs = [ FileFindObjectRule ]; meta = { @@ -19362,10 +19757,10 @@ let TestWarnings = buildPerlPackage { pname = "Test-Warnings"; - version = "0.028"; + version = "0.030"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz"; - sha256 = "26fda9f8d279e943d27e43a4a3a5cea8a6592cd36e7308695f8dc6602262c0e0"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.030.tar.gz; + sha256 = "89a4947ddf1564ae01122275584433d7f6c4370370bcf3768922d796956ae24f"; }; buildInputs = [ CPANMetaCheck PadWalker ]; meta = { @@ -19468,10 +19863,10 @@ let TextAligner = buildPerlModule { pname = "Text-Aligner"; - version = "0.13"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz"; - sha256 = "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.16.tar.gz; + sha256 = "09ap457vrlqvw2544j907fbb5crs08hd7sy4syipzxc6wny7v1aw"; }; meta = { description = "Align text in columns"; @@ -19591,10 +19986,10 @@ let TextCSV_XS = buildPerlPackage { pname = "Text-CSV_XS"; - version = "1.40"; + version = "1.43"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.40.tgz"; - sha256 = "6a448ae1f66768fa5dec1cd2fb246bcaaa3f3ea22d555d1fee8d091833073675"; + url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.43.tgz; + sha256 = "cd94538e8ae9388d9e9e5527630f38f4d2b766e30310d283f0f9c692b94230bb"; }; meta = { description = "Comma-Separated Values manipulation routines"; @@ -19898,10 +20293,10 @@ let TextTable = buildPerlModule { pname = "Text-Table"; - version = "1.133"; + version = "1.134"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz"; - sha256 = "04kh5x5inq183rdg221wlqaaqi1ipyj588mxsslik6nhc14f17nd"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.134.tar.gz; + sha256 = "02yigisvgshpgfyqwj0xad4jg473cd80a6c210nb5h5p32dl5kxs"; }; propagatedBuildInputs = [ TextAligner ]; meta = { @@ -20011,10 +20406,10 @@ let Testutf8 = buildPerlPackage { pname = "Test-utf8"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz"; - sha256 = "ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a"; + url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz; + sha256 = "df82f09c5940830b25a49f1c8162fa24d371e602880edef8d9a4d4bfd66b8bd7"; }; meta = { homepage = "https://github.com/2shortplanks/Test-utf8"; @@ -20288,10 +20683,10 @@ let TimeDate = buildPerlPackage { pname = "TimeDate"; - version = "2.31"; + version = "2.33"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.31.tar.gz"; - sha256 = "10ad6l4ii2iahdpw8h0xqwasc1jblan31h597q3js4j5nbnhywjw"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.33.tar.gz; + sha256 = "1cjyc0yi873597r7xcp9yz0l1c46ik2kxwfrn00zbrlx0d5rrdn0"; }; }; @@ -20374,6 +20769,21 @@ let }; }; + TimePiece = buildPerlPackage { + pname = "Time-Piece"; + version = "1.3401"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ES/ESAYM/Time-Piece-1.3401.tar.gz"; + sha256 = "4b55b7bb0eab45cf239a54dfead277dfa06121a43e63b3fce0853aecfdb04c27"; + }; + meta = { + description = "Object Oriented time objects"; + homepage = "https://metacpan.org/release/Time-Piece"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + Tirex = buildPerlPackage rec { pname = "Tirex"; version = "0.6.1"; @@ -20411,10 +20821,10 @@ let Tk = buildPerlPackage { pname = "Tk"; - version = "804.034"; + version = "804.035"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.034.tar.gz"; - sha256 = "fea6b144c723528a2206c8cd9175844032ee9c14ee37791f0f151e5e5b293fe2"; + url = mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.035.tar.gz; + sha256 = "4d2b80291ba6de34d8ec886a085a6dbd2b790b926035a087e99025614c5ffdd4"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ]; @@ -20508,10 +20918,10 @@ let TypeTiny = buildPerlPackage { pname = "Type-Tiny"; - version = "1.008005"; + version = "1.010002"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.008005.tar.gz"; - sha256 = "cc25eb6bd204b586b71e1f6408922b88be3c8183a1e4f99282d885904c776226"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.010002.tar.gz; + sha256 = "2ea6ea2d8b2b3bb1b94f0309fa5064d57e7734c8bb14e99218e655dc1647073a"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { @@ -20635,6 +21045,22 @@ let }; }; + UnicodeUTF8 = buildPerlPackage { + pname = "Unicode-UTF8"; + version = "0.62"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Unicode-UTF8-0.62.tar.gz"; + sha256 = "fa8722d0b74696e332fddd442994436ea93d3bfc7982d4babdcedfddd657d0f6"; + }; + buildInputs = [ TestFatal ]; + meta = { + homepage = "https://github.com/chansen/p5-unicode-utf8"; + description = "Encoding and decoding of UTF-8 encoding form"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + UnixGetrusage = buildPerlPackage { pname = "Unix-Getrusage"; version = "0.03"; @@ -20898,16 +21324,16 @@ let url = "mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz"; sha256 = "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj"; }; - patches = [ ../development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch ]; + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/curl-7.71.0.patch?h=perl-www-curl&id=261d84887d736cc097abef61164339216fb79180"; + sha256 = "1hiw5lkflfa93z5d6k8fnnml0r08c653bbvvb8zx6gcrlbrdalfs"; + name = "WWWCurl-curl-7.71.0.patch"; + }) + ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-return-type"; buildInputs = [ pkgs.curl ]; - preConfigure = - '' - substituteInPlace Makefile.PL --replace '"cpp"' '"gcc -E"' - substituteInPlace Makefile.PL --replace '_LASTENTRY\z' '_LASTENTRY\z|CURL_DID_MEMORY_FUNC_TYPEDEFS\z' - ''; - NIX_CFLAGS_COMPILE = "-DCURL_STRICTER"; doCheck = false; # performs network access - meta.broken = stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkgs.curl) "7.66"; # broken since "curl: 7.65.3 -> 7.66.0" }; WWWFormUrlEncoded = buildPerlModule { @@ -20926,10 +21352,10 @@ let WWWMechanize = buildPerlPackage { pname = "WWW-Mechanize"; - version = "1.95"; + version = "2.00"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.95.tar.gz"; - sha256 = "1w121x0xsn1bm699ncanyxqv3njqam3zzjkq8p54bqmzpikn5crs"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.00.tar.gz; + sha256 = "0j5bzn9jwb8rclif776gax57jxxn108swmajiqi2cpjbmlwng0ki"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -20938,7 +21364,7 @@ let description = "Handy web browsing in a Perl object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ]; + buildInputs = [ CGI HTTPServerSimple PathTiny TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { @@ -21198,13 +21624,13 @@ let XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0202"; + version = "2.0205"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0202.tar.gz"; - sha256 = "1bp2d5jpfmp35f2giwqx60q2rmzq469szkxzfcqkd742x72h4ayc"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0205.tar.gz; + sha256 = "0y12bcpnxzn8vs9zglaaxkw0kgrgmljxrxdf1cnijgxi2hkh099s"; }; SKIP_SAX_INSTALL = 1; - buildInputs = [ AlienLibxml2 ]; + buildInputs = [ AlienBuild AlienLibxml2 ]; propagatedBuildInputs = [ XMLSAX ]; }; @@ -21256,10 +21682,10 @@ let XMLParser = buildPerlPackage { pname = "XML-Parser"; - version = "2.46"; + version = "2.44"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz"; - sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk"; + url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; + sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; }; patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -21497,12 +21923,12 @@ let XSObjectMagic = buildPerlPackage { pname = "XS-Object-Magic"; - version = "0.04"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz"; - sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; + url = mirror://cpan/authors/id/E/ET/ETHER/XS-Object-Magic-0.05.tar.gz; + sha256 = "0njyy4y0zax4zz55y82dlm9cly1pld1lcxb281s12bp9rrhf9j9x"; }; - buildInputs = [ ExtUtilsDepends TestFatal ]; + buildInputs = [ ExtUtilsDepends TestFatal TestSimple13 ]; meta = { description = "XS pointer backed objects using sv_magic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -21548,6 +21974,7 @@ let url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz"; sha256 = "1fz9r9vvsmjkzvcbznxw65b319vkmwzd0ck09q9nwip00gn907fv"; }; + perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "Fast, lightweight YAML loader and dumper"; license = stdenv.lib.licenses.mit; @@ -21565,19 +21992,19 @@ let YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.81"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.81.tar.gz"; - sha256 = "1rwmy4kywaa0hypy329gb8wbqdk01bv4179bbnjbg66kzl5ndpvh"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.82.tar.gz; + sha256 = "0j7yhxkaasccynl5iq1cqpf4x253p4bi5wsq6qbwwv2wjsiwgd02"; }; }; YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.018"; + version = "0.022"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.018.tar.gz"; - sha256 = "1s957svv1z4sz62s53n5ym3c0liafs2gl8r0m7xq9qgcb9dyvblx"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.022.tar.gz; + sha256 = "1hf7kpnzais4inhvh3azr0r9886lsqr8xjb81nik0idlgpl8rzh2"; }; buildInputs = [ TestDeep TestWarn ]; meta = { diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 6394add948..e45f9a5bf1 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -3,7 +3,7 @@ , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit -, readline, rsync +, readline, rsync, fetchpatch }: let @@ -57,12 +57,12 @@ in }; composer = mkDerivation rec { - version = "1.10.6"; + version = "1.10.8"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0yzfzgg9qlc388g91bdg7y7rp1q8vqb5hkwykwmr1n1lv8dsrg99"; + sha256 = "1rbqa56bsc3wrhk8djxdzh755zx1qrqp3wrdid7x0djzbmzp6h2c"; }; dontUnpack = true; @@ -232,12 +232,12 @@ in }; phpstan = mkDerivation rec { - version = "0.12.25"; + version = "0.12.32"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "1a864v7fxpv5kp24nkvczrir3ldl6wxvaq85rd391ppa8ahdhvdd"; + sha256 = "0sb7yhjjh4wj8wbv4cdf0n1lvhx1ciz7ch8lr73maajj2xbvy1zk"; }; phases = [ "installPhase" ]; @@ -947,6 +947,12 @@ in enable = lib.versionOlder php.version "7.4"; } { name = "gettext"; buildInputs = [ gettext ]; + patches = lib.optionals (lib.versionOlder php.version "7.4") [ + (fetchpatch { + url = "https://github.com/php/php-src/commit/632b6e7aac207194adc3d0b41615bfb610757f41.patch"; + sha256 = "0xn3ivhc4p070vbk5yx0mzj2n7p04drz3f98i77amr51w0vzv046"; + }) + ]; postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' ''; configureFlags = "--with-gettext=${gettext}"; } { name = "gmp"; @@ -965,7 +971,13 @@ in # uwimap doesn't build on darwin. enable = (!stdenv.isDarwin); } # interbase (7.3, 7.2) - { name = "intl"; buildInputs = [ icu ]; } + { name = "intl"; + buildInputs = [ icu ]; + patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch { + url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch"; + sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; + }); + } { name = "json"; } { name = "ldap"; buildInputs = [ openldap cyrus_sasl ]; @@ -1002,6 +1014,7 @@ in +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | '') + ] ++ lib.optional (lib.versionOlder php.version "7.4.8") [ (pkgs.writeText "mysqlnd_fix_compression.patch" '' --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -1157,6 +1170,10 @@ in doCheck = false; } { name = "zlib"; buildInputs = [ zlib ]; + patches = lib.optionals (lib.versionOlder php.version "7.4") [ + # Derived from https://github.com/php/php-src/commit/f16b012116d6c015632741a3caada5b30ef8a699 + ../development/interpreters/php/zlib-darwin-tests.patch + ]; configureFlags = [ "--with-zlib" ] ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]; } ]; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 4d4a3ad052..ebf2585bff 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -150,6 +150,8 @@ in { pynamodb = callPackage ../development/python-modules/pynamodb { }; + aadict = callPackage ../development/python-modules/aadict { }; + absl-py = callPackage ../development/python-modules/absl-py { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; @@ -517,6 +519,12 @@ in { beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + + biplist = callPackage ../development/python-modules/biplist { }; + + bip_utils = callPackage ../development/python-modules/bip_utils { }; + bitarray = callPackage ../development/python-modules/bitarray { }; bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; @@ -555,6 +563,8 @@ in { browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); + btrfs = callPackage ../development/python-modules/btrfs { }; + bt_proximity = callPackage ../development/python-modules/bt-proximity { }; bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 @@ -575,6 +585,12 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; + certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; + + certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; + + certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; + cfn-flip = callPackage ../development/python-modules/cfn-flip { }; chalice = callPackage ../development/python-modules/chalice { }; @@ -645,6 +661,8 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; + diceware = callPackage ../development/python-modules/diceware { }; + dictionaries = callPackage ../development/python-modules/dictionaries { }; diff_cover = callPackage ../development/python-modules/diff_cover { }; @@ -677,6 +695,8 @@ in { inherit (pkgs) dbus pkgconfig; }; + debts = callPackage ../development/python-modules/debts { }; + dftfit = callPackage ../development/python-modules/dftfit { }; dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; @@ -687,6 +707,9 @@ in { parver = callPackage ../development/python-modules/parver { }; arpeggio = callPackage ../development/python-modules/arpeggio { }; + + influxdb-client = callPackage ../development/python-modules/influxdb-client { }; + invoke = callPackage ../development/python-modules/invoke { }; distorm3 = callPackage ../development/python-modules/distorm3 { }; @@ -769,8 +792,15 @@ in { glob2 = callPackage ../development/python-modules/glob2 { }; + globre = callPackage ../development/python-modules/globre { }; + glom = callPackage ../development/python-modules/glom { }; + gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { + inherit (self) python; + enablePython = true; + })); + goocalendar = callPackage ../development/python-modules/goocalendar { }; grandalf = callPackage ../development/python-modules/grandalf { }; @@ -908,6 +938,8 @@ in { logzero = callPackage ../development/python-modules/logzero { }; + mac_alias = callPackage ../development/python-modules/mac_alias { }; + macropy = callPackage ../development/python-modules/macropy { }; mail-parser = callPackage ../development/python-modules/mail-parser { }; @@ -946,6 +978,8 @@ in { mpi = pkgs.openmpi; }; + pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; + python-baseconv = callPackage ../development/python-modules/python-baseconv { }; pycognito = callPackage ../development/python-modules/pycognito { }; @@ -972,6 +1006,8 @@ in { nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nassl = callPackage ../development/python-modules/nassl { }; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; nbsphinx = callPackage ../development/python-modules/nbsphinx { }; @@ -1007,6 +1043,8 @@ in { nvchecker = callPackage ../development/python-modules/nvchecker { }; numericalunits = callPackage ../development/python-modules/numericalunits { }; + + nunavut = callPackage ../development/python-modules/nunavut { }; oath = callPackage ../development/python-modules/oath { }; @@ -1265,6 +1303,8 @@ in { pyres = callPackage ../development/python-modules/pyres { }; + PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; @@ -1294,6 +1334,8 @@ in { pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + pydsdl = callPackage ../development/python-modules/pydsdl { }; + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; @@ -1416,6 +1458,8 @@ in { python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-snappy = callPackage ../development/python-modules/python-snappy { @@ -1470,6 +1514,8 @@ in { rq = callPackage ../development/python-modules/rq { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; + rx = callPackage ../development/python-modules/rx { }; sabyenc = callPackage ../development/python-modules/sabyenc { }; @@ -1490,6 +1536,9 @@ in { inherit (pkgs) sentencepiece pkgconfig; }; + tokenizers = disabledIf (!isPy3k) + (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + transformers = callPackage ../development/python-modules/transformers { }; transforms3d = callPackage ../development/python-modules/transforms3d { }; @@ -1550,12 +1599,18 @@ in { spglib = callPackage ../development/python-modules/spglib { }; + spidev = callPackage ../development/python-modules/spidev { }; + + srvlookup = callPackage ../development/python-modules/srvlookup { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; sshtunnel = callPackage ../development/python-modules/sshtunnel { }; sslib = callPackage ../development/python-modules/sslib { }; + sslyze = callPackage ../development/python-modules/sslyze { }; + statistics = callPackage ../development/python-modules/statistics { }; stm32loader = callPackage ../development/python-modules/stm32loader { }; @@ -1586,6 +1641,8 @@ in { tesserocr = callPackage ../development/python-modules/tesserocr { }; + tls-parser = callPackage ../development/python-modules/tls-parser { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme {}; @@ -1620,6 +1677,17 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; + pyuavcan = callPackage ../development/python-modules/pyuavcan { + # this version pinpoint to anold version is necessary due to a regression + nunavut = self.nunavut.overridePythonAttrs ( old: rec { + version = "0.2.3"; + src = old.src.override { + inherit version; + sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; + }; + }); + }; + pyunifi = callPackage ../development/python-modules/pyunifi { }; vdf = callPackage ../development/python-modules/vdf { }; @@ -2365,6 +2433,8 @@ in { impacket = callPackage ../development/python-modules/impacket { }; + img2pdf = callPackage ../development/python-modules/img2pdf { }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; @@ -2436,7 +2506,7 @@ in { pretend = callPackage ../development/python-modules/pretend { }; - detox = callPackage ../development/python-modules/detox { }; + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; @@ -2631,8 +2701,14 @@ in { zigpy = callPackage ../development/python-modules/zigpy { }; + zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + + zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; @@ -2697,6 +2773,10 @@ in { # Alias that we should deprecate dateutil = self.python-dateutil; + debugpy = callPackage ../development/python-modules/debugpy { + django = if isPy27 then self.django_1_11 else self.django; + }; + decorator = callPackage ../development/python-modules/decorator { }; deform = callPackage ../development/python-modules/deform { }; @@ -2945,6 +3025,8 @@ in { googletrans = callPackage ../development/python-modules/googletrans { }; + gdown = callPackage ../development/python-modules/gdown { }; + gpapi = callPackage ../development/python-modules/gpapi { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; @@ -3178,6 +3260,8 @@ in { midiutil = callPackage ../development/python-modules/midiutil {}; + mido = callPackage ../development/python-modules/mido { }; + misaka = callPackage ../development/python-modules/misaka {}; mlrose = callPackage ../development/python-modules/mlrose { }; @@ -3397,6 +3481,8 @@ in { inherit (pkgs) lzo; }; + pxml = callPackage ../development/python-modules/pxml { }; + junos-eznc = callPackage ../development/python-modules/junos-eznc {}; raven = callPackage ../development/python-modules/raven { }; @@ -3445,6 +3531,8 @@ in { regex = callPackage ../development/python-modules/regex { }; + pygrok = callPackage ../development/python-modules/pygrok { }; + regional = callPackage ../development/python-modules/regional { }; ratelimiter = callPackage ../development/python-modules/ratelimiter { }; @@ -3709,6 +3797,8 @@ in { eventlet = callPackage ../development/python-modules/eventlet { }; + executing = callPackage ../development/python-modules/executing { }; + exifread = callPackage ../development/python-modules/exifread { }; fastimport = callPackage ../development/python-modules/fastimport { }; @@ -4035,6 +4125,8 @@ in { google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { }; + google_cloud_secret_manager = callPackage ../development/python-modules/google_cloud_secret_manager { }; + google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { }; google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; @@ -4129,6 +4221,8 @@ in { htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + html5lib = callPackage ../development/python-modules/html5lib { }; httmock = callPackage ../development/python-modules/httmock { }; @@ -4178,6 +4272,8 @@ in { icalendar = callPackage ../development/python-modules/icalendar { }; + icecream = callPackage ../development/python-modules/icecream { }; + ics = callPackage ../development/python-modules/ics { }; ifaddr = callPackage ../development/python-modules/ifaddr { }; @@ -4301,6 +4397,8 @@ in { jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + kaggle = callPackage ../development/python-modules/kaggle { }; + keyring = if isPy3k then callPackage ../development/python-modules/keyring { } else @@ -4393,6 +4491,11 @@ in { })); libkeepass = callPackage ../development/python-modules/libkeepass { }; + + libredwg = toPythonModule (pkgs.libredwg.override { + enablePython = true; + inherit (self) python libxml2; + }); librepo = pipe pkgs.librepo [ toPythonModule @@ -4441,7 +4544,9 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_8; }; + llvmlite = callPackage ../development/python-modules/llvmlite { + llvm = pkgs.llvm_9; # llvmlite always requires a specific version of llvm. + }; lockfile = callPackage ../development/python-modules/lockfile { }; @@ -4469,6 +4574,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; + maestral = callPackage ../development/python-modules/maestral { }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {}; @@ -4569,6 +4676,8 @@ in { mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; + metaphone = callPackage ../development/python-modules/metaphone { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; @@ -4688,8 +4797,12 @@ in { pint = callPackage ../development/python-modules/pint { }; + pkutils = callPackage ../development/python-modules/pkutils { }; + pygal = callPackage ../development/python-modules/pygal { }; + pygogo = callPackage ../development/python-modules/pygogo { }; + pytaglib = callPackage ../development/python-modules/pytaglib { }; pyte = callPackage ../development/python-modules/pyte { }; @@ -4724,6 +4837,8 @@ in { names = callPackage ../development/python-modules/names { }; + nbclient = callPackage ../development/python-modules/nbclient { }; + nbconflux = callPackage ../development/python-modules/nbconflux { }; nbconvert = callPackage ../development/python-modules/nbconvert { }; @@ -4835,16 +4950,11 @@ in { Nuitka = callPackage ../development/python-modules/nuitka { }; - numpy = let - numpy_ = callPackage ../development/python-modules/numpy { }; - numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec { - version = "1.16.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c"; - }; - }); - in if pythonOlder "3.5" then numpy_2 else numpy_; + numpy = + if pythonOlder "3.5" then + callPackage ../development/python-modules/numpy/1.16.nix { } + else + callPackage ../development/python-modules/numpy { }; numpydoc = callPackage ../development/python-modules/numpydoc { }; @@ -5134,6 +5244,8 @@ in { pymetar = callPackage ../development/python-modules/pymetar { }; + pypubsub = callPackage ../development/python-modules/pypubsub { }; + pysftp = callPackage ../development/python-modules/pysftp { }; soundfile = callPackage ../development/python-modules/soundfile { }; @@ -5231,6 +5343,8 @@ in { pyaudio = callPackage ../development/python-modules/pyaudio { }; + pycoin = callPackage ../development/python-modules/pycoin { }; + pysam = callPackage ../development/python-modules/pysam { }; pysaml2 = callPackage ../development/python-modules/pysaml2 { @@ -5637,7 +5751,6 @@ in { qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; - lndir = pkgs.xorg.lndir; }; qscintilla = self.qscintilla-qt4; @@ -5810,6 +5923,15 @@ in { }); in if pythonOlder "3.5" then scipy_1_2 else scipy_; + scipy_1_3 = self.scipy.overridePythonAttrs(oldAttrs: rec { + version = "1.3.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; + }; + doCheck = false; + }); + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = let @@ -5955,6 +6077,10 @@ in { sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; + sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; + + sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; + sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; @@ -6040,6 +6166,8 @@ in { tqdm = callPackage ../development/python-modules/tqdm { }; + trytond = callPackage ../development/python-modules/trytond { }; + smmap = callPackage ../development/python-modules/smmap { }; smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 @@ -6623,8 +6751,12 @@ in { cmdtest = callPackage ../development/python-modules/cmdtest { }; - tornado = callPackage ../development/python-modules/tornado { }; - tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; }; + tornado = if isPy3k then + callPackage ../development/python-modules/tornado { } + else + callPackage ../development/python-modules/tornado/5.nix { }; + + tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; tokenlib = callPackage ../development/python-modules/tokenlib { }; @@ -6858,6 +6990,8 @@ in { torchvision = callPackage ../development/python-modules/torchvision { }; + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; + jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; @@ -7204,6 +7338,8 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; + typed-ast = callPackage ../development/python-modules/typed-ast { }; stripe = callPackage ../development/python-modules/stripe { }; @@ -7296,6 +7432,8 @@ in { murmurhash = callPackage ../development/python-modules/murmurhash { }; + pkuseg = callPackage ../development/python-modules/pkuseg { }; + plac = callPackage ../development/python-modules/plac { }; preshed = callPackage ../development/python-modules/preshed { }; @@ -7344,8 +7482,12 @@ in { pulp = callPackage ../development/python-modules/pulp { }; + pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + behave = callPackage ../development/python-modules/behave { }; + bellows = callPackage ../development/python-modules/bellows { }; + pyhamcrest = if isPy3k then callPackage ../development/python-modules/pyhamcrest { } else @@ -7501,6 +7643,8 @@ in { webrtcvad = callPackage ../development/python-modules/webrtcvad { }; + pykwalify = callPackage ../development/python-modules/pykwalify { }; + wfuzz = callPackage ../development/python-modules/wfuzz { }; wget = callPackage ../development/python-modules/wget { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index fc317f51ab..c11858f09c 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -89,7 +89,6 @@ let meta.description = "Release-critical builds for the Nixpkgs unstable channel"; constituents = [ jobs.tarball - jobs.metrics jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux