diff --git a/doc/builders/images/dockertools.xml b/doc/builders/images/dockertools.xml
index e7f37fdaaf0..126698d0a9e 100644
--- a/doc/builders/images/dockertools.xml
+++ b/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/lib/licenses.nix b/lib/licenses.nix
index b799a6ae8a4..e24b7e8ec6f 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -462,6 +462,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 +487,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 +555,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";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e8e2eff26c8..ec34287442e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1604,6 +1604,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";
@@ -1782,6 +1788,12 @@
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";
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index 31216874c70..a11a9382764 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/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/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 12363e99921..c2f26371d66 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -504,6 +504,16 @@ 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.
+
+
@@ -665,6 +675,12 @@ 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.
+
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index e7b05968b07..f454b052dc3 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -4,6 +4,7 @@ from queue import Queue, Empty
from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
from xml.sax.saxutils import XMLGenerator
import _thread
+import argparse
import atexit
import base64
import codecs
@@ -751,6 +752,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
@@ -889,6 +895,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 +911,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 +928,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/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix
index da627af73bc..828032dc573 100644
--- a/nixos/modules/services/hardware/undervolt.nix
+++ b/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/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 6e3eed0c557..3ecbd06ee41 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/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/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index 30bf22586f8..5af035fd59e 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/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/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 8abee7130d7..e1d1217943b 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/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/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 8a015bb3556..4c4b7f39e6b 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/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/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
index 0631a26569c..4ab7307c3b6 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/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/nixos/tests/acme.nix b/nixos/tests/acme.nix
index fc41dc1eb5f..a8188473721 100644
--- a/nixos/tests/acme.nix
+++ b/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/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 8fda7c1395e..a4a61468f33 100644
--- a/nixos/tests/docker.nix
+++ b/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/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index c81e78a8f99..1d3679c82a2 100644
--- a/nixos/tests/radicale.nix
+++ b/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/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 2bdca386bf4..f4028807ffc 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/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/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix
new file mode 100644
index 00000000000..593458506d8
--- /dev/null
+++ b/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/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix
index 16d39e85da1..0d59eb67017 100644
--- a/pkgs/applications/blockchains/dcrd.nix
+++ b/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/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix
index 258aad8e1bd..0fbd5f33e72 100644
--- a/pkgs/applications/blockchains/dcrwallet.nix
+++ b/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/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix
index 34800d7f023..d938edaa6e9 100644
--- a/pkgs/applications/editors/lite/default.nix
+++ b/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/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 7ca981b2958..968cc69d92d 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/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/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index fd48a4b1084..cc0c73b73e9 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/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/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix
index 84844191235..209a6a4753b 100644
--- a/pkgs/applications/graphics/cloudcompare/default.nix
+++ b/pkgs/applications/graphics/cloudcompare/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
+{ lib
+, mkDerivation
, fetchFromGitHub
, cmake
-, wrapQtAppsHook
, dxflib
, eigen
, flann
@@ -16,7 +16,7 @@
, xercesc
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "cloudcompare";
version = "2.11.0";
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
eigen # header-only
- wrapQtAppsHook
];
buildInputs = [
@@ -73,7 +72,7 @@ stdenv.mkDerivation rec {
"-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "3D point cloud and mesh processing software";
homepage = "https://cloudcompare.org";
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix
new file mode 100644
index 00000000000..62434982968
--- /dev/null
+++ b/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/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index ec4d71a0dce..42b03774749 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/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/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix
new file mode 100644
index 00000000000..35c94038efc
--- /dev/null
+++ b/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.1";
+
+ src = fetchFromGitHub {
+ owner = "rockowitz";
+ repo = "ddcui";
+ rev = "v${version}";
+ sha256 = "02qr7i3pdq8p6lnhwihfgd9b7y9zwpdk6gwv626rz32ai6mfrfhl";
+ };
+
+ 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/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix
index fcf8191d3b7..bc40f2dad83 100644
--- a/pkgs/applications/misc/fbmenugen/default.nix
+++ b/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/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix
new file mode 100644
index 00000000000..2b4ae320e4e
--- /dev/null
+++ b/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/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index e6193d43563..4f84420330d 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/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/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
new file mode 100644
index 00000000000..396a7845112
--- /dev/null
+++ b/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/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index c0d20c14f7c..892038c252a 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/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/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix
index 3b982b1766f..7b7d9051ada 100644
--- a/pkgs/applications/misc/xpdf/libxpdf.nix
+++ b/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/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 985497a095c..79cb5437b3c 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/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/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix
index c9b15b6d4fc..4028f8622c3 100644
--- a/pkgs/applications/networking/browsers/kristall/default.nix
+++ b/pkgs/applications/networking/browsers/kristall/default.nix
@@ -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/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index d58fc8fd19b..0312c3b6895 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/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/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 856fa51437e..e4a6f63b014 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/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/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 5834aa7689a..7dcff328226 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "kubernetes";
- version = "1.18.4";
+ version = "1.18.5";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "11hic59ffypyky7g57p712y70nwk4qp9bx5vm0j0077c1i1i3756";
+ sha256 = "0pl7dzq5giwkzfyg4pzm8y76fnd62gaa6d4hswvgn87czab37lr6";
};
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 74a43f00ca8..18c39588775 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/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/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index f3b304564cb..2f5316c9fe2 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/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/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index e9ae6696def..3b0be4dad19 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -336,5 +336,6 @@ stdenv.mkDerivation rec {
pierron
];
platforms = platforms.linux;
+ license = licenses.mpl20;
};
}
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 93a899742b5..265c8add278 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/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/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 414e9d1b908..11f97206b6e 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/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/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 51cb2a456c1..cd44dadcedc 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -38,6 +38,10 @@ stdenv.mkDerivation {
})
];
+ postPatch = ''
+ substituteInPlace Makefile.in --replace js_of_ocaml.ppx js_of_ocaml-ppx
+ '';
+
configureFlags = [ "--enable-verbose-make" ];
installTargets = [ "install" "install-lib" ];
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index e393111590a..213530b60a9 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
description = "The ultimate desktop calculator";
homepage = "http://qalculate.github.io";
maintainers = with maintainers; [ gebner ];
+ license = licenses.gpl2Plus;
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix
index 58cc8f8f59e..cab26577bd0 100644
--- a/pkgs/applications/science/misc/root/5.nix
+++ b/pkgs/applications/science/misc/root/5.nix
@@ -86,5 +86,6 @@ stdenv.mkDerivation rec {
description = "A data analysis framework";
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 2cd4adce939..36ea373177a 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,11 +1,8 @@
-{ stdenv, fetchFromGitHub, python2, git }:
+{ stdenv, python3, python3Packages, fetchFromGitHub, git }:
-let
- name = "stgit-${version}";
+python3Packages.buildPythonApplication rec {
+ pname = "stgit";
version = "0.22";
-in
-stdenv.mkDerivation {
- inherit name;
src = fetchFromGitHub {
owner = "ctmarinas";
@@ -14,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0xpvs5fa50rrvl2c8naha1nblk5ip2mgg63a9srqqxfx6z8qmrfz";
};
- buildInputs = [ python2 git ];
+ nativeBuildInputs = [ git ];
makeFlags = [ "prefix=$$out" ];
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index da414cd5546..e9fc96986a8 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/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/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 1593866086e..6d277562065 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -44,11 +44,14 @@ 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
@@ -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/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix
index c18b2129f09..494bb9ff1b7 100644
--- a/pkgs/applications/window-managers/notion/default.nix
+++ b/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/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 83f4a9e0c01..7ff325382a6 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/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,14 @@ 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;
+ buildInputs = [ pigz ];
+ } "${stream} | pigz -nT > $out";
# 1. extract the base image
# 2. create the layer
@@ -774,20 +552,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 +684,117 @@ 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;
+ 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;
+ buildInputs = [ makeWrapper ];
+ } ''
+ makeWrapper ${streamScript} $out --add-flags ${conf}
+ '';
+ in result;
}
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh
deleted file mode 100755
index 3a1fcd0c27a..00000000000
--- a/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/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py
new file mode 100644
index 00000000000..4348513338d
--- /dev/null
+++ b/pkgs/build-support/docker/stream_layered_image.py
@@ -0,0 +1,308 @@
+"""
+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 threading
+from datetime import datetime
+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:
+ ti = tar.gettarinfo(os.path.join("/", path))
+ tar.addfile(apply_filters(append_root(ti)))
+
+ for filename in pathlib.Path(path).rglob("*"):
+ ti = append_root(tar.gettarinfo(filename))
+
+ # copy hardlinks as regular files
+ if ti.islnk():
+ ti.type = tarfile.REGTYPE
+ ti.linkname = ""
+
+ 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=datetime.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": conf["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/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix
index b54fb3fd128..1b107f9cb82 100644
--- a/pkgs/data/fonts/joypixels/default.nix
+++ b/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/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix
index 72dc5fe6313..1bf5c6aa482 100644
--- a/pkgs/data/fonts/material-design-icons/default.nix
+++ b/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/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index fa52ad176d9..2a9a895b6ca 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/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/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 27aa60ac09f..f72431c5a27 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/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/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
new file mode 100644
index 00000000000..69becebe770
--- /dev/null
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -0,0 +1,252 @@
+{ 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
+
+ # Independent from host/target, CC should produce code for the building system.
+ 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/pkgs/development/compilers/go/remove-test-pie-1.15.patch b/pkgs/development/compilers/go/remove-test-pie-1.15.patch
new file mode 100644
index 00000000000..f00685feba9
--- /dev/null
+++ b/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/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch b/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch
new file mode 100644
index 00000000000..945d3ef8d12
--- /dev/null
+++ b/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/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch
new file mode 100644
index 00000000000..0ea1050cd8e
--- /dev/null
+++ b/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/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch
new file mode 100644
index 00000000000..cca48eb5705
--- /dev/null
+++ b/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/pkgs/development/compilers/mruby/bison-36-compat.patch b/pkgs/development/compilers/mruby/bison-36-compat.patch
new file mode 100644
index 00000000000..674a88fe4c2
--- /dev/null
+++ b/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/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix
index f6a7fc2f143..2589c47c3be 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/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/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index 9e78a9f3882..d5cfb5a217f 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/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/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix
index 77154485118..286037b2cce 100644
--- a/pkgs/development/dotnet-modules/python-language-server/default.nix
+++ b/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/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix
index 803f33f892d..c47e29b6420 100644
--- a/pkgs/development/dotnet-modules/python-language-server/deps.nix
+++ b/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/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index c848ebc6047..cfd3bbbda4c 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/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/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
index 39ed74d0075..d6c550a8da8 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/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/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix
index aaf40998102..eaddcb86f54 100644
--- a/pkgs/development/libraries/cm256cc/default.nix
+++ b/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/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix
index 6b42af05c11..a9929ea2add 100644
--- a/pkgs/development/libraries/dclib/default.nix
+++ b/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/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 666aafef7f4..1cbcc5471e0 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/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
@@ -355,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")
@@ -418,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/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index fcb5e7918d9..7f494e8bddc 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/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/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index a3ddfe4c63c..c7a9b3c4a12 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -25,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/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix
index 7863e596e1b..aff56994f49 100644
--- a/pkgs/development/libraries/libblocksruntime/default.nix
+++ b/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/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index 4052f6e45d7..940093ed4ba 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/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/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index 29edf37d80e..830465fb113 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/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/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index d9e9df59324..4587701011d 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/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/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index c9adad6f645..c4e82b1c326 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/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/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index 2b28499864a..d555ecea06d 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/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/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index 22b66442305..842d144005d 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/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/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index 57c47c79f84..38f3a1134ee 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -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/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index 7d9adca074c..edc48d1d873 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/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" ];
diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix
index 08d57cda6c1..855df954eb1 100644
--- a/pkgs/development/libraries/pdf2xml/default.nix
+++ b/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/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
index f17165b5ed3..2120c693857 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
+++ b/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/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix
index 178cee5e69a..d711cd9fc80 100644
--- a/pkgs/development/libraries/serialdv/default.nix
+++ b/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/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix
index fb8c0e0fa21..bca025d622a 100644
--- a/pkgs/development/libraries/wasilibc/default.nix
+++ b/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/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix
new file mode 100644
index 00000000000..4dcc8a47105
--- /dev/null
+++ b/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/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
index 3c7ff00151a..471dd5b3122 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/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/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index d106b8e2efa..29dc8755edf 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -142,7 +142,9 @@
, "prettier"
, "pscid"
, "pulp"
+, "purescript-language-server"
, "purescript-psa"
+, "purty"
, "react-native-cli"
, "react-tools"
, "reveal.js"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 594225a07ab..2b30811e84c 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/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.0" = {
name = "_at_angular-devkit_slash_architect";
packageName = "@angular-devkit/architect";
- version = "0.901.9";
+ version = "0.1000.0";
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.0.tgz";
+ sha512 = "luzBYe7t994ebq6xIfYJudxOkMBO0bywafk6sQqb+bOaBQAran4orF1R/zEx6f8TJzEoXELjUvxm/ePSqZdpKg==";
+ };
+ };
+ "@angular-devkit/core-10.0.0" = {
+ name = "_at_angular-devkit_slash_core";
+ packageName = "@angular-devkit/core";
+ version = "10.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.0.tgz";
+ sha512 = "IvX9IMaCjDkN9vDVnYcgWbSBinlUUb7jdFhDGeTtK6rGSnjX1GoLvWneVI2hoccS07fPbnfMoYXBoZLwVxiIxw==";
};
};
"@angular-devkit/core-9.1.7" = {
@@ -49,6 +58,15 @@ let
sha512 = "SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q==";
};
};
+ "@angular-devkit/schematics-10.0.0" = {
+ name = "_at_angular-devkit_slash_schematics";
+ packageName = "@angular-devkit/schematics";
+ version = "10.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.0.tgz";
+ sha512 = "FJ/dY18M+cnAT9RkVjVRJ0PMFZci3ok0WoOosW25Fk68jwNSbGCeF8k8NcD6YE60+CfF4/0LxQWgFagr/wdEhw==";
+ };
+ };
"@angular-devkit/schematics-9.1.7" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
@@ -256,6 +274,15 @@ let
sha512 = "XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ==";
};
};
+ "@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,31 +301,31 @@ let
sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20";
};
};
- "@babel/code-frame-7.10.1" = {
+ "@babel/code-frame-7.10.3" = {
name = "_at_babel_slash_code-frame";
packageName = "@babel/code-frame";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==";
};
};
- "@babel/compat-data-7.10.1" = {
+ "@babel/compat-data-7.10.3" = {
name = "_at_babel_slash_compat-data";
packageName = "@babel/compat-data";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "BDIfJ9uNZuI0LajPfoYV28lX8kyCPMHY6uY4WH1lJdcicmAfxCK5ASzaeV0D/wsUaRH/cLk+amuxtC37sZ8TUg==";
};
};
- "@babel/core-7.10.2" = {
+ "@babel/core-7.10.3" = {
name = "_at_babel_slash_core";
packageName = "@babel/core";
- version = "7.10.2";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w==";
};
};
"@babel/generator-7.10.2" = {
@@ -310,6 +337,15 @@ let
sha512 = "AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==";
};
};
+ "@babel/generator-7.10.3" = {
+ name = "_at_babel_slash_generator";
+ packageName = "@babel/generator";
+ version = "7.10.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz";
+ sha512 = "drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==";
+ };
+ };
"@babel/helper-annotate-as-pure-7.10.1" = {
name = "_at_babel_slash_helper-annotate-as-pure";
packageName = "@babel/helper-annotate-as-pure";
@@ -319,22 +355,22 @@ let
sha512 = "ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==";
};
};
- "@babel/helper-builder-binary-assignment-operator-visitor-7.10.1" = {
+ "@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.10.1";
+ 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.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.3.tgz";
+ sha512 = "lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A==";
};
};
- "@babel/helper-builder-react-jsx-7.10.1" = {
+ "@babel/helper-builder-react-jsx-7.10.3" = {
name = "_at_babel_slash_helper-builder-react-jsx";
packageName = "@babel/helper-builder-react-jsx";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "vkxmuFvmovtqTZknyMGj9+uQAZzz5Z9mrbnkJnPkaYGfKTaSsYcjQdXP0lgrWLVh8wU6bCjOmXOpx+kqUi+S5Q==";
};
};
"@babel/helper-builder-react-jsx-experimental-7.10.1" = {
@@ -355,13 +391,13 @@ let
sha512 = "hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==";
};
};
- "@babel/helper-create-class-features-plugin-7.10.2" = {
+ "@babel/helper-create-class-features-plugin-7.10.3" = {
name = "_at_babel_slash_helper-create-class-features-plugin";
packageName = "@babel/helper-create-class-features-plugin";
- version = "7.10.2";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "iRT9VwqtdFmv7UheJWthGc/h2s7MqoweBF9RUj77NFZsg9VfISvBTum3k6coAhJ8RWv2tj3yUjA03HxPd0vfpQ==";
};
};
"@babel/helper-create-regexp-features-plugin-7.10.1" = {
@@ -373,67 +409,67 @@ let
sha512 = "Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==";
};
};
- "@babel/helper-define-map-7.10.1" = {
+ "@babel/helper-define-map-7.10.3" = {
name = "_at_babel_slash_helper-define-map";
packageName = "@babel/helper-define-map";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ==";
};
};
- "@babel/helper-explode-assignable-expression-7.10.1" = {
+ "@babel/helper-explode-assignable-expression-7.10.3" = {
name = "_at_babel_slash_helper-explode-assignable-expression";
packageName = "@babel/helper-explode-assignable-expression";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw==";
};
};
- "@babel/helper-function-name-7.10.1" = {
+ "@babel/helper-function-name-7.10.3" = {
name = "_at_babel_slash_helper-function-name";
packageName = "@babel/helper-function-name";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==";
};
};
- "@babel/helper-get-function-arity-7.10.1" = {
+ "@babel/helper-get-function-arity-7.10.3" = {
name = "_at_babel_slash_helper-get-function-arity";
packageName = "@babel/helper-get-function-arity";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==";
};
};
- "@babel/helper-hoist-variables-7.10.1" = {
+ "@babel/helper-hoist-variables-7.10.3" = {
name = "_at_babel_slash_helper-hoist-variables";
packageName = "@babel/helper-hoist-variables";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "9JyafKoBt5h20Yv1+BXQMdcXXavozI1vt401KBiRc2qzUepbVnd7ogVNymY1xkQN9fekGwfxtotH2Yf5xsGzgg==";
};
};
- "@babel/helper-member-expression-to-functions-7.10.1" = {
+ "@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.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==";
};
};
- "@babel/helper-module-imports-7.10.1" = {
+ "@babel/helper-module-imports-7.10.3" = {
name = "_at_babel_slash_helper-module-imports";
packageName = "@babel/helper-module-imports";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w==";
};
};
"@babel/helper-module-transforms-7.10.1" = {
@@ -445,22 +481,22 @@ let
sha512 = "RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==";
};
};
- "@babel/helper-optimise-call-expression-7.10.1" = {
+ "@babel/helper-optimise-call-expression-7.10.3" = {
name = "_at_babel_slash_helper-optimise-call-expression";
packageName = "@babel/helper-optimise-call-expression";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==";
};
};
- "@babel/helper-plugin-utils-7.10.1" = {
+ "@babel/helper-plugin-utils-7.10.3" = {
name = "_at_babel_slash_helper-plugin-utils";
packageName = "@babel/helper-plugin-utils";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==";
};
};
"@babel/helper-regex-7.10.1" = {
@@ -472,13 +508,13 @@ let
sha512 = "7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==";
};
};
- "@babel/helper-remap-async-to-generator-7.10.1" = {
+ "@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.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "sLB7666ARbJUGDO60ZormmhQOyqMX/shKBXZ7fy937s+3ID8gSrneMvKSSb+8xIM5V7Vn6uNVtOY1vIm26XLtA==";
};
};
"@babel/helper-replace-supers-7.10.1" = {
@@ -508,13 +544,13 @@ let
sha512 = "UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==";
};
};
- "@babel/helper-validator-identifier-7.10.1" = {
+ "@babel/helper-validator-identifier-7.10.3" = {
name = "_at_babel_slash_helper-validator-identifier";
packageName = "@babel/helper-validator-identifier";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==";
};
};
"@babel/helper-wrap-function-7.10.1" = {
@@ -535,22 +571,22 @@ let
sha512 = "muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==";
};
};
- "@babel/highlight-7.10.1" = {
+ "@babel/highlight-7.10.3" = {
name = "_at_babel_slash_highlight";
packageName = "@babel/highlight";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==";
};
};
- "@babel/parser-7.10.2" = {
+ "@babel/parser-7.10.3" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.10.2";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==";
};
};
"@babel/plugin-external-helpers-7.8.3" = {
@@ -562,13 +598,13 @@ let
sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw==";
};
};
- "@babel/plugin-proposal-async-generator-functions-7.10.1" = {
+ "@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.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "WUUWM7YTOudF4jZBAJIW9D7aViYC/Fn0Pln4RIHlQALyno3sXSjqmTA4Zy1TKC2D49RCR8Y/Pn4OIUtEypK3CA==";
};
};
"@babel/plugin-proposal-class-properties-7.10.1" = {
@@ -616,13 +652,13 @@ let
sha512 = "jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==";
};
};
- "@babel/plugin-proposal-object-rest-spread-7.10.1" = {
+ "@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.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ==";
};
};
"@babel/plugin-proposal-optional-catch-binding-7.10.1" = {
@@ -634,13 +670,13 @@ let
sha512 = "VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==";
};
};
- "@babel/plugin-proposal-optional-chaining-7.10.1" = {
+ "@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.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng==";
};
};
"@babel/plugin-proposal-private-methods-7.10.1" = {
@@ -841,22 +877,22 @@ let
sha512 = "8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==";
};
};
- "@babel/plugin-transform-classes-7.10.1" = {
+ "@babel/plugin-transform-classes-7.10.3" = {
name = "_at_babel_slash_plugin-transform-classes";
packageName = "@babel/plugin-transform-classes";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw==";
};
};
- "@babel/plugin-transform-computed-properties-7.10.1" = {
+ "@babel/plugin-transform-computed-properties-7.10.3" = {
name = "_at_babel_slash_plugin-transform-computed-properties";
packageName = "@babel/plugin-transform-computed-properties";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA==";
};
};
"@babel/plugin-transform-destructuring-7.10.1" = {
@@ -958,13 +994,13 @@ let
sha512 = "AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==";
};
};
- "@babel/plugin-transform-modules-systemjs-7.10.1" = {
+ "@babel/plugin-transform-modules-systemjs-7.10.3" = {
name = "_at_babel_slash_plugin-transform-modules-systemjs";
packageName = "@babel/plugin-transform-modules-systemjs";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "GWXWQMmE1GH4ALc7YXW56BTh/AlzvDWhUNn9ArFF0+Cz5G8esYlVbXfdyHa1xaD1j+GnBoCeoQNlwtZTVdiG/A==";
};
};
"@babel/plugin-transform-modules-umd-7.10.1" = {
@@ -976,13 +1012,13 @@ let
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 = "f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==";
+ 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.10.1" = {
@@ -1021,22 +1057,22 @@ let
sha512 = "Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==";
};
};
- "@babel/plugin-transform-react-jsx-7.10.1" = {
+ "@babel/plugin-transform-react-jsx-7.10.3" = {
name = "_at_babel_slash_plugin-transform-react-jsx";
packageName = "@babel/plugin-transform-react-jsx";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "Y21E3rZmWICRJnvbGVmDLDZ8HfNDIwjGF3DXYHx1le0v0mIHCs0Gv5SavyW5Z/jgAHLaAoJPiwt+Dr7/zZKcOQ==";
};
};
- "@babel/plugin-transform-regenerator-7.10.1" = {
+ "@babel/plugin-transform-regenerator-7.10.3" = {
name = "_at_babel_slash_plugin-transform-regenerator";
packageName = "@babel/plugin-transform-regenerator";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw==";
};
};
"@babel/plugin-transform-reserved-words-7.10.1" = {
@@ -1048,13 +1084,13 @@ let
sha512 = "qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==";
};
};
- "@babel/plugin-transform-runtime-7.10.1" = {
+ "@babel/plugin-transform-runtime-7.10.3" = {
name = "_at_babel_slash_plugin-transform-runtime";
packageName = "@babel/plugin-transform-runtime";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "b5OzMD1Hi8BBzgQdRHyVVaYrk9zG0wset1it2o3BgonkPadXfOv0aXRqd7864DeOIu3FGKP/h6lr15FE5mahVw==";
};
};
"@babel/plugin-transform-shorthand-properties-7.10.1" = {
@@ -1084,13 +1120,13 @@ let
sha512 = "j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==";
};
};
- "@babel/plugin-transform-template-literals-7.10.1" = {
+ "@babel/plugin-transform-template-literals-7.10.3" = {
name = "_at_babel_slash_plugin-transform-template-literals";
packageName = "@babel/plugin-transform-template-literals";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA==";
};
};
"@babel/plugin-transform-typeof-symbol-7.10.1" = {
@@ -1102,13 +1138,13 @@ let
sha512 = "qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==";
};
};
- "@babel/plugin-transform-typescript-7.10.1" = {
+ "@babel/plugin-transform-typescript-7.10.3" = {
name = "_at_babel_slash_plugin-transform-typescript";
packageName = "@babel/plugin-transform-typescript";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "qU9Lu7oQyh3PGMQncNjQm8RWkzw6LqsWZQlZPQMgrGt6s3YiBIaQ+3CQV/FA/icGS5XlSWZGwo/l8ErTyelS0Q==";
};
};
"@babel/plugin-transform-unicode-escapes-7.10.1" = {
@@ -1138,13 +1174,13 @@ let
sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==";
};
};
- "@babel/preset-env-7.10.2" = {
+ "@babel/preset-env-7.10.3" = {
name = "_at_babel_slash_preset-env";
packageName = "@babel/preset-env";
- version = "7.10.2";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "jHaSUgiewTmly88bJtMHbOd1bJf2ocYxb5BWKSDQIP5tmgFuS/n0gl+nhSrYDhT33m0vPxp+rP8oYYgPgMNQlg==";
};
};
"@babel/preset-flow-7.10.1" = {
@@ -1183,13 +1219,13 @@ let
sha512 = "m6GV3y1ShiqxnyQj10600ZVOFrSSAa8HQ3qIUk2r+gcGtHTIRw0dJnFLt1WNXpKjtVw7yw1DAPU/6ma2ZvgJuA==";
};
};
- "@babel/register-7.10.1" = {
+ "@babel/register-7.10.3" = {
name = "_at_babel_slash_register";
packageName = "@babel/register";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "s1il0vdd02HCGwV1iocGJEzcbTNouZqMolSXKXFAiTNJSudPas9jdLQwyPPyAJxdNL6KGJ8pwWIOpKmgO/JWqg==";
};
};
"@babel/runtime-7.10.2" = {
@@ -1201,6 +1237,15 @@ let
sha512 = "6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==";
};
};
+ "@babel/runtime-7.10.3" = {
+ name = "_at_babel_slash_runtime";
+ packageName = "@babel/runtime";
+ version = "7.10.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.3.tgz";
+ sha512 = "RzGO0RLSdokm9Ipe/YD+7ww8X2Ro79qiXZF3HU9ljrM+qnJmH1Vqth+hbiQZy761LnMJTMitHDuKVYTk3k4dLw==";
+ };
+ };
"@babel/runtime-7.7.7" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
@@ -1210,40 +1255,31 @@ 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.3" = {
name = "_at_babel_slash_runtime-corejs3";
packageName = "@babel/runtime-corejs3";
- version = "7.10.2";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "HA7RPj5xvJxQl429r5Cxr2trJwOfPjKiqhCXcdQPSqO2G0RHPZpXu4fkYmBaTKCp2c/jRaMK9GB/lN+7zvvFPw==";
};
};
- "@babel/template-7.10.1" = {
+ "@babel/template-7.10.3" = {
name = "_at_babel_slash_template";
packageName = "@babel/template";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==";
};
};
- "@babel/traverse-7.10.1" = {
+ "@babel/traverse-7.10.3" = {
name = "_at_babel_slash_traverse";
packageName = "@babel/traverse";
- version = "7.10.1";
+ version = "7.10.3";
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.3.tgz";
+ sha512 = "qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==";
};
};
"@babel/types-7.10.2" = {
@@ -1255,6 +1291,15 @@ let
sha512 = "AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==";
};
};
+ "@babel/types-7.10.3" = {
+ name = "_at_babel_slash_types";
+ packageName = "@babel/types";
+ version = "7.10.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz";
+ sha512 = "nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==";
+ };
+ };
"@chemzqm/neovim-5.1.9" = {
name = "_at_chemzqm_slash_neovim";
packageName = "@chemzqm/neovim";
@@ -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" = {
@@ -1489,40 +1534,40 @@ let
sha512 = "Ec3T4Zuo63LwG+RfK2ryz8ChPfncBf8fiSJ1xr68FtLDVznDNulvlNKFbfREE5koWejwsnJrjLCv6IX5IbhExg==";
};
};
- "@graphql-tools/load-6.0.10" = {
+ "@graphql-tools/load-6.0.11" = {
name = "_at_graphql-tools_slash_load";
packageName = "@graphql-tools/load";
- version = "6.0.10";
+ version = "6.0.11";
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.11.tgz";
+ sha512 = "1e7B+dtubEwu9aGZiakOneXnS5y7dyx9ewceZ1MNE7osS6QU8XnDUVm2qtNGHhoyeJJbn66qsRSjwCort2pSeQ==";
};
};
- "@graphql-tools/merge-6.0.10" = {
+ "@graphql-tools/merge-6.0.11" = {
name = "_at_graphql-tools_slash_merge";
packageName = "@graphql-tools/merge";
- version = "6.0.10";
+ version = "6.0.11";
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.11.tgz";
+ sha512 = "jNXl5pOdjfTRm+JKMpD47hsafM44Ojt7oi25Cflydw9VaWlQ5twFUSXk2rydP0mx1Twdxozk9ZCj4qiTdzw9ag==";
};
};
- "@graphql-tools/schema-6.0.10" = {
+ "@graphql-tools/schema-6.0.11" = {
name = "_at_graphql-tools_slash_schema";
packageName = "@graphql-tools/schema";
- version = "6.0.10";
+ version = "6.0.11";
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.11.tgz";
+ sha512 = "Zl9LTwOnkMaNtgs1+LJEYtklywtn602kRbxkRFeA7nFGaDmFPFHZnfQqcLsfhaPA8S0jNCQnbucHERCz8pRUYA==";
};
};
- "@graphql-tools/utils-6.0.10" = {
+ "@graphql-tools/utils-6.0.11" = {
name = "_at_graphql-tools_slash_utils";
packageName = "@graphql-tools/utils";
- version = "6.0.10";
+ version = "6.0.11";
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.11.tgz";
+ sha512 = "BK6HO73FbB/Ufac6XX5H0O2q4tEZi//HaQ7DgmHFoda53GZSZ/ZckJ59wh/tUvHykEaSFUSmMBVQxKbXBhGhyg==";
};
};
"@gulp-sourcemaps/identity-map-1.0.2" = {
@@ -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" = {
@@ -2830,13 +2875,13 @@ let
sha512 = "8+mDQt1QUmN+4Y9D3yCG8AJNewuTSLYPJVzKKUZ+lGeQrI+bV12Tc5HCyt2WdlnG6ihIL/DPbKRJlB40DX40mw==";
};
};
- "@rollup/plugin-node-resolve-8.0.1" = {
+ "@rollup/plugin-node-resolve-8.1.0" = {
name = "_at_rollup_slash_plugin-node-resolve";
packageName = "@rollup/plugin-node-resolve";
- version = "8.0.1";
+ version = "8.1.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.1.0.tgz";
+ sha512 = "ovq7ZM3JJYUUmEjjO+H8tnUdmQmdQudJB7xruX8LFZ1W2q8jXdPUS6SsIYip8ByOApu4RR7729Am9WhCeCMiHA==";
};
};
"@rollup/pluginutils-3.1.0" = {
@@ -2866,13 +2911,13 @@ let
sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
};
};
- "@schematics/angular-9.1.9" = {
+ "@schematics/angular-10.0.0" = {
name = "_at_schematics_slash_angular";
packageName = "@schematics/angular";
- version = "9.1.9";
+ version = "10.0.0";
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.0.tgz";
+ sha512 = "m7Pxz4guAMbe7NASKCPUNxvUX/LeieDjGsXwIt09tVE4dEi9yqJP5zq8kOnZEiLKKflP7GoB65RNex4dTxsydw==";
};
};
"@schematics/schematics-0.901.9" = {
@@ -2884,13 +2929,13 @@ let
sha512 = "Nca8Ig/mFFnhLmosbdWysX4N2HiwVOzA4gQj2TZnMCJ98Cftdebs388LstjsJwGtJyvAa2v4yoaPaUMIGVgQ9w==";
};
};
- "@schematics/update-0.901.9" = {
+ "@schematics/update-0.1000.0" = {
name = "_at_schematics_slash_update";
packageName = "@schematics/update";
- version = "0.901.9";
+ version = "0.1000.0";
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.0.tgz";
+ sha512 = "snjz7sQCOn4Xi66XQREXZx9K6R/vAnUfdyO5nXekls8+E+MIowlP+gqHM0whi8qJDwCLd9maYmeVsD6XZaGImQ==";
};
};
"@serverless/cli-1.5.1" = {
@@ -2911,13 +2956,13 @@ let
sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
};
};
- "@serverless/components-2.30.20" = {
+ "@serverless/components-2.31.4" = {
name = "_at_serverless_slash_components";
packageName = "@serverless/components";
- version = "2.30.20";
+ version = "2.31.4";
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.4.tgz";
+ sha512 = "aXdEK6dF3AuLmwNwTepmPW0o41QIPUmEG3P4ZNj0x0wixJuREhGZarwHlWsqgqjakZ2oRXraQ2RhuVmRijky3g==";
};
};
"@serverless/core-1.1.2" = {
@@ -2965,13 +3010,22 @@ let
sha512 = "ww5GBt5QEHYppLH8X+gEFiuMoFu9xdXK0bEROYbuxUliiB0IfXTXLzWR5whhi/S94R7pTnJ4O+WUiFj0PcV/tQ==";
};
};
- "@serverless/platform-client-china-1.0.18" = {
+ "@serverless/platform-client-1.0.3" = {
+ name = "_at_serverless_slash_platform-client";
+ packageName = "@serverless/platform-client";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.0.3.tgz";
+ sha512 = "c+KJQLmzGqEK52S98cTZsltvyoNVYMxtYF40KVBWCWTEK9hPO7bNIV79WdB90pBKYTh0sIlHmSlf2dUuOiOxlw==";
+ };
+ };
+ "@serverless/platform-client-china-1.0.20" = {
name = "_at_serverless_slash_platform-client-china";
packageName = "@serverless/platform-client-china";
- version = "1.0.18";
+ version = "1.0.20";
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.20.tgz";
+ sha512 = "KJisy1IKzE4CG86WFzhN5b0tHv6FI9/K9BxvqLZktIeGRf8tr4CqPbU+UE/DnCpDADuBBrFAXbbIv1RZonwhsQ==";
};
};
"@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" = {
@@ -3316,13 +3370,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" = {
@@ -3496,13 +3550,13 @@ let
sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
};
};
- "@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" = {
@@ -3559,6 +3613,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";
@@ -3640,13 +3712,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 +3730,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" = {
@@ -3757,22 +3829,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 +3901,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" = {
@@ -3901,13 +3973,13 @@ let
sha512 = "zWz/8NEPxoXNT9YyF2osqyA9WjssZukYpgI4UYZpOjcyqwIUqWGkcCionaEb9Ki+FULyPyvNFpg/329Kd2/pbw==";
};
};
- "@types/node-14.0.13" = {
+ "@types/node-14.0.14" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "14.0.13";
+ version = "14.0.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-14.0.14.tgz";
+ sha512 = "syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==";
};
};
"@types/node-6.14.10" = {
@@ -3937,6 +4009,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 +4054,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";
@@ -4045,6 +4144,15 @@ let
sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==";
};
};
+ "@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.2" = {
name = "_at_types_slash_uglify-js";
packageName = "@types/uglify-js";
@@ -4162,13 +4270,13 @@ let
sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==";
};
};
- "@typescript-eslint/eslint-plugin-3.3.0" = {
+ "@typescript-eslint/eslint-plugin-3.4.0" = {
name = "_at_typescript-eslint_slash_eslint-plugin";
packageName = "@typescript-eslint/eslint-plugin";
- version = "3.3.0";
+ version = "3.4.0";
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.4.0.tgz";
+ sha512 = "wfkpiqaEVhZIuQRmudDszc01jC/YR7gMSxa6ulhggAe/Hs0KVIuo9wzvFiDbG3JD5pRFQoqnf4m7REDsUvBnMQ==";
};
};
"@typescript-eslint/experimental-utils-1.13.0" = {
@@ -4180,13 +4288,13 @@ let
sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==";
};
};
- "@typescript-eslint/experimental-utils-3.3.0" = {
+ "@typescript-eslint/experimental-utils-3.4.0" = {
name = "_at_typescript-eslint_slash_experimental-utils";
packageName = "@typescript-eslint/experimental-utils";
- version = "3.3.0";
+ version = "3.4.0";
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.4.0.tgz";
+ sha512 = "rHPOjL43lOH1Opte4+dhC0a/+ks+8gOBwxXnyrZ/K4OTAChpSjP76fbI8Cglj7V5GouwVAGaK+xVwzqTyE/TPw==";
};
};
"@typescript-eslint/parser-1.13.0" = {
@@ -4198,13 +4306,13 @@ let
sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==";
};
};
- "@typescript-eslint/parser-3.3.0" = {
+ "@typescript-eslint/parser-3.4.0" = {
name = "_at_typescript-eslint_slash_parser";
packageName = "@typescript-eslint/parser";
- version = "3.3.0";
+ version = "3.4.0";
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.4.0.tgz";
+ sha512 = "ZUGI/de44L5x87uX5zM14UYcbn79HSXUR+kzcqU42gH0AgpdB/TjuJy3m4ezI7Q/jk3wTQd755mxSDLhQP79KA==";
};
};
"@typescript-eslint/typescript-estree-1.13.0" = {
@@ -4225,49 +4333,49 @@ let
sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==";
};
};
- "@typescript-eslint/typescript-estree-3.3.0" = {
+ "@typescript-eslint/typescript-estree-3.4.0" = {
name = "_at_typescript-eslint_slash_typescript-estree";
packageName = "@typescript-eslint/typescript-estree";
- version = "3.3.0";
+ version = "3.4.0";
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.4.0.tgz";
+ sha512 = "zKwLiybtt4uJb4mkG5q2t6+W7BuYx2IISiDNV+IY68VfoGwErDx/RfVI7SWL4gnZ2t1A1ytQQwZ+YOJbHHJ2rw==";
};
};
- "@vue/cli-shared-utils-4.4.4" = {
+ "@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" = {
@@ -5026,13 +5134,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 +5161,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" = {
@@ -7168,13 +7276,13 @@ let
sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==";
};
};
- "autoprefixer-9.8.0" = {
+ "autoprefixer-9.8.4" = {
name = "autoprefixer";
packageName = "autoprefixer";
- version = "9.8.0";
+ version = "9.8.4";
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.4.tgz";
+ sha512 = "84aYfXlpUe45lvmS+HoAWKCkirI/sw4JK0/bTeeqgHYco3dcsOn0NqdejISjptsYwNji/21dnkDri9PsYKk89A==";
};
};
"available-typed-arrays-1.0.2" = {
@@ -7213,13 +7321,13 @@ let
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
- "aws-sdk-2.700.0" = {
+ "aws-sdk-2.706.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.700.0";
+ version = "2.706.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.706.0.tgz";
+ sha512 = "7GT+yrB5Wb/zOReRdv/Pzkb2Qt+hz6B/8FGMVaoysX3NryHvQUdz7EQWi5yhg9CxOjKxdw5lFwYSs69YlSp1KA==";
};
};
"aws-sign2-0.6.0" = {
@@ -8104,13 +8212,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" = {
@@ -8851,13 +8959,13 @@ let
sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==";
};
};
- "browserslist-4.12.0" = {
+ "browserslist-4.12.2" = {
name = "browserslist";
packageName = "browserslist";
- version = "4.12.0";
+ version = "4.12.2";
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.12.2.tgz";
+ sha512 = "MfZaeYqR8StRZdstAK9hCKDd2StvePCYp5rHzQCPicUjfFliDgmuaBNPHYUTpAywBN8+Wc/d7NYVFkO0aqaBUw==";
};
};
"bser-2.1.1" = {
@@ -9175,6 +9283,15 @@ let
sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797";
};
};
+ "bunyan-1.8.13" = {
+ name = "bunyan";
+ packageName = "bunyan";
+ version = "1.8.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.13.tgz";
+ sha512 = "4zO4iMxZeCpf+95ERsr83nwQr11o1KY2FLhX4wZ6kPXieIVYL3k9eX+N6vbHhFEK5h5O/qCQpfXt7N9VBAIvCA==";
+ };
+ };
"bunyan-syslog-udp-0.2.0" = {
name = "bunyan-syslog-udp";
packageName = "bunyan-syslog-udp";
@@ -9589,13 +9706,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001084" = {
+ "caniuse-lite-1.0.30001089" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001084";
+ version = "1.0.30001089";
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.30001089.tgz";
+ sha512 = "RnL5dbdqAfQ5oxHjFUU8uiyJMvTKoXfRn0Asp2R5cpRsyiY5+kLl0fcocQijb0V9XAWFEG/2A/vSswRmpYarmA==";
};
};
"capture-exit-2.0.0" = {
@@ -10129,13 +10246,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" = {
@@ -11056,6 +11173,15 @@ let
sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==";
};
};
+ "colorette-1.2.0" = {
+ name = "colorette";
+ packageName = "colorette";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/colorette/-/colorette-1.2.0.tgz";
+ sha512 = "soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw==";
+ };
+ };
"colornames-1.1.1" = {
name = "colornames";
packageName = "colornames";
@@ -11407,13 +11533,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" = {
@@ -11894,13 +12020,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 +12047,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" = {
@@ -12227,13 +12353,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" = {
@@ -12929,13 +13055,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" = {
@@ -14171,13 +14297,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" = {
@@ -14864,15 +14990,6 @@ let
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";
- };
- };
"dot-prop-4.2.0" = {
name = "dot-prop";
packageName = "dot-prop";
@@ -15278,13 +15395,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.483" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.478";
+ version = "1.3.483";
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.483.tgz";
+ sha512 = "+05RF8S9rk8S0G8eBCqBRBaRq7+UN3lDs2DAvnG8SBSgQO3hjy0+qt4CmRk5eiuGbTcaicgXfPmBi31a+BD3lg==";
};
};
"elegant-spinner-1.0.1" = {
@@ -15612,6 +15738,15 @@ let
sha512 = "S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==";
};
};
+ "enquirer-2.3.5" = {
+ name = "enquirer";
+ packageName = "enquirer";
+ version = "2.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.5.tgz";
+ sha512 = "BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==";
+ };
+ };
"ensure-posix-path-1.1.1" = {
name = "ensure-posix-path";
packageName = "ensure-posix-path";
@@ -15918,15 +16053,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 +16107,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";
@@ -16053,13 +16188,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" = {
@@ -16089,24 +16224,6 @@ let
sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d";
};
};
- "escope-3.6.0" = {
- name = "escope";
- packageName = "escope";
- version = "3.6.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
- sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
- };
- };
- "eslint-3.19.0" = {
- name = "eslint";
- packageName = "eslint";
- version = "3.19.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
- sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
- };
- };
"eslint-4.19.1" = {
name = "eslint";
packageName = "eslint";
@@ -16134,22 +16251,22 @@ let
sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==";
};
};
- "eslint-7.2.0" = {
+ "eslint-7.3.1" = {
name = "eslint";
packageName = "eslint";
- version = "7.2.0";
+ version = "7.3.1";
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.3.1.tgz";
+ sha512 = "cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA==";
};
};
- "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 +16323,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 +16332,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";
@@ -17403,13 +17520,13 @@ let
sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==";
};
};
- "fd-lock-1.0.2" = {
+ "fd-lock-1.1.0" = {
name = "fd-lock";
packageName = "fd-lock";
- version = "1.0.2";
+ version = "1.1.0";
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.0.tgz";
+ sha512 = "efuHbyOAfahrNtc91KUz+hpptp+HoFHj9aoUuffW8/5/iBua+pAv9se01VppWVAzCqj7D93KpQEoYyqTq2tYZQ==";
};
};
"fd-read-stream-1.1.0" = {
@@ -17430,13 +17547,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 +18150,13 @@ let
sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
};
};
- "flow-parser-0.127.0" = {
+ "flow-parser-0.128.0" = {
name = "flow-parser";
packageName = "flow-parser";
- version = "0.127.0";
+ version = "0.128.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.128.0.tgz";
+ sha512 = "BOqwccrxdGQjR09H9/YvmgrY6xCyhfRqqZ6HOiDuPBYkSVd5rKamCLs2S4D7Yd0ltwBtnP3rp7vzaBTIJK1+Iw==";
};
};
"fluent-ffmpeg-2.1.2" = {
@@ -18285,13 +18402,13 @@ let
sha512 = "F3E8C9CTPK+uRGdVTMBHGo7mHX+KRtClLzkegR6ux1yy+ByxOziumpTzxajzfhICHfYdnGWY4Bokl8dirYsDeA==";
};
};
- "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" = {
@@ -18717,15 +18834,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 +18942,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" = {
@@ -19699,15 +19807,6 @@ let
sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==";
};
};
- "globals-9.18.0" = {
- name = "globals";
- packageName = "globals";
- version = "9.18.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
- sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
- };
- };
"globalthis-1.0.1" = {
name = "globalthis";
packageName = "globalthis";
@@ -21986,13 +22085,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" = {
@@ -22022,15 +22121,6 @@ let
sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a";
};
};
- "inquirer-0.12.0" = {
- name = "inquirer";
- packageName = "inquirer";
- version = "0.12.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
- sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
- };
- };
"inquirer-0.8.5" = {
name = "inquirer";
packageName = "inquirer";
@@ -23048,13 +23138,13 @@ let
sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==";
};
};
- "is-my-json-valid-2.20.0" = {
+ "is-my-json-valid-2.20.1" = {
name = "is-my-json-valid";
packageName = "is-my-json-valid";
- version = "2.20.0";
+ version = "2.20.1";
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.1.tgz";
+ sha512 = "KWo8x7CYK5goqyYFJM4ZmapN2DvIGKkx5C1WLHyo2Dcr4R9u4Y9ofpZxn5+LF/d0FHR3AeFcYxVlqIA2OOwuJA==";
};
};
"is-natural-number-4.0.1" = {
@@ -23255,13 +23345,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 +23399,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" = {
@@ -23795,15 +23885,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 +24047,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";
@@ -24146,13 +24236,13 @@ let
sha512 = "FHs9cS0phsXFXI1waqK/kY9TnyiWmQp65NFu/vMZky1Tef4zIYD3D5qZcBhBkXhAbIFA+fPfmMUUgGKBQWtKlQ==";
};
};
- "js-base64-2.6.0" = {
+ "js-base64-2.6.2" = {
name = "js-base64";
packageName = "js-base64";
- version = "2.6.0";
+ version = "2.6.2";
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.2.tgz";
+ sha512 = "1hgLrLIrmCgZG+ID3VoLNLOSwjGnoZa8tyrUdEteMeIzsT6PH7PMLyUvbDwzNE56P3PNxyvuIOx4Uh2E5rzQIw==";
};
};
"js-beautify-1.11.0" = {
@@ -24281,13 +24371,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" = {
@@ -25470,13 +25560,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" = {
@@ -27072,13 +27162,13 @@ 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==";
};
};
"loglevel-1.6.8" = {
@@ -28107,13 +28197,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" = {
@@ -28278,6 +28368,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";
@@ -29115,15 +29214,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";
@@ -29925,15 +30015,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";
@@ -31151,15 +31232,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";
@@ -31953,15 +32025,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";
@@ -33807,6 +33870,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";
@@ -34005,15 +34077,6 @@ let
sha1 = "7482452c1a0f508e3e344eaec312c91c29dc655a";
};
};
- "pluralize-1.2.1" = {
- name = "pluralize";
- packageName = "pluralize";
- version = "1.2.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
- sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
- };
- };
"pluralize-2.0.0" = {
name = "pluralize";
packageName = "pluralize";
@@ -34123,15 +34186,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 +34717,13 @@ let
sha512 = "MbIXTWwAfJ9qET6Zl29UNwJcDJEEz9Zkr5oDhiujitJa7YBJwEpbkX2cmuklCDxubTMoRWpid3q8DrSyGnUUzQ==";
};
};
- "prebuild-install-5.3.4" = {
+ "prebuild-install-5.3.5" = {
name = "prebuild-install";
packageName = "prebuild-install";
- version = "5.3.4";
+ version = "5.3.5";
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.5.tgz";
+ sha512 = "YmMO7dph9CYKi5IR/BzjOJlRzpxGGVo1EsLSUZ0mt/Mq0HWZIHOKHHcHdT69yG54C9m6i45GpItwRHpk0Py7Uw==";
};
};
"precinct-6.3.1" = {
@@ -38299,13 +38353,13 @@ let
sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
};
};
- "rollup-2.17.1" = {
+ "rollup-2.18.1" = {
name = "rollup";
packageName = "rollup";
- version = "2.17.1";
+ version = "2.18.1";
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.18.1.tgz";
+ sha512 = "w4X77ADA+WTGlapC8Z6yggdJtODw3SBl6R2LSkA7ZW5MtdkgcB7sfaSD1UWyx8diXbMcGIb0eI9gCx/dyqOgNQ==";
};
};
"rollup-plugin-babel-4.4.0" = {
@@ -38722,13 +38776,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" = {
@@ -39514,15 +39568,6 @@ let
sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1";
};
};
- "shelljs-0.7.8" = {
- name = "shelljs";
- packageName = "shelljs";
- version = "0.7.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz";
- sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3";
- };
- };
"shelljs-0.8.4" = {
name = "shelljs";
packageName = "shelljs";
@@ -40369,6 +40414,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";
@@ -41080,13 +41134,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 +41152,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" = {
@@ -41332,13 +41386,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" = {
@@ -43070,13 +43124,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" = {
@@ -43367,13 +43421,13 @@ let
sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==";
};
};
- "terminal-kit-1.35.7" = {
+ "terminal-kit-1.35.8" = {
name = "terminal-kit";
packageName = "terminal-kit";
- version = "1.35.7";
+ version = "1.35.8";
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.35.8.tgz";
+ sha512 = "/IGjDgbStqJWgbYhNwgmollwYqGNkDmamYLVnoWwaFYnpyEg3tKHRt3XMKuOAJy5k82q9r18dqngsQqL3g/zRw==";
};
};
"terser-3.17.0" = {
@@ -43610,13 +43664,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" = {
@@ -44915,15 +44969,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";
@@ -45032,6 +45077,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";
@@ -45050,15 +45104,6 @@ let
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";
@@ -46310,13 +46355,13 @@ let
sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w==";
};
};
- "utp-native-2.1.10" = {
+ "utp-native-2.2.0" = {
name = "utp-native";
packageName = "utp-native";
- version = "2.1.10";
+ version = "2.2.0";
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.0.tgz";
+ sha512 = "Yx7O/vbgBNnsqEdIrVzST/cF8Tj/JaLUeQEdRbCSKDpSnHEf+kioD0Xspau2OAI/jkZaAxc67/HqLc03Ykf4mQ==";
};
};
"uuid-3.3.2" = {
@@ -46355,15 +46400,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";
@@ -46382,6 +46418,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";
@@ -47696,13 +47741,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 +48038,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 +48056,13 @@ let
sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==";
};
};
- "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 = "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" = {
@@ -48894,15 +48939,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";
@@ -49002,15 +49038,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 +49173,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 +49314,23 @@ in
"@angular/cli" = nodeEnv.buildNodePackage {
name = "_at_angular_slash_cli";
packageName = "@angular/cli";
- version = "9.1.9";
+ version = "10.0.0";
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.0.tgz";
+ sha512 = "I+2cltQCmThgrnHwsG5AX0hQ9z6rK/8ysRWWeiJXHtEtqupW9eNzXX1QfXWxWB3o6oIKgijvnLlp04BUlWCyXA==";
};
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.0"
+ sources."@angular-devkit/core-10.0.0"
+ sources."@angular-devkit/schematics-10.0.0"
+ sources."@schematics/angular-10.0.0"
+ sources."@schematics/update-0.1000.0"
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"
@@ -49475,7 +49502,7 @@ 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-pick-manifest-6.1.0"
(sources."npm-registry-fetch-4.0.4" // {
dependencies = [
sources."hosted-git-info-2.8.8"
@@ -49490,8 +49517,8 @@ 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"
@@ -49540,10 +49567,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"
@@ -49599,7 +49626,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"
@@ -49724,7 +49751,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 = [
@@ -49913,7 +49939,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 +49960,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"
@@ -50019,7 +50045,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"
@@ -50137,10 +50163,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 +50180,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."chalk-2.4.2"
];
@@ -50172,7 +50198,7 @@ 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.14"
sources."@types/parse-json-4.0.0"
sources."@types/source-list-map-0.1.2"
sources."@types/tapable-1.0.6"
@@ -50243,7 +50269,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 +50445,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"
];
@@ -50855,10 +50881,10 @@ 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"
@@ -50874,52 +50900,107 @@ 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/code-frame-7.10.3"
+ sources."@babel/compat-data-7.10.3"
+ sources."@babel/core-7.10.3"
+ 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-class-features-plugin-7.10.3"
+ 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.1"
- sources."@babel/helper-plugin-utils-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.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.1"
- sources."@babel/parser-7.10.2"
+ 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-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-optional-chaining-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-private-methods-7.10.1"
+ sources."@babel/plugin-proposal-unicode-property-regex-7.10.1"
+ sources."@babel/plugin-syntax-async-generators-7.8.4"
+ sources."@babel/plugin-syntax-class-properties-7.10.1"
+ sources."@babel/plugin-syntax-dynamic-import-7.8.3"
sources."@babel/plugin-syntax-flow-7.10.1"
+ 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-syntax-typescript-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-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-typescript-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-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-typescript-7.10.3"
+ sources."@babel/plugin-transform-unicode-escapes-7.10.1"
+ sources."@babel/plugin-transform-unicode-regex-7.10.1"
+ sources."@babel/preset-env-7.10.3"
sources."@babel/preset-flow-7.10.1"
+ sources."@babel/preset-modules-0.1.3"
sources."@babel/preset-typescript-7.10.1"
- (sources."@babel/register-7.10.1" // {
+ (sources."@babel/register-7.10.3" // {
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.3"
+ sources."@babel/template-7.10.3"
+ sources."@babel/traverse-7.10.3"
+ sources."@babel/types-7.10.3"
+ 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"
@@ -50944,7 +51025,6 @@ in
(sources."@oclif/command-1.6.1" // {
dependencies = [
sources."@oclif/plugin-help-3.1.0"
- sources."semver-5.7.1"
sources."strip-ansi-5.2.0"
];
})
@@ -50968,7 +51048,6 @@ 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"
];
})
@@ -50977,14 +51056,9 @@ in
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."@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,7 +51080,7 @@ 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/graphql-upload-8.0.3"
@@ -51017,7 +51091,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.14"
(sources."@types/node-fetch-2.5.7" // {
dependencies = [
sources."form-data-3.0.0"
@@ -51029,14 +51103,18 @@ in
sources."@types/serve-static-1.13.4"
sources."@types/ws-7.2.5"
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"
@@ -51071,18 +51149,30 @@ in
sources."apollo-client-2.6.10"
(sources."apollo-codegen-core-0.37.3" // {
dependencies = [
+ sources."@babel/generator-7.10.2"
+ sources."@babel/types-7.10.2"
sources."recast-0.19.1"
sources."source-map-0.6.1"
];
})
- sources."apollo-codegen-flow-0.35.3"
+ (sources."apollo-codegen-flow-0.35.3" // {
+ dependencies = [
+ sources."@babel/generator-7.10.2"
+ sources."@babel/types-7.10.2"
+ ];
+ })
sources."apollo-codegen-scala-0.36.3"
sources."apollo-codegen-swift-0.37.3"
- sources."apollo-codegen-typescript-0.37.3"
+ (sources."apollo-codegen-typescript-0.37.3" // {
+ dependencies = [
+ sources."@babel/generator-7.10.2"
+ sources."@babel/types-7.10.2"
+ ];
+ })
sources."apollo-datasource-0.7.1"
(sources."apollo-engine-reporting-2.2.0" // {
dependencies = [
- sources."uuid-8.1.0"
+ sources."uuid-8.2.0"
];
})
sources."apollo-engine-reporting-protobuf-0.5.1"
@@ -51190,6 +51280,7 @@ in
})
sources."brace-expansion-1.1.11"
sources."braces-2.3.2"
+ sources."browserslist-4.12.2"
sources."buffer-5.6.0"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
@@ -51216,6 +51307,7 @@ in
sources."callsites-2.0.0"
sources."camel-case-3.0.0"
sources."camelcase-4.1.0"
+ sources."caniuse-lite-1.0.30001089"
sources."capture-stack-trace-1.0.1"
sources."cardinal-2.1.1"
sources."caseless-0.12.0"
@@ -51268,7 +51360,6 @@ in
sources."ansi-styles-4.2.1"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."semver-5.7.1"
sources."strip-ansi-5.2.0"
sources."type-fest-0.11.0"
];
@@ -51307,6 +51398,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 +51411,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"
@@ -51398,6 +51490,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.483"
sources."elegant-spinner-1.0.1"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
@@ -51408,10 +51501,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"
@@ -51477,12 +51572,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.128.0"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
@@ -51627,6 +51721,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"
@@ -51684,7 +51779,7 @@ 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"
sources."jsesc-2.5.2"
sources."json-buffer-3.0.0"
sources."json-parse-better-errors-1.0.2"
@@ -51699,6 +51794,7 @@ in
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"
@@ -51749,6 +51845,7 @@ 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"
@@ -51817,21 +51914,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.58"
(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"
@@ -51881,11 +51975,7 @@ 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."package-json-4.0.1"
sources."param-case-2.1.1"
sources."parse-git-config-2.0.3"
sources."parse-json-5.0.0"
@@ -51966,21 +52056,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.4"
(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"
@@ -52003,12 +52101,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" // {
@@ -52103,7 +52197,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"
@@ -52223,6 +52316,10 @@ in
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"
@@ -52463,13 +52560,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.3"
+ sources."@babel/generator-7.10.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ sources."@babel/highlight-7.10.3"
+ sources."@babel/parser-7.10.3"
+ sources."@babel/template-7.10.3"
+ sources."@babel/types-7.10.3"
sources."@webassemblyjs/ast-1.9.0"
sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -52548,33 +52645,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.3"
+ (sources."@babel/core-7.10.3" // {
dependencies = [
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.10.2" // {
+ (sources."@babel/generator-7.10.3" // {
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-function-name-7.10.3"
+ sources."@babel/helper-get-function-arity-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.1"
+ sources."@babel/helper-optimise-call-expression-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.1"
+ sources."@babel/helper-validator-identifier-7.10.3"
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/highlight-7.10.3"
+ sources."@babel/parser-7.10.3"
+ sources."@babel/template-7.10.3"
+ sources."@babel/traverse-7.10.3"
+ sources."@babel/types-7.10.3"
sources."JSV-4.0.2"
sources."ansi-styles-3.2.1"
sources."array-unique-0.3.2"
@@ -52675,7 +52772,7 @@ in
dependencies = [
sources."@types/glob-7.1.2"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."chromium-pickle-js-0.2.0"
@@ -52745,7 +52842,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"
@@ -53879,7 +53976,7 @@ in
sha512 = "DfDQbgbnau8CvTa1uEkYuZnMSaOqnQDvNxbwRi24q3t8z/DwMwEubon/lITGM02CkQH5PnfhE5fJYxt6/Q1wvA==";
};
dependencies = [
- sources."@babel/runtime-7.10.2"
+ sources."@babel/runtime-7.10.3"
sources."@chemzqm/neovim-5.1.9"
sources."async-2.6.3"
sources."await-semaphore-0.1.3"
@@ -54005,17 +54102,17 @@ in
sha512 = "NMc/nWUPigKq4rLAvgEOKxTDFkLbp6waK0K3M2V+oZfsJxUrJ4LPEA6yP/DY1RO7trnVCHsTtjYWT+1PauGqkQ==";
};
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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ sources."@babel/highlight-7.10.3"
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.4.0"
+ sources."@typescript-eslint/parser-3.4.0"
+ sources."@typescript-eslint/typescript-estree-3.4.0"
sources."acorn-7.3.1"
sources."acorn-jsx-5.2.0"
sources."ajv-6.12.2"
@@ -54078,7 +54175,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.30001089"
sources."capture-stack-trace-1.0.1"
sources."ccount-1.0.5"
sources."chalk-2.4.2"
@@ -54174,7 +54271,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.483"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."entities-1.1.2"
@@ -54188,7 +54285,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" // {
@@ -54420,7 +54517,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.2"
sources."js-tokens-4.0.0"
sources."js-yaml-3.14.0"
sources."json-parse-better-errors-1.0.2"
@@ -55004,10 +55101,10 @@ in
coc-rust-analyzer = nodeEnv.buildNodePackage {
name = "coc-rust-analyzer";
packageName = "coc-rust-analyzer";
- version = "0.7.4";
+ version = "0.7.8";
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.8.tgz";
+ sha512 = "u+ts1qfvbVASsgC8DMrF6ba1llKrTwMfRd0otwJUG+LT8D452EdJE29w4ECtvB/T0fr766GdGV8n0JffUgFE9g==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -55080,30 +55177,30 @@ 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/code-frame-7.10.3"
+ sources."@babel/core-7.10.3"
+ sources."@babel/generator-7.10.3"
+ sources."@babel/helper-function-name-7.10.3"
+ sources."@babel/helper-get-function-arity-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.1"
+ sources."@babel/helper-optimise-call-expression-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.1"
+ sources."@babel/helper-validator-identifier-7.10.3"
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/highlight-7.10.3"
+ sources."@babel/parser-7.10.3"
+ sources."@babel/template-7.10.3"
+ sources."@babel/traverse-7.10.3"
+ sources."@babel/types-7.10.3"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/glob-7.1.2"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -55128,7 +55225,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.4" // {
dependencies = [
sources."postcss-value-parser-4.1.0"
];
@@ -55146,7 +55243,7 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."browserslist-4.12.0"
+ sources."browserslist-4.12.2"
sources."cache-base-1.0.1"
sources."call-me-maybe-1.0.1"
sources."caller-callsite-2.0.0"
@@ -55154,7 +55251,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.30001089"
sources."ccount-1.0.5"
sources."chalk-2.4.2"
sources."character-entities-1.2.4"
@@ -55183,6 +55280,7 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
+ sources."colorette-1.2.0"
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
(sources."convert-source-map-1.7.0" // {
@@ -55213,10 +55311,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.483"
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"
@@ -55432,7 +55531,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 +55771,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ sources."@babel/highlight-7.10.3"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
sources."balanced-match-1.0.0"
@@ -55758,13 +55856,13 @@ in
coc-tsserver = nodeEnv.buildNodePackage {
name = "coc-tsserver";
packageName = "coc-tsserver";
- version = "1.5.1";
+ version = "1.5.2";
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.2.tgz";
+ sha512 = "jDmG/yzx5MMCk57o8fyV3G3AHHj274pI2mJMiq5pQWEAvKRa2XNrdav/JgAtvfhD0lYZTELgw9juqiyybSHk9g==";
};
dependencies = [
- sources."typescript-3.8.3"
+ sources."typescript-3.9.5"
];
buildInputs = globalBuildInputs;
meta = {
@@ -55785,9 +55883,9 @@ in
sha512 = "dMTBF4NbJ2Rqnh2Lj2Jafi9Fl6gJjHH20fNyztA6DvJ9qEOZgpiXIE2yGznszAHBvJyvoVDE4+qE6Qz5sm3FpA==";
};
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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ sources."@babel/highlight-7.10.3"
sources."@emmetio/extract-abbreviation-0.1.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
(sources."@nodelib/fs.scandir-2.1.3" // {
@@ -55816,7 +55914,7 @@ in
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.14"
sources."@types/normalize-package-data-2.4.0"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
@@ -55877,7 +55975,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 = [
@@ -56058,7 +56156,7 @@ in
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" // {
@@ -56511,7 +56609,7 @@ in
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"
@@ -56992,7 +57090,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"
@@ -57001,7 +57099,7 @@ in
sources."isarray-1.0.0"
sources."kuler-1.0.1"
sources."lodash-4.17.15"
- sources."logform-2.1.2"
+ sources."logform-2.2.0"
sources."lynx-0.2.0"
sources."mersenne-0.0.4"
sources."ms-2.1.2"
@@ -57019,7 +57117,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"
@@ -57050,7 +57148,7 @@ in
sources."@nodelib/fs.stat-1.1.3"
sources."@types/glob-7.1.2"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."ajv-6.12.2"
@@ -57654,15 +57752,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ sources."@babel/highlight-7.10.3"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/glob-7.1.2"
sources."@types/minimatch-3.0.3"
sources."@types/minimist-1.2.0"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."@types/normalize-package-data-2.4.0"
sources."aggregate-error-3.0.1"
sources."ansi-styles-3.2.1"
@@ -58030,7 +58128,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.14"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
@@ -58306,10 +58404,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 = {
@@ -58560,9 +58658,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.0" // {
dependencies = [
- sources."napi-macros-1.8.2"
+ sources."node-gyp-build-4.2.2"
];
})
sources."fd-read-stream-1.1.0"
@@ -58961,7 +59059,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.0" // {
dependencies = [
sources."node-gyp-build-4.2.2"
sources."readable-stream-3.6.0"
@@ -59074,7 +59172,7 @@ in
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.706.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.10.0"
sources."base64-js-1.3.1"
@@ -59221,35 +59319,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/code-frame-7.10.3"
+ sources."@babel/core-7.10.3"
+ sources."@babel/generator-7.10.3"
sources."@babel/helper-annotate-as-pure-7.10.1"
- sources."@babel/helper-builder-react-jsx-7.10.1"
+ sources."@babel/helper-builder-react-jsx-7.10.3"
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-function-name-7.10.3"
+ sources."@babel/helper-get-function-arity-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.1"
- sources."@babel/helper-plugin-utils-7.10.1"
+ sources."@babel/helper-optimise-call-expression-7.10.3"
+ sources."@babel/helper-plugin-utils-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.1"
+ sources."@babel/helper-validator-identifier-7.10.3"
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/highlight-7.10.3"
+ sources."@babel/parser-7.10.3"
+ sources."@babel/plugin-proposal-object-rest-spread-7.10.3"
sources."@babel/plugin-syntax-jsx-7.10.1"
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-react-jsx-7.10.3"
+ sources."@babel/template-7.10.3"
+ sources."@babel/traverse-7.10.3"
+ sources."@babel/types-7.10.3"
sources."@sindresorhus/is-2.1.1"
sources."@szmarczak/http-timer-4.0.5"
sources."@types/cacheable-request-6.0.1"
@@ -59257,7 +59355,7 @@ 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.14"
sources."@types/normalize-package-data-2.4.0"
sources."@types/responselike-1.0.0"
sources."@types/yoga-layout-1.9.2"
@@ -59350,7 +59448,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"
@@ -59575,15 +59673,15 @@ in
eslint = nodeEnv.buildNodePackage {
name = "eslint";
packageName = "eslint";
- version = "7.2.0";
+ version = "7.3.1";
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.3.1.tgz";
+ sha512 = "cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA==";
};
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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."chalk-2.4.2"
];
@@ -59592,11 +59690,7 @@ in
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."ansi-colors-3.2.4"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
@@ -59613,9 +59707,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 +59714,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.5"
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 +59730,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 +59742,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"
@@ -59678,17 +59757,13 @@ in
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."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 +59772,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.0"
+ 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 +59811,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."chalk-2.4.2"
];
@@ -59768,11 +59828,7 @@ in
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."ansi-colors-3.2.4"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
@@ -59789,23 +59845,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.5"
sources."escape-string-regexp-1.0.5"
- sources."eslint-7.2.0"
+ sources."eslint-7.3.1"
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 +59870,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 +59882,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"
@@ -59856,60 +59897,39 @@ in
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."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.0"
+ 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"
@@ -60120,9 +60140,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -60770,7 +60790,7 @@ 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.1"
sources."is-property-1.0.2"
sources."is-valid-domain-0.0.14"
sources."json-buffer-2.0.11"
@@ -60862,7 +60882,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 +60969,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -61233,9 +61253,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -61245,7 +61266,7 @@ in
sources."supports-color-5.5.0"
];
})
- sources."@babel/runtime-7.10.2"
+ sources."@babel/runtime-7.10.3"
sources."@graphql-cli/common-4.0.0"
sources."@graphql-cli/init-4.0.0"
sources."@graphql-toolkit/common-0.10.7"
@@ -61276,10 +61297,10 @@ in
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/load-6.0.11"
+ sources."@graphql-tools/merge-6.0.11"
+ sources."@graphql-tools/schema-6.0.11"
+ sources."@graphql-tools/utils-6.0.11"
sources."@kwsites/exec-p-0.4.0"
sources."@nodelib/fs.scandir-2.1.3"
sources."@nodelib/fs.stat-2.0.3"
@@ -62978,7 +62999,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,10 +63015,10 @@ 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"
@@ -63196,7 +63217,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.13"
sources."colors-0.6.2"
sources."concat-map-0.0.1"
sources."core-util-is-1.0.2"
@@ -63283,7 +63304,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"
@@ -63399,7 +63420,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"
];
@@ -63608,7 +63629,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"
@@ -63735,7 +63756,7 @@ in
sources."emoji-regex-8.0.0"
sources."error-ex-1.3.2"
sources."escape-latex-1.2.0"
- sources."escodegen-1.14.2"
+ sources."escodegen-1.14.3"
(sources."escope-1.0.3" // {
dependencies = [
sources."estraverse-2.0.0"
@@ -64363,7 +64384,7 @@ in
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"
@@ -64709,7 +64730,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.5"
sources."prelude-ls-1.1.2"
sources."process-nextick-args-2.0.1"
sources."promise-7.3.1"
@@ -64891,7 +64912,7 @@ in
sources."q-0.9.7"
];
})
- sources."terminal-kit-1.35.7"
+ sources."terminal-kit-1.35.8"
(sources."tkwidgets-0.5.26" // {
dependencies = [
sources."is-fullwidth-code-point-2.0.0"
@@ -65063,7 +65084,7 @@ in
sha512 = "3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA==";
};
dependencies = [
- sources."@babel/parser-7.10.2"
+ sources."@babel/parser-7.10.3"
sources."argparse-1.0.10"
sources."bluebird-3.7.2"
sources."catharsis-0.8.11"
@@ -65577,7 +65598,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"
@@ -65915,7 +65936,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"
@@ -66121,9 +66142,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ sources."@babel/highlight-7.10.3"
(sources."@evocateur/libnpmaccess-3.1.2" // {
dependencies = [
sources."aproba-2.0.0"
@@ -66221,8 +66242,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 +66261,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,12 +66270,12 @@ 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/minimatch-3.0.3"
sources."@types/minimist-1.2.0"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."@types/normalize-package-data-2.4.0"
sources."@zkochan/cmd-shim-3.1.0"
sources."JSONStream-1.3.5"
@@ -66357,10 +66376,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 +66387,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" // {
@@ -67060,7 +67079,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"
@@ -68090,49 +68109,49 @@ 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/code-frame-7.10.3"
+ sources."@babel/compat-data-7.10.3"
+ sources."@babel/core-7.10.3"
+ 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.1"
+ sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.3"
sources."@babel/helper-compilation-targets-7.10.2"
- sources."@babel/helper-create-class-features-plugin-7.10.2"
+ sources."@babel/helper-create-class-features-plugin-7.10.3"
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-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.1"
- sources."@babel/helper-plugin-utils-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.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.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.1" // {
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.10.2"
+ sources."@babel/parser-7.10.3"
sources."@babel/plugin-external-helpers-7.8.3"
- sources."@babel/plugin-proposal-async-generator-functions-7.10.1"
+ sources."@babel/plugin-proposal-async-generator-functions-7.10.3"
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-object-rest-spread-7.10.3"
sources."@babel/plugin-proposal-optional-catch-binding-7.10.1"
- sources."@babel/plugin-proposal-optional-chaining-7.10.1"
+ sources."@babel/plugin-proposal-optional-chaining-7.10.3"
sources."@babel/plugin-proposal-private-methods-7.10.1"
sources."@babel/plugin-proposal-unicode-property-regex-7.10.1"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -68152,8 +68171,8 @@ in
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-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"
@@ -68164,42 +68183,33 @@ in
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-systemjs-7.10.3"
sources."@babel/plugin-transform-modules-umd-7.10.1"
- sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
+ 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.1"
+ sources."@babel/plugin-transform-regenerator-7.10.3"
sources."@babel/plugin-transform-reserved-words-7.10.1"
- sources."@babel/plugin-transform-runtime-7.10.1"
+ sources."@babel/plugin-transform-runtime-7.10.3"
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-template-literals-7.10.3"
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/preset-env-7.10.3"
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.3"
+ sources."@babel/template-7.10.3"
+ sources."@babel/traverse-7.10.3"
+ sources."@babel/types-7.10.3"
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 +68217,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/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.14"
sources."@types/normalize-package-data-2.4.0"
sources."@types/resolve-0.0.8"
sources."@types/yargs-15.0.5"
@@ -68341,7 +68351,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 +68394,7 @@ in
];
})
sources."browserify-zlib-0.2.0"
- sources."browserslist-4.12.0"
+ sources."browserslist-4.12.2"
sources."bser-2.1.1"
sources."buffer-5.2.1"
sources."buffer-from-1.1.1"
@@ -68399,7 +68409,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.30001089"
sources."capture-exit-2.0.0"
sources."caseless-0.12.0"
(sources."chalk-3.0.0" // {
@@ -68521,7 +68531,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.483"
(sources."elliptic-6.5.3" // {
dependencies = [
sources."bn.js-4.11.9"
@@ -68537,9 +68547,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 +68610,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 +68713,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,7 +68763,7 @@ in
sources."json5-1.0.1"
];
})
- sources."locate-path-2.0.0"
+ sources."locate-path-5.0.0"
sources."lodash-4.17.15"
sources."lodash.memoize-3.0.4"
sources."loose-envify-1.4.0"
@@ -68849,9 +68860,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 +68873,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,12 +68890,10 @@ 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"
@@ -69224,9 +69233,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"
@@ -69534,7 +69542,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"
@@ -70071,7 +70078,7 @@ in
sources."tweetnacl-0.14.5"
sources."type-1.2.0"
sources."typescript-3.9.5"
- sources."uglify-js-3.9.4"
+ 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 +70154,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"
@@ -70368,7 +70375,7 @@ 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"
@@ -70377,7 +70384,7 @@ in
sources."lodash-4.17.15"
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 +70398,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"
@@ -70956,7 +70963,7 @@ in
sha512 = "5K7LKdy232xLSHMo3ZprAEHbLilszSD/qQkt+9PxByJnEMACeHJ7SH4Gpt/1FX+K75gHHNtlnHsWwpQ53lggEA==";
};
dependencies = [
- sources."@babel/runtime-7.10.2"
+ sources."@babel/runtime-7.10.3"
sources."@node-red/editor-api-1.0.6"
sources."@node-red/editor-client-1.0.6"
(sources."@node-red/nodes-1.0.6" // {
@@ -71352,7 +71359,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"
@@ -71642,7 +71649,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"
@@ -72107,7 +72114,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"
@@ -72395,55 +72402,55 @@ 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.3"
+ sources."@babel/compat-data-7.10.3"
+ (sources."@babel/core-7.10.3" // {
dependencies = [
sources."json5-2.1.3"
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.10.2" // {
+ (sources."@babel/generator-7.10.3" // {
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-binary-assignment-operator-visitor-7.10.3"
+ sources."@babel/helper-builder-react-jsx-7.10.3"
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-class-features-plugin-7.10.3"
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-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.1"
- sources."@babel/helper-plugin-utils-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.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.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.1"
- sources."@babel/parser-7.10.2"
- sources."@babel/plugin-proposal-async-generator-functions-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-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-object-rest-spread-7.10.3"
sources."@babel/plugin-proposal-optional-catch-binding-7.10.1"
- sources."@babel/plugin-proposal-optional-chaining-7.10.1"
+ sources."@babel/plugin-proposal-optional-chaining-7.10.3"
sources."@babel/plugin-proposal-private-methods-7.10.1"
sources."@babel/plugin-proposal-unicode-property-regex-7.10.1"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -72462,8 +72469,8 @@ in
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-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"
@@ -72475,29 +72482,29 @@ in
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-systemjs-7.10.3"
sources."@babel/plugin-transform-modules-umd-7.10.1"
- sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
+ 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-react-jsx-7.10.1"
- sources."@babel/plugin-transform-regenerator-7.10.1"
+ sources."@babel/plugin-transform-react-jsx-7.10.3"
+ sources."@babel/plugin-transform-regenerator-7.10.3"
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-template-literals-7.10.3"
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/preset-env-7.10.3"
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.3"
+ sources."@babel/template-7.10.3"
+ sources."@babel/traverse-7.10.3"
+ sources."@babel/types-7.10.3"
sources."@iarna/toml-2.2.5"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -72599,7 +72606,7 @@ in
sources."pako-1.0.11"
];
})
- sources."browserslist-4.12.0"
+ sources."browserslist-4.12.2"
(sources."buffer-4.9.2" // {
dependencies = [
sources."isarray-1.0.0"
@@ -72616,7 +72623,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.30001089"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -72757,7 +72764,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.483"
(sources."elliptic-6.5.3" // {
dependencies = [
sources."bn.js-4.11.9"
@@ -72774,6 +72781,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 +72814,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 +72944,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,7 +72960,7 @@ in
sources."leven-3.1.0"
sources."levenary-1.1.1"
sources."levn-0.3.0"
- sources."locate-path-2.0.0"
+ sources."locate-path-3.0.0"
sources."lodash-4.17.15"
sources."lodash.clone-4.5.0"
sources."lodash.memoize-4.1.2"
@@ -73039,9 +73047,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 +73065,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" // {
@@ -73249,7 +73256,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 +73377,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;
@@ -73430,7 +73429,7 @@ in
];
})
sources."brace-expansion-1.1.11"
- sources."bunyan-1.8.12"
+ sources."bunyan-1.8.13"
sources."bunyan-syslog-udp-0.2.0"
sources."busboy-0.3.1"
sources."bytes-3.0.0"
@@ -73442,7 +73441,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"
@@ -73635,7 +73633,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"
@@ -74360,10 +74358,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "5.2.2";
+ version = "5.2.6";
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.2.6.tgz";
+ sha512 = "7PFzPm0l14hzio59fufxpGgWRcMmtC2JZmYbRdkrJmm/f4iExXFhGklB/IrdQidhTi5helNZrBY48/9Ows4naA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -74394,7 +74392,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"
@@ -74846,6 +74844,37 @@ in
bypassCache = true;
reconstructLock = true;
};
+ purescript-language-server = nodeEnv.buildNodePackage {
+ name = "purescript-language-server";
+ packageName = "purescript-language-server";
+ version = "0.12.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.12.9.tgz";
+ sha512 = "ZbpfltBmRQYx69Gtpx1FnMhvR7Gl0wJFyMmyvuC6nMJC+ysXFdE/eNqGncODPhQUdMoYwCRFGETAY7UC6qxyTQ==";
+ };
+ dependencies = [
+ sources."isexe-2.0.0"
+ sources."vscode-jsonrpc-4.0.0"
+ (sources."vscode-languageserver-5.2.1" // {
+ dependencies = [
+ sources."vscode-uri-1.0.8"
+ ];
+ })
+ sources."vscode-languageserver-protocol-3.14.1"
+ sources."vscode-languageserver-types-3.14.0"
+ 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 +74893,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 +75084,10 @@ in
rollup = nodeEnv.buildNodePackage {
name = "rollup";
packageName = "rollup";
- version = "2.17.1";
+ version = "2.18.1";
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.18.1.tgz";
+ sha512 = "w4X77ADA+WTGlapC8Z6yggdJtODw3SBl6R2LSkA7ZW5MtdkgcB7sfaSD1UWyx8diXbMcGIb0eI9gCx/dyqOgNQ==";
};
dependencies = [
sources."fsevents-2.1.3"
@@ -75061,15 +75108,15 @@ 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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."chalk-2.4.2"
];
})
sources."@rollup/plugin-commonjs-12.0.0"
- sources."@rollup/plugin-node-resolve-8.0.1"
+ sources."@rollup/plugin-node-resolve-8.1.0"
sources."@rollup/pluginutils-3.1.0"
sources."@types/color-name-1.1.1"
sources."@types/eslint-visitor-keys-1.0.0"
@@ -75078,18 +75125,18 @@ in
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-14.0.14"
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."@typescript-eslint/eslint-plugin-3.4.0" // {
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.4.0"
+ sources."@typescript-eslint/parser-3.4.0"
+ (sources."@typescript-eslint/typescript-estree-3.4.0" // {
dependencies = [
sources."semver-7.3.2"
];
@@ -75098,12 +75145,7 @@ in
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."ansi-colors-3.2.4"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
sources."anymatch-3.1.1"
@@ -75112,7 +75154,7 @@ in
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 +75172,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."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"
];
})
@@ -75173,21 +75209,22 @@ in
sources."semver-5.7.1"
];
})
- sources."emoji-regex-8.0.0"
+ sources."emoji-regex-7.0.3"
+ sources."enquirer-2.3.5"
sources."entities-1.1.2"
sources."es-abstract-1.17.6"
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.3.1" // {
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,12 +75236,10 @@ 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"
@@ -75237,36 +75272,21 @@ 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-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-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-symbol-1.0.3"
sources."isexe-2.0.0"
@@ -75295,12 +75315,12 @@ 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" // {
dependencies = [
+ sources."ansi-colors-3.2.3"
sources."debug-3.2.6"
sources."glob-7.1.3"
sources."js-yaml-3.13.1"
@@ -75326,7 +75346,6 @@ in
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"
@@ -75360,49 +75379,32 @@ in
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.18.1"
sources."safe-buffer-5.2.1"
- sources."safer-buffer-2.1.2"
sources."semver-6.3.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."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" // {
@@ -75426,7 +75428,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,7 +75440,6 @@ 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"
];
@@ -75448,9 +75448,6 @@ in
(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"
];
})
@@ -75458,15 +75455,7 @@ in
sources."write-1.0.3"
sources."y18n-4.0.0"
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."yargs-13.3.2"
sources."yargs-parser-13.1.2"
sources."yargs-unparser-1.6.0"
sources."yauzl-2.10.0"
@@ -75738,14 +75727,14 @@ in
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
- version = "1.73.1";
+ version = "1.74.0";
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.0.tgz";
+ sha512 = "aTnGVxGJ3J5hMFlHFUorhqOkshN933ZclRcJe7C9JGJ8ot7KDAmudRgvOB2/jzHL2t6LoutpTmCuyNllxy8ESA==";
};
dependencies = [
sources."2-thenable-1.0.0"
- sources."@babel/parser-7.10.2"
+ sources."@babel/parser-7.10.3"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.scandir-2.1.3"
sources."@nodelib/fs.stat-2.0.3"
@@ -75762,7 +75751,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.4" // {
dependencies = [
sources."globby-10.0.2"
sources."semver-7.3.2"
@@ -75773,11 +75762,15 @@ in
sources."fs-extra-7.0.1"
];
})
- sources."@serverless/enterprise-plugin-3.6.13"
+ (sources."@serverless/enterprise-plugin-3.6.13" // {
+ 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.3"
+ (sources."@serverless/platform-client-china-1.0.20" // {
dependencies = [
sources."archiver-4.0.1"
sources."async-2.6.3"
@@ -75791,27 +75784,28 @@ in
];
})
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."@tencent-sdk/capi-0.2.17"
+ sources."@types/caseless-0.12.2"
+ sources."@types/chalk-2.2.0"
sources."@types/glob-7.1.2"
- sources."@types/lodash-4.14.155"
+ 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.14"
+ 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."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"
@@ -75822,7 +75816,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 +75862,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.706.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."isarray-1.0.0"
@@ -75889,7 +75883,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 +75918,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 +75958,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"
@@ -76069,7 +76054,7 @@ in
sources."dependency-tree-7.2.1"
sources."detective-amd-3.0.0"
sources."detective-cjs-3.1.1"
- sources."detective-es6-2.1.0"
+ sources."detective-es6-2.2.0"
sources."detective-less-1.0.2"
sources."detective-postcss-3.0.1"
sources."detective-sass-3.0.1"
@@ -76128,8 +76113,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"
@@ -76187,7 +76172,7 @@ 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"
@@ -76214,7 +76199,7 @@ in
})
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 +76272,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"
@@ -76435,7 +76420,7 @@ in
sources."type-1.2.0"
];
})
- sources."logform-2.1.2"
+ sources."logform-2.2.0"
sources."long-4.0.0"
sources."lowercase-keys-1.0.1"
sources."lru-cache-4.1.5"
@@ -76557,12 +76542,7 @@ 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 = [
@@ -76575,7 +76555,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.9.0" // {
+ dependencies = [
+ sources."@types/node-13.13.12"
+ ];
+ })
sources."prr-1.0.1"
sources."pseudomap-1.0.2"
sources."psl-1.8.0"
@@ -76595,7 +76579,11 @@ in
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"
@@ -76739,7 +76727,7 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."supports-color-7.1.0"
+ sources."supports-color-6.1.0"
sources."tabtab-3.0.2"
sources."tapable-1.1.3"
sources."tar-stream-2.1.2"
@@ -76821,7 +76809,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"
@@ -77483,10 +77471,10 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.346.0";
+ version = "1.349.0";
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.349.0.tgz";
+ sha512 = "2gE31HJ42H2gYDci9WB+f1GOTNLQXIcO5jm7i8sw+Xpfce3FYYH3s0oCecnrDHV3qOXbr6Qa5MtL0bwWmOA3fg==";
};
dependencies = [
sources."@sindresorhus/is-0.14.0"
@@ -77536,8 +77524,8 @@ in
sources."@types/color-name-1.1.1"
sources."@types/debug-4.1.5"
sources."@types/hosted-git-info-2.7.0"
- sources."@types/js-yaml-3.12.4"
- sources."@types/node-14.0.13"
+ sources."@types/js-yaml-3.12.5"
+ sources."@types/node-14.0.14"
sources."@types/semver-5.5.0"
sources."@types/xml2js-0.4.5"
sources."@yarnpkg/lockfile-1.1.0"
@@ -77659,7 +77647,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"
@@ -78605,7 +78593,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 +78944,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,14 +78963,15 @@ 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"
@@ -79009,7 +78998,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" // {
@@ -79211,7 +79200,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.706.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -79252,7 +79241,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.13"
sources."busboy-0.2.14"
sources."bytebuffer-3.5.5"
sources."bytes-3.1.0"
@@ -79468,7 +79457,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.1"
sources."is-promise-2.2.2"
sources."is-property-1.0.2"
sources."is-regex-1.1.0"
@@ -79480,7 +79469,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.2"
sources."js-stringify-1.0.2"
sources."js-yaml-3.2.7"
sources."jsbn-0.1.1"
@@ -79898,7 +79887,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"
];
@@ -80628,7 +80617,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 = [
@@ -81205,7 +81194,7 @@ in
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."deep-extend-0.6.0"
@@ -81679,10 +81668,10 @@ 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"
@@ -81831,7 +81820,7 @@ in
sources."@types/debug-4.1.5"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."abstract-logging-1.0.0"
@@ -82253,10 +82242,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 = {
@@ -82738,14 +82727,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";
@@ -82869,7 +82855,7 @@ 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."forwarded-0.1.2"
@@ -82914,7 +82900,7 @@ in
sources."locate-path-5.0.0"
sources."locks-0.2.2"
sources."lodash-4.17.15"
- (sources."logform-2.1.2" // {
+ (sources."logform-2.2.0" // {
dependencies = [
sources."ms-2.1.2"
];
@@ -83055,7 +83041,7 @@ in
sources."vary-1.1.2"
sources."which-module-2.0.0"
sources."winston-3.2.1"
- (sources."winston-transport-4.3.0" // {
+ (sources."winston-transport-4.4.0" // {
dependencies = [
sources."isarray-1.0.0"
sources."readable-stream-2.3.7"
@@ -83406,7 +83392,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 +83433,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ sources."@babel/highlight-7.10.3"
sources."@emmetio/extract-abbreviation-0.1.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -83465,7 +83451,7 @@ in
sources."@starptech/rehype-webparser-0.10.0"
sources."@starptech/webparser-0.10.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -83517,7 +83503,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 +83656,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" // {
@@ -84389,15 +84375,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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ (sources."@babel/highlight-7.10.3" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -84409,36 +84395,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.3"
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.14"
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 +84466,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 +84492,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 +84523,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 +84535,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 +84565,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 +84618,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 +84637,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 +84650,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 +84678,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,7 +84696,6 @@ 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" // {
dependencies = [
@@ -84784,7 +84708,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 +84727,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 +84780,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 +84797,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 +84818,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 +84834,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 +84842,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 +84868,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 +84881,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 +84905,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"
@@ -85059,7 +84953,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 +84968,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"
@@ -85093,7 +84987,7 @@ in
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."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 +85003,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 +85028,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 +85043,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 +85055,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,12 +85095,6 @@ 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"
@@ -85237,23 +85118,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."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 +85149,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 +85157,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 +85167,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 +85202,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 +85234,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 +85253,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 +85286,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 +85309,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 +85362,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" // {
@@ -85568,7 +85462,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"
@@ -86355,7 +86249,7 @@ in
dependencies = [
sources."@types/glob-7.1.2"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."accepts-1.3.7"
sources."ajv-6.12.2"
sources."ajv-errors-1.0.1"
@@ -87473,17 +87367,17 @@ 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.3"
+ sources."@babel/helper-validator-identifier-7.10.3"
+ sources."@babel/highlight-7.10.3"
+ sources."@babel/runtime-7.10.3"
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/minimatch-3.0.3"
- sources."@types/node-14.0.13"
+ sources."@types/node-14.0.14"
sources."@types/normalize-package-data-2.4.0"
sources."JSONStream-1.3.5"
sources."aggregate-error-3.0.1"
@@ -87690,6 +87584,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 +87726,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"
@@ -88230,7 +88130,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"
@@ -88356,25 +88256,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/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
index af3341e7e59..8db892f325e 100644
--- a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
+++ b/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/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
index 2c4cf4928db..2264f0dedbf 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/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/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix
index 829e909535a..2cce0a22124 100644
--- a/pkgs/development/python-modules/marionette-harness/mozfile.nix
+++ b/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/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix
new file mode 100644
index 00000000000..3b1c2bd5bce
--- /dev/null
+++ b/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/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index a7671d0356a..5136cf20104 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/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/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix
index 568d85b7e1b..e283cc10d16 100644
--- a/pkgs/development/python-modules/pylint/1.9.nix
+++ b/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/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix
index a2bf20188ff..12a327be2a6 100644
--- a/pkgs/development/python-modules/python-igraph/default.nix
+++ b/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/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix
index 2ea72441d10..f718b3655f6 100644
--- a/pkgs/development/python-modules/simpy/default.nix
+++ b/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/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix
index 958c9ab8266..c9415999262 100644
--- a/pkgs/development/python-modules/somajo/default.nix
+++ b/pkgs/development/python-modules/somajo/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "SoMaJo";
- version = "2.0.6";
+ version = "2.1.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "tsproisl";
repo = pname;
rev = "v${version}";
- sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s";
+ sha256 = "17ybm5rgwc6jy3i1c8nm05j7fd418n6hp44zv0q77kzhd66am6pp";
};
propagatedBuildInputs = [ regex ];
diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index 1c02b05d303..3a427f8932a 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/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/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix
index b091c3b7d56..b83ae5d7ddc 100644
--- a/pkgs/development/python-modules/spacy/models.nix
+++ b/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/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index d4d09f7ae26..88b556bd06a 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/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/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index ccf7a699dae..00babb3c824 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/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/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index 2600d13cab9..f11a7fc35d6 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/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/pkgs/development/tools/gosec/deps.nix b/pkgs/development/tools/gosec/deps.nix
deleted file mode 100644
index 80a77e7fb80..00000000000
--- a/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/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index ee7ed476622..48be7c568d7 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/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/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index 8b980dc7e31..b4cbb3cee63 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, kubectl, makeWrapper }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
-with lib;
-
-stdenv.mkDerivation rec {
+buildGoModule rec {
pname = "kubectx";
version = "0.9.0";
@@ -13,41 +11,19 @@ stdenv.mkDerivation rec {
sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55";
};
- 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/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix
index f6a4a4d9f6a..0d058ef1f88 100644
--- a/pkgs/development/tools/misc/cli11/default.nix
+++ b/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/pkgs/development/tools/misc/easypdkprog/default.nix b/pkgs/development/tools/misc/easypdkprog/default.nix
new file mode 100644
index 00000000000..eb8ce5d44b0
--- /dev/null
+++ b/pkgs/development/tools/misc/easypdkprog/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "easypdkprog";
+ version = "1.2";
+
+ src = fetchFromGitHub {
+ owner = "free-pdk";
+ repo = "easy-pdk-programmer-software";
+ rev = version;
+ sha256 = "06bn86rd57ff567l0ipx38raih0zll3y16lg5fpn7c601a9jldps";
+ };
+
+ 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/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index 90e0a7935de..888cc51a99d 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/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/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 9ca6ca67421..666cda592fb 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/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/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index 5c8f4377e8d..2ad8578894f 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/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/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
index 344352467e9..50bcd69eb66 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+++ b/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/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 3adad22bd9c..69783c7eada 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/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/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index 47396829f8a..d3cc4e08787 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/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/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index c39c985183a..fcfeeaf8d99 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/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/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 95778c2544c..d47b029a67c 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,22 +18,21 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "0034c2qp8sf6li7d38rnd6h9vhhi82p5rysm0pkrdhlmfqkqdgma";
+ sha256 = "1vfvkrwlhixygd9cn05wq28iw8dch04j8d62a54pbyyxlixrjwfx";
fetchSubmodules = true;
};
- cargoSha256 = "1wbqxv2mzbs27j617a88gd7z0fjnjr2z1nklqfk49y62v8f1vsm1";
+ cargoSha256 = "0ddsks81wdddcd4d8w2xz17l41iiga44xiv74hi2158ykrk8rqdi";
# 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/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix
index 32669a6111b..61cb967a36b 100644
--- a/pkgs/development/web/deno/deps.nix
+++ b/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/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index d0ae0a59717..5ba4b4de2f6 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/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/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 70c5657508b..b3a7966071a 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/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/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix
index 8702c480457..785f7f396e9 100644
--- a/pkgs/misc/drivers/xow/default.nix
+++ b/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/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix
index d72af71f663..a7bce745984 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/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/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index dd3cae339ca..ffad1e3c990 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "5.10";
+ version = "5.11";
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
- sha256 = "0g9k094biyjc0ng3vnncdr1psf0ykn36nqirrqdzc5y82s9a1alv";
+ sha256 = "1q0sh89xnn6cq3kpqrrq9h316qyzpslj2w6m6vq7pq4y4p727nxk";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "1nnj52g0kp7i38qw85sp5qsf7gph1hh3ywibrdfpjmjpyj30v7sw";
+ sha256 = "050npck8mdck8m2rs9xn6mszzj2fv9ql80g08j2ahinf792svrid";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index aefb5ff6835..0a98475384d 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/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/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix
index 696625761b1..2f03ee8c820 100644
--- a/pkgs/os-specific/linux/undervolt/default.nix
+++ b/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/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 43c2900443e..8d4125b8fa1 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/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,7 +11,7 @@
, rrtypes ? false
, zoneStats ? false
-, configFile ? "etc/nsd/nsd.conf"
+, configFile ? "/etc/nsd/nsd.conf"
}:
stdenv.mkDerivation rec {
@@ -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/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 0a91677011a..d4622a21f6c 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/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/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/2.x.nix
similarity index 88%
rename from pkgs/servers/radicale/default.nix
rename to pkgs/servers/radicale/2.x.nix
index fc98795bbc7..8d36717ec69 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/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/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix
new file mode 100644
index 00000000000..7b42bd3be34
--- /dev/null
+++ b/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/pkgs/servers/roundcube/plugins/carddav/default.nix b/pkgs/servers/roundcube/plugins/carddav/default.nix
new file mode 100644
index 00000000000..c3745c9bcc5
--- /dev/null
+++ b/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/pkgs/servers/roundcube/plugins/plugins.nix b/pkgs/servers/roundcube/plugins/plugins.nix
index 4eed1227be6..a9c73874b69 100644
--- a/pkgs/servers/roundcube/plugins/plugins.nix
+++ b/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/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 5994e2829ed..a52cc4621cb 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -39,6 +39,13 @@ rustPlatform.buildRustPackage rec {
export HOME=$TMPDIR
'';
+ checkPhase = ''
+ runHook preCheck
+ echo "Running cargo test"
+ cargo test
+ runHook postCheck
+ '';
+
meta = with lib; {
description = "A modern shell written in Rust";
homepage = "https://www.nushell.sh/";
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 4bea6e2c5f1..169dd1456f3 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2020-06-26";
+ version = "2020-06-28";
pname = "oh-my-zsh";
- rev = "6152ac30bede172ba0422a8610dc796948ae1546";
+ rev = "97cf0bf4bd7655767e9e5ea27ddb6fbe550a305d";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "1kadz2c4lwvp37yw95fly4gc5klzajxsi8x9463xiqj2rrcpd1m3";
+ sha256 = "1hynii1nvchnlgyiy0phyz5gd83xcbjdj82ddd2dyl1ci1yvpvqb";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix
index f9b6a941f68..588295f7791 100644
--- a/pkgs/tools/filesystems/file-rename/default.nix
+++ b/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/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 54e1b1bf5a4..354c4b4ddf4 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "0.18.0";
+ version = "0.18.1";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
- sha256 = "0b2hggm2ckdzl9f2dn64gdyvd7flpq3szmx69k84f3fimabn7yrm";
+ sha256 = "0lmcjc08902h4mi6qx3x2v1xa4w980xvmbrbfm59lis856whaqww";
};
- cargoSha256 = "1bl2y7h72vwi2jvnszd8vna4yc71s9n6kgmlq4ib2cjmzsppqdpa";
+ 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/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix
index 99eb6a52ca0..d48dc5ec1c9 100644
--- a/pkgs/tools/misc/cpuminer/default.nix
+++ b/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/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index 8d7f16b5bec..2f4c117c615 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/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/pkgs/tools/misc/dashing/deps.nix b/pkgs/tools/misc/dashing/deps.nix
index 4ad5a10149e..a87de8674ff 100644
--- a/pkgs/tools/misc/dashing/deps.nix
+++ b/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/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix
index af0fa6a76ba..5bfbb53c106 100644
--- a/pkgs/tools/misc/envsubst/default.nix
+++ b/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/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix
index 6137abd9293..b2b66515168 100644
--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/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/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 3fec20f95bb..0112c0ea686 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/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.43.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "17wc9f07308a97dsmrkq74w2r639sqms0hwh8gavwxycj7wq7xz2";
+ sha256 = "16ch3dhwgwmdalif3cyi3x4vrpww546wspcwc4xi0k7lp2zppbwf";
};
- 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 = "09lq9ngnwg5z2l2y2ah8ng4cl8afb4gy4djwiq9yv61sjlqbr1y2";
+
+ 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/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index af21e9d4fef..17592ec3369 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/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/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix
index 6bae95298fe..2fc95c76210 100644
--- a/pkgs/tools/networking/grpcui/default.nix
+++ b/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/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix
index 63e2af48c1e..a9bd2739a8a 100644
--- a/pkgs/tools/networking/persepolis/default.nix
+++ b/pkgs/tools/networking/persepolis/default.nix
@@ -6,6 +6,7 @@
, pyqt5
, requests
, setproctitle
+, setuptools
, sound-theme-freedesktop
, youtube-dl
}:
@@ -47,6 +48,7 @@ buildPythonApplication rec {
pyqt5
requests
setproctitle
+ setuptools
sound-theme-freedesktop
youtube-dl
];
diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix
index c3756b545e3..429a8689a1f 100644
--- a/pkgs/tools/security/age/default.nix
+++ b/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/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix
index c7a5a998555..b59cef13942 100644
--- a/pkgs/tools/security/hcxdumptool/default.nix
+++ b/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/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index bbed166d759..d7f42479d0b 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/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/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix
index 9e9cbe2bb3a..8b99649e0c9 100644
--- a/pkgs/tools/security/sn0int/default.nix
+++ b/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/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix
index e1e5e100bd1..a3f3132aa3c 100644
--- a/pkgs/tools/security/verifpal/default.nix
+++ b/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/pkgs/tools/security/verifpal/deps.nix b/pkgs/tools/security/verifpal/deps.nix
deleted file mode 100644
index aaa4269416a..00000000000
--- a/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/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 5d856e79530..722df46c05f 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/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/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix
index 2e397da8a81..3e38b7bfdf9 100644
--- a/pkgs/tools/system/netdata/go.d.plugin.nix
+++ b/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/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 251f6224b40..43c945ac769 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a11116c96b2..6c6bcecc645 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -213,7 +213,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 { };
@@ -2895,6 +2897,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 { };
@@ -4325,6 +4329,8 @@ in
incron = callPackage ../tools/system/incron { };
+ industrializer = callPackage ../applications/audio/industrializer { };
+
inetutils = callPackage ../tools/networking/inetutils { };
inform7 = callPackage ../development/compilers/inform7 { };
@@ -7701,6 +7707,8 @@ in
whsniff = callPackage ../applications/networking/sniffers/whsniff { };
+ wiiuse = callPackage ../development/libraries/wiiuse { };
+
woeusb = callPackage ../tools/misc/woeusb { };
chase = callPackage ../tools/system/chase { };
@@ -8760,6 +8768,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 { };
@@ -10433,6 +10448,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 { };
@@ -15480,6 +15497,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;
@@ -15489,6 +15509,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;
@@ -16329,9 +16352,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 { };
@@ -18938,6 +18962,8 @@ in
batik = callPackage ../applications/graphics/batik { };
+ batsignal = callPackage ../applications/misc/batsignal { };
+
baudline = callPackage ../applications/audio/baudline { };
bb = callPackage ../applications/misc/bb { };
@@ -20575,6 +20601,8 @@ in
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 { };
@@ -21482,6 +21510,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.'';
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 068132e388d..47e0317a3f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7330,6 +7330,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 { };