diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md
index f268c552566..9a5df2523a2 100644
--- a/doc/languages-frameworks/android.section.md
+++ b/doc/languages-frameworks/android.section.md
@@ -95,7 +95,7 @@ $ nix-build
The Android SDK gets deployed with all desired plugin versions.
-We can also deploy subsets of the Android SDK. For example, to only the the
+We can also deploy subsets of the Android SDK. For example, to only the
`platform-tools` package, you can evaluate the following expression:
```nix
diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md
index 6684b809ffe..5a81795c004 100644
--- a/doc/languages-frameworks/ios.section.md
+++ b/doc/languages-frameworks/ios.section.md
@@ -1,7 +1,7 @@
---
title: iOS
author: Sander van der Burg
-date: 2018-11-18
+date: 2019-11-10
---
# iOS
@@ -217,3 +217,13 @@ xcode.simulateApp {
By providing the result of an `xcode.buildApp {}` function and configuring the
app bundle id, the app gets deployed automatically and started.
+
+Troubleshooting
+---------------
+In some rare cases, it may happen that after a failure, changes are not picked
+up. Most likely, this is caused by a derived data cache that Xcode maintains.
+To wipe it you can run:
+
+```bash
+$ rm -rf ~/Library/Developer/Xcode/DerivedData
+```
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 8b9aa5dc168..709a0d504cf 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -203,7 +203,7 @@ argument and returns a set that contains all attribute that should be
overwritten.
For more complicated cases, such as when parts of the crate's
-derivation depend on the the crate's version, the `attrs` argument of
+derivation depend on the crate's version, the `attrs` argument of
the override above can be read, as in the following example, which
patches the derivation:
diff --git a/doc/stdenv/cross-compilation.xml b/doc/stdenv/cross-compilation.xml
index 93fe9095ce2..5476c9a4893 100644
--- a/doc/stdenv/cross-compilation.xml
+++ b/doc/stdenv/cross-compilation.xml
@@ -348,12 +348,12 @@ nix-build '<nixpkgs>' --arg crossSystem '{ config = "<arch>-<os&g
- In each stage, pkgsBuildHost refers the the previous stage, pkgsBuildBuild refers to the one before that, and pkgsHostTarget refers to the current one, and pkgsTargetTarget refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. pkgsBuildTarget and pkgsHostHost are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in pkgs/stdenv/booter.nix, and secondarily aliases in pkgs/top-level/stage.nix.
+ In each stage, pkgsBuildHost refers to the previous stage, pkgsBuildBuild refers to the one before that, and pkgsHostTarget refers to the current one, and pkgsTargetTarget refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. pkgsBuildTarget and pkgsHostHost are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in pkgs/stdenv/booter.nix, and secondarily aliases in pkgs/top-level/stage.nix.
- Note the native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the the bootstrapping stages leading up to the final stages are ignored inthe previous paragraph.
+ Note the native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the bootstrapping stages leading up to the final stages are ignored inthe previous paragraph.
diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml
index a68ae739f52..6406c3af3ec 100644
--- a/doc/using/configuration.xml
+++ b/doc/using/configuration.xml
@@ -142,7 +142,7 @@
{
allowUnfreePredicate = (pkg: builtins.elem
- (builtins.parseDrvName pkg.name).name [
+ (pkg.pname or (builtins.parseDrvName pkg.name).name) [
"flashplayer"
"vscode"
]);
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 23b79775f2e..ec21dd9fafb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1401,6 +1401,12 @@
githubId = 411324;
name = "Carles Pagès";
};
+ craigem = {
+ email = "craige@mcwhirter.io";
+ github = "craigem";
+ githubId = "6470493";
+ name = "Craige McWhirter";
+ };
cransom = {
email = "cransom@hubns.net";
github = "cransom";
@@ -6518,6 +6524,12 @@
githubId = 506181;
name = "Peter Marheine";
};
+ tasmo = {
+ email = "tasmo@tasmo.de";
+ github = "tasmo";
+ githubId = 102685;
+ name = "Thomas Friese";
+ };
tavyc = {
email = "octavian.cerna@gmail.com";
github = "tavyc";
diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix
index 148240d631c..14d6340fc33 100644
--- a/nixos/modules/config/xdg/sounds.nix
+++ b/nixos/modules/config/xdg/sounds.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
with lib;
{
@@ -14,6 +14,10 @@ with lib;
};
config = mkIf config.xdg.sounds.enable {
+ environment.systemPackages = [
+ pkgs.sound-theme-freedesktop
+ ];
+
environment.pathsToLink = [
"/share/sounds"
];
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index d510f3b2daf..7865b767f0b 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -140,7 +140,11 @@ in
export img=$out/sd-image/${config.sdImage.imageName}
echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system
- echo "file sd-image $img" >> $out/nix-support/hydra-build-products
+ if test -n "$compressImage"; then
+ echo "file sd-image $img.bz2" >> $out/nix-support/hydra-build-products
+ else
+ echo "file sd-image $img" >> $out/nix-support/hydra-build-products
+ fi
# Gap in front of the first partition, in MiB
gap=8
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 3e8a5b07a5e..a4db2c9d1d8 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -128,7 +128,7 @@
tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice.
firebird = 95;
#keys = 96; # unused
- haproxy = 97;
+ #haproxy = 97; # DynamicUser as of 2019-11-08
mongodb = 98;
openldap = 99;
#users = 100; # unused
@@ -443,7 +443,7 @@
#tcpcryptd = 93; # unused
firebird = 95;
keys = 96;
- haproxy = 97;
+ #haproxy = 97; # DynamicUser as of 2019-11-08
#mongodb = 98; # unused
openldap = 99;
munin = 102;
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index a870550ba50..1fabe2da45c 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -101,6 +101,12 @@ in {
};
};
+ systemd.tmpfiles.rules = [
+ "d /var/spool/smtpd 711 root - - -"
+ "d /var/spool/smtpd/offline 770 root smtpq - -"
+ "d /var/spool/smtpd/purge 700 smtpq root - -"
+ ];
+
systemd.services.opensmtpd = let
procEnv = pkgs.buildEnv {
name = "opensmtpd-procs";
@@ -110,18 +116,6 @@ in {
in {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- preStart = ''
- mkdir -p /var/spool/smtpd
- chmod 711 /var/spool/smtpd
-
- mkdir -p /var/spool/smtpd/offline
- chown root.smtpq /var/spool/smtpd/offline
- chmod 770 /var/spool/smtpd/offline
-
- mkdir -p /var/spool/smtpd/purge
- chown smtpq.root /var/spool/smtpd/purge
- chmod 700 /var/spool/smtpd/purge
- '';
serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
};
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index ce565dbaab8..83995d28179 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -12,11 +12,6 @@ let
samba = cfg.package;
- setupScript =
- ''
- mkdir -p /var/lock/samba /var/log/samba /var/cache/samba /var/lib/samba/private
- '';
-
shareConfig = name:
let share = getAttr name cfg.shares; in
"[${name}]\n " + (smbToString (
@@ -62,6 +57,7 @@ let
Type = "notify";
NotifyAccess = "all"; #may not do anything...
};
+ unitConfig.RequiresMountsFor = "/var/lib/samba";
restartTriggers = [ configFile ];
};
@@ -228,8 +224,7 @@ in
systemd = {
targets.samba = {
description = "Samba Server";
- requires = [ "samba-setup.service" ];
- after = [ "samba-setup.service" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
};
# Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
@@ -238,12 +233,13 @@ in
samba-smbd = daemonService "smbd" "";
samba-nmbd = mkIf cfg.enableNmbd (daemonService "nmbd" "");
samba-winbindd = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
- samba-setup = {
- description = "Samba Setup Task";
- script = setupScript;
- unitConfig.RequiresMountsFor = "/var/lib/samba";
- };
};
+ tmpfiles.rules = [
+ "d /var/lock/samba - - - - -"
+ "d /var/log/samba - - - - -"
+ "d /var/cache/samba - - - - -"
+ "d /var/lib/samba/private - - - - -"
+ ];
};
security.pam.services.samba = {};
diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix
index 0438d0bf8d8..aff71e5e97d 100644
--- a/nixos/modules/services/networking/haproxy.nix
+++ b/nixos/modules/services/networking/haproxy.nix
@@ -1,7 +1,16 @@
{ config, lib, pkgs, ... }:
+
let
cfg = config.services.haproxy;
- haproxyCfg = pkgs.writeText "haproxy.conf" cfg.config;
+
+ haproxyCfg = pkgs.writeText "haproxy.conf" ''
+ global
+ # needed for hot-reload to work without dropping packets in multi-worker mode
+ stats socket /run/haproxy/haproxy.sock mode 600 expose-fd listeners level user
+
+ ${cfg.config}
+ '';
+
in
with lib;
{
@@ -25,9 +34,7 @@ with lib;
haproxy.conf.
'';
};
-
};
-
};
config = mkIf cfg.enable {
@@ -42,21 +49,16 @@ with lib;
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- Type = "forking";
- PIDFile = "/run/haproxy.pid";
- ExecStartPre = "${pkgs.haproxy}/sbin/haproxy -c -q -f ${haproxyCfg}";
- ExecStart = "${pkgs.haproxy}/sbin/haproxy -D -f ${haproxyCfg} -p /run/haproxy.pid";
- ExecReload = "-${pkgs.bash}/bin/bash -c \"exec ${pkgs.haproxy}/sbin/haproxy -D -f ${haproxyCfg} -p /run/haproxy.pid -sf $MAINPID\"";
+ DynamicUser = true;
+ Type = "notify";
+ # when running the config test, don't be quiet so we can see what goes wrong
+ ExecStartPre = "${pkgs.haproxy}/sbin/haproxy -c -f ${haproxyCfg}";
+ ExecStart = "${pkgs.haproxy}/sbin/haproxy -Ws -f ${haproxyCfg}";
+ Restart = "on-failure";
+ RuntimeDirectory = "haproxy";
+ # needed in case we bind to port < 1024
+ AmbientCapabilities = "CAP_NET_BIND_SERVICE";
};
};
-
- environment.systemPackages = [ pkgs.haproxy ];
-
- users.users.haproxy = {
- group = "haproxy";
- uid = config.ids.uids.haproxy;
- };
-
- users.groups.haproxy.gid = config.ids.uids.haproxy;
};
}
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix
index 7b2c464ab46..79507b2ebcd 100644
--- a/nixos/modules/services/networking/tinydns.nix
+++ b/nixos/modules/services/networking/tinydns.nix
@@ -37,6 +37,7 @@ with lib;
systemd.services.tinydns = {
description = "djbdns tinydns server";
wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
path = with pkgs; [ daemontools djbdns ];
preStart = ''
rm -rf /var/lib/tinydns
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 5ad31e5b9d0..0aae25662c6 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -217,6 +217,12 @@ in
services.xserver.updateDbusEnvironment = true;
+ # gnome has a custom alert theme but it still
+ # inherits from the freedesktop theme.
+ environment.systemPackages = with pkgs; [
+ sound-theme-freedesktop
+ ];
+
# Needed for themes and backgrounds
environment.pathsToLink = [
"/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index adca3c3f66e..23fce22366d 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -25,6 +25,7 @@ let
[Daemon]
ShowDelay=0
Theme=${cfg.theme}
+ ${cfg.extraConfig}
'';
in
@@ -65,6 +66,15 @@ in
'';
};
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Literal string to append to configFile
+ and the config file generated by the plymouth module.
+ '';
+ };
+
};
};
diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix
index 22a83e9d1ea..72e77a68193 100644
--- a/nixos/tests/haproxy.nix
+++ b/nixos/tests/haproxy.nix
@@ -16,6 +16,8 @@ import ./make-test.nix ({ pkgs, ...}: {
frontend http
bind *:80
mode http
+ option http-use-htx
+ http-request use-service prometheus-exporter if { path /metrics }
use_backend http_server
'';
};
@@ -36,6 +38,6 @@ import ./make-test.nix ({ pkgs, ...}: {
$machine->waitForUnit('haproxy.service');
$machine->waitForUnit('httpd.service');
$machine->succeed('curl -k http://localhost:80/index.txt | grep "We are all good!"');
-
+ $machine->succeed('curl -k http://localhost:80/metrics | grep haproxy_process_pool_allocated_bytes');
'';
})
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index c805f1ed9f3..ef30f7741e2 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "lightdm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig worldofpeace ];
@@ -18,12 +18,12 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in ''
- startAll;
- $machine->waitForText(qr/${user.description}/);
- $machine->screenshot("lightdm");
- $machine->sendChars("${user.password}\n");
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow("^IceWM ");
+ start_all()
+ machine.wait_for_text("${user.description}")
+ machine.screenshot("lightdm")
+ machine.send_chars("${user.password}\n")
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.wait_for_window("^IceWM ")
'';
})
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 883ad760494..e6f52db1d98 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "opensmtpd";
nodes = {
@@ -102,23 +102,23 @@ import ./make-test.nix {
};
testScript = ''
- startAll;
+ start_all()
- $client->waitForUnit("network-online.target");
- $smtp1->waitForUnit('opensmtpd');
- $smtp2->waitForUnit('opensmtpd');
- $smtp2->waitForUnit('dovecot2');
+ client.wait_for_unit("network-online.target")
+ smtp1.wait_for_unit("opensmtpd")
+ smtp2.wait_for_unit("opensmtpd")
+ smtp2.wait_for_unit("dovecot2")
# To prevent sporadic failures during daemon startup, make sure
# services are listening on their ports before sending requests
- $smtp1->waitForOpenPort(25);
- $smtp2->waitForOpenPort(25);
- $smtp2->waitForOpenPort(143);
+ smtp1.wait_for_open_port(25)
+ smtp2.wait_for_open_port(25)
+ smtp2.wait_for_open_port(143)
- $client->succeed('send-a-test-mail');
- $smtp1->waitUntilFails('smtpctl show queue | egrep .');
- $smtp2->waitUntilFails('smtpctl show queue | egrep .');
- $client->succeed('check-mail-landed >&2');
+ client.succeed("send-a-test-mail")
+ smtp1.wait_until_fails("smtpctl show queue | egrep .")
+ smtp2.wait_until_fails("smtpctl show queue | egrep .")
+ client.succeed("check-mail-landed >&2")
'';
meta.timeout = 30;
diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix
index 2802e00a5b1..142269752b3 100644
--- a/nixos/tests/samba.nix
+++ b/nixos/tests/samba.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "samba";
@@ -36,12 +36,12 @@ import ./make-test.nix ({ pkgs, ... }:
testScript =
''
- $server->start;
- $server->waitForUnit("samba.target");
- $server->succeed("mkdir -p /public; echo bar > /public/foo");
+ server.start()
+ server.wait_for_unit("samba.target")
+ server.succeed("mkdir -p /public; echo bar > /public/foo")
- $client->start;
- $client->waitForUnit("remote-fs.target");
- $client->succeed("[[ \$(cat /public/foo) = bar ]]");
+ client.start()
+ client.wait_for_unit("remote-fs.target")
+ client.succeed("[[ $(cat /public/foo) = bar ]]")
'';
})
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 678bcbeab20..11d60598445 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -3,7 +3,7 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
let
inherit (pkgs) lib;
@@ -26,13 +26,13 @@ let
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in ''
- startAll;
- $machine->waitForText(qr/select your user/i);
- $machine->screenshot("sddm");
- $machine->sendChars("${user.password}\n");
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow("^IceWM ");
+ start_all()
+ machine.wait_for_text("select your user")
+ machine.screenshot("sddm")
+ machine.send_chars("${user.password}\n")
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.wait_for_window("^IceWM ")
'';
};
@@ -57,11 +57,13 @@ let
services.xserver.desktopManager.default = "none";
};
- testScript = { ... }: ''
- startAll;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow("^IceWM ");
+ testScript = { nodes, ... }: let
+ user = nodes.machine.config.users.users.alice;
+ in ''
+ start_all()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.wait_for_window("^IceWM ")
'';
};
};
diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix
index cb7ee0c5fb5..c7740d5ade3 100644
--- a/nixos/tests/tinydns.nix
+++ b/nixos/tests/tinydns.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ...} : {
+import ./make-test-python.nix ({ lib, ...} : {
name = "tinydns";
meta = {
maintainers = with lib.maintainers; [ basvandijk ];
@@ -19,8 +19,8 @@ import ./make-test.nix ({ lib, ...} : {
};
};
testScript = ''
- $nameserver->start;
- $nameserver->waitForUnit("tinydns.service");
- $nameserver->succeed("host bla.foo.bar | grep '1\.2\.3\.4'");
+ nameserver.start()
+ nameserver.wait_for_unit("tinydns.service")
+ nameserver.succeed("host bla.foo.bar | grep '1\.2\.3\.4'")
'';
})
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index 87efa6fb6b6..4a757ed434a 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -1,4 +1,6 @@
{ stdenv
+, mkDerivation
+, lib
, fetchzip
, pkgconfig
, qtbase
@@ -6,7 +8,7 @@
, python3Packages
}:
- stdenv.mkDerivation rec {
+ mkDerivation rec {
version = "0.9.0";
pname = "cadence";
@@ -15,65 +17,56 @@
sha256 = "08vcggypkdfr70v49innahs5s11hi222dhhnm5wcqzdgksphqzwx";
};
- nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ qtbase ];
+ nativeBuildInputs = [
+ pkgconfig
+ ];
- makeFlags = ''
- PREFIX=""
- DESTDIR=$(out)
- '';
+ buildInputs = [
+ qtbase
+ ];
- propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit ];
+ makeFlags = [
+ "PREFIX=''"
+ "DESTDIR=${placeholder "out"}"
+ ];
- postInstall = ''
- # replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise
- rm $out/bin/cadence
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/cadence.py"
- rm $out/bin/claudia
- makeWrapper ${python3Packages.python.interpreter} $out/bin/claudia \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/claudia.py"
- rm $out/bin/catarina
- makeWrapper ${python3Packages.python.interpreter} $out/bin/catarina \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/catarina.py"
- rm $out/bin/catia
- makeWrapper ${python3Packages.python.interpreter} $out/bin/catia \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/catia.py"
- rm $out/bin/cadence-jacksettings
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-jacksettings \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/jacksettings.py"
- rm $out/bin/cadence-aloop-daemon
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-aloop-daemon \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/cadence_aloop_daemon.py"
- rm $out/bin/cadence-logs
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-logs \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/logs.py"
- rm $out/bin/cadence-render
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-render \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/render.py"
- rm $out/bin/claudia-launcher
- makeWrapper ${python3Packages.python.interpreter} $out/bin/claudia-launcher \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/claudia_launcher.py"
- rm $out/bin/cadence-session-start
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-session-start \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/cadence_session_start.py"
- '';
+ propagatedBuildInputs = with python3Packages; [
+ pyqt5_with_qtwebkit
+ ];
+
+ dontWrapQtApps = true;
+
+ # Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise.
+ preFixup = let
+ outRef = placeholder "out";
+ prefix = "${outRef}/share/cadence/src";
+ scriptAndSource = lib.mapAttrs' (script: source:
+ lib.nameValuePair ("${outRef}/bin/" + script) ("${prefix}/" + source)
+ ) {
+ "cadence" = "cadence.py";
+ "claudia" = "claudia.py";
+ "catarina" = "catarina.py";
+ "catia" = "catia.py";
+ "cadence-jacksettings" = "jacksettings.py";
+ "cadence-aloop-daemon" = "cadence_aloop_daemon.py";
+ "cadence-logs" = "logs.py";
+ "cadence-render" = "render.py";
+ "claudia-launcher" = "claudia_launcher.py";
+ "cadence-session-start" = "cadence_session_start.py";
+ };
+ in lib.mapAttrsToList (script: source: ''
+ rm -f ${script}
+ makeWrapper ${python3Packages.python.interpreter} ${script} \
+ --set PYTHONPATH "$PYTHONPATH:${outRef}/share/cadence" \
+ ''${qtWrapperArgs[@]} \
+ --add-flags "-O ${source}"
+ '') scriptAndSource;
meta = {
homepage = https://github.com/falkTX/Cadence/;
description = "Collection of tools useful for audio production";
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ genesis ];
+ maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
index 5e95d717968..248967e06e6 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildPhase = ''
cd lv2
substituteInPlace GNUmakefile --replace "/usr/lib/lv2" "$out/lib/lv2"
- make
+ make SIMD=0
'';
preInstall = "mkdir -p $out/lib/lv2";
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 22cef5414f8..37e233b5e9e 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
- version = "3.41.1";
+ version = "3.42.2";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "1bdcxsvb756rchyp9cj1y5x1w0w6p2hp7grgar5c4cyh3kshc2kj";
+ sha256 = "1v1dy857kxxn1si0x7p3qz63l1af5pln1jji1f7fis6id8iy7wfm";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 92f6f008021..dde324b39e1 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -1,27 +1,27 @@
-{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub
+{ stdenv, wrapQtAppsHook, makeDesktopItem, fetchFromGitHub
, qtbase, qmake, qtmultimedia, qttools
, qtgraphicaleffects, qtdeclarative
, qtlocation, qtquickcontrols, qtquickcontrols2
, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
-, hidapi
+, hidapi, randomx
}:
-with lib;
+with stdenv.lib;
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "monero-gui";
- version = "0.14.1.2";
+ version = "0.15.0.0";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k";
+ sha256 = "1shpnly2dym5jhvk8zk10p69mz062dihx979djg74q6hgkhhhqsh";
};
- nativeBuildInputs = [ qmake pkgconfig ];
+ nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
buildInputs = [
qtbase qtmultimedia qtgraphicaleffects
@@ -30,7 +30,7 @@ mkDerivation rec {
qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline
boost libunwind libsodium pcsclite zeromq
- cppzmq hidapi
+ cppzmq hidapi randomx
];
patches = [ ./move-log-file.patch ];
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index b6f07452861..b526fb61a62 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -1,43 +1,41 @@
-{ stdenv, fetchgit
-, cmake, pkgconfig, git
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline, libsodium, hidapi
-, python3Packages
+, python3Packages, randomx, rapidjson
, CoreData, IOKit, PCSC
}:
assert stdenv.isDarwin -> IOKit != null;
-with stdenv.lib;
-
stdenv.mkDerivation rec {
pname = "monero";
- version = "0.14.1.0";
+ version = "0.15.0.0";
- src = fetchgit {
- url = "https://github.com/monero-project/monero.git";
- rev = "v${version}";
- sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh";
+ src = fetchFromGitHub {
+ owner = "monero-project";
+ repo = "monero";
+ rev = "v${version}";
+ sha256 = "19y4kcj4agws7swfa3draysb1y18c3xb13r8cg0faxx1dlm0zbnr";
+ fetchSubmodules = true;
};
- nativeBuildInputs = [ cmake pkgconfig git ];
+ nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
- libsodium hidapi
+ libsodium hidapi randomx rapidjson
python3Packages.protobuf
- ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
- ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
+ ] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
- hardeningDisable = [ "fortify" ];
-
- meta = {
+ meta = with stdenv.lib; {
description = "Private, secure, untraceable currency";
homepage = https://getmonero.org/;
license = licenses.bsd3;
diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/applications/misc/epr/default.nix
new file mode 100644
index 00000000000..f67c15f0a99
--- /dev/null
+++ b/pkgs/applications/misc/epr/default.nix
@@ -0,0 +1,21 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "epr";
+ version = "2.3.0b";
+
+ src = fetchFromGitHub {
+ owner = "wustho";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1a6md3015284hzmx0sby5kl59p7lwv73sq7sid35vrr15zrl0aw7";
+ };
+
+ meta = with lib; {
+ description = "CLI Epub Reader";
+ homepage = "https://github.com/wustho/epr";
+ license = licenses.mit;
+ maintainers = [ maintainers.filalex77 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index e3c75b25b47..0bdf8e49d96 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.10";
+ version = "1.2.11";
src = fetchFromGitHub {
owner = "kanboard";
repo = "kanboard";
rev = "v${version}";
- sha256 = "0k45vfiacvwmrglpqwjq22pvdg4n0mf75x0r8nb79bmxp8sk0j0c";
+ sha256 = "0if5nh4m4y3xlvlv86jph7ix5nvpgc1zjkp4cq5iig6z0041bw98";
};
dontBuild = true;
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 8670371b006..6701c910a1f 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -26,6 +26,8 @@
, withKeePassKeeShareSecure ? true
, withKeePassSSHAgent ? true
, withKeePassNetworking ? false
+, withKeePassTouchID ? true
+, withKeePassFDOSecrets ? true
}:
with stdenv.lib;
@@ -69,6 +71,8 @@ stdenv.mkDerivation rec {
++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON")
++ (optional withKeePassKeeShareSecure "-DWITH_XC_KEESHARE_SECURE=ON")
++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON")
+ ++ (optional (withKeePassTouchID && stdenv.isDarwin) "-DWITH_XC_TOUCHID=ON")
+ ++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON")
++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON");
doCheck = true;
diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix
index b6a8b567a50..680573fd304 100644
--- a/pkgs/applications/misc/verbiste/default.nix
+++ b/pkgs/applications/misc/verbiste/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "verbiste";
- version = "0.1.46";
+ version = "0.1.47";
src = fetchurl {
url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
- sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0";
+ sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index 93f50fb5370..567d299fd3a 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "wego";
- version = "20170403-${stdenv.lib.strings.substring 0 7 rev}";
+ version = "unstable-2017-04-03";
rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c";
goPackagePath = "github.com/schachmat/wego";
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index ae3659a21fe..6b059ccd4c4 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "0.69.128";
+ version = "0.69.135";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r";
+ sha256 = "1ahxciiilpaz2zdmi25lpw0x2mgwvd8acjn7h11i2ciqw0xbl3iy";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 9851ff94d79..0494de83708 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -93,19 +93,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "9.0";
+ version = "9.0.1";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
- sha256 = "0aajbk65lpcazn8mdk7ngaqp0sykql8zjlkhznphxxw9v59mq3b7";
+ sha256 = "09iasj13wn3d1dygpxn4www4rx8wnxxlm9h6df9lzf4wll15px55";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
- sha256 = "08ahs9985ndcq1ywz06q4znai6a3ivibjk473kymzl6k40q1c9y2";
+ sha256 = "1vz3pvqi114c9lkyhqy754ngi90708c187xwiyr9786ff89sjw5i";
};
};
in
@@ -397,7 +397,7 @@ stdenv.mkDerivation rec {
longDescription = tor-browser-bundle.meta.longDescription;
homepage = "https://www.torproject.org/";
platforms = attrNames srcs;
- maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
+ maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 ];
hydraPlatforms = [];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index f3228b11eb9..a8e7bed5ede 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "2.9.1705.38-1";
+ version = "2.9.1705.41-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "0jj2kfdl4788l132ncz3jf1pnjig7dc9gaxjmgv51n1ahmmx8shi";
+ sha256 = "0c6cvhh05scmgpjy7f5wps62arhf5nsdnw9dllzqxpbsii1p6rv5";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
new file mode 100644
index 00000000000..63caf836ad9
--- /dev/null
+++ b/pkgs/applications/networking/calls/default.nix
@@ -0,0 +1,79 @@
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkgconfig
+, libhandy
+, modemmanager
+, gtk3
+, gom
+, gsound
+, evolution-data-server
+, desktop-file-utils
+, libpeas
+, dbus
+, xorg
+, xvfb_run
+, libxml2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "calls-unstable";
+ version = "2019-10-09";
+
+ src = fetchFromGitLab {
+ domain = "source.puri.sm";
+ owner = "Librem5";
+ repo = pname;
+ rev = "4b4cfa04266ebbe2f3da5abd9624ea07aa159fea";
+ sha256 = "0qvnddjpkh6gsywzdi24lmjlbwi0q54m1xa6hiaf1ch1j7kcv8fr";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ desktop-file-utils
+ ];
+
+ buildInputs = [
+ modemmanager
+ libhandy
+ evolution-data-server
+ gom
+ gsound
+ gtk3
+ libhandy
+ libpeas
+ libxml2
+ ];
+
+ checkInputs = [
+ dbus
+ xvfb_run
+ xorg.xauth
+ ];
+
+ mesonFlags = [
+ "-Dgtk_doc=false"
+ ];
+
+ doCheck = true;
+
+ checkPhase = ''
+ runHook preCheck
+ NO_AT_BRIDGE=1 \
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test --print-errorlogs
+ runHook postCheck
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A phone dialer and call handler";
+ homepage = https://source.puri.sm/Librem5/calls;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ craigem lheckemann ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index fcc55c5e1d0..6be9a5092ba 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -4,27 +4,31 @@
{
owner = "terraform-providers";
repo = "terraform-provider-acme";
- version = "1.3.5";
- sha256 = "0xjxxz3vxq7vk7sv6b5p57z5x92dmrm44v6ksffcg76ngc40nrxk";
+ rev = "v1.5.0";
+ version = "1.5.0";
+ sha256 = "1h53bgflchavnn4laf801d920bsgqqg0ph4slnf7y1fpb0mz5vdv";
};
alicloud =
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- version = "1.54.0";
- sha256 = "01pmhwdnhfsk785ja11hxn5l5fmklnkiv12kv2pw2280cdljfcv4";
+ rev = "v1.60.0";
+ version = "1.60.0";
+ sha256 = "14k96ccjrjiqfrdrj9kd090ms1p15z71qv60gm05bhffviyplmgw";
};
archive =
{
owner = "terraform-providers";
repo = "terraform-provider-archive";
- version = "1.2.2";
- sha256 = "1saprj2r74b63z03n80m3mfj3vhgvlm4gp2hzqzjbdgibxsz4jaw";
+ rev = "v1.3.0";
+ version = "1.3.0";
+ sha256 = "1hwg8ai4bvsmgnl669608lr4v940xnyig1xshps490f47c8hqy6y";
};
arukas =
{
owner = "terraform-providers";
repo = "terraform-provider-arukas";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "1akl9fzgm5qv01vz18xjzyqjnlxw699qq4x8vr96j16l1zf10h99";
};
@@ -32,6 +36,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-atlas";
+ rev = "v0.1.1";
version = "0.1.1";
sha256 = "0k73vv14vnjl5qm33w54s5zzi0mmk1kn2zs3qkfq71aqi9ml7d14";
};
@@ -39,41 +44,47 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "2.23.0";
- sha256 = "0yscy0qmdl07air0b16i6zd0w8y3z20pk5l53pwm78ssdxn3w6qc";
+ rev = "v2.34.0";
+ version = "2.34.0";
+ sha256 = "1kmy6hn1d3padfnix17ibmrm1339q4li0740dlfgjlxjv179bv34";
};
azuread =
{
owner = "terraform-providers";
repo = "terraform-provider-azuread";
- version = "0.5.1";
- sha256 = "0bjy6wdfzsxchqclgp7c06b49b5h60nips69hcpwd45564iql5fh";
+ rev = "v0.6.0";
+ version = "0.6.0";
+ sha256 = "1s3k2plka1lzfij4vhr30vc549zysa6v8j5mphra7fjxy236v40j";
};
azurerm =
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "1.32.1";
- sha256 = "0ydzibmvz52i62pk0g96rl7vxhff5izrsgdwk6lgc56nw63w2l8g";
+ rev = "v1.36.1";
+ version = "1.36.1";
+ sha256 = "1mnbmbfsnc859j6ahcph80z0v1jl82dnbjqmqg2q0kiappz2g2lm";
};
azurestack =
{
owner = "terraform-providers";
repo = "terraform-provider-azurestack";
- version = "0.8.1";
- sha256 = "1sbmjrqzzn8rf9xhaax2ykyg199sggx80apx0xvd4ab82c3ldyfw";
+ rev = "v0.9.0";
+ version = "0.9.0";
+ sha256 = "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324";
};
bigip =
{
owner = "terraform-providers";
repo = "terraform-provider-bigip";
- version = "0.12.3";
- sha256 = "1zlwk7jp5r45b3rwkxsq9mqf4nym3ifx56vhcvyc9a3w25s0ss8p";
+ rev = "v1.0.0";
+ version = "1.0.0";
+ sha256 = "0dz5dfv3glx7898a9bi9vi3g0ghyi96pc45brrj41and5835jvdc";
};
bitbucket =
{
owner = "terraform-providers";
repo = "terraform-provider-bitbucket";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "06bjagbgpgfphwym015wl00wx6qf7lsdig0fhpxqaykvlkn3sg49";
};
@@ -81,6 +92,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-brightbox";
+ rev = "v1.2.0";
version = "1.2.0";
sha256 = "0s1b2k58r2kmjrdqrkw2dlfpby79i81gml9rpa10y372bwq314zd";
};
@@ -88,6 +100,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-chef";
+ rev = "v0.2.0";
version = "0.2.0";
sha256 = "0ihn4706fflmf0585w22l7arzxsa9biq4cgh8nlhlp5y0zy934ns";
};
@@ -95,6 +108,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-circonus";
+ rev = "v0.2.0";
version = "0.2.0";
sha256 = "1vcia3p31cgdwjs06k4244bk7ib2qp1f2lhc7hmyhdfi1c8jym45";
};
@@ -102,6 +116,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-clc";
+ rev = "v0.1.0";
version = "0.1.0";
sha256 = "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf";
};
@@ -109,13 +124,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cloudflare";
- version = "1.17.1";
- sha256 = "0kmkk5fhgsvjakqrfs7p92dcljn04asxq15af1r9n5csq54q7na3";
+ rev = "v2.0.1";
+ version = "2.0.1";
+ sha256 = "18cxyxgv6x5s1xsd5l460hnl1xdvrvkwb36lhvk3dgziaw2xxr81";
};
cloudscale =
{
owner = "terraform-providers";
repo = "terraform-provider-cloudscale";
+ rev = "v2.0.0";
version = "2.0.0";
sha256 = "145hj4pbi5zrkgamicy3m1n3380fpd2ndd6ym7mwd65d95g39vwb";
};
@@ -123,6 +140,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cloudstack";
+ rev = "v0.3.0";
version = "0.3.0";
sha256 = "0zmyww6z3j839ydlmv254hr8gcsixng4lcvmiwkhxb3hj1nw8hcw";
};
@@ -130,6 +148,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cobbler";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "08ljqibfi6alpvv8f7pzvjl2k4w6br6g6ac755x4xw4ycrr24xw9";
};
@@ -137,27 +156,31 @@
{
owner = "terraform-providers";
repo = "terraform-provider-consul";
- version = "2.5.0";
- sha256 = "1nmldxn4y87fyb308dajjzcyvxrr6ka5nicyw84a8s7pixzbqh6q";
+ rev = "v2.6.0";
+ version = "2.6.0";
+ sha256 = "1c7qpgf2vh4crs69alzwwaicsz29b2y72x4xjmfb9dg5cy7gk1i5";
};
datadog =
{
owner = "terraform-providers";
repo = "terraform-provider-datadog";
- version = "2.1.0";
- sha256 = "0k7apad2r07gw9kf0zzqc8wa2wcmxihi3x8sdssl32qjib20qwv1";
+ rev = "v2.5.0";
+ version = "2.5.0";
+ sha256 = "0l5jix165ghfj72l3mr76d5b5lx5pgr45zimk8lr0fwn79f4bs74";
};
digitalocean =
{
owner = "terraform-providers";
repo = "terraform-provider-digitalocean";
- version = "1.6.0";
- sha256 = "06cxm3qcym8jwp4nl1bzk3p9fbaz26bvddqzn3p8l57c802qqds6";
+ rev = "v1.10.0";
+ version = "1.10.0";
+ sha256 = "1c53g32mk41lvq4ikfj04m89nhzrdk8d6h35aq3z07yyqp6ap2a0";
};
dme =
{
owner = "terraform-providers";
repo = "terraform-provider-dme";
+ rev = "v0.1.0";
version = "0.1.0";
sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv";
};
@@ -165,6 +188,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-dns";
+ rev = "v2.2.0";
version = "2.2.0";
sha256 = "11xdxj6hfclaq9glbh14nihmrsk220crm9ld8bdv77w0bppmrrch";
};
@@ -172,6 +196,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-dnsimple";
+ rev = "v0.2.0";
version = "0.2.0";
sha256 = "0jj82fffqaz7gramj5d4avx7vka6w190yz4r9q7628qh8ih2pfhz";
};
@@ -179,13 +204,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-docker";
- version = "2.1.1";
- sha256 = "0px3xj76ay5ixpmynas49z31xmk4zmpn0917y6a20kr2x2abi9zb";
+ rev = "v2.5.0";
+ version = "2.5.0";
+ sha256 = "1nril7qy1nm1dq19vg6mm0zc0sgkjrm1s39n7p9gxf4s4j78ig1n";
};
dyn =
{
owner = "terraform-providers";
repo = "terraform-provider-dyn";
+ rev = "v1.2.0";
version = "1.2.0";
sha256 = "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48";
};
@@ -193,6 +220,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-external";
+ rev = "v1.2.0";
version = "1.2.0";
sha256 = "1kx28bffhd1pg3m0cbldclc8l9zic16mqrk7gybcls9vyds5gbvc";
};
@@ -200,48 +228,55 @@
{
owner = "terraform-providers";
repo = "terraform-provider-fastly";
- version = "0.9.0";
- sha256 = "0g3rgi6s9hyb6vzl682n8zqz5virdxvxh04v88n9iy5r7hwrxxzg";
+ rev = "v0.11.0";
+ version = "0.11.0";
+ sha256 = "0wq8l1lkfpv5nfd04dsjaa9wv09373i6wwnapifx1wncjyhs4jd4";
};
flexibleengine =
{
owner = "terraform-providers";
repo = "terraform-provider-flexibleengine";
- version = "1.6.0";
- sha256 = "0vz68nhpy93zsdssxzr41flrwhjqh7wcjrc4nklg6kmr99n6jcc6";
+ rev = "v1.9.0";
+ version = "1.9.0";
+ sha256 = "1y66xy5yqdjdrh3zkw1q7ml5b2rsyy4ayc4m026c4mmh0x1vfk9y";
};
github =
{
owner = "terraform-providers";
repo = "terraform-provider-github";
- version = "2.2.0";
- sha256 = "1h44v7428z3v3hv6ywi3n0yhnvgx9cr6vgqb1n2w1qf7k2f0jkzx";
+ rev = "v2.2.1";
+ version = "2.2.1";
+ sha256 = "1dg5jgd3cdz98wfd71l58wsp949mvs2lrcqh1amgql0s90pwjmvg";
};
gitlab =
{
owner = "terraform-providers";
repo = "terraform-provider-gitlab";
- version = "2.2.0";
- sha256 = "0iz5ggjkcip86cz2zmsryad34hly542grwzlm5rvpcmfw5csjadw";
+ rev = "v2.3.0";
+ version = "2.3.0";
+ sha256 = "012pbgfdmwyq8y8ddrhyf14jc6s7v24f1w3mrpi6mp4glqc5yfqx";
};
google =
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "2.12.0";
- sha256 = "15fdpmdikm77hlfksdbcblysb82sd51vw4ninx60hzgddqp6ll4m";
+ rev = "v2.19.0";
+ version = "2.19.0";
+ sha256 = "00pqkysic3x8iygcxb232dwbpmy5ldf7fdfi6ldiv3g6gbvlcaf7";
};
google-beta =
{
owner = "terraform-providers";
repo = "terraform-provider-google-beta";
- version = "2.12.0";
- sha256 = "11aky7jvm7i39pnj3ypy42d9yk9akqb3wjb03hyllzfddwhvay5q";
+ rev = "v2.19.0";
+ version = "2.19.0";
+ sha256 = "03im9h7r2vyx4y9qnc3l0hsvcqy7rai5dlkmj1za3npm98vpx2d7";
};
grafana =
{
owner = "terraform-providers";
repo = "terraform-provider-grafana";
+ rev = "v1.5.0";
version = "1.5.0";
sha256 = "0zy3bqgpxymp2zygaxzllk1ysdankwxa1sy1djfgr4fs2nlggkwi";
};
@@ -249,13 +284,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-hcloud";
- version = "1.12.0";
- sha256 = "1r61s7chq636fcjv67g0vjlc35xx0ycy58hg6b5i5rdc9737v7hp";
+ rev = "v1.14.0";
+ version = "1.14.0";
+ sha256 = "13zxrjx4im25g7m45z95d3py85nzs2k8r9grilxshr6x95bxk2f0";
};
hedvig =
{
owner = "terraform-providers";
repo = "terraform-provider-hedvig";
+ rev = "v1.0.4";
version = "1.0.4";
sha256 = "0y6brzznxp8khdfbnpmnbjqf140411z0pvnp88p8mj2kmbk7kkjd";
};
@@ -263,20 +300,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-helm";
- version = "0.10.2";
- sha256 = "1xp8dx6ncskmfa9bjd54434f4a7pnjz5r3yvnh1hmv3i5ykfxzdn";
+ rev = "v0.10.4";
+ version = "0.10.4";
+ sha256 = "0xl0wgh1j6yhymadqvlj21qddxfzaxk3d5wpzskfmhfk732795rc";
};
heroku =
{
owner = "terraform-providers";
repo = "terraform-provider-heroku";
- version = "2.1.2";
- sha256 = "0n8id5rw4hzsiic9yv4rzm709npagv9sfp6dd1ax6np5kai78b87";
+ rev = "v2.2.1";
+ version = "2.2.1";
+ sha256 = "145kfm4asca0ksprb076mjdhs5ahrlrad8cqz8spxra5fa3j46sq";
};
http =
{
owner = "terraform-providers";
repo = "terraform-provider-http";
+ rev = "v1.1.1";
version = "1.1.1";
sha256 = "0ah4wi9gm5m7z0wyy6vn3baz2iw2sq7ah7q0lb9srwr887aai3x0";
};
@@ -284,13 +324,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-huaweicloud";
- version = "1.7.0";
- sha256 = "1yhyyh33hvzs74pryb383p1w0c0d4vn23pnm6snxi1cw49wgiiyf";
+ rev = "v1.9.0";
+ version = "1.9.0";
+ sha256 = "06blhsbv5pxlb1m07qanrq5qmbai33dlk89ghzscrqwnvv1nnszr";
};
icinga2 =
{
owner = "terraform-providers";
repo = "terraform-provider-icinga2";
+ rev = "v0.2.0";
version = "0.2.0";
sha256 = "02ladn2w75k35vn8llj3zh9hbpnnnvpm47c9f29zshfs04acwbq0";
};
@@ -298,6 +340,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ignition";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "0vpjbb70wnlrvw7z2zc92fbisgjk49ivdmv10ahyqlgvc23js5va";
};
@@ -305,6 +348,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-influxdb";
+ rev = "v1.3.0";
version = "1.3.0";
sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9";
};
@@ -312,13 +356,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-kubernetes";
- version = "1.8.1";
- sha256 = "0jcc3i10x0qz7sj8l5yv98jc2g32a6yhdpc45sq33wmhcvp1fsn4";
+ rev = "v1.9.0";
+ version = "1.9.0";
+ sha256 = "1ai8w853k4pgr43g9dwdsimw0g0c6vg6vg2f20d9ch7bx8ii4nhf";
};
librato =
{
owner = "terraform-providers";
repo = "terraform-provider-librato";
+ rev = "v0.1.0";
version = "0.1.0";
sha256 = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923";
};
@@ -326,6 +372,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-linode";
+ rev = "v1.8.0";
version = "1.8.0";
sha256 = "1jgh2ij58a5mr6ns604cfpvfvr19qr0q51j57gvchz53iv683m9q";
};
@@ -333,13 +380,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-local";
- version = "1.3.0";
- sha256 = "1z6b52vdq7wzzipldys28z45glwgj9k15ighjix1dy78mzi0p99n";
+ rev = "v1.4.0";
+ version = "1.4.0";
+ sha256 = "1k1kbdn99ypn1pi6vqbs1l9a8vvf4vs32wl8waa16i26514sz1wk";
};
logentries =
{
owner = "terraform-providers";
repo = "terraform-provider-logentries";
+ rev = "v1.0.0";
version = "1.0.0";
sha256 = "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq";
};
@@ -347,6 +396,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-logicmonitor";
+ rev = "v1.2.1";
version = "1.2.1";
sha256 = "1fcv5g92l6xr4x69h9rg48zazjr99wrz9mkmr122fyq9s7kdd98y";
};
@@ -354,20 +404,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-mailgun";
- version = "0.1.0";
- sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj";
+ rev = "v0.4.1";
+ version = "0.4.1";
+ sha256 = "1l76pg4hmww9zg2n4rkhm5dwjh42fxri6d41ih1bf670krkxwsmz";
};
mysql =
{
owner = "terraform-providers";
repo = "terraform-provider-mysql";
- version = "1.7.0";
- sha256 = "19l1ihp5jlaahm8zncjlrnfw8d8gcpnq3z6pn421j1x0d5v5vw9b";
+ rev = "v1.8.0";
+ version = "1.8.0";
+ sha256 = "1llcg2mp6jbj386liinly62pgy934v0c2g5z976n0xwfdiybyhwx";
};
netlify =
{
owner = "terraform-providers";
repo = "terraform-provider-netlify";
+ rev = "v0.3.0";
version = "0.3.0";
sha256 = "0mmbli6d3fbpyvvdfsg32f1w83g8ga3x21b36rgmx3mn156r7yij";
};
@@ -375,27 +428,31 @@
{
owner = "terraform-providers";
repo = "terraform-provider-newrelic";
- version = "1.5.1";
- sha256 = "1xrwh9m1sig4hd2vvb7apy2gh8rz15wdrajggzmmpc1z1rlhf90p";
+ rev = "v1.5.2";
+ version = "1.5.2";
+ sha256 = "1q2vlpzxz04xhmf2wi5pc501454qwzh59kdhfhs8yjg1d1489jng";
};
nomad =
{
owner = "terraform-providers";
repo = "terraform-provider-nomad";
- version = "1.4.1";
- sha256 = "1v4wwinnb2qc71jgil4607kgdccjivssabqgb5l3yk8pwfidgdnr";
+ rev = "v1.4.2";
+ version = "1.4.2";
+ sha256 = "0h0snkzqdi4g5lp78f5pq98x6556ldwgkg9p9jkmrg04y7928w5v";
};
ns1 =
{
owner = "terraform-providers";
repo = "terraform-provider-ns1";
- version = "1.5.0";
- sha256 = "1m6f1hsx2gcb5b50sm8cj04hkmn71xlxji8qwlswasz2sg1sllrx";
+ rev = "v1.6.0";
+ version = "1.6.0";
+ sha256 = "1v075wc48pq9kp9rp4kanlfshnxgan9h914nqalq90xgzyl2gf3v";
};
nsxt =
{
owner = "terraform-providers";
repo = "terraform-provider-nsxt";
+ rev = "v1.1.1";
version = "1.1.1";
sha256 = "19bbycify25bshpyq65qjxnl72b6wmwwwdb7hxl94hhbgx2c9z29";
};
@@ -403,6 +460,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-null";
+ rev = "v2.1.2";
version = "2.1.2";
sha256 = "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2";
};
@@ -410,20 +468,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-nutanix";
- version = "1.0.1";
- sha256 = "1g7p6qg32g75x8fgspgxcdsa086mz3yabdgv1k68rykhw3zbri5d";
+ rev = "v1.0.2";
+ version = "1.0.2";
+ sha256 = "17sgsxsh8minirks08c6gz52cf7ndn220sx4xzi6bq64yi6qw2yc";
};
oci =
{
owner = "terraform-providers";
repo = "terraform-provider-oci";
- version = "3.37.0-rc1";
- sha256 = "0ahqnh9qzixp434qn2ckj8p32kb9x26l1xz8yr84h6sqfrn58bcv";
+ rev = "v3.50.0-rc1";
+ version = "3.50.0-rc1";
+ sha256 = "0nzz62zyx5xf2qlvjcbsqnafdhmq194yhyipcab1n2ckji8zb03z";
};
oneandone =
{
owner = "terraform-providers";
repo = "terraform-provider-oneandone";
+ rev = "v1.3.0";
version = "1.3.0";
sha256 = "0c412nqg3k17124i51nn3ffra6gcll904h37h7hyvz97cdblcncn";
};
@@ -431,6 +492,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-opc";
+ rev = "v1.3.7";
version = "1.3.7";
sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w";
};
@@ -438,34 +500,39 @@
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
- version = "1.21.1";
- sha256 = "0nvhn2bnk11sz4i98yw7rpxi8b3c2y04qq37ybvqx2jyi3n9kj30";
+ rev = "v1.24.0";
+ version = "1.24.0";
+ sha256 = "1w82ix6l6ad7q0zl00hys8c4gm27nnk12wm2n8i3prwpjnrar70m";
};
opentelekomcloud =
{
owner = "terraform-providers";
repo = "terraform-provider-opentelekomcloud";
- version = "1.11.0";
- sha256 = "175j2bbw3bdbjq1b7b1kwsr8iay9aafz165d0brfpb8gf096y7xa";
+ rev = "v1.13.1";
+ version = "1.13.1";
+ sha256 = "1mxbfskxf9zwm55r3s6fhk634pnyk0sx5pgwk3kmw4sgjv88i1ny";
};
opsgenie =
{
owner = "terraform-providers";
repo = "terraform-provider-opsgenie";
- version = "0.1.0";
- sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
+ rev = "v0.2.4";
+ version = "0.2.4";
+ sha256 = "1kgvbx39v6f3hszwrqjsaq3wvwzkxf4gwwfix2m6bprfr5q5vn0d";
};
oraclepaas =
{
owner = "terraform-providers";
repo = "terraform-provider-oraclepaas";
- version = "1.5.2";
- sha256 = "0m886wfg5ski8s1zr7g1h1m6q5ai08jk35ymipxpb6ipx781qvvk";
+ rev = "v1.5.3";
+ version = "1.5.3";
+ sha256 = "0xb03b5jgm06rgrllib6zj1nkh54zv2mqjnyfflgnazpf4c1ia15";
};
ovh =
{
owner = "terraform-providers";
repo = "terraform-provider-ovh";
+ rev = "v0.5.0";
version = "0.5.0";
sha256 = "07n8ismxbv0gngh4kibqhr4ndqkrg6gxbpj3zl764rrwp54gwgbw";
};
@@ -473,41 +540,47 @@
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- version = "2.3.0";
- sha256 = "1v2758wjhrn7rhwdx658w3sf1q5lp4cawl6llbv4p16c5fyzwwc2";
+ rev = "v2.6.1";
+ version = "2.6.1";
+ sha256 = "198lkw5b4xfyf82yzym66fna7j0wl3hzvkdr9b9q7f0nffx47xri";
};
pagerduty =
{
owner = "terraform-providers";
repo = "terraform-provider-pagerduty";
- version = "1.3.1";
- sha256 = "1x29ya0xcjj2b3x2q2q7iyqric8vswf18a5bwhwv2017c1g4n299";
+ rev = "v1.4.1";
+ version = "1.4.1";
+ sha256 = "0dmafnlziyczad907isjqzsn1fyjzc8pdigp3m6114bbnca0ry5k";
};
panos =
{
owner = "terraform-providers";
repo = "terraform-provider-panos";
- version = "1.5.2";
- sha256 = "0sycgr4k4dlhxj5klmgg2xcw3xha06332ij8cfzz4xvgdq0xky3j";
+ rev = "v1.6.0";
+ version = "1.6.0";
+ sha256 = "0qszdyrj84c8i195y45cnanzmkn8ypi1gi5a03pf3gsf2fdcj9gq";
};
postgresql =
{
owner = "terraform-providers";
repo = "terraform-provider-postgresql";
- version = "1.1.0";
- sha256 = "1dxspqajfy8dmplasazi4s34f47n1qz7qg2dr9ypdvd3jp63072w";
+ rev = "v1.3.0";
+ version = "1.3.0";
+ sha256 = "14ma5lm6ng52dfl8bl4rmpy8ylnkbvnbskvkr6r5sn28x51p601y";
};
powerdns =
{
owner = "terraform-providers";
repo = "terraform-provider-powerdns";
- version = "1.0.0";
- sha256 = "1qh4z69b0sqxwjjgc8xis165gdszav9yc85ba6pgyl3wbymkld30";
+ rev = "v1.2.0";
+ version = "1.2.0";
+ sha256 = "1108hq4z4is305hnbkn95gv0f5lx5l27wvxvq0g03fcdqdimkrfn";
};
profitbricks =
{
owner = "terraform-providers";
repo = "terraform-provider-profitbricks";
+ rev = "v1.4.4";
version = "1.4.4";
sha256 = "0pzcl3pdhaykihvv1v38zrv607mydchvkzrzhwcakgmdkp3vq54i";
};
@@ -515,6 +588,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rabbitmq";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "0xihc44923kx8c3v6wrvczzbhmbjkhy7dhgx3sy5sqhmm22y0gys";
};
@@ -522,6 +596,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rancher";
+ rev = "v1.4.0";
version = "1.4.0";
sha256 = "106arszmdjmgrz4iv01bbf72jarn7zjqvmc43b6n1s3lzd7jnfpc";
};
@@ -529,13 +604,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-random";
- version = "2.2.0";
- sha256 = "0vg33jbvyxvg4dwcwjb2p57jjkq7qj50d356r4a1f2ysl2axwwjw";
+ rev = "v2.2.1";
+ version = "2.2.1";
+ sha256 = "1qklsxj443vsj61lwl7qf7xwgnllwcvb2yk6s0kn9g3iq63pcv30";
};
rightscale =
{
owner = "terraform-providers";
repo = "terraform-provider-rightscale";
+ rev = "v1.3.1";
version = "1.3.1";
sha256 = "0abwxaghrxpahpsk6kd02fjh0rhck4xsdrzcpv629yh8ip9rzcaj";
};
@@ -543,6 +620,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rundeck";
+ rev = "v0.4.0";
version = "0.4.0";
sha256 = "1x131djsny8w84yf7w2il33wlc3ysy3k399dziii2lmq4h8sgrpr";
};
@@ -550,6 +628,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-runscope";
+ rev = "v0.6.0";
version = "0.6.0";
sha256 = "1fsph2cnyvzdwa5hwdjabfk4azmc3x8a7afpwpawxfdvqhgpr595";
};
@@ -557,20 +636,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-scaleway";
- version = "1.10.0";
- sha256 = "0sbcvcd413f53b25piymmh4rfmlmqsxdscpar8gf2dx6mrsacgf0";
+ rev = "v1.12.0";
+ version = "1.12.0";
+ sha256 = "0044fq5jkdx2ryc2bxqajkrngs6z81kd2narg4zxvfn0r1bfswvc";
};
selectel =
{
owner = "terraform-providers";
repo = "terraform-provider-selectel";
- version = "2.3.0";
- sha256 = "0n0nqlajcx44zxbc2k58lv3jy2y6p9zqkby2vy5a2856kcksm7pf";
+ rev = "v3.0.0";
+ version = "3.0.0";
+ sha256 = "0fr97j85inaqvdqmlfk3xcq73zvncn001nsd03pp2ws30qqa8p7r";
};
skytap =
{
owner = "terraform-providers";
repo = "terraform-provider-skytap";
+ rev = "v0.11.1";
version = "0.11.1";
sha256 = "1mlv6jp6lp47chcnsmx8dzy01bxpb9jx1wl122lxd88app9nxq1k";
};
@@ -578,6 +660,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-softlayer";
+ rev = "v0.0.1";
version = "0.0.1";
sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq";
};
@@ -585,13 +668,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-spotinst";
- version = "1.13.3";
- sha256 = "0s75xlw8y3rz1ik11dnh3dzkk1jfklvq3wsf2fam0789z2j1zr1m";
+ rev = "v1.13.4";
+ version = "1.13.4";
+ sha256 = "063lhm065y6qh9b2k11qjnqyfg5zrx6wa3bqrm7d1dqcha1i6d9f";
};
statuscake =
{
owner = "terraform-providers";
repo = "terraform-provider-statuscake";
+ rev = "v1.0.0";
version = "1.0.0";
sha256 = "1x295va6c72465cxps0kx3rrb7s9aip2cniy6icsg1b2yrsb9b26";
};
@@ -599,6 +684,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-telefonicaopencloud";
+ rev = "v1.0.0";
version = "1.0.0";
sha256 = "1761wkjz3d2458xl7855lxklyxgyk05fddh92rp6975y0ca6xa5m";
};
@@ -606,6 +692,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-template";
+ rev = "v2.1.2";
version = "2.1.2";
sha256 = "18w1mmma81m9j7yf6q500w8v9ss28w6sw2ynssl99pyw2gwmd04q";
};
@@ -613,13 +700,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tencentcloud";
- version = "1.15.0";
- sha256 = "1ics91fxsl1z1wqd961wdn2s22ck25yphp341qlbs8ln2dcwk8r7";
+ rev = "v1.22.0";
+ version = "1.22.0";
+ sha256 = "0lamj77n9b5m80201wim0zcjgdcbihcaq27z49himh2qi5j8lxiz";
};
terraform =
{
owner = "terraform-providers";
repo = "terraform-provider-terraform";
+ rev = "v1.0.2";
version = "1.0.2";
sha256 = "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v";
};
@@ -627,34 +716,39 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tfe";
- version = "0.10.1";
- sha256 = "09hrdschgydnziq1sv6ql7gc4qwx8j4dnmx4fdw8452qpszk17n2";
+ rev = "v0.11.1";
+ version = "0.11.1";
+ sha256 = "0iagddaivpd7cxgf8ha2pk0m66gi4a804s86fsxla0j1knmmyra0";
};
tls =
{
owner = "terraform-providers";
repo = "terraform-provider-tls";
- version = "2.0.1";
- sha256 = "08fh4k5fvkijl2ds8mxdc5fxlwhs11y5s48vvxdskklvkjhygzc7";
+ rev = "v2.1.1";
+ version = "2.1.1";
+ sha256 = "1qsx540pjcq4ra034q2dwnw5nmzab5h1c3vm20ppg5dkhhyiizq8";
};
triton =
{
owner = "terraform-providers";
repo = "terraform-provider-triton";
- version = "0.5.1";
- sha256 = "1bn5x6nmhfkrzpxhyfclls85l9qqffvzx1xsgcb3368lhwzarn2f";
+ rev = "v0.6.0";
+ version = "0.6.0";
+ sha256 = "10z032fa64sd8d6r4v2f4m7gp93v8wb2zk2r13fflzg5rfk5740z";
};
ucloud =
{
owner = "terraform-providers";
repo = "terraform-provider-ucloud";
- version = "1.11.1";
- sha256 = "1la5kapdwpd2f6x00yc9j25rl8qkrndgqpzp2jp6mcbj5zif82ns";
+ rev = "v1.14.1";
+ version = "1.14.1";
+ sha256 = "04vi87q2fhy907l7rwsbq5p6l9vm6avm1hbf9qwddkbxx2kjjf64";
};
ultradns =
{
owner = "terraform-providers";
repo = "terraform-provider-ultradns";
+ rev = "v0.1.0";
version = "0.1.0";
sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj";
};
@@ -662,41 +756,71 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vault";
- version = "2.2.0";
- sha256 = "0k9frx29pjrrx67cwzsrnj0x90ff5k99l5yzfgb58sajkz1j8nln";
+ rev = "v2.5.0";
+ version = "2.5.0";
+ sha256 = "0h3q2zifjgm05kvdans88dl8wx9hr21c1s64fmfs4an07gkg8947";
};
vcd =
{
owner = "terraform-providers";
repo = "terraform-provider-vcd";
- version = "2.4.0";
- sha256 = "020wmdl5cbma9r7sv3bx6v8b59w5nwkzgwj4xm7a2s6kn8jygr2x";
+ rev = "v2.5.0";
+ version = "2.5.0";
+ sha256 = "0h78ij9rkx43i9kdcfy7waa6xyn2j40zgm6im3zp0yswy6vjlcyq";
};
vsphere =
{
owner = "terraform-providers";
repo = "terraform-provider-vsphere";
- version = "1.12.0";
- sha256 = "0g3pnk2b4dmz5bkr7xjpp45dwy767k6a02rjva38xls185qs7i7c";
+ rev = "v1.13.0";
+ version = "1.13.0";
+ sha256 = "10gl042l5mlmklhjjknwln1qcwl65xz8sbg1acyv8xkb6nsaxcf1";
};
yandex =
{
owner = "terraform-providers";
repo = "terraform-provider-yandex";
- version = "0.9.0";
- sha256 = "0x3l0pbpdsm43jsx42xzc46r9j40l7szkcf851q16wsxf70lchqr";
+ rev = "v0.23.0";
+ version = "0.23.0";
+ sha256 = "0vv8lp834q8i7fam2s8pvs7slfwlf8m4g080i9cij5z2lgipja32";
+ };
+ segment =
+ {
+ owner = "ajbosco";
+ repo = "terraform-provider-segment";
+ rev = "v0.2.0";
+ version = "0.2.0";
+ sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz";
+ };
+ pass =
+ {
+ owner = "camptocamp";
+ repo = "terraform-provider-pass";
+ rev = "1.2.1";
+ version = "1.2.1";
+ sha256 = "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk";
};
matchbox =
{
owner = "poseidon";
repo = "terraform-provider-matchbox";
+ rev = "v0.3.0";
version = "0.3.0";
sha256 = "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3";
};
+ wavefront =
+ {
+ owner = "spaceapegames";
+ repo = "terraform-provider-wavefront";
+ rev = "v2.1.1";
+ version = "2.1.1";
+ sha256 = "0cbs74kd820i8f13a9jfbwh2y5zmmx3c2mp07qy7m0xx3m78jksn";
+ };
nixos =
{
owner = "tweag";
repo = "terraform-provider-nixos";
+ rev = "v0.0.1";
version = "0.0.1";
sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf";
};
@@ -704,21 +828,8 @@
{
owner = "tweag";
repo = "terraform-provider-secret";
- version = "1.0.0";
- sha256 = "03q78d0g3b4j4213qjlacj1adh7hjwcqcqrwm8c2r2k5w9kb25k0";
- };
- segment =
- {
- owner = "ajbosco";
- repo = "terraform-provider-segment";
- version = "0.2.0";
- sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz";
- };
- wavefront =
- {
- owner = "spaceapegames";
- repo = "terraform-provider-wavefront";
- version = "2.1.0";
- sha256 = "1ir2wkg5mfng7h5544kar1arkjb5ffjhki5qr25a5x0rpwlg99sx";
+ rev = "v1.1.0";
+ version = "1.1.0";
+ sha256 = "09gv0fpsrxzgna0xrhrdk8d4va9s0gvdbz596r306qxb4mip4w3r";
};
}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 83157c90a48..6298c25ba25 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -9,13 +9,12 @@ let
toDrv = data:
buildGoPackage rec {
- inherit (data) owner repo version sha256;
+ inherit (data) owner repo rev version sha256;
name = "${repo}-${version}";
goPackagePath = "github.com/${owner}/${repo}";
subPackages = [ "." ];
src = fetchFromGitHub {
- inherit owner repo sha256;
- rev = "v${version}";
+ inherit owner repo rev sha256;
};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index d04f85fe455..bdde6600678 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -9,17 +9,10 @@
# include all terraform-providers
terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\)
-# include terraform-provider-matchbox
-poseidon/terraform-provider-matchbox
-
-# include terraform-provider-nixos
-tweag/terraform-provider-nixos
-
-# include terraform-provider-secret
-tweag/terraform-provider-secret
-
-# include terraform-provider-segment
+# include providers from individual repos
ajbosco/terraform-provider-segment
-
-# include terraform-provider-wavefront
+camptocamp/terraform-provider-pass
+poseidon/terraform-provider-matchbox
spaceapegames/terraform-provider-wavefront
+tweag/terraform-provider-nixos
+tweag/terraform-provider-secret
diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all
index 2009d474db7..893a6b1c7d7 100755
--- a/pkgs/applications/networking/cluster/terraform-providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-all
@@ -58,12 +58,14 @@ prefetch_github() {
echo_entry() {
local owner=$1
local repo=$2
- local version=${3:1}
+ local rev=$3
+ local version=$(echo $3 | sed 's/^v//')
local sha256=$4
cat < plugs;
-
- public signal void plug_added (Switchboard.Plug plug);
--
-+
+@@ -36,7 +36,15 @@ public class Switchboard.PlugsManager : GLib.Object {
+
private PlugsManager () {
plugs = new Gee.LinkedList ();
- var base_folder = File.new_for_path (Build.PLUGS_DIR);
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 2f917b19f11..02421f28164 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0lrd474m6p8di73hqjilqnnl7qg72ky5narkgcvm4lk8dyi78mz0";
+ sha256 = "0jc12xfaj3micpjssxc7m6hzssvyq26ln5az05x5f1j6v8lccbyn";
};
passthru = {
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 409ac03d92f..4032f0b5e92 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -212,7 +212,14 @@ in rec {
binary = binaryCrystal_0_29;
};
- crystal = crystal_0_30;
+ crystal_0_31 = generic {
+ version = "0.31.1";
+ sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8";
+ doCheck = false; # 5 checks are failing now
+ binary = crystal_0_30;
+ };
+
+ crystal = crystal_0_31;
crystal2nix = callPackage ./crystal2nix.nix {};
}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 06c2aa838c5..084ced822c7 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -7,6 +7,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which
@@ -96,69 +97,8 @@ let version = "4.8.5";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
in
@@ -232,98 +172,45 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langJava langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langJava "java"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
+ cloog
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
- optionals (cloog != null) [
- "--with-cloog=${cloog}"
- "--disable-cloog-version-check"
- "--enable-cloog-backend=isl"
- ] ++
-
- # Java options
- optionals langJava [
- "--with-ecj-jar=${javaEcj}"
-
- # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
- # .
- "--enable-java-home"
- "--with-java-home=\${prefix}/lib/jvm/jre"
- ] ++
- optional javaAwtGtk "--enable-java-awt=gtk" ++
- optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langJava javaAwtGtk javaAntlr javaEcj
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index ebcf20d4e09..a2a9f39a94e 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -7,6 +7,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which
@@ -101,72 +102,8 @@ let version = "4.9.4";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
in
@@ -241,102 +178,45 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- sed -i -e "s/-lrt//g" libstdc++-v3/configure
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- ''
- + stdenv.lib.optionalString (langJava || langGo) ''
- export lib=$out;
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langJava langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langJava "java"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
+ cloog
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
- optionals (cloog != null) [
- "--with-cloog=${cloog}"
- "--disable-cloog-version-check"
- "--enable-cloog-backend=isl"
- ] ++
-
- # Java options
- optionals langJava [
- "--with-ecj-jar=${javaEcj}"
-
- # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
- # .
- "--enable-java-home"
- "--with-java-home=\${prefix}/lib/jvm/jre"
- ] ++
- optional javaAwtGtk "--enable-java-awt=gtk" ++
- optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langJava javaAwtGtk javaAntlr javaEcj
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 0adedb6f842..775245aae42 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -7,6 +7,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which
@@ -88,72 +89,8 @@ let version = "5.5.0";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
in
@@ -249,99 +186,44 @@ stdenv.mkDerivation ({
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langJava langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langJava "java"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- # Java options
- optionals langJava [
- "--with-ecj-jar=${javaEcj}"
-
- # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
- # .
- "--enable-java-home"
- "--with-java-home=\${prefix}/lib/jvm/jre"
- ] ++
- optional javaAwtGtk "--enable-java-awt=gtk" ++
- optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langJava javaAwtGtk javaAntlr javaEcj
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 959b5e62381..3f5644e9450 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -7,6 +7,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which
@@ -85,74 +86,8 @@ let version = "6.5.0";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
in
@@ -253,102 +188,44 @@ stdenv.mkDerivation ({
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- ''
- + stdenv.lib.optionalString (langJava || langGo) ''
- export lib=$out;
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langJava langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langJava "java"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- # Java options
- optionals langJava [
- "--with-ecj-jar=${javaEcj}"
-
- # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
- # .
- "--enable-java-home"
- "--with-java-home=\${prefix}/lib/jvm/jre"
- ] ++
- optional javaAwtGtk "--enable-java-awt=gtk" ++
- optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langJava javaAwtGtk javaAntlr javaEcj
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 39b3e4734fe..f780bfdfc76 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -63,75 +63,8 @@ let version = "7.4.0";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- # No final libdecnumber (it may work only in 386)
- "--disable-decimal-float"
- ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
in
@@ -231,88 +164,45 @@ stdenv.mkDerivation ({
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- (if enableLTO then "--enable-lto" else "--disable-lto")
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
+ langC
+ langCC
+ langFortran
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ } ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
++ optional targetPlatform.isNetBSD "--disable-libcilkrts"
;
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 52f568b2ed9..dc051d9c4b6 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -55,79 +55,13 @@ let version = "8.3.0";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
- bootstrap = targetPlatform == hostPlatform;
-
in
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;
@@ -221,86 +155,43 @@ stdenv.mkDerivation ({
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- (if enableLTO then "--enable-lto" else "--disable-lto")
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index de4d893b99e..57f4a72c135 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -6,6 +6,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which
@@ -53,79 +54,13 @@ let version = "9.2.0";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
- bootstrap = targetPlatform == hostPlatform;
-
in
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;
@@ -219,86 +154,43 @@ stdenv.mkDerivation ({
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
new file mode 100644
index 00000000000..7554818e0a0
--- /dev/null
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -0,0 +1,174 @@
+{ stdenv
+, targetPackages
+
+, crossStageStatic, libcCross
+, version
+
+, gmp, mpfr, libmpc, libelf, isl
+, cloog ? null
+
+, enableLTO
+, enableMultilib
+, enablePlugin
+, enableShared
+
+, langC
+, langCC
+, langFortran
+, langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null
+, langGo
+, langObjC
+, langObjCpp
+}:
+
+assert cloog != null -> stdenv.lib.versionOlder version "5";
+assert langJava -> stdenv.lib.versionOlder version "6";
+
+let
+ inherit (stdenv)
+ buildPlatform hostPlatform targetPlatform
+ lib;
+
+ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+ crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
+
+ crossConfigureFlags =
+ # Ensure that -print-prog-name is able to find the correct programs.
+ [
+ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
+ "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld"
+ ]
+ ++ (if crossStageStatic then [
+ "--disable-libssp"
+ "--disable-nls"
+ "--without-headers"
+ "--disable-threads"
+ "--disable-libgomp"
+ "--disable-libquadmath"
+ "--disable-shared"
+ "--disable-libatomic" # requires libc
+ "--disable-decimal-float" # requires libc
+ "--disable-libmpx" # requires libc
+ ] ++ lib.optionals crossMingw [
+ "--with-headers=${libcCross}/include"
+ "--with-gcc"
+ "--with-gnu-as"
+ "--with-gnu-ld"
+ "--disable-debug"
+ "--enable-sjlj-exceptions"
+ "--disable-win32-registry"
+ ] else [
+ (if crossDarwin then "--with-sysroot=${lib.getLib libcCross}/share/sysroot"
+ else "--with-headers=${lib.getDev libcCross}${libcCross.incdir or "/include"}")
+ "--enable-__cxa_atexit"
+ "--enable-long-long"
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ] ++ lib.optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
+ # libsanitizer requires netrom/netrom.h which is not
+ # available in uclibc.
+ "--disable-libsanitizer"
+ # In uclibc cases, libgomp needs an additional '-ldl'
+ # and as I don't know how to pass it, I disable libgomp.
+ "--disable-libgomp"
+ ] ++ lib.optionals (targetPlatform.libc == "musl") [
+ # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
+ "--disable-libmpx"
+ ] ++ lib.optionals crossMingw [
+ "--enable-sjlj-exceptions"
+ "--enable-hash-synchronization"
+ "--enable-libssp"
+ "--disable-nls"
+ "--with-dwarf2"
+ # To keep ABI compatibility with upstream mingw-w64
+ "--enable-fully-dynamic-string"
+ ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ );
+
+ configureFlags =
+ # Basic dependencies
+ [
+ "--with-gmp-include=${gmp.dev}/include"
+ "--with-gmp-lib=${gmp.out}/lib"
+ "--with-mpfr-include=${mpfr.dev}/include"
+ "--with-mpfr-lib=${mpfr.out}/lib"
+ "--with-mpc=${libmpc}"
+ ]
+ ++ lib.optional (libelf != null) "--with-libelf=${libelf}"
+ ++ lib.optional (!(crossMingw && crossStageStatic))
+ "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include"
+
+ # Basic configuration
+ ++ [
+ (lib.enableFeature enableLTO "lto")
+ "--disable-libstdcxx-pch"
+ "--without-included-gettext"
+ "--with-system-zlib"
+ "--enable-static"
+ "--enable-languages=${
+ lib.concatStrings (lib.intersperse ","
+ ( lib.optional langC "c"
+ ++ lib.optional langCC "c++"
+ ++ lib.optional langFortran "fortran"
+ ++ lib.optional langJava "java"
+ ++ lib.optional langGo "go"
+ ++ lib.optional langObjC "objc"
+ ++ lib.optional langObjCpp "obj-c++"
+ ++ lib.optionals crossDarwin [ "objc" "obj-c++" ]
+ )
+ )
+ }"
+ ]
+
+ ++ (if (enableMultilib || targetPlatform.isAvr)
+ then ["--enable-multilib" "--disable-libquadmath"]
+ else ["--disable-multilib"])
+ ++ lib.optional (!enableShared) "--disable-shared"
+ ++ [
+ (lib.enableFeature enablePlugin "plugin")
+ ]
+
+ # Optional features
+ ++ lib.optional (isl != null) "--with-isl=${isl}"
+ ++ lib.optionals (cloog != null) [
+ "--with-cloog=${cloog}"
+ "--disable-cloog-version-check"
+ "--enable-cloog-backend=isl"
+ ]
+
+ # Java options
+ ++ lib.optionals langJava [
+ "--with-ecj-jar=${javaEcj}"
+
+ # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
+ # .
+ "--enable-java-home"
+ "--with-java-home=\${prefix}/lib/jvm/jre"
+ ]
+ ++ lib.optional javaAwtGtk "--enable-java-awt=gtk"
+ ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
+
+ ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; })
+ ++ lib.optional (targetPlatform != hostPlatform) crossConfigureFlags
+ ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap"
+
+ # Platform-specific flags
+ ++ lib.optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
+ ++ lib.optionals hostPlatform.isSunOS [
+ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
+ # On Illumos/Solaris GNU as is preferred
+ "--with-gnu-as" "--without-gnu-ld"
+ ]
+ ++ lib.optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+ "--disable-libsanitizer"
+ "--disable-symvers"
+ "libat_cv_have_ifunc=no"
+ "--disable-gnu-indirect-function"
+ ]
+ ;
+
+in configureFlags
diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix
new file mode 100644
index 00000000000..4c86d37e243
--- /dev/null
+++ b/pkgs/development/compilers/gcc/common/pre-configure.nix
@@ -0,0 +1,12 @@
+{ lib, version, hostPlatform, langJava ? false, langGo }:
+
+assert langJava -> lib.versionOlder version "7";
+
+lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+ export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+ export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+ export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+ export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+'' + lib.optionalString (lib.versionOlder version "7" && (langJava || langGo)) ''
+ export lib=$out;
+''
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index a07f6f1feb2..ef55806ce08 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -6,6 +6,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which
@@ -50,77 +51,13 @@ let version = "7-20170409";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
- bootstrap = targetPlatform == hostPlatform;
-
in
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;
@@ -184,82 +121,44 @@ stdenv.mkDerivation ({
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if enableMultilib
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
- buildFlags = if bootstrap then
- (if profiledCompiler then "profiledbootstrap" else "bootstrap")
- else "";
+ buildFlags = optional
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
+ (if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
NIX_STRIP_DEBUG = !stripped;
diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix
new file mode 100644
index 00000000000..ef1b3055190
--- /dev/null
+++ b/pkgs/development/compilers/jasmin/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetchurl
+, unzip
+, jdk
+, ant
+, makeWrapper
+, jre
+, callPackage
+}:
+
+stdenv.mkDerivation rec {
+ pname = "jasmin";
+ version = "2.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/jasmin/jasmin-${version}/jasmin-${version}.zip";
+ sha256 = "17a41vr96glcdrdbk88805wwvv1r6w8wg7if23yhd0n6rrl0r8ga";
+ };
+
+ nativeBuildInputs = [ unzip jdk ant makeWrapper ];
+
+ buildPhase = "ant all";
+ installPhase =
+ ''
+ install -Dm644 jasmin.jar $out/share/java/jasmin.jar
+ mkdir -p $out/bin
+ makeWrapper ${jre}/bin/java $out/bin/jasmin \
+ --add-flags "-jar $out/share/java/jasmin.jar"
+ '';
+
+ passthru.tests = {
+ minimal-module = callPackage ./test-assemble-hello-world {};
+ };
+
+ meta = with stdenv.lib; {
+ description = "An assembler for the Java Virtual Machine";
+ homepage = "http://jasmin.sourceforge.net/";
+ downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
new file mode 100644
index 00000000000..564e6c8a9aa
--- /dev/null
+++ b/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
@@ -0,0 +1,31 @@
+.class public HelloWorld
+.super java/lang/Object
+
+;
+; standard initializer (calls java.lang.Object's initializer)
+;
+.method public ()V
+ aload_0
+ invokenonvirtual java/lang/Object/()V
+ return
+.end method
+
+;
+; main() - prints out Hello World
+;
+.method public static main([Ljava/lang/String;)V
+ .limit stack 2 ; up to two items can be pushed
+
+ ; push System.out onto the stack
+ getstatic java/lang/System/out Ljava/io/PrintStream;
+
+ ; push a string onto the stack
+ ldc "Hello World!"
+
+ ; call the PrintStream.println() method.
+ invokevirtual java/io/PrintStream/println(Ljava/lang/String;)V
+
+ ; done
+ return
+.end method
+
diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
new file mode 100644
index 00000000000..1840edffa77
--- /dev/null
+++ b/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, jasmin, jre }:
+
+stdenv.mkDerivation {
+ name = "jasmin-test-assemble-hello-world";
+ meta.timeout = 60;
+ buildCommand = ''
+ ${jasmin}/bin/jasmin ${./HelloWorld.j}
+ ${jre}/bin/java HelloWorld | grep "Hello World"
+ touch $out
+ '';
+}
+
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index d41b4c55f86..f914a112e10 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2019-17545.patch";
+ url = "https://github.com/OSGeo/gdal/commit/8cd2d2eb6327cf782a74dae263ffa6f89f46c93d.patch";
+ stripLen = 1;
+ sha256 = "06h88a659jcqf6ps1m91qy78s6s9krbkwnz28f5qh7032vlp6qpw";
+ })
+ ];
+
buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with pythonPackages; [ python numpy wrapPython ])
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index bb53277075f..922877f6f46 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -20,7 +20,15 @@ stdenv.mkDerivation rec {
sourceRoot = "source/gdal";
- patches = [ ./001.3_0_1.darwin.patch ];
+ patches = [
+ ./001.3_0_1.darwin.patch
+ (fetchpatch {
+ name = "CVE-2019-17545.patch";
+ url = "https://github.com/OSGeo/gdal/commit/148115fcc40f1651a5d15fa34c9a8c528e7147bb.patch";
+ stripLen = 1;
+ sha256 = "0hai59hhvrci9xwjw4lp3wc1brn00imngmqrbbs8v9yr3b0fzbgs";
+ })
+ ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/development/libraries/libisds/default.nix
new file mode 100644
index 00000000000..4ed5a830964
--- /dev/null
+++ b/pkgs/development/libraries/libisds/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, expat
+, gpgme
+, libgcrypt
+, libxml2
+, libxslt
+, curl
+, docbook_xsl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libisds";
+ version = "0.11";
+
+ src = fetchurl {
+ url = "http://xpisar.wz.cz/${pname}/dist/${pname}-${version}.tar.xz";
+ sha256 = "1cy161l7rl25xji2xpb9vjpvg02bc7mwd4fpp2sx9zhpifn5dfbr";
+ };
+
+ configureFlags = [
+ "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook"
+ ];
+
+ buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ];
+
+ meta = with stdenv.lib; {
+ description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";
+ homepage = "http://xpisar.wz.cz/libisds/";
+ license = licenses.lgpl3;
+ maintainers = [ maintainers.mmahut ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index 7f82d49462c..7fba3f3baa6 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -1,44 +1,35 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, cmake, zlib
-, opentracing-cpp, enableGrpc ? false
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
+, opentracing-cpp, protobuf, zlib
+, enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null
}:
-let
- # be sure to use the right revision based on the submodule!
- common =
- fetchFromGitHub {
- owner = "lightstep";
- repo = "lightstep-tracer-common";
- rev = "5fe3bf885bcece14c3c65df06c86c826ba45ad69";
- sha256 = "1q39a0zaqbnqyhl2hza2xzc44235p65bbkfkzs2981niscmggq8w";
- };
-
-in
+assert enableGrpc -> grpc != null;
+assert enableGrpc -> openssl != null;
+assert enableGrpc -> c-ares != null;
stdenv.mkDerivation rec {
pname = "lightstep-tracer-cpp";
- version = "0.8.1";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "lightstep";
- repo = "lightstep-tracer-cpp";
+ repo = pname;
rev = "v${version}";
- sha256 = "1m4kl70lhvy1bsmkdh6bf2fddz5v1ikb27vgi99i2akpq40g4fvf";
+ sha256 = "1x7n3b5i9a0481azy3ymfybjfvr5z0i8wm17d964hsv7ryvnapj0";
};
- postUnpack = ''
- cp -r ${common}/* $sourceRoot/lightstep-tracer-common
- '';
-
- cmakeFlags = ["-DOPENTRACING_INCLUDE_DIR=${opentracing-cpp}/include" "-DOPENTRACING_LIBRARY=${opentracing-cpp}/lib/libopentracing.so"] ++ lib.optional (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
-
nativeBuildInputs = [
- pkgconfig cmake
+ cmake pkgconfig
];
buildInputs = [
- protobuf zlib
+ opentracing-cpp protobuf zlib
+ ] ++ lib.optionals enableGrpc [
+ grpc openssl c-ares c-ares.cmake-config
];
+ cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
+
meta = with lib; {
description = "Distributed tracing system built on top of the OpenTracing standard";
homepage = "https://lightstep.com/";
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 2800f2d7797..9b6534c01b2 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -79,6 +79,15 @@ let
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
})
+ # patch for CVE-2019-13720, can be removed when it is included in the next upstream release
+ # https://bugreports.qt.io/browse/QTBUG-1019226
+ (fetchpatch {
+ name = "qtwebengine-CVE-2019-13720.patch";
+ url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10";
+ sha256 = "0ywc12m196pr6xn7l5xbascihygkjj4pbcgcn9wxvi5ssdr6z46z";
+ extraPrefix = "src/3rdparty/";
+ stripLen = 1;
+ })
]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ]
diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix
new file mode 100644
index 00000000000..79ce9e41324
--- /dev/null
+++ b/pkgs/development/libraries/randomx/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "randomX";
+ version = "1.1.6";
+
+ nativeBuildInputs = [ cmake ];
+
+ src = fetchFromGitHub {
+ owner = "tevador";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1qd0rbzgxdy87wwy0n6ca29bcq25j5ndnfgmx8iyf225m4rcwngf";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Proof of work algorithm based on random code execution";
+ homepage = https://github.com/tevador/RandomX;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ rnhmjoj ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 7d48b68d14c..f20d12359c9 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -16,7 +16,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
- version = "2.26.1";
+ version = "2.26.2";
meta = {
description = "Web content rendering engine, GTK port";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
- sha256 = "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb";
+ sha256 = "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b";
};
patches = optionals stdenv.isLinux [
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 6821474c4d0..c85eab108ff 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,8 +1,8 @@
-{pkgs, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}:
+{pkgs, androidenv, xcodeenv, tiVersion ? "8.2.1.GA"}:
rec {
titaniumsdk = let
- titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix
+ titaniumSdkFile = if tiVersion == "8.2.1.GA" then ./titaniumsdk-8.2.nix
else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix
else throw "Titanium version not supported: "+tiVersion;
in
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
similarity index 85%
rename from pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
rename to pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index 13abc18f76e..45523fad908 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
@@ -53,14 +53,14 @@ let
};
in
stdenv.mkDerivation {
- name = "mobilesdk-7.1.0.GA";
+ name = "mobilesdk-8.2.1.GA";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
- url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip;
- sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn";
+ url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip;
+ sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
- url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip;
- sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m";
+ url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip;
+ sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l";
}
else throw "Platform: ${stdenv.system} not supported!";
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
# Rename ugly version number
cd mobilesdk/*
- mv * 7.1.0.GA
+ mv * 8.2.1.GA
cd *
# Patch bundled gradle build infrastructure to make shebangs work
@@ -87,6 +87,13 @@ stdenv.mkDerivation {
# Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
+ ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+ # Patch the strip frameworks script in the iPhone build template to not let
+ # it skip the strip phase. This is caused by an assumption on the file
+ # permissions in which Nix deviates from the standard.
+ sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
+ ''}
+
# Patch some executables
${if stdenv.system == "i686-linux" then
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index 05ddf5366c7..fa108c8e470 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -1,7 +1,7 @@
{stdenv, composeXcodeWrapper}:
{ name
, src
-, sdkVersion ? "12.1"
+, sdkVersion ? "13.1"
, target ? null
, configuration ? null
, scheme ? null
diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
index f1941e051bc..0a469da418a 100644
--- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
@@ -1,5 +1,5 @@
{stdenv}:
-{version ? "10.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
+{version ? "11.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
assert stdenv.isDarwin;
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index 18f96e2cc02..ce5373c9b5b 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -41,6 +41,7 @@
, "git-run"
, "git-ssb"
, "git-standup"
+, "gitmoji-cli"
, "graphql-cli"
, "grunt-cli"
, "gtop"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 27636c5395f..f0396473389 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -13,67 +13,67 @@ let
sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
};
};
- "@angular-devkit/architect-0.803.14" = {
+ "@angular-devkit/architect-0.803.17" = {
name = "_at_angular-devkit_slash_architect";
packageName = "@angular-devkit/architect";
- version = "0.803.14";
+ version = "0.803.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.14.tgz";
- sha512 = "CPDDNTpM/9XWCFxCRL1/mYB54ivZcmWaVSjUgN2zcHWBc0gW3lrJrmmb+cJ1KSlOI7hoZaMTV1gWoX2QXd4JrA==";
+ url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.17.tgz";
+ sha512 = "QbuWJhjh78Pb/9574OIjR38hhJCRBd0BtdrRRdTjP7By6liXURnA/OH6iZ9o1jA8It1NvoJQtM2flr8dQf83Mw==";
};
};
- "@angular-devkit/core-8.3.14" = {
+ "@angular-devkit/core-8.3.17" = {
name = "_at_angular-devkit_slash_core";
packageName = "@angular-devkit/core";
- version = "8.3.14";
+ version = "8.3.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.14.tgz";
- sha512 = "+IYLbtCxwIpaieRj0wurEXBzZ/fDSdWbyrCfajzDerzsxqghNcafAXSazHXWwISqtbr/pAOuqUNR+mEk2XBz3Q==";
+ url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.17.tgz";
+ sha512 = "cR2H/7OxxqagwGfzxwNWDOYN4QpOZ56Fei9JED/2p/K/5UDAowl20o3qP9mTfia/lEhFeyjMBcM8gsHxhJNYJQ==";
};
};
- "@angular-devkit/schematics-8.3.14" = {
+ "@angular-devkit/schematics-8.3.17" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
- version = "8.3.14";
+ version = "8.3.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.14.tgz";
- sha512 = "5gPmTBN85a2gTxz/FsM5fO9Bxw4KG6uJNLMDAWfPG8vvSQEl7J64ujyqxPz39TernQTEKeuhRC4I5H1aaW9I/Q==";
+ url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.17.tgz";
+ sha512 = "1ttzYGnw5Ux7Nfr/TGyWx3C/rarq5l+dn+5SpKof/8ctvQU1gJaswF492ngPs/jDjaPq5MucKYoX+wTUJHnUhg==";
};
};
- "@antora/asciidoc-loader-2.1.2" = {
+ "@antora/asciidoc-loader-2.2.0" = {
name = "_at_antora_slash_asciidoc-loader";
packageName = "@antora/asciidoc-loader";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.1.2.tgz";
- sha512 = "Hm/E+ff5HgafFi4iAkMHTHP0/iHRrTg96wnX4fFtogHW3tuAOCN+e0d1e4HmHeUwRwy+PSJgXECKyswWA5h8cw==";
+ url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.2.0.tgz";
+ sha512 = "dwKXao6eqbAh8O7OS1ZUgVHmbfl38z7RzBCM6DbTb1VODk1HGIgp6gxauGmy5rBvjrJTtz7M1Dxs+BzBApeyMw==";
};
};
- "@antora/content-aggregator-2.1.2" = {
+ "@antora/content-aggregator-2.2.0" = {
name = "_at_antora_slash_content-aggregator";
packageName = "@antora/content-aggregator";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.1.2.tgz";
- sha512 = "yNhtS2JcHlwcgz06HS2jtkWmbruxqRENT2raN9xk1PkKeubDEOKmbBXNQHvUjQviDXwpB2jehgIpGFlo/UcqoA==";
+ url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.2.0.tgz";
+ sha512 = "Dd3jvjIty75G5X04lf6XFK8wKwKo1bfJfafsvwwJuApILASt0Nrv+Z3O+rfc4MhaswgZNqVBrEcSJW9BJxXPtw==";
};
};
- "@antora/content-classifier-2.1.2" = {
+ "@antora/content-classifier-2.2.0" = {
name = "_at_antora_slash_content-classifier";
packageName = "@antora/content-classifier";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.1.2.tgz";
- sha512 = "JiuBrvJFmjtvka5zcpYOxXbf8n7wWTHDcCMsCxFeadoyXBvUrdGHmT/oKq9/IiyCrda9onwV/IY/mdrD4Gr9uQ==";
+ url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.2.0.tgz";
+ sha512 = "cVoL7aR619FNFN3bKiiFhLinaFktQ06OmMG+QMJW0tNRaeI1ATYtrpUvwG5KVuciwDZFKp+GboRUoud0OGLfJQ==";
};
};
- "@antora/document-converter-2.1.2" = {
+ "@antora/document-converter-2.2.0" = {
name = "_at_antora_slash_document-converter";
packageName = "@antora/document-converter";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.1.2.tgz";
- sha512 = "gmjXV5gSkDi6dhagojQAMHeMH0jvqmkce8AZCPAePeQfc5gpdiSCtRMP/vld5InfYQJ40ckxdQilPqFUpxJk3Q==";
+ url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.2.0.tgz";
+ sha512 = "Ka3moJL5HRoaHUz6U1s9M36WGJg8vUmlQziUpKsC96GbgWyiNXIvNwvQN9kdAW0AXR1CNpIcZ8sl7ygIaa7pLA==";
};
};
"@antora/expand-path-helper-1.0.0" = {
@@ -85,67 +85,67 @@ let
sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw==";
};
};
- "@antora/navigation-builder-2.1.2" = {
+ "@antora/navigation-builder-2.2.0" = {
name = "_at_antora_slash_navigation-builder";
packageName = "@antora/navigation-builder";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.1.2.tgz";
- sha512 = "LDc5j9VJWjeBtvGHiQWd3GHSJAUXuLze5oRpO3WaHjlR6oxt0q9vlfWWNTQg+5yj0BBXdINkHv+LzuxcWys0mw==";
+ url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.2.0.tgz";
+ sha512 = "r78NVNN/PbbSbXI5+NJ4d5G0RM1cklv++djPI0xIjFPK8R7GsuQagAaEpZS9o8UKcRlIyyGTeaT8dWKnFxZh2w==";
};
};
- "@antora/page-composer-2.1.2" = {
+ "@antora/page-composer-2.2.0" = {
name = "_at_antora_slash_page-composer";
packageName = "@antora/page-composer";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.1.2.tgz";
- sha512 = "COMB+t/9l/QM4G6o3VwP+IBkI24CvhTp2yEmlt/dQ0JE1yFuO/jEKGXmBoL02rll3g/WRlUxSIGNJLt7R1QWZQ==";
+ url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.2.0.tgz";
+ sha512 = "JBRqWjJE8pUJG7AU6GMYWo2avBHLzxBisyfFq9FGH7Uf+Shv+0RYImFH0fDX0Et+83sfg2i3y39SfTYXKLsc3g==";
};
};
- "@antora/playbook-builder-2.1.2" = {
+ "@antora/playbook-builder-2.2.0" = {
name = "_at_antora_slash_playbook-builder";
packageName = "@antora/playbook-builder";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.1.2.tgz";
- sha512 = "JggjwTxiguVyAJaOuAVqpg06aYtahYiTXmSsczOILEEP6viehxuXS1dbNCqg+xwvdvPxJhsBI5x3bfWhcTWs0w==";
+ url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.2.0.tgz";
+ sha512 = "GIbkyCnwdTJVHYwSEG4d6Px2Uh/zBiwLXK7zGsaMY4/DmbYBKzNK4xpt7fHXvIw2IyH9GA1XRQ7+vpBSg8VP8w==";
};
};
- "@antora/redirect-producer-2.1.2" = {
+ "@antora/redirect-producer-2.2.0" = {
name = "_at_antora_slash_redirect-producer";
packageName = "@antora/redirect-producer";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.1.2.tgz";
- sha512 = "Y5H5/7Mm9c6rMnLMTRI+c3f2AqHisMDAvBy8OyBW75rlg2+fwG1I1VdZxOoTkCXmAS93QyPX/wDymbRUpiBOHQ==";
+ url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.2.0.tgz";
+ sha512 = "ZkUe95Wj3TiFrbXA0sRDCv+0yD1HxI84/2pQj6cnMV01vrfj9HKeMdbBG1Sgf5bmaDDJ1nImlT0l2g6t+pBIJg==";
};
};
- "@antora/site-mapper-2.1.2" = {
+ "@antora/site-mapper-2.2.0" = {
name = "_at_antora_slash_site-mapper";
packageName = "@antora/site-mapper";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.1.2.tgz";
- sha512 = "KgXn7W47HW7WIYuoptawvkXq2Fg1Es6zn0IlTCyQF/zjQmfoxgHrMk6dW93YjD75RdhKTEeI7hhMzKfwoTYRHA==";
+ url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.2.0.tgz";
+ sha512 = "318hg4n6SjisAA5e3uq02IdSeW6hQwCo+2TfQQQlCY/+DlFV0V2ML2bicwSrdfweJ42o5TxgSQAtTuOc1YPjgA==";
};
};
- "@antora/site-publisher-2.1.2" = {
+ "@antora/site-publisher-2.2.0" = {
name = "_at_antora_slash_site-publisher";
packageName = "@antora/site-publisher";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.1.2.tgz";
- sha512 = "5ekXPBRk3YMVeqhPCnPdjKNRqcI8OKqxisVhWplS/YgY9n2TGICyz01ZtAmueWD0l3mHH5cJRfPHPnTPNXc7Aw==";
+ url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.2.0.tgz";
+ sha512 = "3pcGacS72sOKnm7Hnx328AUWGMEDsNHHQla6lwHL7gtWGtn/9tpt0M+MtgkxZnOLmoif8pt/JWPmlnv6td2xSw==";
};
};
- "@antora/ui-loader-2.1.2" = {
+ "@antora/ui-loader-2.2.0" = {
name = "_at_antora_slash_ui-loader";
packageName = "@antora/ui-loader";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.1.2.tgz";
- sha512 = "fHjJ0wBr0NIaWn6+xDMFOtCc7kf7sdt8I9g/r090X4lImodD2rNm5Jf3wnvAL91M66hDrFaJmE2Fkpbv8fmkBA==";
+ url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.2.0.tgz";
+ sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow==";
};
};
"@apollo/federation-0.10.2" = {
@@ -1246,13 +1246,13 @@ let
sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==";
};
};
- "@hapi/hoek-8.3.2" = {
+ "@hapi/hoek-8.5.0" = {
name = "_at_hapi_slash_hoek";
packageName = "@hapi/hoek";
- version = "8.3.2";
+ version = "8.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.3.2.tgz";
- sha512 = "NP5SG4bzix+EtSMtcudp8TvI0lB46mXNo8uFpTDw6tqxGx4z5yx+giIunEFA0Z7oUO4DuWrOJV9xqR2tJVEdyA==";
+ url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz";
+ sha512 = "7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==";
};
};
"@hapi/joi-15.1.1" = {
@@ -2083,13 +2083,13 @@ let
sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==";
};
};
- "@octokit/endpoint-5.5.0" = {
+ "@octokit/endpoint-5.5.1" = {
name = "_at_octokit_slash_endpoint";
packageName = "@octokit/endpoint";
- version = "5.5.0";
+ version = "5.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.0.tgz";
- sha512 = "TXYS6zXeBImNB9BVj+LneMDqXX+H0exkOpyXobvp92O3B1348QsKnNioISFKgOMsb3ibZvQGwCdpiwQd3KAjIA==";
+ url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.1.tgz";
+ sha512 = "nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg==";
};
};
"@octokit/plugin-enterprise-rest-3.6.2" = {
@@ -2101,40 +2101,40 @@ let
sha512 = "3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA==";
};
};
- "@octokit/request-5.3.0" = {
+ "@octokit/request-5.3.1" = {
name = "_at_octokit_slash_request";
packageName = "@octokit/request";
- version = "5.3.0";
+ version = "5.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/request/-/request-5.3.0.tgz";
- sha512 = "mMIeNrtYyNEIYNsKivDyUAukBkw0M5ckyJX56xoFRXSasDPCloIXaQOnaKNopzQ8dIOvpdq1ma8gmrS+h6O2OQ==";
+ url = "https://registry.npmjs.org/@octokit/request/-/request-5.3.1.tgz";
+ sha512 = "5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==";
};
};
- "@octokit/request-error-1.0.4" = {
+ "@octokit/request-error-1.1.0" = {
name = "_at_octokit_slash_request-error";
packageName = "@octokit/request-error";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.0.4.tgz";
- sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig==";
- };
- };
- "@octokit/rest-16.34.0" = {
- name = "_at_octokit_slash_rest";
- packageName = "@octokit/rest";
- version = "16.34.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.34.0.tgz";
- sha512 = "EBe5qMQQOZRuezahWCXCnSe0J6tAqrW2hrEH9U8esXzKor1+HUDf8jgImaZf5lkTyWCQA296x9kAH5c0pxEgVQ==";
- };
- };
- "@octokit/types-1.1.0" = {
- name = "_at_octokit_slash_types";
- packageName = "@octokit/types";
version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-1.1.0.tgz";
- sha512 = "t4ZD74UnNVMq6kZBDZceflRKK3q4o5PoCKMAGht0RK84W57tqonqKL3vCxJHtbGExdan9RwV8r7VJBZxIM1O7Q==";
+ url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.1.0.tgz";
+ sha512 = "06lt8PulL3rKpmwzYLCeLEt1iHFoj8l0PLkObAtp5Cx0Wwd1+5FAa9u6UXjA0kzYsfbjBKF9TtO9CuXelKiYlw==";
+ };
+ };
+ "@octokit/rest-16.34.1" = {
+ name = "_at_octokit_slash_rest";
+ packageName = "@octokit/rest";
+ version = "16.34.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.34.1.tgz";
+ sha512 = "JUoS12cdktf1fv86rgrjC/RvYLuL+o7p57W7zX1x7ANFJ7OvdV8emvUNkFlcidEaOkYrxK3SoWgQFt3FhNmabA==";
+ };
+ };
+ "@octokit/types-2.0.1" = {
+ name = "_at_octokit_slash_types";
+ packageName = "@octokit/types";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/types/-/types-2.0.1.tgz";
+ sha512 = "YDYgV6nCzdGdOm7wy43Ce8SQ3M5DMKegB8E5sTB/1xrxOdo2yS/KgUgML2N2ZGD621mkbdrAglwTyA4NDOlFFA==";
};
};
"@parcel/fs-1.11.0" = {
@@ -2290,22 +2290,22 @@ let
sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
};
};
- "@schematics/angular-8.3.14" = {
+ "@schematics/angular-8.3.17" = {
name = "_at_schematics_slash_angular";
packageName = "@schematics/angular";
- version = "8.3.14";
+ version = "8.3.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.14.tgz";
- sha512 = "1XXBh9+lowvltRlcCjDJa4GEr5Xq+uNJcxULHBaNY7YfQSwZ5KuyhTBWjCdKmMaTOV3pEcIHwyuNh26mpn98Bw==";
+ url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.17.tgz";
+ sha512 = "Ot++j7vpEBKUD+D6eQxIJto+PYR2HPR9hmBoshZ2nt1/mU3OPEpIMIO/OBnbVtGmuzKXdq2n2NvbPtnhlxWplA==";
};
};
- "@schematics/update-0.803.14" = {
+ "@schematics/update-0.803.17" = {
name = "_at_schematics_slash_update";
packageName = "@schematics/update";
- version = "0.803.14";
+ version = "0.803.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.14.tgz";
- sha512 = "1erj7oaR2vKXo1DLE0s4BbbouBmgeAHEkPHQM7FPtyroZ18kytlT+qjTbsSnlRCwcFsjxmRkbRjXaXDz7ttsYQ==";
+ url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.17.tgz";
+ sha512 = "42CqIcm0i1BfBXYm6YuE8Q6kEEb0ATYiPYJQTgmb+bZSF2Sl9eAzPBaackW2EwVK1JP3Rdyl2S31OwGvgAk6xA==";
};
};
"@serverless/cli-1.4.0" = {
@@ -2335,13 +2335,13 @@ let
sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
};
};
- "@serverless/enterprise-plugin-3.2.0" = {
+ "@serverless/enterprise-plugin-3.2.1" = {
name = "_at_serverless_slash_enterprise-plugin";
packageName = "@serverless/enterprise-plugin";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.2.0.tgz";
- sha512 = "FNOlna7fdC9HPAM6l0LG/4dV9z+UOgl0Ju/pwfSHmXanl+ROUg6lcU1ZXX4+fK6T0+doWGcGSP+ksd9XWSBNqw==";
+ url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.2.1.tgz";
+ sha512 = "CLTuvtEYhmvV7qiYuHkDJxoIIdcRU8OQBUhoBhUscK6UVdsKB2Y4ykz8su0rGg5rdgcaaluJF0+H87oBNw77ag==";
};
};
"@serverless/event-mocks-1.1.1" = {
@@ -2353,13 +2353,13 @@ let
sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==";
};
};
- "@serverless/platform-sdk-2.1.2" = {
+ "@serverless/platform-sdk-2.2.0" = {
name = "_at_serverless_slash_platform-sdk";
packageName = "@serverless/platform-sdk";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.1.2.tgz";
- sha512 = "+mMrcagi6ROhlhHaZ5CBSJrWbs/Rk+/24Vqm+KEQliDpktr5CHTC5sFGk01uiKVFyceR3fTwxmNlRyywM7DRPA==";
+ url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.2.0.tgz";
+ sha512 = "w5A/szD0ZMUIuqUt5HyHllQ9LKO9/mpgv3rtJjLRI5ZJq1GvY4pv2pyQQPxGLT1gv0ER+b5vF+4tfrkx6MEuEw==";
};
};
"@serverless/template-1.1.3" = {
@@ -2434,15 +2434,6 @@ let
sha512 = "hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg==";
};
};
- "@snyk/dep-graph-1.12.0" = {
- name = "_at_snyk_slash_dep-graph";
- packageName = "@snyk/dep-graph";
- version = "1.12.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.12.0.tgz";
- sha512 = "n7+PlHn3SqznHgsCpeBRfEvU1oiQydoGkXQlnSB2+tfImiKXvY7YZbrg4wlbvYgylYiTbpCi5CpPNkJG14S+UQ==";
- };
- };
"@snyk/dep-graph-1.13.0" = {
name = "_at_snyk_slash_dep-graph";
packageName = "@snyk/dep-graph";
@@ -2452,6 +2443,15 @@ let
sha512 = "e0XcLH6Kgs/lunf6iDjbxEnm9+JYFEJn6eo/PlEUW+SMWBZ2uEXHBTDNp9oxjJou48PngzWMveEkniBAN+ulOQ==";
};
};
+ "@snyk/dep-graph-1.13.1" = {
+ name = "_at_snyk_slash_dep-graph";
+ packageName = "@snyk/dep-graph";
+ version = "1.13.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.13.1.tgz";
+ sha512 = "Ww2xvm5UQgrq9eV0SdTBCh+w/4oI2rCx5vn1IOSeypaR0CO4p+do1vm3IDZ2ugg4jLSfHP8+LiD6ORESZMkQ2w==";
+ };
+ };
"@snyk/gemfile-1.2.0" = {
name = "_at_snyk_slash_gemfile";
packageName = "@snyk/gemfile";
@@ -2596,40 +2596,40 @@ let
sha512 = "qSPTUptR/C4YwoeVXRLUij6TpxbXT7U0P9S0No+p9Q+EYJeNvl1NUTrcpQmzrRydo6vCR0RzVkHmj+gEckH2Ug==";
};
};
- "@textlint/feature-flag-3.1.4" = {
+ "@textlint/feature-flag-3.1.5" = {
name = "_at_textlint_slash_feature-flag";
packageName = "@textlint/feature-flag";
- version = "3.1.4";
+ version = "3.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.1.4.tgz";
- sha512 = "sQle1237X/ckMnHkSAuQYDRuCnKgBHdJuWFPHMpgT4CBb2UjWSZkjCgmzf3Ov6UZQL/1BwuA53wT4T+i1rB1zw==";
+ url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.1.5.tgz";
+ sha512 = "KHQ/hYO4O2dNRcdSJQo/alLqMyVwsYIncMlCQdgmRDnr65vxTcKtMKEKFQ+CkelyCH1tKSIyp776xpXop6SWFQ==";
};
};
- "@textlint/fixer-formatter-3.1.9" = {
+ "@textlint/fixer-formatter-3.1.10" = {
name = "_at_textlint_slash_fixer-formatter";
packageName = "@textlint/fixer-formatter";
- version = "3.1.9";
+ version = "3.1.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.9.tgz";
- sha512 = "4eU2kJC0A5EljfhbVhwVaNUEiBSCaRq0k4h19/OeVk9blkAwmILtBbAgbuxGuQAOquBLJGLx+3+tspBOlydS2g==";
+ url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.10.tgz";
+ sha512 = "rYGL3KKSSx+9un9EbONYnZVxj3yFMSGC1B/TQXC52C7Hpt6vpx5aRoovKpr4qTzzX1IhvxaMmlCyEKI6UZz1qw==";
};
};
- "@textlint/kernel-3.1.9" = {
+ "@textlint/kernel-3.1.10" = {
name = "_at_textlint_slash_kernel";
packageName = "@textlint/kernel";
- version = "3.1.9";
+ version = "3.1.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.9.tgz";
- sha512 = "WGD5Xb0wyYMdiqF+Ozo1TqnAo1LA5n+jmpFT/Q/Pnx2zifT4/OszwBd9g43g3xGdsUJKk00eKwvSQaCXxj07wg==";
+ url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.10.tgz";
+ sha512 = "umCapHNApEYPzvUVBvPLwuF874+37Tw5Poa5Vhx8B8Y7MPfWg+q3bMvjnZvf9eBOKxxJdhxz8LtK7JrLuJIoFg==";
};
};
- "@textlint/linter-formatter-3.1.8" = {
+ "@textlint/linter-formatter-3.1.9" = {
name = "_at_textlint_slash_linter-formatter";
packageName = "@textlint/linter-formatter";
- version = "3.1.8";
+ version = "3.1.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.8.tgz";
- sha512 = "gq8g5GbRDxYlffjP+CuggSk5Hb35jg1fXLbffkLGbiWiJn/s6InbcBqCkxGLCzPqdRhN6uHE40ID3idKJWp2Rg==";
+ url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.9.tgz";
+ sha512 = "jahCeq+g8aLJcQZaTXURYeyY2fw5hVbNilPxnYqvaXGSbrw0vrTPa2dJhfAEJ+H/Gw0ZSM9abNSoZI4GqAtWlA==";
};
};
"@textlint/markdown-to-ast-6.1.6" = {
@@ -2659,31 +2659,31 @@ let
sha512 = "w0oBF3OeTT8syF+Y3BT1/pFYhBT2ZbzBDGqFELZVeBQNtGUKCpvJtu4Q1fCftElTbOIY01aSecj3GJTS6tmlBg==";
};
};
- "@textlint/textlint-plugin-markdown-5.1.9" = {
+ "@textlint/textlint-plugin-markdown-5.1.10" = {
name = "_at_textlint_slash_textlint-plugin-markdown";
packageName = "@textlint/textlint-plugin-markdown";
- version = "5.1.9";
+ version = "5.1.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.9.tgz";
- sha512 = "5bYPGid5dIWBjY3oKhmWmeWvBfl04ZGp0c4OD24MZHRkxrARKJg7i+hR7qhedAGdkeZ33fxQt/NILvbuLSvQVw==";
+ url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.10.tgz";
+ sha512 = "G7xoAugkwGY6pt262Coeab5TKq+dTBl1E6Uv83EW1iK6DZoHC0xxUrdRHGFeKbtGa0iM6BmKgEqjZfWOjus0LQ==";
};
};
- "@textlint/textlint-plugin-text-4.1.9" = {
+ "@textlint/textlint-plugin-text-4.1.10" = {
name = "_at_textlint_slash_textlint-plugin-text";
packageName = "@textlint/textlint-plugin-text";
- version = "4.1.9";
+ version = "4.1.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.9.tgz";
- sha512 = "7iWNs2gsc+GXcDQfaow/S/BVjlu/bSw1dbiMJLfVaRb+D9gAojVm+sGHt9ePAhr9MWjt1uDUsWsvSNDL0UpZWA==";
+ url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.10.tgz";
+ sha512 = "w20Mt5RnWnZq4ai/H9yYEMSudPOSUBJ9+rNO8Ld2s1O2FiPnq++A/QQLuhhIJOjC9+slUemMYnlvVpa5PH775g==";
};
};
- "@textlint/types-1.2.2" = {
+ "@textlint/types-1.2.3" = {
name = "_at_textlint_slash_types";
packageName = "@textlint/types";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/types/-/types-1.2.2.tgz";
- sha512 = "eo+/NSmJxAk47Dvnjp4p3jbA/z/adVoAXjFURRhVQ4W/1KTVLyvB+WdiJBp8fiT5t5Kf3XSxyiS7mZcrY2bf/Q==";
+ url = "https://registry.npmjs.org/@textlint/types/-/types-1.2.3.tgz";
+ sha512 = "48wXioiKIKAWPkgTWf/KyvZpjGH5L2ohmrSVgtx/u8q+KcY+q+/dslKy7QN0H+Yeu5Vj4GZRHOzCYWtzHMQleQ==";
};
};
"@textlint/utils-1.0.3" = {
@@ -2830,13 +2830,13 @@ let
sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==";
};
};
- "@types/express-serve-static-core-4.16.10" = {
+ "@types/express-serve-static-core-4.16.11" = {
name = "_at_types_slash_express-serve-static-core";
packageName = "@types/express-serve-static-core";
- version = "4.16.10";
+ version = "4.16.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.10.tgz";
- sha512 = "gM6evDj0OvTILTRKilh9T5dTaGpv1oYiFcJAfgSejuMJgGJUsD9hKEU2lB4aiTNy4WwChxRnjfYFuBQsULzsJw==";
+ url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.11.tgz";
+ sha512 = "K8d2M5t3tBQimkyaYTXxtHYyoJPUEhy2/omVRnTAKw5FEdT+Ft6lTaTOpoJdHeG+mIwQXXtqiTcYZ6IR8LTzjQ==";
};
};
"@types/fs-capacitor-2.0.0" = {
@@ -2956,31 +2956,31 @@ let
sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
};
};
- "@types/node-10.17.0" = {
+ "@types/node-10.17.3" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "10.17.0";
+ version = "10.17.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz";
- sha512 = "wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==";
+ url = "https://registry.npmjs.org/@types/node/-/node-10.17.3.tgz";
+ sha512 = "QZ9CjUB3QoA3f2afw3utKlfRPhpmufB7jC2+oDhLWnXqoyx333fhKSQDLQu2EK7OE0a15X67eYiRAaJsHXrpMA==";
};
};
- "@types/node-12.11.7" = {
+ "@types/node-12.12.5" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "12.11.7";
+ version = "12.12.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-12.11.7.tgz";
- sha512 = "JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==";
+ url = "https://registry.npmjs.org/@types/node/-/node-12.12.5.tgz";
+ sha512 = "KEjODidV4XYUlJBF3XdjSH5FWoMCtO0utnhtdLf1AgeuZLOrRbvmU/gaRCVg7ZaQDjVf3l84egiY0mRNe5xE4A==";
};
};
- "@types/node-6.14.8" = {
+ "@types/node-6.14.9" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "6.14.8";
+ version = "6.14.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-6.14.8.tgz";
- sha512 = "ZVswkI0zxOcADy2b4T9Lj3N+OYyHwCyzMtmkRIi1P94vF/GOLpDPB76P1uBXX/QM6e5wICriSz2XBPSBdxIN5g==";
+ url = "https://registry.npmjs.org/@types/node/-/node-6.14.9.tgz";
+ sha512 = "leP/gxHunuazPdZaCvsCefPQxinqUDsCxCR5xaDUrY2MkYxQRFZZwU5e7GojyYsGB7QVtCi7iVEl/hoFXQYc+w==";
};
};
"@types/q-1.5.2" = {
@@ -5989,13 +5989,13 @@ let
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
- "aws-sdk-2.556.0" = {
+ "aws-sdk-2.563.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.556.0";
+ version = "2.563.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.556.0.tgz";
- sha512 = "qILMUNl/a7FYWU67Y24OGsXFhyDHM4qYdplMR2tps/g17pN9bEQ5ijxvGzW2T8VVyAsTanmn+dFyl/CH38pC5Q==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.563.0.tgz";
+ sha512 = "ygpsr2jL36Y7gctR1jr6gmHuyk4So3I52H2iOAIIO2bNRKbwse6sBy7vI89JhF5W5NtV3drM7lGcao0DCZ9uEQ==";
};
};
"aws-sign2-0.6.0" = {
@@ -6034,6 +6034,15 @@ let
sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d";
};
};
+ "axios-0.18.1" = {
+ name = "axios";
+ packageName = "axios";
+ version = "0.18.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz";
+ sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==";
+ };
+ };
"babel-code-frame-6.26.0" = {
name = "babel-code-frame";
packageName = "babel-code-frame";
@@ -6844,15 +6853,6 @@ let
sha512 = "IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==";
};
};
- "benchmark-1.0.0" = {
- name = "benchmark";
- packageName = "benchmark";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
- sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
- };
- };
"bencode-0.7.0" = {
name = "bencode";
packageName = "bencode";
@@ -7402,13 +7402,13 @@ let
sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
};
};
- "boolean-2.0.2" = {
+ "boolean-2.0.3" = {
name = "boolean";
packageName = "boolean";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/boolean/-/boolean-2.0.2.tgz";
- sha512 = "ymsbJQlux/uogyEWfsXJUYzuyoOzPyp6NvEV71s6/ptQR7ptKO9uHF+WZL2GRATDeN52EFhNyrIu+exNZKh3Cw==";
+ url = "https://registry.npmjs.org/boolean/-/boolean-2.0.3.tgz";
+ sha512 = "iHzXeFCXWrpjYE7DToXGCBPGZf0eVISqzL+4sgrOSYEKXnb59WHPFvGTTyCj6zJ/MuuLAxEn8zPkrTHHzlt3IA==";
};
};
"boom-2.10.1" = {
@@ -8419,13 +8419,13 @@ let
sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77";
};
};
- "camelcase-keys-6.0.1" = {
+ "camelcase-keys-6.1.0" = {
name = "camelcase-keys";
packageName = "camelcase-keys";
- version = "6.0.1";
+ version = "6.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.0.1.tgz";
- sha512 = "Pet+fVo99HMVy183qJuyTiQECQlb0dCXg89qhixcud88j4BSns+gzhSrjRT0ustEYSWJqKMO42arm1cS1VG5FA==";
+ url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.1.0.tgz";
+ sha512 = "43tBGDIs3SBDA5R5mYzkiBP3lt2IKhLDp1wVGS9XTq6SR3+7ZNdi/VwBJsk4NKgySoaziTrKM+N8hhT04NBVUA==";
};
};
"caniuse-api-3.0.0" = {
@@ -8437,13 +8437,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001004" = {
+ "caniuse-lite-1.0.30001008" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001004";
+ version = "1.0.30001008";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001004.tgz";
- sha512 = "3nfOR4O8Wa2RWoYfJkMtwRVOsK96TQ+eq57wd0iKaEWl8dwG4hKZ/g0MVBfCvysFvMLi9fQGR/DvozMdkEPl3g==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001008.tgz";
+ sha512 = "b8DJyb+VVXZGRgJUa30cbk8gKHZ3LOZTBLaUEEVr2P4xpmFigOCc62CO4uzquW641Ouq1Rm9N+rWLWdSYDaDIw==";
};
};
"capture-stack-trace-1.0.1" = {
@@ -8878,13 +8878,13 @@ let
sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
};
};
- "chokidar-3.2.2" = {
+ "chokidar-3.3.0" = {
name = "chokidar";
packageName = "chokidar";
- version = "3.2.2";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chokidar/-/chokidar-3.2.2.tgz";
- sha512 = "bw3pm7kZ2Wa6+jQWYP/c7bAZy3i4GwiIiMO2EeRjrE48l8vBqC/WvFhSF0xyM8fQiPEGvwMY/5bqDG7sSEOuhg==";
+ url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz";
+ sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==";
};
};
"chownr-0.0.2" = {
@@ -8905,13 +8905,13 @@ let
sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
};
};
- "chroma-js-2.0.6" = {
+ "chroma-js-2.1.0" = {
name = "chroma-js";
packageName = "chroma-js";
- version = "2.0.6";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.0.6.tgz";
- sha512 = "IiiClbBRkRwuXNl6impq5ssEhUGpmWvc5zzImZbDUWLWcFbj6ZbtsdZEx6sIXMKes7azgYaUpnmsY1T8BL6PqQ==";
+ url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.0.tgz";
+ sha512 = "uiRdh4ZZy+UTPSrAdp8hqEdVb1EllLtTHOt5TMaOjJUvi+O54/83Fc5K2ld1P+TJX+dw5B+8/sCgzI6eaur/lg==";
};
};
"chrome-dgram-3.0.4" = {
@@ -9094,13 +9094,13 @@ let
sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==";
};
};
- "clean-git-ref-1.0.3" = {
+ "clean-git-ref-2.0.1" = {
name = "clean-git-ref";
packageName = "clean-git-ref";
- version = "1.0.3";
+ version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/clean-git-ref/-/clean-git-ref-1.0.3.tgz";
- sha1 = "5325dc839eab01c974ae0e97f5734782750f88ec";
+ url = "https://registry.npmjs.org/clean-git-ref/-/clean-git-ref-2.0.1.tgz";
+ sha512 = "bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw==";
};
};
"clean-html-1.5.0" = {
@@ -10039,15 +10039,6 @@ let
sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
};
};
- "commander-3.0.0" = {
- name = "commander";
- packageName = "commander";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz";
- sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow==";
- };
- };
"commander-3.0.2" = {
name = "commander";
packageName = "commander";
@@ -10057,6 +10048,15 @@ let
sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==";
};
};
+ "commander-4.0.0" = {
+ name = "commander";
+ packageName = "commander";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-4.0.0.tgz";
+ sha512 = "SEa2abMBTZuEjLVYpNrAFoRgxPwG4rXP3+SGY6CM/HZGeDzIA7Pzp+7H3AHDukKEpyy2SoSGGPShKqqfH9T9AQ==";
+ };
+ };
"commist-1.1.0" = {
name = "commist";
packageName = "commist";
@@ -10264,6 +10264,15 @@ let
sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==";
};
};
+ "conf-2.2.0" = {
+ name = "conf";
+ packageName = "conf";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/conf/-/conf-2.2.0.tgz";
+ sha512 = "93Kz74FOMo6aWRVpAZsonOdl2I57jKtHrNmxhumehFQw4X8Sk37SohNY11PG7Q8Okta+UnrVaI006WLeyp8/XA==";
+ };
+ };
"config-1.31.0" = {
name = "config";
packageName = "config";
@@ -10372,6 +10381,15 @@ let
sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
};
};
+ "console-browserify-1.2.0" = {
+ name = "console-browserify";
+ packageName = "console-browserify";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz";
+ sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==";
+ };
+ };
"console-control-strings-1.1.0" = {
name = "console-control-strings";
packageName = "console-control-strings";
@@ -10633,13 +10651,13 @@ let
sha1 = "f67a4938c5233443564250479c67014bac878499";
};
};
- "convict-5.1.0" = {
+ "convict-5.2.0" = {
name = "convict";
packageName = "convict";
- version = "5.1.0";
+ version = "5.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/convict/-/convict-5.1.0.tgz";
- sha512 = "0+Rf3wUfEpz+UuwksNgjREf+81eRDsiQ64ZAs3Gh2rZeXIjiI5m0pxwybRZUebpSKEfOFxN5oUthIUpnqIMh6w==";
+ url = "https://registry.npmjs.org/convict/-/convict-5.2.0.tgz";
+ sha512 = "C3cdUwo47cCikZNzu5Vv8AL0MuXVVeg9t/Gyr9qyK5ZpCjOkMPmJ85KUF3CowNeSfj4UtztHxS+hoO9wGRh6kg==";
};
};
"cookie-0.0.4" = {
@@ -10858,22 +10876,22 @@ let
sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==";
};
};
- "core-js-3.3.4" = {
+ "core-js-3.3.6" = {
name = "core-js";
packageName = "core-js";
- version = "3.3.4";
+ version = "3.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js/-/core-js-3.3.4.tgz";
- sha512 = "BtibooaAmSOptGLRccsuX/dqgPtXwNgqcvYA6kOTTMzonRxZ+pJS4e+6mvVutESfXMeTnK8m3M+aBu3bkJbR+w==";
+ url = "https://registry.npmjs.org/core-js/-/core-js-3.3.6.tgz";
+ sha512 = "u4oM8SHwmDuh5mWZdDg9UwNVq5s1uqq6ZDLLIs07VY+VJU91i3h4f3K/pgFvtUQPGdeStrZ+odKyfyt4EnKHfA==";
};
};
- "core-js-compat-3.3.4" = {
+ "core-js-compat-3.3.6" = {
name = "core-js-compat";
packageName = "core-js-compat";
- version = "3.3.4";
+ version = "3.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.3.4.tgz";
- sha512 = "7OK3/LPP8R3Ovasf3GilEOp+o1w0ZKJ75FMou2RDfTwIV69G5RkKCGFnqgBv/ZhR6xo9GCzlfVALyHmydbE7DA==";
+ url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.3.6.tgz";
+ sha512 = "YnwZG/+0/f7Pf6Lr3jxtVAFjtGBW9lsLYcqrxhYJai1GfvrP8DEyEpnNzj/FRQfIkOOfk1j5tTBvPBLWVVJm4A==";
};
};
"core-util-is-1.0.2" = {
@@ -11065,13 +11083,13 @@ let
sha512 = "LuoXnCRMKEo3KR3jEbCRpP3Nu2TUhLTlb/axP9+rl+ouhBpxTaHaTTN1bdUS2x2VK3wWyCBl1OZHyHhlRBntWg==";
};
};
- "creato-1.0.7" = {
+ "creato-1.1.0" = {
name = "creato";
packageName = "creato";
- version = "1.0.7";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/creato/-/creato-1.0.7.tgz";
- sha512 = "FuIJS+j87XAZGeblY2GINN+C4QHoFGP1gMAbsdr2uU+m8HvSHokzE/Ok6SLVFnSMQMLjDX0jS0EW6jlVmo5MsQ==";
+ url = "https://registry.npmjs.org/creato/-/creato-1.1.0.tgz";
+ sha512 = "fxVZGER1+o5HTBtGYuQEtaYe4uTvplCoPm28uu/7nMzMdBdPvZJlA5qyONJUEevJQGssWJxcmrGMOOCbv25CeA==";
};
};
"cron-1.7.1" = {
@@ -11092,6 +11110,15 @@ let
sha512 = "jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==";
};
};
+ "cross-env-6.0.3" = {
+ name = "cross-env";
+ packageName = "cross-env";
+ version = "6.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz";
+ sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==";
+ };
+ };
"cross-fetch-2.2.2" = {
name = "cross-fetch";
packageName = "cross-fetch";
@@ -11299,22 +11326,13 @@ let
sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==";
};
};
- "css-tree-1.0.0-alpha.29" = {
+ "css-tree-1.0.0-alpha.37" = {
name = "css-tree";
packageName = "css-tree";
- version = "1.0.0-alpha.29";
+ version = "1.0.0-alpha.37";
src = fetchurl {
- url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz";
- sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==";
- };
- };
- "css-tree-1.0.0-alpha.33" = {
- name = "css-tree";
- packageName = "css-tree";
- version = "1.0.0-alpha.33";
- src = fetchurl {
- url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz";
- sha512 = "SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==";
+ url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz";
+ sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
};
};
"css-unit-converter-1.1.1" = {
@@ -11434,13 +11452,13 @@ let
sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==";
};
};
- "csso-3.5.1" = {
+ "csso-4.0.2" = {
name = "csso";
packageName = "csso";
- version = "3.5.1";
+ version = "4.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz";
- sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==";
+ url = "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz";
+ sha512 = "kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==";
};
};
"cssom-0.3.8" = {
@@ -12298,13 +12316,13 @@ let
sha512 = "YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==";
};
};
- "deepmerge-4.2.1" = {
+ "deepmerge-4.2.2" = {
name = "deepmerge";
packageName = "deepmerge";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.1.tgz";
- sha512 = "32P7FIV6JKt0hPMFNlWFytzVGpppYHFKdnhFUEMXheWc8Lw4HnHEzJa5yxhaQedDAXv2SI6zD7+UbqnC5k9g9Q==";
+ url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz";
+ sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==";
};
};
"default-browser-id-1.0.4" = {
@@ -12352,13 +12370,13 @@ let
sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d";
};
};
- "defer-to-connect-1.0.2" = {
+ "defer-to-connect-1.1.0" = {
name = "defer-to-connect";
packageName = "defer-to-connect";
- version = "1.0.2";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz";
- sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==";
+ url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.0.tgz";
+ sha512 = "WE2sZoctWm/v4smfCAdjYbrfS55JiMRdlY9ZubFhsYbteCK9+BvAx4YV7nPjYM6ZnX5BcoVKwfmyx9sIFTgQMQ==";
};
};
"deferred-0.7.11" = {
@@ -12568,13 +12586,13 @@ let
sha512 = "xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==";
};
};
- "deps-sort-2.0.0" = {
+ "deps-sort-2.0.1" = {
name = "deps-sort";
packageName = "deps-sort";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz";
- sha1 = "091724902e84658260eb910748cccd1af6e21fb5";
+ url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz";
+ sha512 = "1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==";
};
};
"deref-0.6.4" = {
@@ -12802,15 +12820,6 @@ let
sha512 = "s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==";
};
};
- "diff-lines-1.1.1" = {
- name = "diff-lines";
- packageName = "diff-lines";
- version = "1.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/diff-lines/-/diff-lines-1.1.1.tgz";
- sha512 = "Oo5JzEEriF/+T0usOeRP5yOzr6SWvni2rrxvIgijMZSxPcEvf8JOvCO5GpnWwkte7fcOgnue/f5ECg1H9lMPCw==";
- };
- };
"diff-match-patch-1.0.4" = {
name = "diff-match-patch";
packageName = "diff-match-patch";
@@ -12829,6 +12838,15 @@ let
sha512 = "YDadfvH7ge833dKRGNr1gWZLa00tihMhwACUuQwrIQcPu/tnZ9t/Dq5W6fTQaKnLZ7iY7snGoyikTmF9mqBx+Q==";
};
};
+ "diff3-0.0.3" = {
+ name = "diff3";
+ packageName = "diff3";
+ version = "0.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/diff3/-/diff3-0.0.3.tgz";
+ sha1 = "d4e5c3a4cdf4e5fe1211ab42e693fcb4321580fc";
+ };
+ };
"diffie-hellman-5.0.3" = {
name = "diffie-hellman";
packageName = "diffie-hellman";
@@ -13666,13 +13684,13 @@ let
sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
};
};
- "electron-to-chromium-1.3.296" = {
+ "electron-to-chromium-1.3.302" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.296";
+ version = "1.3.302";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.296.tgz";
- sha512 = "s5hv+TSJSVRsxH190De66YHb50pBGTweT9XGWYu/LMR20KX6TsjFzObo36CjVAzM+PUeeKSBRtm/mISlCzeojQ==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.302.tgz";
+ sha512 = "1qConyiVEbj4xZRBXqtGR003+9tV0rJF0PS6aeO0Ln/UL637js9hdwweCl07meh/kJoI2N4W8q3R3g3F5z46ww==";
};
};
"elegant-spinner-1.0.1" = {
@@ -14099,6 +14117,15 @@ let
sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0";
};
};
+ "env-paths-2.2.0" = {
+ name = "env-paths";
+ packageName = "env-paths";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz";
+ sha512 = "6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==";
+ };
+ };
"env-variable-0.0.5" = {
name = "env-variable";
packageName = "env-variable";
@@ -14207,13 +14234,13 @@ let
sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
};
};
- "es5-ext-0.10.51" = {
+ "es5-ext-0.10.52" = {
name = "es5-ext";
packageName = "es5-ext";
- version = "0.10.51";
+ version = "0.10.52";
src = fetchurl {
- url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz";
- sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==";
+ url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.52.tgz";
+ sha512 = "bWCbE9fbpYQY4CU6hJbJ1vSz70EClMlDgJ7BmwI+zEJhxrwjesZRPglGJlsZhu0334U3hI+gaspwksH9IGD6ag==";
};
};
"es5-ext-0.8.2" = {
@@ -14342,13 +14369,13 @@ let
sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
};
};
- "es6-symbol-3.1.2" = {
+ "es6-symbol-3.1.3" = {
name = "es6-symbol";
packageName = "es6-symbol";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz";
- sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==";
+ url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz";
+ sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==";
};
};
"es6-weak-map-2.0.3" = {
@@ -15314,6 +15341,15 @@ let
sha1 = "f5fc2f9fa9e9a8578634f10e86ba5a4346b96f4f";
};
};
+ "ext-1.1.2" = {
+ name = "ext";
+ packageName = "ext";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ext/-/ext-1.1.2.tgz";
+ sha512 = "/KLjJdTNyDepCihrk4HQt57nAE1IRCEo5jUt+WgWGCr1oARhibDvmI2DMcSNWood1T9AUWwq+jaV1wvRqaXfnA==";
+ };
+ };
"ext-list-2.2.2" = {
name = "ext-list";
packageName = "ext-list";
@@ -15854,13 +15890,13 @@ let
sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==";
};
};
- "file-type-12.1.0" = {
+ "file-type-12.3.1" = {
name = "file-type";
packageName = "file-type";
- version = "12.1.0";
+ version = "12.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/file-type/-/file-type-12.1.0.tgz";
- sha512 = "aZkf42yWGiH+vSOpbVgvbnoRuX4JiitMX9pHYqTHemNQ3lrx64iHi33YGAP7TSJSno56kxQY1lHmw8S6ujlFUg==";
+ url = "https://registry.npmjs.org/file-type/-/file-type-12.3.1.tgz";
+ sha512 = "FXxY5h6vSYMjrRal4YqbtfuoKD/oE0AMjJ7E5Hm+BdaQECcFVD03B41RAWYJ7wyuLr/wRnCtFo7y37l+nh+TAA==";
};
};
"file-type-3.9.0" = {
@@ -16322,13 +16358,13 @@ let
sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ==";
};
};
- "flow-parser-0.110.1" = {
+ "flow-parser-0.111.1" = {
name = "flow-parser";
packageName = "flow-parser";
- version = "0.110.1";
+ version = "0.111.1";
src = fetchurl {
- url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.110.1.tgz";
- sha512 = "k0QoogCKfE7cr3WSgHYTt8QhZxxoi0tun4uVMSqx68L0E9ao1ltxlhJAKibTGlwR1V6lnGfKXU1zU9JB1q2ZRg==";
+ url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.111.1.tgz";
+ sha512 = "yo+C0a/fMsGwooxA2xd4kK/kuzSnFC8JZLsIB68mkTllLrF/nSQ8llwD82o8Vxwvisw9IPC/ZC8zqrWmkir9jQ==";
};
};
"fluent-ffmpeg-2.1.2" = {
@@ -16448,6 +16484,15 @@ let
sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7";
};
};
+ "follow-redirects-1.5.10" = {
+ name = "follow-redirects";
+ packageName = "follow-redirects";
+ version = "1.5.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
+ sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
+ };
+ };
"follow-redirects-1.9.0" = {
name = "follow-redirects";
packageName = "follow-redirects";
@@ -16907,6 +16952,15 @@ let
sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
};
};
+ "fs-minipass-2.0.0" = {
+ name = "fs-minipass";
+ packageName = "fs-minipass";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.0.0.tgz";
+ sha512 = "40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A==";
+ };
+ };
"fs-mkdirp-stream-1.0.0" = {
name = "fs-mkdirp-stream";
packageName = "fs-mkdirp-stream";
@@ -18438,13 +18492,13 @@ let
sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
};
};
- "gulp-vinyl-zip-2.1.2" = {
+ "gulp-vinyl-zip-2.1.3" = {
name = "gulp-vinyl-zip";
packageName = "gulp-vinyl-zip";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.2.tgz";
- sha512 = "wJn09jsb8PyvUeyFF7y7ImEJqJwYy40BqL9GKfJs6UGpaGW9A+N68Q+ajsIpb9AeR6lAdjMbIdDPclIGo1/b7Q==";
+ url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.3.tgz";
+ sha512 = "wOHNPddyZ45il4wNz3Bk9ChpEq5FK/P76SSkqAMCLVZSOVtLBiDIVXDbYWDlfZpoYEjZQl+28I+Uzmmr6pSnBQ==";
};
};
"gulplog-1.0.0" = {
@@ -18456,13 +18510,13 @@ let
sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
};
};
- "handlebars-4.4.5" = {
+ "handlebars-4.5.1" = {
name = "handlebars";
packageName = "handlebars";
- version = "4.4.5";
+ version = "4.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz";
- sha512 = "0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==";
+ url = "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz";
+ sha512 = "C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==";
};
};
"har-schema-1.0.5" = {
@@ -18978,13 +19032,13 @@ let
sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
};
};
- "highlight.js-9.15.10" = {
+ "highlight.js-9.16.2" = {
name = "highlight.js";
packageName = "highlight.js";
- version = "9.15.10";
+ version = "9.16.2";
src = fetchurl {
- url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz";
- sha512 = "RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==";
+ url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.16.2.tgz";
+ sha512 = "feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==";
};
};
"hipchatter-0.3.2" = {
@@ -21616,13 +21670,13 @@ let
sha1 = "611ae1acf14f5e81f729507472819fe9733558a9";
};
};
- "isomorphic-git-0.47.0" = {
+ "isomorphic-git-0.70.4" = {
name = "isomorphic-git";
packageName = "isomorphic-git";
- version = "0.47.0";
+ version = "0.70.4";
src = fetchurl {
- url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.47.0.tgz";
- sha512 = "oea4It03KvuJrEbwYGMrRmlY+Wh7a/J/jBYKezkiUW/s6GrcAePOCnpfLR8TXkHiASZlEHCgckMd7uMAfJ9w/w==";
+ url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.70.4.tgz";
+ sha512 = "Nk/iD4iEL35zY1B4l2PgPOJpVgTQzVH9W0oRkKc3vDbMjcfvs7nle4Y8NRghXIG27Z6KQVSTi/om6lTbzpfl+A==";
};
};
"isomorphic-textencoder-1.0.1" = {
@@ -22976,6 +23030,15 @@ let
sha1 = "f2b842be0b86da3352798505b31ebcae590d77d0";
};
};
+ "ldap-filter-0.3.3" = {
+ name = "ldap-filter";
+ packageName = "ldap-filter";
+ version = "0.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.3.3.tgz";
+ sha1 = "2b14c68a2a9d4104dbdbc910a1ca85fd189e9797";
+ };
+ };
"ldapjs-1.0.2" = {
name = "ldapjs";
packageName = "ldapjs";
@@ -22985,6 +23048,15 @@ let
sha1 = "544ff7032b7b83c68f0701328d9297aa694340f9";
};
};
+ "ldapjs-2.0.0-pre.2" = {
+ name = "ldapjs";
+ packageName = "ldapjs";
+ version = "2.0.0-pre.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ldapjs/-/ldapjs-2.0.0-pre.2.tgz";
+ sha512 = "KZnKiFXu5eEU4jKWoz29yUWh6fS8pIBuxFq9njji8LfHu3T4i05j6lsnGyDLayhJDw+rtKpEgmS3/As7CXg7WQ==";
+ };
+ };
"lead-1.0.0" = {
name = "lead";
packageName = "lead";
@@ -25470,15 +25542,6 @@ let
sha512 = "O3zJqbmehz0Hn3wpk62taA0+jNF7yn6BDWqQ9Wh2bEoO9Rx1BYiTmNX565eNVbW0ixfQkY6Sp9FvY/rr79Qmyg==";
};
};
- "mdn-data-1.1.4" = {
- name = "mdn-data";
- packageName = "mdn-data";
- version = "1.1.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz";
- sha512 = "FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==";
- };
- };
"mdn-data-2.0.4" = {
name = "mdn-data";
packageName = "mdn-data";
@@ -26217,6 +26280,15 @@ let
sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
};
};
+ "minipass-3.1.1" = {
+ name = "minipass";
+ packageName = "minipass";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz";
+ sha512 = "UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==";
+ };
+ };
"minitouch-prebuilt-1.2.0" = {
name = "minitouch-prebuilt";
packageName = "minitouch-prebuilt";
@@ -26235,6 +26307,15 @@ let
sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
};
};
+ "minizlib-2.1.0" = {
+ name = "minizlib";
+ packageName = "minizlib";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz";
+ sha512 = "EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==";
+ };
+ };
"mired-0.0.0" = {
name = "mired";
packageName = "mired";
@@ -27472,15 +27553,6 @@ let
sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
};
};
- "nick-0.1.3" = {
- name = "nick";
- packageName = "nick";
- version = "0.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/nick/-/nick-0.1.3.tgz";
- sha1 = "d8a30b7da789d417e0baa5437f33c487be9b6020";
- };
- };
"nijs-0.0.25" = {
name = "nijs";
packageName = "nijs";
@@ -27752,6 +27824,15 @@ let
sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==";
};
};
+ "node-gyp-build-4.2.0" = {
+ name = "node-gyp-build";
+ packageName = "node-gyp-build";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz";
+ sha512 = "4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ==";
+ };
+ };
"node-int64-0.4.0" = {
name = "node-int64";
packageName = "node-int64";
@@ -28481,13 +28562,13 @@ let
sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==";
};
};
- "nwsapi-2.1.4" = {
+ "nwsapi-2.2.0" = {
name = "nwsapi";
packageName = "nwsapi";
- version = "2.1.4";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz";
- sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==";
+ url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz";
+ sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==";
};
};
"oauth-0.9.15" = {
@@ -29679,13 +29760,13 @@ let
sha512 = "jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==";
};
};
- "pacote-9.5.8" = {
+ "pacote-9.5.9" = {
name = "pacote";
packageName = "pacote";
- version = "9.5.8";
+ version = "9.5.9";
src = fetchurl {
- url = "https://registry.npmjs.org/pacote/-/pacote-9.5.8.tgz";
- sha512 = "0Tl8Oi/K0Lo4MZmH0/6IsT3gpGf9eEAznLXEQPKgPq7FscnbUOyopnVpwXlnQdIbCUaojWy1Wd7VMyqfVsRrIw==";
+ url = "https://registry.npmjs.org/pacote/-/pacote-9.5.9.tgz";
+ sha512 = "S1nYW9ly+3btn3VmwRAk2LG3TEh8mkrFdY+psbnHSk8oPODbZ28uG0Z0d3yI0EpqcpLR6BukoVRf3H4IbGCkPQ==";
};
};
"pad-0.0.5" = {
@@ -29751,6 +29832,15 @@ let
sha512 = "b6t7ORo/MwT6xvRiuu1c1do3+CAUd7/0rgc1d3qNHUeP64zxy4ttLIvK7SEHzyfyDLvD9pPuV9mYKHf6MgUkmg==";
};
};
+ "parent-dirs-1.0.0" = {
+ name = "parent-dirs";
+ packageName = "parent-dirs";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parent-dirs/-/parent-dirs-1.0.0.tgz";
+ sha1 = "b88851d1534013db421ce1695766906d0fbfb392";
+ };
+ };
"parent-module-1.0.1" = {
name = "parent-module";
packageName = "parent-module";
@@ -30570,13 +30660,13 @@ let
sha1 = "18de2f97e4bf7a9551ad7511942b5496f7aba660";
};
};
- "picomatch-2.0.7" = {
+ "picomatch-2.1.0" = {
name = "picomatch";
packageName = "picomatch";
- version = "2.0.7";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz";
- sha512 = "oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==";
+ url = "https://registry.npmjs.org/picomatch/-/picomatch-2.1.0.tgz";
+ sha512 = "uhnEDzAbrcJ8R3g2fANnSuXZMBtkpSjxTTgn2LeSiQlfmq72enQJWdQllXW24MBLYnA1SBD2vfvx2o0Zw3Ielw==";
};
};
"picture-tuber-1.0.2" = {
@@ -31327,13 +31417,13 @@ let
sha512 = "yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w==";
};
};
- "prebuild-install-5.3.2" = {
+ "prebuild-install-5.3.3" = {
name = "prebuild-install";
packageName = "prebuild-install";
- version = "5.3.2";
+ version = "5.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.2.tgz";
- sha512 = "INDfXzTPnhT+WYQemqnAXlP7SvfiFMopMozSgXCZ+RDLb279gKfIuLk4o7PgEawLp3WrMgIYGBpkxpraROHsSA==";
+ url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz";
+ sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==";
};
};
"precond-0.2.3" = {
@@ -33235,13 +33325,22 @@ let
sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
};
};
- "rc-config-loader-2.0.4" = {
+ "rc-config-loader-2.0.5" = {
name = "rc-config-loader";
packageName = "rc-config-loader";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.4.tgz";
- sha512 = "k06UzRbYDWgF4Mc/YrsZsmzSpDLuHoThJxep+vq5H09hiX8rbA5Ue/Ra0dwWm5MQvWYW4YBXgA186inNxuxidQ==";
+ url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.5.tgz";
+ sha512 = "T464K2MQlnNWOblUDIglpFhyN+zYJq7jSlL++/N0hUkcmIXeNFumwXFVdtf8qhUGohn4RYQ0wdi74R575I44PQ==";
+ };
+ };
+ "rc-config-loader-3.0.0" = {
+ name = "rc-config-loader";
+ packageName = "rc-config-loader";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-3.0.0.tgz";
+ sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ==";
};
};
"re-emitter-1.1.4" = {
@@ -34153,31 +34252,31 @@ let
sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
};
};
- "request-promise-4.2.4" = {
+ "request-promise-4.2.5" = {
name = "request-promise";
packageName = "request-promise";
- version = "4.2.4";
+ version = "4.2.5";
src = fetchurl {
- url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.4.tgz";
- sha512 = "8wgMrvE546PzbR5WbYxUQogUnUDfM0S7QIFZMID+J73vdFARkFy+HElj4T+MWYhpXwlLp0EQ8Zoj8xUA0he4Vg==";
+ url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz";
+ sha512 = "ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==";
};
};
- "request-promise-core-1.1.2" = {
+ "request-promise-core-1.1.3" = {
name = "request-promise-core";
packageName = "request-promise-core";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz";
- sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==";
+ url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz";
+ sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==";
};
};
- "request-promise-native-1.0.7" = {
+ "request-promise-native-1.0.8" = {
name = "request-promise-native";
packageName = "request-promise-native";
- version = "1.0.7";
+ version = "1.0.8";
src = fetchurl {
- url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz";
- sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==";
+ url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz";
+ sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==";
};
};
"requestretry-4.0.2" = {
@@ -34747,13 +34846,13 @@ let
sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c";
};
};
- "roarr-2.14.2" = {
+ "roarr-2.14.3" = {
name = "roarr";
packageName = "roarr";
- version = "2.14.2";
+ version = "2.14.3";
src = fetchurl {
- url = "https://registry.npmjs.org/roarr/-/roarr-2.14.2.tgz";
- sha512 = "ibqv70DCUhGVMfPe0JSUHBZ9PKLhxdk8VJ/Y2M7vVr+L4VakW1CdVTU9cJQBbM2STQa84CgBAzd7hJGcnALGeg==";
+ url = "https://registry.npmjs.org/roarr/-/roarr-2.14.3.tgz";
+ sha512 = "D4BpKVruUDCJ9DJWcC7T+fx4o10IUYJ7MdmjM4Skx1aqc42CE7LGzPDUAfczibhavNGcnY1IHqJdq16NmiG4rQ==";
};
};
"rollup-0.67.0" = {
@@ -35791,6 +35890,15 @@ let
sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
};
};
+ "shasum-object-1.0.0" = {
+ name = "shasum-object";
+ packageName = "shasum-object";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz";
+ sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==";
+ };
+ };
"shebang-command-1.2.0" = {
name = "shebang-command";
packageName = "shebang-command";
@@ -36358,13 +36466,13 @@ let
sha512 = "IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ==";
};
};
- "snyk-gradle-plugin-3.1.0" = {
+ "snyk-gradle-plugin-3.2.0" = {
name = "snyk-gradle-plugin";
packageName = "snyk-gradle-plugin";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz";
- sha512 = "789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ==";
+ url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.0.tgz";
+ sha512 = "0fopfp3g7xzs2D20pQBZgP2x4jugyr0cASv/Px3WEfsQR+bJlfk6h67euhH24lOl0fhdTYfz4oiteWPskb39sg==";
};
};
"snyk-module-1.9.1" = {
@@ -36385,22 +36493,22 @@ let
sha512 = "Fmt6Mjx6zZz+4q6PnBkhuNGhEX++q/pKMI26ls4p3JPkx4KxBz89oncpkmf7P8YCkoaka8oHhtDEv/R4Z9LleQ==";
};
};
- "snyk-nodejs-lockfile-parser-1.16.0" = {
+ "snyk-nodejs-lockfile-parser-1.16.1" = {
name = "snyk-nodejs-lockfile-parser";
packageName = "snyk-nodejs-lockfile-parser";
- version = "1.16.0";
+ version = "1.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.16.0.tgz";
- sha512 = "cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA==";
+ url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.16.1.tgz";
+ sha512 = "MEQImB2XU35D66wYve6g1RcDuD9vyoxGvYtM+ngSd5ItujzjIpyF26W7niqHwBRGLamqjsKF5cOlbmHs+wsx/Q==";
};
};
- "snyk-nuget-plugin-1.13.0" = {
+ "snyk-nuget-plugin-1.13.1" = {
name = "snyk-nuget-plugin";
packageName = "snyk-nuget-plugin";
- version = "1.13.0";
+ version = "1.13.1";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.0.tgz";
- sha512 = "9PrsN6kSz79lKUlpfqAYvMtac7HYbscf4OJ5LTzTcPn2XRs24NCTZylUUpilkSY0r2DyDLY18cl+qHHjfJKnig==";
+ url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.1.tgz";
+ sha512 = "2AQVeahBK7Rt38p0Acl1fMsFQu3dsqoRODPoRaS0IM/bOBzVdAkDF9pCb5yKMREGpMZcyRFkt8Q+hGiUk0Nlfg==";
};
};
"snyk-paket-parser-1.5.0" = {
@@ -36916,6 +37024,15 @@ let
sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==";
};
};
+ "source-map-support-0.5.16" = {
+ name = "source-map-support";
+ packageName = "source-map-support";
+ version = "0.5.16";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz";
+ sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==";
+ };
+ };
"source-map-url-0.4.0" = {
name = "source-map-url";
packageName = "source-map-url";
@@ -37213,15 +37330,6 @@ let
sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==";
};
};
- "sqlite3-4.0.9" = {
- name = "sqlite3";
- packageName = "sqlite3";
- version = "4.0.9";
- src = fetchurl {
- url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.9.tgz";
- sha512 = "IkvzjmsWQl9BuBiM4xKpl5X8WCR4w0AeJHRdobCdXZ8dT/lNc1XS6WqvY35N6+YzIIgzSBeY5prdFObID9F9tA==";
- };
- };
"sqlite3-4.1.0" = {
name = "sqlite3";
packageName = "sqlite3";
@@ -37285,13 +37393,13 @@ let
sha512 = "UF+4+khFXILLBqtu9HfrpUwYnDXIdAyJe3u9X4GrApuoakxuSKwaUGakUxLPyo6COyV2brMqufUgf+fDOI8Ftw==";
};
};
- "ssb-config-3.4.2" = {
+ "ssb-config-3.4.3" = {
name = "ssb-config";
packageName = "ssb-config";
- version = "3.4.2";
+ version = "3.4.3";
src = fetchurl {
- url = "https://registry.npmjs.org/ssb-config/-/ssb-config-3.4.2.tgz";
- sha512 = "y8SQeTsTzkbB7rrugSytdTqnJbQuNe9AayOAuFGlbR5Z81tRskWjDgOvqm/4rPkS6BO8YWRwSaRnHF2LVAT8DA==";
+ url = "https://registry.npmjs.org/ssb-config/-/ssb-config-3.4.3.tgz";
+ sha512 = "qvutXHzW+KPhopVGAc8QYJ0jKorGVVYrZBbuyTGU1sCVdtXKGqOIQGJzpiwQUdLe2UM4Sc9WWWCAYTWlSSqhkA==";
};
};
"ssb-db-19.2.0" = {
@@ -37942,15 +38050,6 @@ let
sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
};
};
- "stream-source-0.3.5" = {
- name = "stream-source";
- packageName = "stream-source";
- version = "0.3.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/stream-source/-/stream-source-0.3.5.tgz";
- sha512 = "ZuEDP9sgjiAwUVoDModftG0JtYiLUV8K4ljYD1VyUMRWtbVf92474o4kuuul43iZ8t/hRuiDAx1dIJSvirrK/g==";
- };
- };
"stream-splicer-2.0.1" = {
name = "stream-splicer";
packageName = "stream-splicer";
@@ -38797,13 +38896,13 @@ let
sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8";
};
};
- "svgo-1.3.0" = {
+ "svgo-1.3.2" = {
name = "svgo";
packageName = "svgo";
- version = "1.3.0";
+ version = "1.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz";
- sha512 = "MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==";
+ url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz";
+ sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==";
};
};
"swagger-converter-0.1.7" = {
@@ -39158,6 +39257,15 @@ let
sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
};
};
+ "tar-5.0.5" = {
+ name = "tar";
+ packageName = "tar";
+ version = "5.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tar/-/tar-5.0.5.tgz";
+ sha512 = "MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ==";
+ };
+ };
"tar-fs-2.0.0" = {
name = "tar-fs";
packageName = "tar-fs";
@@ -39230,13 +39338,13 @@ let
sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29";
};
};
- "telegraf-3.33.0" = {
+ "telegraf-3.33.3" = {
name = "telegraf";
packageName = "telegraf";
- version = "3.33.0";
+ version = "3.33.3";
src = fetchurl {
- url = "https://registry.npmjs.org/telegraf/-/telegraf-3.33.0.tgz";
- sha512 = "5N47JPHVfypNW8U8xCE1hg59itFfohvRvMVceigYbj+A7pb9o9aZzjYA5MjNeTXuADubFVl/ZdWFMfNf/uN7TQ==";
+ url = "https://registry.npmjs.org/telegraf/-/telegraf-3.33.3.tgz";
+ sha512 = "ItSAeE9OjFH+X0rS8DeErccoUZRy2hBl+mDjFWDqyZWyRElxA5L178UpJV7tM6hCVN/leFY+9orfra2JtX4AyQ==";
};
};
"telegram-typings-3.6.1" = {
@@ -39266,6 +39374,15 @@ let
sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
};
};
+ "temp-0.8.4" = {
+ name = "temp";
+ packageName = "temp";
+ version = "0.8.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz";
+ sha512 = "s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==";
+ };
+ };
"temp-0.9.0" = {
name = "temp";
packageName = "temp";
@@ -39275,6 +39392,15 @@ let
sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==";
};
};
+ "temp-0.9.1" = {
+ name = "temp";
+ packageName = "temp";
+ version = "0.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz";
+ sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==";
+ };
+ };
"temp-dir-1.0.0" = {
name = "temp-dir";
packageName = "temp-dir";
@@ -39437,15 +39563,6 @@ let
sha512 = "PW6rXqLNGL3xZ6d5/INrX+pt8qbffmeDPLcvkBOlfNpDRFhVvNNjFmZXH86ZQjrOz9t/nNZDBXqnzqJuioJbSQ==";
};
};
- "thelounge-ldapjs-non-maintained-fork-1.0.4" = {
- name = "thelounge-ldapjs-non-maintained-fork";
- packageName = "thelounge-ldapjs-non-maintained-fork";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/thelounge-ldapjs-non-maintained-fork/-/thelounge-ldapjs-non-maintained-fork-1.0.4.tgz";
- sha512 = "uf6H6UMv6EKmU81V1Q5lECwiGz4noSua+C+nGiC/Vgtayu3VRjtSSIJzUJDUjJT3YS8HJgkvBe2SsgGrPlT/7g==";
- };
- };
"then-fs-2.0.0" = {
name = "then-fs";
packageName = "then-fs";
@@ -40859,13 +40976,13 @@ let
sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==";
};
};
- "uglify-js-3.6.4" = {
+ "uglify-js-3.6.7" = {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.6.4";
+ version = "3.6.7";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.4.tgz";
- sha512 = "9Yc2i881pF4BPGhjteCXQNaXx1DCwm3dtOyBaG2hitHjLWOczw/ki8vD1bqyT3u6K0Ms/FpCShkmfg+FtlOfYA==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.7.tgz";
+ sha512 = "4sXQDzmdnoXiO+xvmTzQsfIiwrjUCSA95rSP4SEd8tDb51W2TiDOlL76Hl+Kw0Ie42PSItCW8/t6pBNCF2R48A==";
};
};
"uglify-to-browserify-1.0.2" = {
@@ -42218,6 +42335,15 @@ let
sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==";
};
};
+ "validator-11.1.0" = {
+ name = "validator";
+ packageName = "validator";
+ version = "11.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/validator/-/validator-11.1.0.tgz";
+ sha512 = "qiQ5ktdO7CD6C/5/mYV4jku/7qnqzjrxb3C/Q5wR3vGGinHTgJZN/TdFT3ZX4vXhX2R1PXx42fB1cn5W+uJ4lg==";
+ };
+ };
"validator-5.7.0" = {
name = "validator";
packageName = "validator";
@@ -42335,6 +42461,15 @@ let
sha1 = "dfe93616ad0e7ae801b332a9d88bfc5cdc8e1d1f";
};
};
+ "vasync-2.2.0" = {
+ name = "vasync";
+ packageName = "vasync";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vasync/-/vasync-2.2.0.tgz";
+ sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b";
+ };
+ };
"vendors-1.0.3" = {
name = "vendors";
packageName = "vendors";
@@ -42344,13 +42479,13 @@ let
sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==";
};
};
- "verda-1.0.0-10" = {
+ "verda-1.0.0-11" = {
name = "verda";
packageName = "verda";
- version = "1.0.0-10";
+ version = "1.0.0-11";
src = fetchurl {
- url = "https://registry.npmjs.org/verda/-/verda-1.0.0-10.tgz";
- sha512 = "5VWCbPzZnYjjrlvCE4XW4wT8ko9ppCSo6EyHDfH7XBsv0EEglzq/Pdg8k77aV/9xQwFvnFcd1y/XnmDbya77Ow==";
+ url = "https://registry.npmjs.org/verda/-/verda-1.0.0-11.tgz";
+ sha512 = "h97YglCV4HLUUSIi682tbcBlA5FH9sQPBkJQw8Nv6rErPDu7QAL66/bJxzuR5svkDlyZJZh8QKL2amC2idJPqw==";
};
};
"verror-1.1.0" = {
@@ -42650,13 +42785,13 @@ let
sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==";
};
};
- "vm-browserify-1.1.0" = {
+ "vm-browserify-1.1.2" = {
name = "vm-browserify";
packageName = "vm-browserify";
- version = "1.1.0";
+ version = "1.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
- sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
+ url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
+ sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
};
};
"voc-1.1.0" = {
@@ -42794,13 +42929,13 @@ let
sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==";
};
};
- "vscode-languageserver-protocol-3.15.0-next.9" = {
+ "vscode-languageserver-protocol-3.15.0-next.10" = {
name = "vscode-languageserver-protocol";
packageName = "vscode-languageserver-protocol";
- version = "3.15.0-next.9";
+ version = "3.15.0-next.10";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.9.tgz";
- sha512 = "b9PAxouMmtsLEe8ZjbIMPb7wRWPhckGfgjwZLmp/dWnaAuRPYtY3lGO0/rNbLc3jKIqCVlnEyYVFKalzDAzj0g==";
+ url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.10.tgz";
+ sha512 = "TmbBhKrBoYNX+/pQGwoXmy2qlOfjGBUhwUGIzQoWpj8qtDzYuLof8bi19rGLZ9sVuSHh3anvIyVpGJEqT0QODQ==";
};
};
"vscode-languageserver-protocol-3.6.0" = {
@@ -42830,13 +42965,13 @@ let
sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==";
};
};
- "vscode-languageserver-types-3.15.0-next.5" = {
+ "vscode-languageserver-types-3.15.0-next.6" = {
name = "vscode-languageserver-types";
packageName = "vscode-languageserver-types";
- version = "3.15.0-next.5";
+ version = "3.15.0-next.6";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.5.tgz";
- sha512 = "7hrELhTeWieUgex3+6692KjCkcmO/+V/bFItM5MHGcBotzwmjEuXjapLLYTYhIspuJ1ibRSik5MhX5YwLpsPiw==";
+ url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.6.tgz";
+ sha512 = "+4jfvmZ26oFMSX6EgPRB75PWHoT8pzyWuSSWk0erC4hTzmJq2gWxVLh20bZutZjMmiivawvPshtM3XZhX2SttA==";
};
};
"vscode-languageserver-types-3.6.0" = {
@@ -43073,13 +43208,13 @@ let
sha1 = "7137946585c73fe44882013853bd000c5d687a4e";
};
};
- "web-push-3.3.5" = {
+ "web-push-3.4.1" = {
name = "web-push";
packageName = "web-push";
- version = "3.3.5";
+ version = "3.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/web-push/-/web-push-3.3.5.tgz";
- sha512 = "sukVBk0chRCL4n+Xwurl2TlD4/JmezNv4L2nwlTZx4KwMeUPfmD9TdGl6A6taayNgjObYzp0k0gubAcQCp7TMg==";
+ url = "https://registry.npmjs.org/web-push/-/web-push-3.4.1.tgz";
+ sha512 = "wtx18llPtWWW+x8hv+Gxvz+2VjO+vZuyihInsjySNpNGNVswH1Bb2KkbbCtE96yi52VUmbFMdidxM8kJAPaSWQ==";
};
};
"web-tree-sitter-0.15.10" = {
@@ -43127,13 +43262,13 @@ let
sha512 = "Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==";
};
};
- "webpack-cli-3.3.9" = {
+ "webpack-cli-3.3.10" = {
name = "webpack-cli";
packageName = "webpack-cli";
- version = "3.3.9";
+ version = "3.3.10";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
- sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
+ url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz";
+ sha512 = "u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==";
};
};
"webpack-core-0.6.9" = {
@@ -44262,6 +44397,15 @@ let
sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
};
};
+ "yallist-4.0.0" = {
+ name = "yallist";
+ packageName = "yallist";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
+ sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
+ };
+ };
"yaml-ast-parser-0.0.40" = {
name = "yaml-ast-parser";
packageName = "yaml-ast-parser";
@@ -44379,13 +44523,13 @@ let
sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==";
};
};
- "yargs-14.2.0" = {
+ "yargs-14.2.1" = {
name = "yargs";
packageName = "yargs";
- version = "14.2.0";
+ version = "14.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/yargs/-/yargs-14.2.0.tgz";
- sha512 = "/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==";
+ url = "https://registry.npmjs.org/yargs/-/yargs-14.2.1.tgz";
+ sha512 = "rZ00XIuGAoI58F0weHyCP3PAN17wJqdN/pF8eMp+imuP+jSdMCD5t4bSf5d5FKPvEDrK9zYlnhO7bFYKQ5UYow==";
};
};
"yargs-3.10.0" = {
@@ -44550,15 +44694,6 @@ let
sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==";
};
};
- "yarn-1.17.3" = {
- name = "yarn";
- packageName = "yarn";
- version = "1.17.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/yarn/-/yarn-1.17.3.tgz";
- sha512 = "CgA8o7nRZaQvmeF/WBx2FC7f9W/0X59T2IaLYqgMo6637wfp5mMEsM3YXoJtKUspnpmDJKl/gGFhnqS+sON7hA==";
- };
- };
"yarn-1.19.1" = {
name = "yarn";
packageName = "yarn";
@@ -44622,13 +44757,13 @@ let
sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA==";
};
};
- "yeoman-environment-2.5.0" = {
+ "yeoman-environment-2.6.0" = {
name = "yeoman-environment";
packageName = "yeoman-environment";
- version = "2.5.0";
+ version = "2.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.5.0.tgz";
- sha512 = "RCxVKbSiW1o0l5C7dkGvG4BHmI4dfSA50pcBU9VQ2AOUErgGdCtfU+bLM6g7NV9iA2uxFGFYv6iJArhmWzRouA==";
+ url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.6.0.tgz";
+ sha512 = "Hl0LBs9/mKun8XyJ6gFiUNhZwjN/eezn+E9IFWz6KtXg/3wsnztF2lgtE8eIjfhWYtvY4yMq9iizi1Ei5JJ+7A==";
};
};
"yn-3.1.1" = {
@@ -44736,17 +44871,17 @@ in
"@angular/cli" = nodeEnv.buildNodePackage {
name = "_at_angular_slash_cli";
packageName = "@angular/cli";
- version = "8.3.14";
+ version = "8.3.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.14.tgz";
- sha512 = "cOP2UvnnYocx1U1aiNkuLCcBxSktIXkadzrY7UlWJtQiCPGWm3Y87BfrQXub9Nsh79iyV8k8uKZKEax2ayESSg==";
+ url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.17.tgz";
+ sha512 = "1R4IlPnrm6B9drhrCHTu9fBFIqCvOXK1zqYLsdobz6KfdkBcLSFqRqRfgEqADLChkxMo4tedtsftkuqY5Xinrg==";
};
dependencies = [
- sources."@angular-devkit/architect-0.803.14"
- sources."@angular-devkit/core-8.3.14"
- sources."@angular-devkit/schematics-8.3.14"
- sources."@schematics/angular-8.3.14"
- sources."@schematics/update-0.803.14"
+ sources."@angular-devkit/architect-0.803.17"
+ sources."@angular-devkit/core-8.3.17"
+ sources."@angular-devkit/schematics-8.3.17"
+ sources."@schematics/angular-8.3.17"
+ sources."@schematics/update-0.803.17"
sources."@yarnpkg/lockfile-1.1.0"
sources."JSONStream-1.3.5"
sources."agent-base-4.3.0"
@@ -45051,19 +45186,19 @@ in
"@antora/cli" = nodeEnv.buildNodePackage {
name = "_at_antora_slash_cli";
packageName = "@antora/cli";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/cli/-/cli-2.1.2.tgz";
- sha512 = "U0N8yjQl7kFUsJuCSMiXTWFnXFKMwmDwPy0cH98Kx251PrsvNRv1i2SdHrlp6Ve2+VcaJ3qpv2UcuyG1GKUzKg==";
+ url = "https://registry.npmjs.org/@antora/cli/-/cli-2.2.0.tgz";
+ sha512 = "/fQDYEMypZbC8LxpZak/3nsP8Rr3voXXvxSan/718uDJUHFwq1rHl9Y/pOoE/tRs0Qv1jtDvk2eZgFDlsMMmlQ==";
};
dependencies = [
- sources."@antora/playbook-builder-2.1.2"
+ sources."@antora/playbook-builder-2.2.0"
sources."@iarna/toml-2.2.3"
sources."argparse-1.0.10"
sources."camelcase-5.3.1"
- sources."camelcase-keys-6.0.1"
+ sources."camelcase-keys-6.1.0"
sources."commander-3.0.2"
- (sources."convict-5.1.0" // {
+ (sources."convict-5.2.0" // {
dependencies = [
sources."json5-2.1.0"
];
@@ -45079,7 +45214,7 @@ in
sources."moment-2.24.0"
sources."quick-lru-4.0.1"
sources."sprintf-js-1.0.3"
- sources."validator-10.11.0"
+ sources."validator-11.1.0"
sources."yargs-parser-13.0.0"
];
buildInputs = globalBuildInputs;
@@ -45095,25 +45230,24 @@ in
"@antora/site-generator-default" = nodeEnv.buildNodePackage {
name = "_at_antora_slash_site-generator-default";
packageName = "@antora/site-generator-default";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.1.2.tgz";
- sha512 = "iHy4YFdIsOO5wTuB1CAvuPcojTSSIhKgiY1E4e1FZVUe3J7SGfbrj49pSbwYugrMgPtCf2KwcCZKwXnKW+k71A==";
+ url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.2.0.tgz";
+ sha512 = "fy2tG1I3/FK1s/y/GhGMkFICtXkkSOpxVy5OjBXXfkBNHQIHYSLDv460Gz8NvSiVe99LWWa+FOpr5G13Bb0bvw==";
};
dependencies = [
- sources."@antora/asciidoc-loader-2.1.2"
- sources."@antora/content-aggregator-2.1.2"
- sources."@antora/content-classifier-2.1.2"
- sources."@antora/document-converter-2.1.2"
+ sources."@antora/asciidoc-loader-2.2.0"
+ sources."@antora/content-aggregator-2.2.0"
+ sources."@antora/content-classifier-2.2.0"
+ sources."@antora/document-converter-2.2.0"
sources."@antora/expand-path-helper-1.0.0"
- sources."@antora/navigation-builder-2.1.2"
- sources."@antora/page-composer-2.1.2"
- sources."@antora/playbook-builder-2.1.2"
- sources."@antora/redirect-producer-2.1.2"
- sources."@antora/site-mapper-2.1.2"
- sources."@antora/site-publisher-2.1.2"
- sources."@antora/ui-loader-2.1.2"
- sources."@babel/runtime-7.6.3"
+ sources."@antora/navigation-builder-2.2.0"
+ sources."@antora/page-composer-2.2.0"
+ sources."@antora/playbook-builder-2.2.0"
+ sources."@antora/redirect-producer-2.2.0"
+ sources."@antora/site-mapper-2.2.0"
+ sources."@antora/site-publisher-2.2.0"
+ sources."@antora/ui-loader-2.2.0"
sources."@iarna/toml-2.2.3"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
@@ -45123,7 +45257,6 @@ in
sources."async-lock-1.2.2"
sources."balanced-match-1.0.0"
sources."base64-js-0.0.2"
- sources."benchmark-1.0.0"
sources."bl-4.0.0"
sources."bops-0.0.7"
sources."brace-expansion-1.1.11"
@@ -45138,8 +45271,8 @@ in
];
})
sources."camelcase-5.3.1"
- sources."camelcase-keys-6.0.1"
- sources."clean-git-ref-1.0.3"
+ sources."camelcase-keys-6.1.0"
+ sources."clean-git-ref-2.0.1"
sources."clone-2.1.2"
sources."clone-buffer-1.0.0"
(sources."clone-response-1.0.2" // {
@@ -45162,7 +45295,7 @@ in
sources."safe-buffer-5.1.2"
];
})
- (sources."convict-5.1.0" // {
+ (sources."convict-5.2.0" // {
dependencies = [
sources."json5-2.1.0"
];
@@ -45172,10 +45305,9 @@ in
sources."decamelize-1.2.0"
sources."decompress-response-4.2.1"
sources."deep-freeze-node-1.1.3"
- sources."defer-to-connect-1.0.2"
+ sources."defer-to-connect-1.1.0"
sources."define-properties-1.1.3"
- sources."diff-3.5.0"
- sources."diff-lines-1.1.1"
+ sources."diff3-0.0.3"
sources."duplexer-0.1.1"
sources."duplexer3-0.1.4"
(sources."duplexify-3.7.1" // {
@@ -45236,7 +45368,7 @@ in
];
})
sources."graceful-fs-4.2.3"
- (sources."gulp-vinyl-zip-2.1.2" // {
+ (sources."gulp-vinyl-zip-2.1.3" // {
dependencies = [
sources."readable-stream-2.3.6"
sources."safe-buffer-5.1.2"
@@ -45244,7 +45376,7 @@ in
sources."through2-2.0.5"
];
})
- sources."handlebars-4.4.5"
+ sources."handlebars-4.5.1"
sources."has-symbols-1.0.0"
sources."http-cache-semantics-4.0.3"
sources."ignore-5.1.4"
@@ -45261,7 +45393,7 @@ in
sources."is-valid-glob-1.0.0"
sources."is-windows-1.0.2"
sources."isarray-1.0.0"
- sources."isomorphic-git-0.47.0"
+ sources."isomorphic-git-0.70.4"
sources."js-yaml-3.13.1"
sources."json-buffer-3.0.0"
sources."json-stable-stringify-without-jsonify-1.0.1"
@@ -45293,7 +45425,6 @@ in
sources."moment-2.24.0"
sources."multi-progress-2.0.0"
sources."neo-async-2.6.1"
- sources."nick-0.1.3"
sources."normalize-path-2.1.1"
sources."normalize-url-4.5.0"
sources."now-and-later-2.0.1"
@@ -45329,7 +45460,6 @@ in
sources."queue-4.5.1"
sources."quick-lru-4.0.1"
sources."readable-stream-3.4.0"
- sources."regenerator-runtime-0.13.3"
sources."remove-bom-buffer-3.0.0"
(sources."remove-bom-stream-1.2.0" // {
dependencies = [
@@ -45357,11 +45487,9 @@ in
sources."simple-get-3.1.0"
sources."source-map-0.6.1"
sources."split-0.3.3"
- sources."split2-3.1.1"
sources."sprintf-js-1.0.3"
sources."stream-combiner-0.0.4"
sources."stream-shift-1.0.0"
- sources."stream-source-0.3.5"
sources."string_decoder-1.3.0"
sources."through-2.3.8"
sources."through2-3.0.1"
@@ -45384,13 +45512,13 @@ in
];
})
sources."to-utf8-0.0.1"
- sources."uglify-js-3.6.4"
+ sources."uglify-js-3.6.7"
sources."unc-path-regex-0.1.2"
sources."unique-stream-2.3.1"
sources."universalify-0.1.2"
sources."url-parse-lax-3.0.0"
sources."util-deprecate-1.0.2"
- sources."validator-10.11.0"
+ sources."validator-11.1.0"
sources."value-or-function-3.0.0"
sources."varint-0.0.3"
sources."vinyl-2.2.0"
@@ -45535,7 +45663,7 @@ in
sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1"
sources."@hapi/address-2.1.2"
sources."@hapi/bourne-1.3.2"
- sources."@hapi/hoek-8.3.2"
+ sources."@hapi/hoek-8.5.0"
sources."@hapi/joi-15.1.1"
sources."@hapi/topo-3.1.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
@@ -45602,7 +45730,7 @@ in
sources."@types/cors-2.8.6"
sources."@types/events-3.0.0"
sources."@types/express-4.17.1"
- sources."@types/express-serve-static-core-4.16.10"
+ sources."@types/express-serve-static-core-4.16.11"
sources."@types/fs-capacitor-2.0.0"
sources."@types/fs-extra-5.1.0"
sources."@types/glob-7.1.1"
@@ -45614,7 +45742,7 @@ in
sources."@types/long-4.0.0"
sources."@types/mime-2.0.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."@types/range-parser-1.2.3"
sources."@types/serve-static-1.13.3"
sources."@types/ws-6.0.3"
@@ -45772,7 +45900,7 @@ in
sources."callsites-2.0.0"
sources."camel-case-3.0.0"
sources."camelcase-4.1.0"
- sources."caniuse-lite-1.0.30001004"
+ sources."caniuse-lite-1.0.30001008"
sources."capture-stack-trace-1.0.1"
sources."cardinal-2.1.1"
sources."caseless-0.12.0"
@@ -45842,8 +45970,8 @@ in
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
sources."copy-descriptor-0.1.1"
- sources."core-js-3.3.4"
- sources."core-js-compat-3.3.4"
+ sources."core-js-3.3.6"
+ sources."core-js-compat-3.3.6"
sources."core-util-is-1.0.2"
sources."cors-2.8.5"
sources."cosmiconfig-5.2.1"
@@ -45914,7 +46042,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.1"
- sources."electron-to-chromium-1.3.296"
+ sources."electron-to-chromium-1.3.302"
sources."elegant-spinner-1.0.1"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
@@ -46004,7 +46132,7 @@ in
})
sources."find-up-3.0.0"
sources."fkill-6.2.0"
- sources."flow-parser-0.110.1"
+ sources."flow-parser-0.111.1"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
@@ -46418,7 +46546,7 @@ in
sources."proto-list-1.2.4"
(sources."protobufjs-6.8.8" // {
dependencies = [
- sources."@types/node-10.17.0"
+ sources."@types/node-10.17.3"
];
})
sources."proxy-addr-2.0.5"
@@ -46473,8 +46601,8 @@ in
sources."qs-6.5.2"
];
})
- sources."request-promise-core-1.1.2"
- sources."request-promise-native-1.0.7"
+ sources."request-promise-core-1.1.3"
+ sources."request-promise-native-1.0.8"
sources."resolve-1.12.0"
sources."resolve-from-3.0.0"
sources."resolve-url-0.2.1"
@@ -46558,7 +46686,7 @@ in
})
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.2"
- (sources."source-map-support-0.5.13" // {
+ (sources."source-map-support-0.5.16" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -46637,9 +46765,9 @@ in
sources."pify-2.3.0"
];
})
- (sources."temp-0.8.3" // {
+ (sources."temp-0.8.4" // {
dependencies = [
- sources."rimraf-2.2.8"
+ sources."rimraf-2.6.3"
];
})
(sources."term-size-1.2.0" // {
@@ -46739,7 +46867,7 @@ in
(sources."vue-cli-plugin-apollo-0.21.3" // {
dependencies = [
sources."cross-spawn-7.0.1"
- sources."deepmerge-4.2.1"
+ sources."deepmerge-4.2.2"
sources."execa-3.2.0"
sources."fs-extra-8.1.0"
sources."get-stream-5.1.0"
@@ -47237,7 +47365,7 @@ in
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
- sources."nwsapi-2.1.4"
+ sources."nwsapi-2.2.0"
sources."oauth-sign-0.9.0"
sources."once-1.4.0"
sources."optionator-0.8.2"
@@ -47250,8 +47378,8 @@ in
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."request-2.88.0"
- sources."request-promise-core-1.1.2"
- sources."request-promise-native-1.0.7"
+ sources."request-promise-core-1.1.3"
+ sources."request-promise-native-1.0.8"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
@@ -47498,7 +47626,7 @@ in
sources."combine-source-map-0.8.0"
sources."concat-map-0.0.1"
sources."concat-stream-1.6.2"
- sources."console-browserify-1.1.0"
+ sources."console-browserify-1.2.0"
sources."constants-browserify-1.0.0"
sources."convert-source-map-1.1.3"
sources."core-util-is-1.0.2"
@@ -47507,9 +47635,8 @@ in
sources."create-hmac-1.1.7"
sources."crypto-browserify-3.12.0"
sources."dash-ast-1.0.0"
- sources."date-now-0.1.4"
sources."defined-1.0.0"
- sources."deps-sort-2.0.0"
+ sources."deps-sort-2.0.1"
sources."des.js-1.0.0"
(sources."detective-5.2.0" // {
dependencies = [
@@ -47522,6 +47649,7 @@ in
sources."elliptic-6.5.1"
sources."events-2.1.0"
sources."evp_bytestokey-1.0.3"
+ sources."fast-safe-stringify-2.0.7"
sources."fs.realpath-1.0.0"
sources."function-bind-1.1.1"
sources."get-assigned-identifiers-1.2.0"
@@ -47583,6 +47711,7 @@ in
sources."safe-buffer-5.2.0"
sources."sha.js-2.4.11"
sources."shasum-1.0.2"
+ sources."shasum-object-1.0.0"
sources."shell-quote-1.7.2"
sources."simple-concat-1.0.0"
sources."source-map-0.5.7"
@@ -47619,7 +47748,7 @@ in
];
})
sources."util-deprecate-1.0.2"
- sources."vm-browserify-1.1.0"
+ sources."vm-browserify-1.1.2"
sources."wrappy-1.0.2"
sources."xtend-4.0.2"
];
@@ -47653,7 +47782,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.0"
- sources."@types/node-10.17.0"
+ sources."@types/node-10.17.3"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.2.16"
sources."ajv-6.10.2"
@@ -47714,7 +47843,7 @@ in
sources."co-3.1.0"
sources."codepage-1.4.0"
sources."combined-stream-1.0.8"
- sources."commander-3.0.2"
+ sources."commander-4.0.0"
sources."compact2string-1.4.1"
sources."concat-map-0.0.1"
(sources."concat-stream-2.0.0" // {
@@ -48247,7 +48376,7 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."ajv-6.10.2"
@@ -48881,7 +49010,7 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."arr-diff-4.0.0"
sources."arr-flatten-1.1.0"
sources."arr-union-3.1.0"
@@ -49209,7 +49338,7 @@ in
sources."@cycle/run-3.4.0"
sources."@cycle/time-0.10.1"
sources."@types/cookiejar-2.1.1"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
@@ -49238,7 +49367,7 @@ in
sources."d-1.0.1"
sources."debug-3.2.6"
sources."delayed-stream-1.0.0"
- sources."es5-ext-0.10.51"
+ sources."es5-ext-0.10.52"
sources."es6-iterator-2.0.3"
sources."es6-map-0.1.5"
(sources."es6-set-0.1.5" // {
@@ -49246,9 +49375,14 @@ in
sources."es6-symbol-3.1.1"
];
})
- sources."es6-symbol-3.1.2"
+ sources."es6-symbol-3.1.3"
sources."escape-string-regexp-1.0.5"
sources."event-emitter-0.3.5"
+ (sources."ext-1.1.2" // {
+ dependencies = [
+ sources."type-2.0.0"
+ ];
+ })
sources."extend-3.0.2"
sources."external-editor-2.2.0"
sources."figures-2.0.0"
@@ -50061,7 +50195,7 @@ in
sources."sodium-javascript-0.5.5"
(sources."sodium-native-2.4.6" // {
dependencies = [
- sources."node-gyp-build-4.1.1"
+ sources."node-gyp-build-4.2.0"
];
})
sources."sodium-universal-2.0.0"
@@ -50420,10 +50554,10 @@ in
elasticdump = nodeEnv.buildNodePackage {
name = "elasticdump";
packageName = "elasticdump";
- version = "6.15.4";
+ version = "6.15.7";
src = fetchurl {
- url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.15.4.tgz";
- sha512 = "IN2+A+39FDlJIaMfnn4zrWIR5cObI8UdW5+YHbwwhE/LXQMBOtTXLYEUQL0UxrGuAo6ZMbtU1HZyvR206OWcFQ==";
+ url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.15.7.tgz";
+ sha512 = "Z6AsKLwPxSz7auY4+p9mFOR+Ep0+iAIJ9OxADLeadprQO33A4XuerCpkePOzewQeVFbnspdB0+jCRsj9shPpCw==";
};
dependencies = [
sources."JSONStream-1.3.5"
@@ -50432,7 +50566,7 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.3"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.556.0"
+ sources."aws-sdk-2.563.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."base64-js-1.3.1"
@@ -50448,6 +50582,7 @@ in
sources."delay-4.3.0"
sources."delayed-stream-1.0.0"
sources."ecc-jsbn-0.1.2"
+ sources."end-of-stream-1.4.4"
sources."eventemitter3-4.0.0"
sources."events-1.1.1"
sources."extend-3.0.2"
@@ -50484,6 +50619,7 @@ in
sources."mime-types-2.1.24"
sources."minimist-0.0.10"
sources."oauth-sign-0.9.0"
+ sources."once-1.4.0"
sources."optimist-0.6.1"
sources."p-finally-1.0.0"
sources."p-queue-6.2.0"
@@ -50491,6 +50627,7 @@ in
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."psl-1.4.0"
+ sources."pump-3.0.0"
sources."punycode-1.3.2"
sources."qs-6.5.2"
sources."querystring-0.2.0"
@@ -50540,6 +50677,7 @@ in
sources."verror-1.10.0"
sources."when-3.7.8"
sources."wordwrap-0.0.3"
+ sources."wrappy-1.0.2"
sources."xml2js-0.4.19"
sources."xmlbuilder-9.0.7"
];
@@ -52006,7 +52144,7 @@ in
sources."git-remote-ssb-2.0.4"
sources."git-ssb-web-2.8.0"
sources."hashlru-2.3.0"
- sources."highlight.js-9.15.10"
+ sources."highlight.js-9.16.2"
sources."increment-buffer-1.0.1"
sources."inherits-2.0.4"
sources."ini-1.3.5"
@@ -52044,7 +52182,7 @@ in
sources."muxrpc-6.4.2"
sources."nan-2.14.0"
sources."nearley-2.19.0"
- sources."node-gyp-build-4.1.1"
+ sources."node-gyp-build-4.2.0"
sources."node-polyglot-1.0.0"
sources."non-private-ip-1.4.4"
sources."options-0.0.6"
@@ -52125,7 +52263,7 @@ in
sources."ssb-caps-1.1.0"
(sources."ssb-client-4.7.8" // {
dependencies = [
- sources."ssb-config-3.4.2"
+ sources."ssb-config-3.4.3"
];
})
sources."ssb-config-2.3.9"
@@ -52188,6 +52326,201 @@ in
bypassCache = true;
reconstructLock = true;
};
+ gitmoji-cli = nodeEnv.buildNodePackage {
+ name = "gitmoji-cli";
+ packageName = "gitmoji-cli";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-2.2.0.tgz";
+ sha512 = "1eYIuRcKtKtnktW/4D0043qMW2Q1iIv90q+gWsStW3i9Uo6hEC8wWjmHu9047pNvcmYEeK7XuPrYzFvq+FfVyw==";
+ };
+ dependencies = [
+ sources."ansi-align-2.0.0"
+ sources."ansi-escapes-3.2.0"
+ sources."ansi-regex-3.0.0"
+ sources."ansi-styles-3.2.1"
+ sources."array-find-index-1.0.2"
+ sources."arrify-1.0.1"
+ sources."axios-0.18.1"
+ sources."boxen-1.3.0"
+ sources."camelcase-4.1.0"
+ sources."camelcase-keys-4.2.0"
+ sources."capture-stack-trace-1.0.1"
+ sources."chalk-2.4.2"
+ sources."chardet-0.7.0"
+ sources."ci-info-1.6.0"
+ sources."cli-boxes-1.0.0"
+ sources."cli-cursor-2.1.0"
+ sources."cli-width-2.2.0"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."conf-2.2.0"
+ sources."configstore-3.1.2"
+ sources."create-error-class-3.0.2"
+ sources."cross-spawn-6.0.5"
+ sources."crypto-random-string-1.0.0"
+ sources."currently-unhandled-0.4.1"
+ sources."debug-3.1.0"
+ sources."decamelize-1.2.0"
+ (sources."decamelize-keys-1.1.0" // {
+ dependencies = [
+ sources."map-obj-1.0.1"
+ ];
+ })
+ sources."deep-extend-0.6.0"
+ sources."dot-prop-4.2.0"
+ sources."duplexer3-0.1.4"
+ sources."end-of-stream-1.4.4"
+ sources."env-paths-1.0.0"
+ sources."error-ex-1.3.2"
+ sources."escape-string-regexp-1.0.5"
+ sources."execa-1.0.0"
+ sources."external-editor-3.1.0"
+ sources."figures-2.0.0"
+ sources."find-up-2.1.0"
+ sources."follow-redirects-1.5.10"
+ sources."get-stream-4.1.0"
+ sources."global-dirs-0.1.1"
+ (sources."got-6.7.1" // {
+ dependencies = [
+ sources."get-stream-3.0.0"
+ ];
+ })
+ sources."graceful-fs-4.2.3"
+ sources."has-flag-3.0.0"
+ sources."hosted-git-info-2.8.5"
+ sources."iconv-lite-0.4.24"
+ sources."import-lazy-2.1.0"
+ sources."imurmurhash-0.1.4"
+ sources."indent-string-3.2.0"
+ sources."ini-1.3.5"
+ sources."inquirer-6.5.2"
+ sources."inquirer-autocomplete-prompt-1.0.1"
+ sources."is-arrayish-0.2.1"
+ sources."is-buffer-2.0.4"
+ sources."is-ci-1.2.1"
+ sources."is-fullwidth-code-point-2.0.0"
+ sources."is-installed-globally-0.1.0"
+ sources."is-npm-1.0.0"
+ sources."is-obj-1.0.1"
+ sources."is-path-inside-1.0.1"
+ sources."is-plain-obj-1.1.0"
+ sources."is-promise-2.1.0"
+ sources."is-redirect-1.0.0"
+ sources."is-retry-allowed-1.2.0"
+ sources."is-stream-1.1.0"
+ sources."isexe-2.0.0"
+ sources."json-parse-better-errors-1.0.2"
+ sources."latest-version-3.1.0"
+ sources."load-json-file-4.0.0"
+ sources."locate-path-2.0.0"
+ sources."lodash-4.17.15"
+ sources."loud-rejection-1.6.0"
+ sources."lowercase-keys-1.0.1"
+ sources."lru-cache-4.1.5"
+ sources."make-dir-1.3.0"
+ sources."map-obj-2.0.0"
+ sources."meow-5.0.0"
+ sources."mimic-fn-1.2.0"
+ sources."minimist-1.2.0"
+ sources."minimist-options-3.0.2"
+ sources."ms-2.0.0"
+ sources."mute-stream-0.0.7"
+ sources."nice-try-1.0.5"
+ sources."normalize-package-data-2.5.0"
+ sources."npm-run-path-2.0.2"
+ sources."once-1.4.0"
+ sources."onetime-2.0.1"
+ sources."os-tmpdir-1.0.2"
+ sources."p-finally-1.0.0"
+ sources."p-limit-1.3.0"
+ sources."p-locate-2.0.0"
+ sources."p-try-1.0.0"
+ sources."package-json-4.0.1"
+ sources."parent-dirs-1.0.0"
+ sources."parse-json-4.0.0"
+ sources."path-exists-3.0.0"
+ sources."path-is-inside-1.0.2"
+ sources."path-key-2.0.1"
+ sources."path-parse-1.0.6"
+ sources."path-type-3.0.0"
+ sources."pify-3.0.0"
+ sources."pkg-up-2.0.0"
+ sources."prepend-http-1.0.4"
+ sources."pseudomap-1.0.2"
+ sources."pump-3.0.0"
+ sources."quick-lru-1.1.0"
+ sources."rc-1.2.8"
+ sources."read-pkg-3.0.0"
+ sources."read-pkg-up-3.0.0"
+ sources."redent-2.0.0"
+ sources."registry-auth-token-3.4.0"
+ sources."registry-url-3.1.0"
+ sources."resolve-1.12.0"
+ sources."restore-cursor-2.0.0"
+ sources."run-async-2.3.0"
+ sources."rxjs-6.5.3"
+ sources."safe-buffer-5.2.0"
+ sources."safer-buffer-2.1.2"
+ sources."semver-5.7.1"
+ sources."semver-diff-2.1.0"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."signal-exit-3.0.2"
+ sources."spdx-correct-3.1.0"
+ sources."spdx-exceptions-2.2.0"
+ sources."spdx-expression-parse-3.0.0"
+ sources."spdx-license-ids-3.0.5"
+ (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-bom-3.0.0"
+ sources."strip-eof-1.0.0"
+ sources."strip-indent-2.0.0"
+ sources."strip-json-comments-2.0.1"
+ sources."supports-color-5.5.0"
+ (sources."term-size-1.2.0" // {
+ dependencies = [
+ sources."cross-spawn-5.1.0"
+ sources."execa-0.7.0"
+ sources."get-stream-3.0.0"
+ ];
+ })
+ sources."through-2.3.8"
+ sources."timed-out-4.0.1"
+ sources."tmp-0.0.33"
+ sources."trim-newlines-2.0.0"
+ sources."tslib-1.10.0"
+ sources."unique-string-1.0.0"
+ sources."unzip-response-2.0.1"
+ sources."update-notifier-2.5.0"
+ sources."url-parse-lax-1.0.0"
+ sources."validate-npm-package-license-3.0.4"
+ sources."which-1.3.1"
+ sources."widest-line-2.0.1"
+ sources."wrappy-1.0.2"
+ sources."write-file-atomic-2.4.3"
+ sources."xdg-basedir-3.0.0"
+ sources."yallist-2.1.2"
+ sources."yargs-parser-10.1.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "A gitmoji client for using emojis on commit messages.";
+ homepage = "https://github.com/carloscuesta/gitmoji-cli#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
graphql-cli = nodeEnv.buildNodePackage {
name = "graphql-cli";
packageName = "graphql-cli";
@@ -52209,10 +52542,20 @@ in
sources."yargs-parser-7.0.0"
];
})
+ sources."@sindresorhus/is-0.14.0"
+ sources."@szmarczak/http-timer-1.1.2"
sources."accepts-1.3.7"
sources."agent-base-4.3.0"
sources."ajv-6.10.2"
- sources."ansi-align-2.0.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"
+ ];
+ })
sources."ansi-escapes-4.2.1"
sources."ansi-regex-3.0.0"
sources."ansi-styles-3.2.1"
@@ -52247,11 +52590,27 @@ in
sources."qs-6.7.0"
];
})
- sources."boxen-1.3.0"
+ (sources."boxen-3.2.0" // {
+ dependencies = [
+ sources."ansi-regex-4.1.0"
+ sources."camelcase-5.3.1"
+ 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."type-fest-0.3.1"
+ ];
+ })
sources."brace-expansion-1.1.11"
sources."buffer-equal-constant-time-1.0.1"
sources."buffer-from-1.1.1"
sources."bytes-3.1.0"
+ (sources."cacheable-request-6.1.0" // {
+ dependencies = [
+ sources."get-stream-5.1.0"
+ sources."lowercase-keys-2.0.0"
+ ];
+ })
sources."call-me-maybe-1.0.1"
sources."caller-callsite-2.0.0"
sources."caller-path-2.0.0"
@@ -52264,13 +52623,14 @@ in
sources."change-case-3.1.0"
sources."chardet-0.7.0"
sources."chownr-1.1.3"
- sources."ci-info-1.6.0"
- sources."cli-boxes-1.0.0"
+ sources."ci-info-2.0.0"
+ sources."cli-boxes-2.2.0"
sources."cli-cursor-3.1.0"
sources."cli-spinners-2.2.0"
sources."cli-width-2.2.0"
sources."cliui-4.1.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."color-convert-1.9.3"
@@ -52286,7 +52646,7 @@ in
sources."commander-2.20.3"
sources."common-tags-1.8.0"
sources."concat-map-0.0.1"
- sources."configstore-3.1.2"
+ sources."configstore-4.0.0"
sources."constant-case-2.0.0"
(sources."content-disposition-0.5.3" // {
dependencies = [
@@ -52300,7 +52660,7 @@ in
sources."core-util-is-1.0.2"
sources."cosmiconfig-5.2.1"
sources."create-error-class-3.0.2"
- (sources."creato-1.0.7" // {
+ (sources."creato-1.1.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
sources."inquirer-7.0.0"
@@ -52308,6 +52668,7 @@ in
sources."ora-4.0.2"
sources."string-width-4.1.0"
sources."strip-ansi-5.2.0"
+ sources."update-notifier-3.0.1"
];
})
(sources."cross-fetch-2.2.2" // {
@@ -52315,7 +52676,11 @@ in
sources."node-fetch-2.1.2"
];
})
- sources."cross-spawn-6.0.5"
+ (sources."cross-spawn-6.0.5" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
sources."crypto-random-string-1.0.0"
(sources."cucumber-html-reporter-3.0.4" // {
dependencies = [
@@ -52326,8 +52691,10 @@ in
sources."dashdash-1.14.1"
sources."debug-2.6.9"
sources."decamelize-1.2.0"
+ sources."decompress-response-3.3.0"
sources."deep-extend-0.6.0"
sources."defaults-1.0.3"
+ sources."defer-to-connect-1.1.0"
sources."delayed-stream-1.0.0"
sources."depd-1.1.2"
sources."destroy-1.0.4"
@@ -52395,7 +52762,7 @@ in
sources."forwarded-0.1.2"
sources."fresh-0.5.2"
sources."fs-extra-5.0.0"
- sources."fs-minipass-1.2.7"
+ sources."fs-minipass-2.0.0"
sources."fs.realpath-1.0.0"
sources."get-caller-file-1.0.3"
sources."get-stream-3.0.0"
@@ -52404,7 +52771,11 @@ in
sources."global-dirs-0.1.1"
sources."global-modules-1.0.0"
sources."global-prefix-1.0.2"
- sources."got-6.7.1"
+ (sources."got-9.6.0" // {
+ dependencies = [
+ sources."get-stream-4.1.0"
+ ];
+ })
sources."graceful-fs-4.2.3"
sources."graphcool-json-schema-1.2.1"
(sources."graphcool-yml-0.4.15" // {
@@ -52441,9 +52812,11 @@ in
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-flag-3.0.0"
+ sources."has-yarn-2.1.0"
sources."header-case-1.0.1"
sources."homedir-polyfill-1.0.3"
sources."hosted-git-info-2.8.5"
+ sources."http-cache-semantics-4.0.3"
(sources."http-errors-1.7.2" // {
dependencies = [
sources."inherits-2.0.3"
@@ -52487,13 +52860,13 @@ in
sources."ip-regex-1.0.3"
sources."ipaddr.js-1.9.0"
sources."is-arrayish-0.2.1"
- sources."is-ci-1.2.1"
+ sources."is-ci-2.0.0"
sources."is-directory-0.3.1"
sources."is-fullwidth-code-point-1.0.0"
sources."is-installed-globally-0.1.0"
sources."is-interactive-1.0.0"
sources."is-lower-case-1.1.3"
- sources."is-npm-1.0.0"
+ sources."is-npm-3.0.0"
sources."is-obj-1.0.1"
sources."is-path-inside-1.0.1"
sources."is-promise-2.1.0"
@@ -52505,6 +52878,7 @@ in
sources."is-url-superb-2.0.0"
sources."is-windows-1.0.2"
sources."is-wsl-1.1.0"
+ sources."is-yarn-global-0.3.0"
sources."isarray-0.0.1"
sources."isexe-2.0.0"
(sources."isomorphic-fetch-2.2.1" // {
@@ -52518,6 +52892,7 @@ in
sources."js-yaml-3.13.1"
sources."jsbn-0.1.1"
sources."jsesc-2.5.2"
+ sources."json-buffer-3.0.0"
sources."json-parse-better-errors-1.0.2"
sources."json-schema-0.2.3"
(sources."json-schema-ref-parser-3.3.1" // {
@@ -52534,16 +52909,19 @@ in
(sources."jsonwebtoken-8.5.1" // {
dependencies = [
sources."ms-2.1.2"
+ sources."semver-5.7.1"
];
})
sources."jsprim-1.4.1"
sources."jwa-1.4.1"
sources."jws-3.2.2"
- sources."latest-version-3.1.0"
+ sources."keyv-3.1.0"
+ sources."latest-version-5.1.0"
sources."lcid-1.0.0"
(sources."load-json-file-2.0.0" // {
dependencies = [
sources."parse-json-2.2.0"
+ sources."pify-2.3.0"
];
})
sources."locate-path-2.0.0"
@@ -52562,11 +52940,7 @@ in
sources."lower-case-first-1.0.2"
sources."lowercase-keys-1.0.1"
sources."lru-cache-4.1.5"
- (sources."make-dir-1.3.0" // {
- dependencies = [
- sources."pify-3.0.0"
- ];
- })
+ sources."make-dir-1.3.0"
sources."map-age-cleaner-0.1.3"
sources."media-typer-0.3.0"
sources."mem-1.1.0"
@@ -52576,15 +52950,24 @@ in
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."mimic-fn-1.2.0"
+ sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
- sources."minimist-0.0.8"
- (sources."minipass-2.9.0" // {
+ sources."minimist-1.2.0"
+ (sources."minipass-3.1.1" // {
dependencies = [
- sources."yallist-3.1.1"
+ sources."yallist-4.0.0"
+ ];
+ })
+ (sources."minizlib-2.1.0" // {
+ dependencies = [
+ sources."yallist-4.0.0"
+ ];
+ })
+ (sources."mkdirp-0.5.1" // {
+ dependencies = [
+ sources."minimist-0.0.8"
];
})
- sources."minizlib-1.3.3"
- sources."mkdirp-0.5.1"
sources."ms-2.0.0"
sources."mute-stream-0.0.8"
sources."negotiator-0.6.2"
@@ -52592,13 +52975,17 @@ in
sources."no-case-2.3.2"
sources."node-fetch-2.6.0"
sources."node-request-by-swagger-1.1.4"
- sources."normalize-package-data-2.5.0"
+ (sources."normalize-package-data-2.5.0" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
+ sources."normalize-url-4.5.0"
sources."npm-path-2.0.4"
sources."npm-paths-1.0.0"
(sources."npm-run-4.1.2" // {
dependencies = [
sources."cross-spawn-5.1.0"
- sources."minimist-1.2.0"
];
})
sources."npm-run-path-2.0.2"
@@ -52627,13 +53014,14 @@ in
})
sources."os-locale-2.1.0"
sources."os-tmpdir-1.0.2"
+ sources."p-cancelable-1.1.0"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-is-promise-2.1.0"
sources."p-limit-1.3.0"
sources."p-locate-2.0.0"
sources."p-try-1.0.0"
- sources."package-json-4.0.1"
+ sources."package-json-6.5.0"
sources."param-case-2.1.1"
sources."parse-github-url-1.0.2"
sources."parse-json-4.0.0"
@@ -52647,10 +53035,14 @@ in
sources."path-key-2.0.1"
sources."path-parse-1.0.6"
sources."path-to-regexp-0.1.7"
- sources."path-type-2.0.0"
+ (sources."path-type-2.0.0" // {
+ dependencies = [
+ sources."pify-2.3.0"
+ ];
+ })
sources."performance-now-2.1.0"
- sources."pify-2.3.0"
- sources."prepend-http-1.0.4"
+ sources."pify-3.0.0"
+ sources."prepend-http-2.0.0"
sources."prisma-json-schema-0.1.3"
(sources."prisma-yml-1.26.6" // {
dependencies = [
@@ -52674,11 +53066,7 @@ in
sources."qs-6.5.2"
sources."range-parser-1.2.1"
sources."raw-body-2.4.0"
- (sources."rc-1.2.8" // {
- dependencies = [
- sources."minimist-1.2.0"
- ];
- })
+ sources."rc-1.2.8"
sources."read-pkg-2.0.0"
sources."read-pkg-up-2.0.0"
(sources."readable-stream-2.3.6" // {
@@ -52688,17 +53076,18 @@ in
];
})
sources."regenerator-runtime-0.11.1"
- sources."registry-auth-token-3.4.0"
- sources."registry-url-3.1.0"
+ sources."registry-auth-token-4.0.0"
+ sources."registry-url-5.1.0"
sources."replaceall-0.1.6"
sources."request-2.88.0"
- sources."request-promise-4.2.4"
- sources."request-promise-core-1.1.2"
+ sources."request-promise-4.2.5"
+ sources."request-promise-core-1.1.3"
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
sources."resolve-1.12.0"
sources."resolve-dir-1.0.1"
sources."resolve-from-4.0.0"
+ sources."responselike-1.0.2"
sources."restore-cursor-3.1.0"
sources."rimraf-2.7.1"
sources."run-async-2.3.0"
@@ -52706,8 +53095,12 @@ in
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
sources."scuid-1.1.0"
- sources."semver-5.7.1"
- sources."semver-diff-2.1.0"
+ sources."semver-6.3.0"
+ (sources."semver-diff-2.1.0" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
(sources."send-0.17.1" // {
dependencies = [
sources."ms-2.1.1"
@@ -52724,7 +53117,7 @@ in
sources."simple-errors-1.0.1"
sources."snake-case-2.1.0"
sources."source-map-0.5.7"
- (sources."source-map-support-0.5.13" // {
+ (sources."source-map-support-0.5.16" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -52754,9 +53147,9 @@ in
sources."supports-color-5.5.0"
sources."swap-case-1.1.2"
sources."sync-exec-0.6.2"
- (sources."tar-4.4.13" // {
+ (sources."tar-5.0.5" // {
dependencies = [
- sources."yallist-3.1.1"
+ sources."yallist-4.0.0"
];
})
sources."term-size-1.2.0"
@@ -52767,6 +53160,7 @@ in
sources."tmp-0.1.0"
sources."tmp-graphql-config-extension-openapi-1.0.7"
sources."to-fast-properties-2.0.0"
+ sources."to-readable-stream-1.0.0"
sources."toidentifier-1.0.0"
(sources."tough-cookie-2.4.3" // {
dependencies = [
@@ -52784,12 +53178,30 @@ in
sources."universalify-0.1.2"
sources."unpipe-1.0.0"
sources."unzip-response-2.0.1"
- sources."update-notifier-2.5.0"
+ (sources."update-notifier-2.5.0" // {
+ dependencies = [
+ sources."ansi-align-2.0.0"
+ sources."boxen-1.3.0"
+ sources."ci-info-1.6.0"
+ sources."cli-boxes-1.0.0"
+ sources."configstore-3.1.2"
+ sources."got-6.7.1"
+ sources."is-ci-1.2.1"
+ sources."is-npm-1.0.0"
+ sources."latest-version-3.1.0"
+ sources."package-json-4.0.1"
+ sources."prepend-http-1.0.4"
+ sources."registry-auth-token-3.4.0"
+ sources."registry-url-3.1.0"
+ sources."semver-5.7.1"
+ sources."url-parse-lax-1.0.0"
+ ];
+ })
sources."upper-case-1.1.3"
sources."upper-case-first-1.1.2"
sources."uri-js-4.2.2"
sources."url-join-4.0.0"
- sources."url-parse-lax-1.0.0"
+ sources."url-parse-lax-3.0.0"
sources."url-regex-3.2.0"
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
@@ -53322,9 +53734,9 @@ in
sources."each-props-1.3.2"
sources."end-of-stream-1.4.4"
sources."error-ex-1.3.2"
- sources."es5-ext-0.10.51"
+ sources."es5-ext-0.10.52"
sources."es6-iterator-2.0.3"
- sources."es6-symbol-3.1.2"
+ sources."es6-symbol-3.1.3"
sources."es6-weak-map-2.0.3"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -53345,6 +53757,11 @@ in
];
})
sources."expand-tilde-2.0.2"
+ (sources."ext-1.1.2" // {
+ dependencies = [
+ sources."type-2.0.0"
+ ];
+ })
sources."extend-3.0.2"
(sources."extend-shallow-3.0.2" // {
dependencies = [
@@ -53721,9 +54138,9 @@ in
sources."detect-file-1.0.0"
sources."each-props-1.3.2"
sources."error-ex-1.3.2"
- sources."es5-ext-0.10.51"
+ sources."es5-ext-0.10.52"
sources."es6-iterator-2.0.3"
- sources."es6-symbol-3.1.2"
+ sources."es6-symbol-3.1.3"
(sources."expand-brackets-2.1.4" // {
dependencies = [
sources."define-property-0.2.5"
@@ -53735,6 +54152,11 @@ in
];
})
sources."expand-tilde-2.0.2"
+ (sources."ext-1.1.2" // {
+ dependencies = [
+ sources."type-2.0.0"
+ ];
+ })
sources."extend-3.0.2"
(sources."extend-shallow-3.0.2" // {
dependencies = [
@@ -54016,7 +54438,7 @@ in
sources."param-case-2.1.1"
sources."relateurl-0.2.7"
sources."source-map-0.6.1"
- sources."uglify-js-3.6.4"
+ sources."uglify-js-3.6.7"
sources."upper-case-1.1.3"
];
buildInputs = globalBuildInputs;
@@ -54350,10 +54772,10 @@ in
ionic = nodeEnv.buildNodePackage {
name = "ionic";
packageName = "ionic";
- version = "5.4.4";
+ version = "5.4.5";
src = fetchurl {
- url = "https://registry.npmjs.org/ionic/-/ionic-5.4.4.tgz";
- sha512 = "OebF6aBl3HRTCJcD/iWXrOl2VVEF/TGhu5Zr9Zqu+xRpFLjqJnDfxjiitLZRc/bMNyh9+b56ioV/JW9fwwUCog==";
+ url = "https://registry.npmjs.org/ionic/-/ionic-5.4.5.tgz";
+ sha512 = "hc45gTZeqNGQl8Pr3R9F2Ud8qrMybOK9YiG1vGwZVm4ZwnhQw3urB4UHIQVjuruHWQBXS+KM9gFAopJlan9E4Q==";
};
dependencies = [
sources."@ionic/cli-framework-3.0.0"
@@ -54486,7 +54908,7 @@ in
sources."is-promise-2.1.0"
sources."is-stream-1.1.0"
sources."is-typedarray-1.0.0"
- sources."is-wsl-1.1.0"
+ sources."is-wsl-2.1.1"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."jsonfile-4.0.0"
@@ -54542,7 +54964,7 @@ in
})
sources."once-1.4.0"
sources."onetime-2.0.1"
- sources."open-6.4.0"
+ sources."open-7.0.0"
sources."optionator-0.8.2"
sources."os-name-3.1.0"
sources."os-tmpdir-1.0.2"
@@ -54926,7 +55348,7 @@ in
sources."restore-cursor-2.0.0"
sources."resumer-0.0.0"
sources."retry-0.12.0"
- sources."rimraf-2.2.8"
+ sources."rimraf-2.6.3"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
@@ -54969,7 +55391,7 @@ in
})
sources."supports-color-5.5.0"
sources."tar-2.2.2"
- sources."temp-0.8.3"
+ sources."temp-0.8.4"
sources."through-2.3.8"
sources."tiny-emitter-2.1.0"
sources."toml-2.3.6"
@@ -54995,7 +55417,7 @@ in
sources."util-deprecate-1.0.2"
sources."uuid-3.3.3"
sources."validate-npm-package-license-3.0.4"
- (sources."verda-1.0.0-10" // {
+ (sources."verda-1.0.0-11" // {
dependencies = [
sources."ansi-regex-4.1.0"
sources."fs-extra-6.0.1"
@@ -55050,10 +55472,10 @@ in
jake = nodeEnv.buildNodePackage {
name = "jake";
packageName = "jake";
- version = "10.1.1";
+ version = "10.1.6";
src = fetchurl {
- url = "https://registry.npmjs.org/jake/-/jake-10.1.1.tgz";
- sha512 = "STOuBZ3//C+8nL8MiDMW/2W6OrOHiAezMMQzAWkr9+wmPCh8wHdcNvJ33qUof4KrLZNplCnmshinXufFb+wjkg==";
+ url = "https://registry.npmjs.org/jake/-/jake-10.1.6.tgz";
+ sha512 = "gGnRHch3G461ryAnrBEeepuoyBHtqOfskwTWJntwF9hfzhe5kfcYbIpZKqFDniBWkyoUqktigvoTn+tysnjJdg==";
};
dependencies = [
sources."ansi-styles-3.2.1"
@@ -55235,7 +55657,7 @@ in
sources."chalk-2.4.2"
sources."charenc-0.0.2"
sources."chownr-1.1.3"
- sources."chroma-js-2.0.6"
+ sources."chroma-js-2.1.0"
sources."clean-css-4.2.1"
sources."clean-html-1.5.0"
sources."cliss-0.0.2"
@@ -55251,6 +55673,8 @@ in
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.2"
+ sources."cross-env-6.0.3"
+ sources."cross-spawn-7.0.1"
sources."crypt-0.0.2"
sources."css-2.2.4"
sources."cssom-0.3.8"
@@ -55412,6 +55836,7 @@ in
];
})
sources."isarray-1.0.0"
+ sources."isexe-2.0.0"
sources."isstream-0.1.2"
sources."joplin-turndown-4.0.18"
sources."joplin-turndown-plugin-gfm-1.0.11"
@@ -55491,7 +55916,7 @@ in
sources."npm-packlist-1.4.6"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
- sources."nwsapi-2.1.4"
+ sources."nwsapi-2.2.0"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
sources."object-inspect-1.6.0"
@@ -55516,13 +55941,14 @@ in
sources."parse5-4.0.0"
sources."path-exists-3.0.0"
sources."path-is-absolute-1.0.1"
+ sources."path-key-3.1.0"
sources."pend-1.2.0"
sources."performance-now-2.1.0"
sources."pify-3.0.0"
sources."pipe-functions-1.3.0"
sources."pn-1.1.0"
sources."pngjs-2.3.1"
- sources."prebuild-install-5.3.2"
+ sources."prebuild-install-5.3.3"
sources."prelude-ls-1.1.2"
sources."process-nextick-args-2.0.1"
sources."promise-7.3.1"
@@ -55548,8 +55974,8 @@ in
sources."tough-cookie-2.4.3"
];
})
- sources."request-promise-core-1.1.2"
- sources."request-promise-native-1.0.7"
+ sources."request-promise-core-1.1.3"
+ sources."request-promise-native-1.0.8"
sources."requires-port-1.0.0"
sources."resolve-url-0.2.1"
sources."retry-0.10.1"
@@ -55564,6 +55990,8 @@ in
sources."setprototypeof-1.1.1"
sources."seventh-0.7.30"
sources."sharp-0.22.1"
+ sources."shebang-command-2.0.0"
+ sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.2"
sources."simple-concat-1.0.0"
sources."simple-get-3.1.0"
@@ -55666,6 +56094,7 @@ in
sources."whatwg-encoding-1.0.5"
sources."whatwg-mimetype-2.3.0"
sources."whatwg-url-6.5.0"
+ sources."which-2.0.1"
sources."which-pm-runs-1.0.0"
sources."wide-align-1.1.3"
sources."word-wrap-1.2.3"
@@ -56025,7 +56454,7 @@ in
sources."decamelize-1.2.0"
sources."decompress-response-3.3.0"
sources."deep-extend-0.6.0"
- sources."defer-to-connect-1.0.2"
+ sources."defer-to-connect-1.1.0"
sources."delayed-stream-1.0.0"
sources."depd-1.1.2"
sources."destroy-1.0.4"
@@ -56234,7 +56663,7 @@ in
sources."xdg-basedir-3.0.0"
sources."y18n-4.0.0"
sources."yallist-2.1.2"
- sources."yargs-14.2.0"
+ sources."yargs-14.2.1"
sources."yargs-parser-15.0.0"
];
buildInputs = globalBuildInputs;
@@ -56304,7 +56733,7 @@ in
sources."buffer-fill-1.0.0"
sources."bytes-3.1.0"
sources."callsite-1.0.0"
- sources."chokidar-3.2.2"
+ sources."chokidar-3.3.0"
sources."colors-1.4.0"
sources."component-bind-1.0.0"
sources."component-emitter-1.2.1"
@@ -56392,7 +56821,7 @@ in
sources."parseuri-0.0.5"
sources."parseurl-1.3.3"
sources."path-is-absolute-1.0.1"
- sources."picomatch-2.0.7"
+ sources."picomatch-2.1.0"
sources."pseudomap-1.0.2"
sources."qjobs-1.2.0"
sources."qs-6.7.0"
@@ -56912,26 +57341,26 @@ in
sources."@lerna/write-log-file-3.13.0"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
- (sources."@octokit/endpoint-5.5.0" // {
+ (sources."@octokit/endpoint-5.5.1" // {
dependencies = [
sources."is-plain-object-3.0.0"
sources."isobject-4.0.0"
];
})
sources."@octokit/plugin-enterprise-rest-3.6.2"
- (sources."@octokit/request-5.3.0" // {
+ (sources."@octokit/request-5.3.1" // {
dependencies = [
sources."is-plain-object-3.0.0"
sources."isobject-4.0.0"
];
})
- sources."@octokit/request-error-1.0.4"
- sources."@octokit/rest-16.34.0"
- sources."@octokit/types-1.1.0"
+ sources."@octokit/request-error-1.1.0"
+ sources."@octokit/rest-16.34.1"
+ sources."@octokit/types-2.0.1"
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."@zkochan/cmd-shim-3.1.0"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
@@ -57242,7 +57671,7 @@ in
];
})
sources."graceful-fs-4.2.3"
- (sources."handlebars-4.4.5" // {
+ (sources."handlebars-4.5.1" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -57686,7 +58115,7 @@ in
sources."tweetnacl-0.14.5"
sources."type-fest-0.3.1"
sources."typedarray-0.0.6"
- (sources."uglify-js-3.6.4" // {
+ (sources."uglify-js-3.6.7" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -57749,7 +58178,7 @@ in
sources."xtend-4.0.2"
sources."y18n-4.0.0"
sources."yallist-3.1.1"
- (sources."yargs-14.2.0" // {
+ (sources."yargs-14.2.1" // {
dependencies = [
sources."ansi-regex-4.1.0"
sources."string-width-3.1.0"
@@ -58803,7 +59232,7 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."@webassemblyjs/ast-1.8.5"
sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
sources."@webassemblyjs/helper-api-error-1.8.5"
@@ -59019,7 +59448,7 @@ in
})
sources."call-me-maybe-1.0.1"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001004"
+ sources."caniuse-lite-1.0.30001008"
sources."caw-2.0.1"
(sources."chalk-2.4.2" // {
dependencies = [
@@ -59089,14 +59518,14 @@ in
sources."concat-map-0.0.1"
sources."concat-stream-1.6.2"
sources."config-chain-1.1.12"
- sources."console-browserify-1.1.0"
+ sources."console-browserify-1.2.0"
sources."constants-browserify-1.0.0"
sources."content-disposition-0.5.3"
sources."convert-source-map-1.6.0"
sources."copy-concurrently-1.0.5"
sources."copy-descriptor-0.1.1"
sources."core-js-2.6.10"
- (sources."core-js-compat-3.3.4" // {
+ (sources."core-js-compat-3.3.6" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -59109,7 +59538,6 @@ in
sources."cross-spawn-6.0.5"
sources."crypto-browserify-3.12.0"
sources."cyclist-1.0.1"
- sources."date-now-0.1.4"
sources."death-1.1.0"
sources."debug-4.1.1"
sources."decamelize-1.2.0"
@@ -59150,7 +59578,7 @@ in
sources."clone-1.0.4"
];
})
- sources."defer-to-connect-1.0.2"
+ sources."defer-to-connect-1.1.0"
sources."define-properties-1.1.3"
(sources."define-property-2.0.2" // {
dependencies = [
@@ -59177,7 +59605,7 @@ in
})
sources."duplexer3-0.1.4"
sources."duplexify-3.7.1"
- sources."electron-to-chromium-1.3.296"
+ sources."electron-to-chromium-1.3.302"
sources."elliptic-6.5.1"
sources."emoji-regex-7.0.3"
sources."emojis-list-2.1.0"
@@ -59841,7 +60269,7 @@ in
sources."source-list-map-0.1.8"
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.2"
- (sources."source-map-support-0.5.13" // {
+ (sources."source-map-support-0.5.16" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -59963,7 +60391,7 @@ in
sources."v8-compile-cache-2.0.3"
sources."validate-npm-package-license-3.0.4"
sources."vinyl-2.2.0"
- sources."vm-browserify-1.1.0"
+ sources."vm-browserify-1.1.2"
sources."watchpack-1.6.0"
sources."wcwidth-1.0.1"
(sources."webpack-4.41.2" // {
@@ -60009,7 +60437,7 @@ in
sources."ms-2.0.0"
];
})
- (sources."webpack-cli-3.3.9" // {
+ (sources."webpack-cli-3.3.10" // {
dependencies = [
sources."enhanced-resolve-4.1.0"
sources."memory-fs-0.4.1"
@@ -60188,7 +60616,7 @@ in
sha512 = "z4uLbDHNbs/aRuR6zCcnzwFQuMixkHCcWqgVaommfK/3cA1Ahq7OXemn+m8JwTYcBApSHgcrSbPr9sm3sZFL+A==";
};
dependencies = [
- sources."commander-3.0.2"
+ sources."commander-4.0.0"
sources."esm-3.2.25"
sources."mathjax-full-git://github.com/mathjax/MathJax-src.git"
sources."mj-context-menu-0.2.0"
@@ -60417,9 +60845,9 @@ in
sources."ecc-jsbn-0.1.2"
sources."end-of-stream-0.1.5"
sources."errno-0.1.7"
- sources."es5-ext-0.10.51"
+ sources."es5-ext-0.10.52"
sources."es6-iterator-2.0.3"
- sources."es6-symbol-3.1.2"
+ sources."es6-symbol-3.1.3"
sources."es6-weak-map-2.0.3"
sources."escape-string-regexp-1.0.5"
sources."event-emitter-0.3.5"
@@ -60442,6 +60870,11 @@ in
];
})
sources."expand-tilde-2.0.2"
+ (sources."ext-1.1.2" // {
+ dependencies = [
+ sources."type-2.0.0"
+ ];
+ })
sources."extend-3.0.2"
(sources."extend-shallow-3.0.2" // {
dependencies = [
@@ -60897,7 +61330,7 @@ in
sources."tweetnacl-0.14.5"
sources."type-1.2.0"
sources."typescript-3.6.4"
- (sources."uglify-js-3.6.4" // {
+ (sources."uglify-js-3.6.7" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -61206,10 +61639,10 @@ in
node-gyp = nodeEnv.buildNodePackage {
name = "node-gyp";
packageName = "node-gyp";
- version = "6.0.0";
+ version = "6.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.0.0.tgz";
- sha512 = "Qz6Xda2bKzdsooXITarGf2uaCJcYh7ua+jeRMifBFmTz0peo0JW6IjpqELlX+ZiHXphsKzISgaCsZeQch5a+NA==";
+ url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.0.1.tgz";
+ sha512 = "udHG4hGe3Ji97AYJbJhaRwuSOuQO7KHnE4ZPH3Sox3tjRZ+bkBsDvfZ7eYA1qwD8eLWr//193x806ss3HFTPRw==";
};
dependencies = [
sources."abbrev-1.1.1"
@@ -61236,7 +61669,7 @@ in
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."ecc-jsbn-0.1.2"
- sources."env-paths-1.0.0"
+ sources."env-paths-2.2.0"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
@@ -61272,12 +61705,15 @@ in
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.1"
- sources."nopt-3.0.6"
+ sources."nopt-4.0.1"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
sources."once-1.4.0"
+ sources."os-homedir-1.0.2"
+ sources."os-tmpdir-1.0.2"
+ sources."osenv-0.1.5"
sources."path-is-absolute-1.0.1"
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
@@ -61289,7 +61725,7 @@ in
sources."rimraf-2.7.1"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- sources."semver-5.3.0"
+ sources."semver-5.7.1"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."sshpk-1.16.1"
@@ -61326,10 +61762,10 @@ in
node-gyp-build = nodeEnv.buildNodePackage {
name = "node-gyp-build";
packageName = "node-gyp-build";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz";
- sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==";
+ url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz";
+ sha512 = "4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -61866,7 +62302,7 @@ in
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
sources."entities-1.1.2"
- sources."es5-ext-0.10.51"
+ sources."es5-ext-0.10.52"
sources."es6-iterator-2.0.3"
sources."es6-map-0.1.5"
sources."es6-promise-4.2.8"
@@ -61876,7 +62312,7 @@ in
sources."es6-symbol-3.1.1"
];
})
- sources."es6-symbol-3.1.2"
+ sources."es6-symbol-3.1.3"
sources."escape-html-1.0.3"
sources."esprima-4.0.1"
sources."etag-1.8.1"
@@ -61891,6 +62327,11 @@ in
sources."depd-2.0.0"
];
})
+ (sources."ext-1.1.2" // {
+ dependencies = [
+ sources."type-2.0.0"
+ ];
+ })
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
@@ -62334,7 +62775,7 @@ in
})
sources."strip-ansi-3.0.1"
sources."tar-4.4.13"
- sources."temp-0.9.0"
+ sources."temp-0.9.1"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
@@ -62721,10 +63162,10 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "6.12.0";
+ version = "6.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-6.12.0.tgz";
- sha512 = "juj5VkB3/k+PWbJUnXD7A/8oc8zLusDnK/sV9PybSalsbOVOTIp5vSE0rz5rQ7BsmUgQS47f/L2GYQnWXaKgnQ==";
+ url = "https://registry.npmjs.org/npm/-/npm-6.12.1.tgz";
+ sha512 = "+pMvUpgSXVBythrv//64j4i6DaLLJ1O0y8kwjNgjAE7atBNGzX4rcOEWvmsuiei6J+mA38O0nUZ/P35GuCD/jg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -62739,10 +63180,10 @@ in
npm-check-updates = nodeEnv.buildNodePackage {
name = "npm-check-updates";
packageName = "npm-check-updates";
- version = "3.1.25";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.25.tgz";
- sha512 = "B2tAgclEby1VyoN4cZp5Zm+iam72jQV1c2uZIcoNwB0cBbJQZaI1Xj+uxkYkoDs2w4DuaM1hQUavIZgfGKkCgg==";
+ url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.2.0.tgz";
+ sha512 = "Gqxd6Fv+EoGNKg2thclx3LPs9dHa1Tp/R+/59iYAgbliJ5NsDd/D6j6kjhnLtKh+7XMX7co3gTrVzsSqTPNRAg==";
};
dependencies = [
sources."@sindresorhus/is-0.14.0"
@@ -62801,7 +63242,7 @@ in
})
sources."decompress-response-3.3.0"
sources."deep-extend-0.6.0"
- sources."defer-to-connect-1.0.2"
+ sources."defer-to-connect-1.1.0"
sources."dot-prop-4.2.0"
sources."duplexer3-0.1.4"
sources."duplexify-3.7.1"
@@ -62939,7 +63380,7 @@ in
sources."p-locate-4.1.0"
sources."p-try-2.2.0"
sources."package-json-6.5.0"
- (sources."pacote-9.5.8" // {
+ (sources."pacote-9.5.9" // {
dependencies = [
sources."semver-5.7.1"
];
@@ -62970,7 +63411,7 @@ in
sources."minimist-1.2.0"
];
})
- (sources."rc-config-loader-2.0.4" // {
+ (sources."rc-config-loader-2.0.5" // {
dependencies = [
sources."debug-4.1.1"
sources."path-exists-3.0.0"
@@ -63496,7 +63937,7 @@ in
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001004"
+ sources."caniuse-lite-1.0.30001008"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -63517,12 +63958,12 @@ in
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
sources."concat-stream-1.6.2"
- sources."console-browserify-1.1.0"
+ sources."console-browserify-1.2.0"
sources."constants-browserify-1.0.0"
sources."convert-source-map-1.6.0"
sources."copy-descriptor-0.1.1"
sources."core-js-2.6.10"
- (sources."core-js-compat-3.3.4" // {
+ (sources."core-js-compat-3.3.6" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -63562,11 +64003,7 @@ in
sources."regjsparser-0.1.5"
];
})
- (sources."css-tree-1.0.0-alpha.33" // {
- dependencies = [
- sources."source-map-0.5.7"
- ];
- })
+ sources."css-tree-1.0.0-alpha.37"
sources."css-unit-converter-1.1.1"
sources."css-what-2.1.3"
sources."cssesc-0.1.0"
@@ -63576,18 +64013,11 @@ in
sources."cssnano-util-get-match-4.0.0"
sources."cssnano-util-raw-cache-4.0.1"
sources."cssnano-util-same-parent-4.0.1"
- (sources."csso-3.5.1" // {
- dependencies = [
- sources."css-tree-1.0.0-alpha.29"
- sources."mdn-data-1.1.4"
- sources."source-map-0.5.7"
- ];
- })
+ sources."csso-4.0.2"
sources."cssom-0.3.8"
sources."cssstyle-1.4.0"
sources."dashdash-1.14.1"
sources."data-urls-1.1.0"
- sources."date-now-0.1.4"
sources."deasync-0.1.15"
sources."debug-4.1.1"
sources."decode-uri-component-0.2.0"
@@ -63636,7 +64066,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.296"
+ sources."electron-to-chromium-1.3.302"
sources."elliptic-6.5.1"
sources."encodeurl-1.0.2"
sources."entities-1.1.2"
@@ -63885,7 +64315,7 @@ in
sources."normalize-path-3.0.0"
sources."normalize-url-3.3.0"
sources."nth-check-1.0.2"
- sources."nwsapi-2.1.4"
+ sources."nwsapi-2.2.0"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
sources."object-copy-0.1.0"
@@ -64035,8 +64465,8 @@ in
sources."tough-cookie-2.4.3"
];
})
- sources."request-promise-core-1.1.2"
- sources."request-promise-native-1.0.7"
+ sources."request-promise-core-1.1.3"
+ sources."request-promise-native-1.0.8"
sources."resolve-1.12.0"
sources."resolve-from-3.0.0"
sources."resolve-url-0.2.1"
@@ -64092,7 +64522,7 @@ in
sources."snapdragon-util-3.0.1"
sources."source-map-0.6.1"
sources."source-map-resolve-0.5.2"
- sources."source-map-support-0.5.13"
+ sources."source-map-support-0.5.16"
sources."source-map-url-0.4.0"
(sources."split-string-3.1.0" // {
dependencies = [
@@ -64120,7 +64550,7 @@ in
];
})
sources."supports-color-5.5.0"
- sources."svgo-1.3.0"
+ sources."svgo-1.3.2"
sources."symbol-tree-3.2.4"
sources."terser-3.17.0"
sources."through2-2.0.5"
@@ -64194,7 +64624,7 @@ in
sources."vendors-1.0.3"
sources."verror-1.10.0"
sources."vlq-0.2.3"
- sources."vm-browserify-1.1.0"
+ sources."vm-browserify-1.1.2"
sources."w3c-hr-time-1.0.1"
sources."w3c-xmlserializer-1.1.2"
sources."wcwidth-1.0.1"
@@ -64907,10 +65337,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "4.1.6";
+ version = "4.1.7";
src = fetchurl {
- url = "https://registry.npmjs.org/pnpm/-/pnpm-4.1.6.tgz";
- sha512 = "pTeynpUShgdh1fyP1hbqL+Q0ozaCHqDoG46KzkPfdSyUXxhLO/MSxxc7Wcx1Rl2uvu69CeENL85QFgUa/NOp0Q==";
+ url = "https://registry.npmjs.org/pnpm/-/pnpm-4.1.7.tgz";
+ sha512 = "0JfrmMLsy5x5nwUULUnXmKz6IbRXLc1r04STPDje6SIwcnyDwiRC5gR4LkC+AgVe2HuIhOSQm/MM1ypC63JDnQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -65005,7 +65435,7 @@ in
sources."readable-stream-3.4.0"
];
})
- sources."console-browserify-1.1.0"
+ sources."console-browserify-1.2.0"
sources."constants-browserify-1.0.0"
sources."convert-source-map-1.1.3"
sources."core-util-is-1.0.2"
@@ -65014,9 +65444,8 @@ in
sources."create-hmac-1.1.7"
sources."crypto-browserify-3.12.0"
sources."dash-ast-1.0.0"
- sources."date-now-0.1.4"
sources."defined-1.0.0"
- sources."deps-sort-2.0.0"
+ sources."deps-sort-2.0.1"
sources."des.js-1.0.0"
(sources."detective-5.2.0" // {
dependencies = [
@@ -65030,6 +65459,7 @@ in
sources."es6-promise-3.3.1"
sources."events-2.1.0"
sources."evp_bytestokey-1.0.3"
+ sources."fast-safe-stringify-2.0.7"
sources."fs.realpath-1.0.0"
sources."function-bind-1.1.1"
sources."gaze-1.1.3"
@@ -65120,6 +65550,7 @@ in
sources."sander-0.5.1"
sources."sha.js-2.4.11"
sources."shasum-1.0.2"
+ sources."shasum-object-1.0.0"
sources."shell-quote-1.7.2"
sources."simple-concat-1.0.0"
(sources."sorcery-0.10.0" // {
@@ -65144,7 +65575,7 @@ in
];
})
sources."syntax-error-1.4.0"
- (sources."temp-0.9.0" // {
+ (sources."temp-0.9.1" // {
dependencies = [
sources."rimraf-2.6.3"
];
@@ -65168,7 +65599,7 @@ in
];
})
sources."util-deprecate-1.0.2"
- sources."vm-browserify-1.1.0"
+ sources."vm-browserify-1.1.2"
sources."which-1.3.1"
sources."wordwrap-1.0.0"
sources."wrappy-1.0.2"
@@ -65594,10 +66025,10 @@ in
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
- version = "1.55.1";
+ version = "1.56.1";
src = fetchurl {
- url = "https://registry.npmjs.org/serverless/-/serverless-1.55.1.tgz";
- sha512 = "eLHRFKe5norcgw2ZJEwh66hd/khgR9unocAOSzCOyi9fgB3/F4RTAeIaJVtDHZSGpwCI2APmDYzye11NZ86EfA==";
+ url = "https://registry.npmjs.org/serverless/-/serverless-1.56.1.tgz";
+ sha512 = "yLEQbyHdrgM8MG64J7o1jrjaaCaGOoNThRl9PGzBGZmibtDBDzRBlclVcjcWIWDItw35t6OtMRlwQrXYPtgoqw==";
};
dependencies = [
sources."@serverless/cli-1.4.0"
@@ -65612,7 +66043,7 @@ in
sources."semver-6.3.0"
];
})
- (sources."@serverless/enterprise-plugin-3.2.0" // {
+ (sources."@serverless/enterprise-plugin-3.2.1" // {
dependencies = [
sources."fs-extra-7.0.1"
sources."node-fetch-2.6.0"
@@ -65620,7 +66051,7 @@ in
];
})
sources."@serverless/event-mocks-1.1.1"
- (sources."@serverless/platform-sdk-2.1.2" // {
+ (sources."@serverless/platform-sdk-2.2.0" // {
dependencies = [
sources."ramda-0.25.0"
sources."uuid-3.3.3"
@@ -65630,7 +66061,6 @@ in
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/lodash-4.14.144"
- sources."accepts-1.3.7"
sources."agent-base-4.3.0"
sources."ansi-align-2.0.0"
sources."ansi-escapes-4.2.1"
@@ -65650,15 +66080,15 @@ in
sources."argparse-1.0.10"
sources."arr-diff-4.0.0"
sources."arr-union-3.1.0"
- sources."array-flatten-1.1.1"
sources."array-union-1.0.2"
sources."array-uniq-1.0.3"
sources."array-unique-0.3.2"
sources."assign-symbols-1.0.0"
sources."async-1.5.2"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.556.0" // {
+ (sources."aws-sdk-2.563.0" // {
dependencies = [
sources."buffer-4.9.1"
sources."uuid-3.3.2"
@@ -65674,7 +66104,6 @@ in
sources."binary-extensions-2.0.0"
sources."bl-1.2.2"
sources."bluebird-3.7.1"
- sources."body-parser-1.19.0"
sources."boxen-1.3.0"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
@@ -65685,7 +66114,6 @@ in
sources."buffer-fill-1.0.0"
sources."buffer-from-1.1.1"
sources."builtin-modules-3.1.0"
- sources."bytes-3.1.0"
sources."cache-base-1.0.1"
(sources."cacheable-request-6.1.0" // {
dependencies = [
@@ -65699,7 +66127,7 @@ in
sources."caw-2.0.1"
sources."chalk-2.4.2"
sources."chardet-0.7.0"
- sources."chokidar-3.2.2"
+ sources."chokidar-3.3.0"
sources."ci-info-1.6.0"
(sources."class-utils-0.3.6" // {
dependencies = [
@@ -65738,14 +66166,7 @@ in
sources."concat-map-0.0.1"
sources."config-chain-1.1.12"
sources."configstore-3.1.2"
- (sources."content-disposition-0.5.3" // {
- dependencies = [
- sources."safe-buffer-5.1.2"
- ];
- })
- sources."content-type-1.0.4"
- sources."cookie-0.4.0"
- sources."cookie-signature-1.0.6"
+ sources."cookie-0.3.1"
sources."cookiejar-2.1.2"
sources."copy-descriptor-0.1.1"
sources."core-util-is-1.0.2"
@@ -65759,7 +66180,7 @@ in
sources."type-1.2.0"
];
})
- sources."debug-2.6.9"
+ sources."debug-4.1.1"
sources."decode-uri-component-0.2.0"
sources."decompress-4.2.0"
sources."decompress-response-3.3.0"
@@ -65777,12 +66198,10 @@ in
];
})
sources."deep-extend-0.6.0"
- sources."defer-to-connect-1.0.2"
+ sources."defer-to-connect-1.1.0"
sources."deferred-0.7.11"
sources."define-property-2.0.2"
sources."delayed-stream-1.0.0"
- sources."depd-1.1.2"
- sources."destroy-1.0.4"
sources."dot-prop-4.2.0"
sources."dotenv-8.2.0"
(sources."download-5.0.3" // {
@@ -65794,11 +66213,9 @@ in
];
})
sources."duplexer3-0.1.4"
- sources."ee-first-1.1.1"
- sources."encodeurl-1.0.2"
sources."encoding-0.1.12"
sources."end-of-stream-1.4.4"
- sources."es5-ext-0.10.51"
+ sources."es5-ext-0.10.52"
sources."es6-iterator-2.0.3"
sources."es6-promise-4.2.8"
sources."es6-promisify-5.0.0"
@@ -65807,13 +66224,11 @@ in
sources."es6-symbol-3.1.1"
];
})
- sources."es6-symbol-3.1.2"
+ sources."es6-symbol-3.1.3"
sources."es6-weak-map-2.0.3"
- sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
sources."esniff-1.1.0"
sources."esprima-4.0.1"
- sources."etag-1.8.1"
sources."event-emitter-0.3.5"
sources."events-1.1.1"
(sources."execa-0.7.0" // {
@@ -65821,11 +66236,7 @@ in
sources."get-stream-3.0.0"
];
})
- (sources."express-4.17.1" // {
- dependencies = [
- sources."safe-buffer-5.1.2"
- ];
- })
+ sources."ext-1.1.2"
sources."extend-3.0.2"
sources."extend-shallow-3.0.2"
sources."external-editor-3.1.0"
@@ -65837,15 +66248,12 @@ in
sources."filenamify-2.1.0"
sources."filesize-3.6.1"
sources."fill-range-7.0.1"
- sources."finalhandler-1.1.2"
sources."find-requires-1.0.0"
sources."flat-4.1.0"
sources."for-in-1.0.2"
sources."form-data-2.5.1"
sources."formidable-1.2.1"
- sources."forwarded-0.1.2"
sources."fragment-cache-0.2.1"
- sources."fresh-0.5.2"
sources."fs-constants-1.0.0"
(sources."fs-extra-0.30.0" // {
dependencies = [
@@ -65887,11 +66295,9 @@ in
];
})
sources."http-cache-semantics-4.0.3"
- sources."http-errors-1.7.2"
(sources."https-proxy-agent-3.0.1" // {
dependencies = [
sources."debug-3.2.6"
- sources."ms-2.1.2"
];
})
sources."iconv-lite-0.4.24"
@@ -65901,7 +66307,7 @@ in
sources."import-lazy-2.1.0"
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
- sources."inherits-2.0.3"
+ sources."inherits-2.0.4"
sources."ini-1.3.5"
(sources."inquirer-6.5.2" // {
dependencies = [
@@ -65909,7 +66315,6 @@ in
sources."figures-2.0.0"
];
})
- sources."ipaddr.js-1.9.0"
sources."is-accessor-descriptor-1.0.0"
sources."is-binary-path-2.1.0"
sources."is-buffer-2.0.4"
@@ -65979,9 +66384,7 @@ in
})
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
- sources."media-typer-0.3.0"
sources."memoizee-0.4.14"
- sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
sources."mime-db-1.40.0"
@@ -65997,13 +66400,12 @@ in
];
})
sources."moment-2.24.0"
- sources."ms-2.0.0"
+ sources."ms-2.1.2"
sources."mute-stream-0.0.7"
sources."nanoid-2.1.6"
sources."nanomatch-1.2.13"
sources."native-promise-only-0.8.1"
sources."ncjsm-4.0.1"
- sources."negotiator-0.6.2"
sources."next-tick-1.0.0"
sources."node-dir-0.1.17"
sources."node-fetch-1.7.3"
@@ -66033,7 +66435,6 @@ in
sources."object-hash-1.3.1"
sources."object-visit-1.0.1"
sources."object.pick-1.3.0"
- sources."on-finished-2.3.0"
sources."once-1.4.0"
sources."onetime-2.0.1"
(sources."opn-5.5.0" // {
@@ -66052,15 +66453,13 @@ in
];
})
sources."pako-1.0.10"
- sources."parseurl-1.3.3"
sources."pascalcase-0.1.1"
sources."path-is-absolute-1.0.1"
sources."path-is-inside-1.0.2"
sources."path-key-2.0.1"
sources."path-loader-1.0.10"
- sources."path-to-regexp-0.1.7"
sources."pend-1.2.0"
- sources."picomatch-2.0.7"
+ sources."picomatch-2.1.0"
sources."pify-2.3.0"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
@@ -66069,21 +66468,17 @@ in
sources."process-nextick-args-2.0.1"
sources."promise-queue-2.2.5"
sources."proto-list-1.2.4"
- sources."proxy-addr-2.0.5"
sources."pseudomap-1.0.2"
sources."pump-3.0.0"
sources."punycode-1.3.2"
- sources."qs-6.7.0"
+ sources."qs-6.9.0"
sources."querystring-0.2.0"
sources."ramda-0.26.1"
- sources."range-parser-1.2.1"
(sources."raven-1.2.1" // {
dependencies = [
- sources."cookie-0.3.1"
sources."uuid-3.0.0"
];
})
- sources."raw-body-2.4.0"
sources."rc-1.2.8"
(sources."readable-stream-2.3.6" // {
dependencies = [
@@ -66116,12 +66511,6 @@ in
sources."semver-5.7.1"
sources."semver-diff-2.1.0"
sources."semver-regex-1.0.0"
- (sources."send-0.17.1" // {
- dependencies = [
- sources."ms-2.1.1"
- ];
- })
- sources."serve-static-1.14.1"
sources."set-immediate-shim-1.0.1"
(sources."set-value-2.0.1" // {
dependencies = [
@@ -66129,20 +66518,15 @@ in
sources."is-extendable-0.1.1"
];
})
- sources."setprototypeof-1.1.1"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
sources."shortid-2.2.15"
sources."signal-exit-3.0.2"
- (sources."simple-git-1.126.0" // {
- dependencies = [
- sources."debug-4.1.1"
- sources."ms-2.1.2"
- ];
- })
+ sources."simple-git-1.126.0"
sources."slash-1.0.0"
(sources."snapdragon-0.8.2" // {
dependencies = [
+ sources."debug-2.6.9"
sources."define-property-0.2.5"
sources."extend-shallow-2.0.1"
(sources."is-accessor-descriptor-0.1.6" // {
@@ -66159,12 +66543,13 @@ in
sources."is-descriptor-0.1.6"
sources."is-extendable-0.1.1"
sources."kind-of-5.1.0"
+ sources."ms-2.0.0"
sources."source-map-0.5.7"
];
})
sources."source-map-0.6.1"
sources."source-map-resolve-0.5.2"
- sources."source-map-support-0.5.13"
+ sources."source-map-support-0.5.16"
sources."source-map-url-0.4.0"
sources."split-string-3.1.0"
sources."sprintf-js-1.0.3"
@@ -66187,7 +66572,6 @@ in
sources."kind-of-5.1.0"
];
})
- sources."statuses-1.5.0"
(sources."string-width-2.1.1" // {
dependencies = [
sources."ansi-regex-3.0.0"
@@ -66207,15 +66591,12 @@ in
(sources."superagent-3.8.3" // {
dependencies = [
sources."debug-3.2.6"
- sources."ms-2.1.2"
];
})
sources."supports-color-5.5.0"
(sources."tabtab-3.0.2" // {
dependencies = [
- sources."debug-4.1.1"
sources."es6-promisify-6.0.2"
- sources."ms-2.1.2"
];
})
sources."tar-stream-1.6.2"
@@ -66234,14 +66615,12 @@ in
sources."to-readable-stream-1.0.0"
sources."to-regex-3.0.2"
sources."to-regex-range-5.0.1"
- sources."toidentifier-1.0.0"
sources."traverse-0.6.6"
sources."trim-repeated-1.0.0"
sources."tslib-1.10.0"
sources."tunnel-agent-0.6.0"
sources."type-2.0.0"
sources."type-fest-0.5.2"
- sources."type-is-1.6.18"
sources."unbzip2-stream-1.3.3"
(sources."union-value-1.0.1" // {
dependencies = [
@@ -66250,7 +66629,6 @@ in
})
sources."unique-string-1.0.0"
sources."universalify-0.1.2"
- sources."unpipe-1.0.0"
(sources."unset-value-1.0.0" // {
dependencies = [
(sources."has-value-0.3.1" // {
@@ -66275,15 +66653,14 @@ in
sources."url-to-options-1.0.1"
sources."use-3.1.1"
sources."util-deprecate-1.0.2"
- sources."utils-merge-1.0.1"
sources."uuid-2.0.3"
- sources."vary-1.1.2"
sources."walkdir-0.0.11"
sources."whatwg-fetch-3.0.0"
sources."which-1.3.1"
sources."widest-line-2.0.1"
sources."wrappy-1.0.2"
sources."write-file-atomic-2.4.3"
+ sources."ws-6.2.1"
sources."xdg-basedir-3.0.0"
sources."xml2js-0.4.19"
sources."xmlbuilder-9.0.7"
@@ -66926,16 +67303,16 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.239.0";
+ version = "1.242.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.239.0.tgz";
- sha512 = "f6wGzYA/dZx4VfIJXz/W9taIVx9U3w1lVSDlBDq3TcoaBk9iLR3EMpAILHgNsroLCBk8ymDfzHisO00N7vB+UQ==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.242.0.tgz";
+ sha512 = "/FYu3vnv0XWA3bu6yVWpAXDYRVaC3xFf09KfekyYYXXZKPwBeYD7eu3iT+aXYua+DNuIfMJ6mWUbxjLp7LCi3Q==";
};
dependencies = [
sources."@snyk/cli-interface-2.2.0"
sources."@snyk/cocoapods-lockfile-parser-2.0.4"
sources."@snyk/composer-lockfile-parser-1.0.3"
- sources."@snyk/dep-graph-1.12.0"
+ sources."@snyk/dep-graph-1.13.1"
sources."@snyk/gemfile-1.2.0"
sources."@snyk/ruby-semver-2.0.4"
(sources."@snyk/snyk-cocoapods-plugin-1.0.3" // {
@@ -66949,7 +67326,7 @@ in
sources."@types/debug-4.1.5"
sources."@types/events-3.0.0"
sources."@types/js-yaml-3.12.1"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."@types/restify-4.3.6"
sources."@types/semver-5.5.0"
sources."@types/xml2js-0.4.3"
@@ -67007,7 +67384,7 @@ in
sources."color-name-1.1.3"
sources."concat-map-0.0.1"
sources."configstore-3.1.2"
- sources."core-js-3.3.4"
+ sources."core-js-3.3.6"
sources."core-util-is-1.0.2"
sources."create-error-class-3.0.2"
(sources."cross-spawn-6.0.5" // {
@@ -67258,7 +67635,7 @@ in
sources."debug-4.1.1"
];
})
- (sources."snyk-gradle-plugin-3.1.0" // {
+ (sources."snyk-gradle-plugin-3.2.0" // {
dependencies = [
sources."debug-4.1.1"
];
@@ -67269,8 +67646,8 @@ in
sources."tslib-1.9.3"
];
})
- sources."snyk-nodejs-lockfile-parser-1.16.0"
- sources."snyk-nuget-plugin-1.13.0"
+ sources."snyk-nodejs-lockfile-parser-1.16.1"
+ sources."snyk-nuget-plugin-1.13.1"
sources."snyk-paket-parser-1.5.0"
(sources."snyk-php-plugin-1.6.4" // {
dependencies = [
@@ -67282,7 +67659,7 @@ in
sources."snyk-resolve-1.0.1"
(sources."snyk-resolve-deps-4.4.0" // {
dependencies = [
- sources."@types/node-6.14.8"
+ sources."@types/node-6.14.9"
sources."lru-cache-4.1.5"
sources."semver-5.7.1"
sources."yallist-2.1.2"
@@ -67307,7 +67684,7 @@ in
];
})
sources."source-map-0.6.1"
- sources."source-map-support-0.5.13"
+ sources."source-map-support-0.5.16"
sources."sprintf-js-1.0.3"
sources."statuses-1.5.0"
(sources."string-width-2.1.1" // {
@@ -67983,6 +68360,7 @@ in
(sources."leveldown-5.4.1" // {
dependencies = [
sources."abstract-leveldown-6.2.2"
+ sources."node-gyp-build-4.1.1"
];
})
sources."levelup-4.3.2"
@@ -68046,7 +68424,7 @@ in
sources."ncp-2.0.0"
sources."nearley-2.19.0"
sources."nice-try-1.0.5"
- sources."node-gyp-build-4.1.1"
+ sources."node-gyp-build-4.2.0"
sources."non-private-ip-1.4.4"
sources."normalize-path-2.1.1"
sources."normalize-uri-1.1.2"
@@ -68316,7 +68694,7 @@ in
sources."ssb-blobs-1.2.2"
sources."ssb-caps-1.1.0"
sources."ssb-client-4.7.8"
- sources."ssb-config-3.4.2"
+ sources."ssb-config-3.4.3"
sources."ssb-db-19.2.0"
sources."ssb-ebt-5.6.7"
sources."ssb-friends-4.1.4"
@@ -68544,7 +68922,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.556.0" // {
+ (sources."aws-sdk-2.563.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -68729,6 +69107,7 @@ in
sources."formidable-1.2.1"
sources."forwarded-0.1.2"
sources."fresh-0.5.2"
+ sources."fs.realpath-1.0.0"
sources."function-bind-1.1.1"
sources."generate-function-2.3.1"
sources."generate-object-property-1.2.0"
@@ -68933,7 +69312,6 @@ in
sources."options-0.0.6"
sources."optjs-3.2.2"
sources."os-locale-3.1.0"
- sources."os-tmpdir-1.0.2"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-is-promise-2.1.0"
@@ -69164,9 +69542,10 @@ in
];
})
sources."switchback-2.0.5"
- (sources."temp-0.8.3" // {
+ (sources."temp-0.8.4" // {
dependencies = [
- sources."rimraf-2.2.8"
+ sources."glob-7.1.5"
+ sources."rimraf-2.6.3"
];
})
sources."throttleit-1.0.0"
@@ -69315,10 +69694,10 @@ in
svgo = nodeEnv.buildNodePackage {
name = "svgo";
packageName = "svgo";
- version = "1.3.0";
+ version = "1.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz";
- sha512 = "MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==";
+ url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz";
+ sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==";
};
dependencies = [
sources."@types/q-1.5.2"
@@ -69331,14 +69710,9 @@ in
sources."color-name-1.1.3"
sources."css-select-2.0.2"
sources."css-select-base-adapter-0.1.1"
- sources."css-tree-1.0.0-alpha.33"
+ sources."css-tree-1.0.0-alpha.37"
sources."css-what-2.1.3"
- (sources."csso-3.5.1" // {
- dependencies = [
- sources."css-tree-1.0.0-alpha.29"
- sources."mdn-data-1.1.4"
- ];
- })
+ sources."csso-4.0.2"
sources."define-properties-1.1.3"
(sources."dom-serializer-0.2.1" // {
dependencies = [
@@ -69371,7 +69745,7 @@ in
sources."object.values-1.1.0"
sources."q-1.5.1"
sources."sax-1.2.4"
- sources."source-map-0.5.7"
+ sources."source-map-0.6.1"
sources."sprintf-js-1.0.3"
sources."stable-0.1.8"
sources."string.prototype.trimleft-2.1.0"
@@ -69600,7 +69974,7 @@ in
];
})
sources."growl-1.9.2"
- (sources."handlebars-4.4.5" // {
+ (sources."handlebars-4.5.1" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -69960,7 +70334,7 @@ in
sources."truncate-utf8-bytes-1.0.2"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
- (sources."uglify-js-3.6.4" // {
+ (sources."uglify-js-3.6.7" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -70031,7 +70405,7 @@ in
sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
};
dependencies = [
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."ajv-6.10.2"
sources."ansi-regex-4.1.0"
sources."ansi-styles-3.2.1"
@@ -70119,7 +70493,7 @@ in
})
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
- sources."telegraf-3.33.0"
+ sources."telegraf-3.33.3"
sources."telegram-typings-3.6.1"
(sources."tough-cookie-2.4.3" // {
dependencies = [
@@ -70199,26 +70573,26 @@ in
textlint = nodeEnv.buildNodePackage {
name = "textlint";
packageName = "textlint";
- version = "11.4.0";
+ version = "11.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/textlint/-/textlint-11.4.0.tgz";
- sha512 = "RWzN5JdIiBO8BzCxu1uUYhVTxM2Q7ex4y7eBWEpMdkMvFc4sH2RZ5OI5lDK34Gf8M0C76hmMu3IszcsFJgKfug==";
+ url = "https://registry.npmjs.org/textlint/-/textlint-11.5.0.tgz";
+ sha512 = "RUTUj/OS7UdV1Z7/KA4oQfoUkpt1vaoaFizuMlwRZ9MJMhLHBnnXBMlRKUJd1H0Nj32087xIqi1e2pSwsUBK8Q==";
};
dependencies = [
sources."@azu/format-text-1.0.1"
sources."@azu/style-format-1.0.0"
sources."@textlint/ast-node-types-4.2.5"
sources."@textlint/ast-traverse-2.1.6"
- sources."@textlint/feature-flag-3.1.4"
- sources."@textlint/fixer-formatter-3.1.9"
- sources."@textlint/kernel-3.1.9"
- sources."@textlint/linter-formatter-3.1.8"
+ sources."@textlint/feature-flag-3.1.5"
+ sources."@textlint/fixer-formatter-3.1.10"
+ sources."@textlint/kernel-3.1.10"
+ sources."@textlint/linter-formatter-3.1.9"
sources."@textlint/markdown-to-ast-6.1.6"
sources."@textlint/module-interop-1.0.2"
sources."@textlint/text-to-ast-3.1.6"
- sources."@textlint/textlint-plugin-markdown-5.1.9"
- sources."@textlint/textlint-plugin-text-4.1.9"
- sources."@textlint/types-1.2.2"
+ sources."@textlint/textlint-plugin-markdown-5.1.10"
+ sources."@textlint/textlint-plugin-text-4.1.10"
+ sources."@textlint/types-1.2.3"
sources."@textlint/utils-1.0.3"
sources."@types/bluebird-3.5.28"
sources."ajv-4.11.8"
@@ -70314,7 +70688,6 @@ in
sources."ms-2.1.2"
sources."normalize-package-data-2.5.0"
sources."number-is-nan-1.0.1"
- sources."object-assign-4.1.1"
sources."object-inspect-1.6.0"
sources."object-is-1.0.1"
sources."object-keys-1.1.1"
@@ -70336,7 +70709,7 @@ in
sources."pluralize-2.0.0"
sources."prelude-ls-1.1.2"
sources."process-nextick-args-2.0.1"
- sources."rc-config-loader-2.0.4"
+ sources."rc-config-loader-3.0.0"
sources."read-pkg-1.1.0"
(sources."read-pkg-up-3.0.0" // {
dependencies = [
@@ -70477,7 +70850,7 @@ in
};
dependencies = [
sources."@textlint/ast-node-types-4.2.5"
- sources."@textlint/types-1.2.2"
+ sources."@textlint/types-1.2.3"
sources."alex-5.1.0"
sources."ansi-align-2.0.0"
sources."ansi-regex-3.0.0"
@@ -70911,7 +71284,7 @@ in
};
dependencies = [
sources."@textlint/ast-node-types-4.2.5"
- sources."@textlint/types-1.2.2"
+ sources."@textlint/types-1.2.3"
sources."boundary-1.0.1"
sources."buffer-from-1.1.1"
sources."concat-stream-1.6.2"
@@ -71005,7 +71378,7 @@ in
};
dependencies = [
sources."@textlint/ast-node-types-4.2.5"
- sources."@textlint/types-1.2.2"
+ sources."@textlint/types-1.2.3"
sources."boundary-1.0.1"
sources."lodash-4.17.15"
sources."split-lines-2.0.0"
@@ -71035,7 +71408,7 @@ in
};
dependencies = [
sources."@textlint/ast-node-types-4.2.5"
- sources."@textlint/types-1.2.2"
+ sources."@textlint/types-1.2.3"
sources."boundary-1.0.1"
sources."lodash-4.17.15"
sources."strip-json-comments-3.0.1"
@@ -71101,7 +71474,7 @@ in
};
dependencies = [
sources."@textlint/ast-node-types-4.2.5"
- sources."@textlint/types-1.2.2"
+ sources."@textlint/types-1.2.3"
sources."adverb-where-0.0.9"
sources."boundary-1.0.1"
sources."define-properties-1.1.3"
@@ -71134,10 +71507,10 @@ in
thelounge = nodeEnv.buildNodePackage {
name = "thelounge";
packageName = "thelounge";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/thelounge/-/thelounge-3.2.0.tgz";
- sha512 = "yOS19bt2O0l6DGAiJRad6DFMmDHmDVylfInLthNl9YfMfgSoC7aZcT7fofTe9htAE4SRfac9YsgKEtmywQ+MkA==";
+ url = "https://registry.npmjs.org/thelounge/-/thelounge-3.3.0.tgz";
+ sha512 = "F7qYCmAkb/HPFxZfyKi/gEm24ZzjgUzJb+zI5I5u8b5PNJrfi9RwFb3cmE4pvF2Ft0QejR5O4khuX6DEFFxYDw==";
};
dependencies = [
sources."@sindresorhus/is-0.14.0"
@@ -71161,7 +71534,7 @@ in
})
sources."array-flatten-1.1.1"
sources."arraybuffer.slice-0.0.7"
- sources."asn1-0.2.3"
+ sources."asn1-0.2.4"
sources."asn1.js-5.2.0"
sources."assert-plus-1.0.0"
sources."async-limiter-1.0.1"
@@ -71172,7 +71545,7 @@ in
sources."backoff-2.5.0"
sources."balanced-match-1.0.0"
sources."base64-arraybuffer-0.1.5"
- sources."base64id-1.0.0"
+ sources."base64id-2.0.0"
sources."bcrypt-pbkdf-1.0.2"
sources."bcryptjs-2.4.3"
sources."better-assert-1.0.2"
@@ -71200,7 +71573,7 @@ in
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."combined-stream-1.0.8"
- sources."commander-3.0.0"
+ sources."commander-3.0.2"
sources."component-bind-1.0.0"
sources."component-emitter-1.2.1"
sources."component-inherit-0.0.3"
@@ -71214,7 +71587,7 @@ in
sources."content-type-1.0.4"
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
- sources."core-js-3.3.4"
+ sources."core-js-3.3.6"
sources."core-util-is-1.0.2"
sources."css-select-1.2.0"
sources."css-what-2.1.3"
@@ -71222,7 +71595,7 @@ in
sources."debug-2.6.9"
sources."decompress-response-3.3.0"
sources."deep-extend-0.6.0"
- sources."defer-to-connect-1.0.2"
+ sources."defer-to-connect-1.1.0"
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."depd-1.1.2"
@@ -71239,18 +71612,21 @@ in
sources."ee-first-1.1.1"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
- (sources."engine.io-3.3.2" // {
+ (sources."engine.io-3.4.0" // {
dependencies = [
sources."cookie-0.3.1"
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
];
})
- (sources."engine.io-client-3.3.2" // {
+ (sources."engine.io-client-3.4.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
+ sources."ws-6.1.4"
];
})
- sources."engine.io-parser-2.1.3"
+ sources."engine.io-parser-2.2.0"
sources."entities-1.1.2"
sources."es6-promise-4.2.8"
sources."es6-promisify-5.0.0"
@@ -71264,11 +71640,11 @@ in
];
})
sources."extend-3.0.2"
- sources."extsprintf-1.2.0"
+ sources."extsprintf-1.4.0"
sources."fast-deep-equal-2.0.1"
sources."fast-json-stable-stringify-2.0.0"
sources."fast-text-encoding-1.0.0"
- sources."file-type-12.1.0"
+ sources."file-type-12.3.1"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-4.1.0"
sources."finalhandler-1.1.2"
@@ -71301,7 +71677,7 @@ in
})
sources."http-signature-1.2.0"
sources."http_ece-1.1.0"
- (sources."https-proxy-agent-2.2.4" // {
+ (sources."https-proxy-agent-3.0.1" // {
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
@@ -71335,11 +71711,8 @@ in
sources."jwa-1.4.1"
sources."jws-3.2.2"
sources."keyv-3.1.0"
- (sources."ldap-filter-0.2.2" // {
- dependencies = [
- sources."assert-plus-0.1.5"
- ];
- })
+ sources."ldap-filter-0.3.3"
+ sources."ldapjs-2.0.0-pre.2"
sources."linkify-it-2.2.0"
sources."lodash-4.17.15"
sources."lodash.assignin-4.2.0"
@@ -71451,21 +71824,29 @@ in
sources."set-blocking-2.0.0"
sources."setprototypeof-1.1.1"
sources."signal-exit-3.0.2"
- (sources."socket.io-2.2.0" // {
+ (sources."socket.io-2.3.0" // {
dependencies = [
sources."debug-4.1.1"
sources."ms-2.1.2"
];
})
sources."socket.io-adapter-1.1.1"
- (sources."socket.io-client-2.2.0" // {
+ (sources."socket.io-client-2.3.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
+ (sources."socket.io-parser-3.3.0" // {
+ dependencies = [
+ sources."debug-3.1.0"
+ sources."ms-2.0.0"
+ ];
+ })
];
})
- (sources."socket.io-parser-3.3.0" // {
+ (sources."socket.io-parser-3.4.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
];
})
(sources."socksjs-0.5.0" // {
@@ -71473,7 +71854,7 @@ in
sources."ipaddr.js-0.1.3"
];
})
- sources."sqlite3-4.0.9"
+ sources."sqlite3-4.1.0"
sources."sshpk-1.16.1"
sources."statuses-1.5.0"
sources."streamsearch-0.1.2"
@@ -71484,7 +71865,6 @@ in
sources."strip-outer-1.0.1"
sources."supports-color-5.5.0"
sources."tar-4.4.13"
- sources."thelounge-ldapjs-non-maintained-fork-1.0.4"
sources."tlds-1.203.1"
sources."to-array-0.1.4"
sources."to-readable-stream-1.0.0"
@@ -71507,22 +71887,18 @@ in
sources."urlsafe-base64-1.0.0"
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
- sources."uuid-3.3.2"
+ sources."uuid-3.3.3"
sources."vary-1.1.2"
- (sources."vasync-1.6.4" // {
- dependencies = [
- sources."verror-1.6.0"
- ];
- })
+ sources."vasync-2.2.0"
sources."verror-1.10.0"
- sources."web-push-3.3.5"
+ sources."web-push-3.4.1"
sources."wide-align-1.1.3"
sources."with-open-file-0.1.6"
sources."wrappy-1.0.2"
- sources."ws-6.1.4"
+ sources."ws-7.2.0"
sources."xmlhttprequest-ssl-1.5.5"
sources."yallist-3.1.1"
- sources."yarn-1.17.3"
+ sources."yarn-1.19.1"
sources."yeast-0.1.2"
];
buildInputs = globalBuildInputs;
@@ -71538,10 +71914,10 @@ in
three = nodeEnv.buildNodePackage {
name = "three";
packageName = "three";
- version = "0.109.0";
+ version = "0.110.0";
src = fetchurl {
- url = "https://registry.npmjs.org/three/-/three-0.109.0.tgz";
- sha512 = "XT99T3Hvgh2CEvwPdHYEunNE+clLK6KiT1U8En7YOgIqTUw4MrLeIc8zxQAJ6wbP8hhJaY5+Cff3jwBPpBa0gA==";
+ url = "https://registry.npmjs.org/three/-/three-0.110.0.tgz";
+ sha512 = "wlurH8XBO9Sd5VIw8nBa+taLR20kqaI4e9FiuMh6tqK8eOS2q2R+ZoUyufbyDTVTHhs8GiTbv0r2CMLkwerFJg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -71642,13 +72018,12 @@ in
sources."moment-2.24.0"
(sources."node-appc-0.2.49" // {
dependencies = [
- sources."temp-0.8.3"
+ sources."temp-0.8.4"
];
})
sources."oauth-sign-0.9.0"
sources."once-1.4.0"
sources."optimist-0.6.1"
- sources."os-tmpdir-1.0.2"
sources."path-is-absolute-1.0.1"
sources."performance-now-2.1.0"
sources."pkginfo-0.3.1"
@@ -71656,7 +72031,7 @@ in
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."request-2.88.0"
- sources."rimraf-2.2.8"
+ sources."rimraf-2.6.3"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
sources."semver-5.5.1"
@@ -71664,11 +72039,7 @@ in
sources."sprintf-0.1.5"
sources."sshpk-1.16.1"
sources."stack-trace-0.0.10"
- (sources."temp-0.9.0" // {
- dependencies = [
- sources."rimraf-2.6.3"
- ];
- })
+ sources."temp-0.9.0"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
@@ -71902,25 +72273,35 @@ in
sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ==";
};
dependencies = [
- sources."@types/node-6.14.8"
+ sources."@types/node-6.14.9"
sources."ansi-0.3.1"
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
+ sources."balanced-match-1.0.0"
+ sources."brace-expansion-1.1.11"
sources."chalk-1.1.3"
sources."colors-1.4.0"
+ sources."concat-map-0.0.1"
sources."diff-2.2.3"
sources."escape-string-regexp-1.0.5"
+ sources."fs.realpath-1.0.0"
+ sources."glob-7.1.5"
sources."has-ansi-2.0.0"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.4"
+ sources."minimatch-3.0.4"
sources."minimist-0.0.10"
sources."node-color-readline-1.0.1"
+ sources."once-1.4.0"
sources."optimist-0.6.1"
- sources."os-tmpdir-1.0.2"
- sources."rimraf-2.2.8"
+ sources."path-is-absolute-1.0.1"
+ sources."rimraf-2.6.3"
sources."strip-ansi-3.0.1"
sources."supports-color-2.0.0"
- sources."temp-0.8.3"
+ sources."temp-0.8.4"
sources."tslib-1.10.0"
sources."wordwrap-0.0.3"
+ sources."wrappy-1.0.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -71995,8 +72376,8 @@ in
sources."universalify-0.1.2"
sources."vscode-jsonrpc-5.0.0-next.2"
sources."vscode-languageserver-5.3.0-next.10"
- sources."vscode-languageserver-protocol-3.15.0-next.9"
- sources."vscode-languageserver-types-3.15.0-next.5"
+ sources."vscode-languageserver-protocol-3.15.0-next.10"
+ sources."vscode-languageserver-types-3.15.0-next.6"
sources."vscode-textbuffer-1.0.0"
sources."vscode-uri-1.0.8"
];
@@ -72012,10 +72393,10 @@ in
uglify-js = nodeEnv.buildNodePackage {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.6.4";
+ version = "3.6.7";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.4.tgz";
- sha512 = "9Yc2i881pF4BPGhjteCXQNaXx1DCwm3dtOyBaG2hitHjLWOczw/ki8vD1bqyT3u6K0Ms/FpCShkmfg+FtlOfYA==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.7.tgz";
+ sha512 = "4sXQDzmdnoXiO+xvmTzQsfIiwrjUCSA95rSP4SEd8tDb51W2TiDOlL76Hl+Kw0Ie42PSItCW8/t6pBNCF2R48A==";
};
dependencies = [
sources."commander-2.20.3"
@@ -72411,7 +72792,7 @@ in
sources."semver-6.3.0"
];
})
- sources."temp-0.9.0"
+ sources."temp-0.9.1"
sources."to-array-0.1.4"
sources."toidentifier-1.0.0"
(sources."tough-cookie-2.4.3" // {
@@ -72650,7 +73031,7 @@ in
sources."graceful-fs-4.2.3"
sources."graceful-readlink-1.0.1"
sources."gray-matter-2.1.1"
- sources."handlebars-4.4.5"
+ sources."handlebars-4.5.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
(sources."has-ansi-2.0.0" // {
@@ -72803,7 +73184,7 @@ in
sources."tslib-1.10.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."uglify-js-3.6.4"
+ sources."uglify-js-3.6.7"
sources."uid-0.0.2"
sources."unbzip2-stream-1.3.3"
sources."unyield-0.0.1"
@@ -72859,7 +73240,7 @@ in
sources."@starptech/rehype-minify-whitespace-0.9.0"
sources."@starptech/rehype-webparser-0.9.0"
sources."@starptech/webparser-0.9.0"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-1.0.1"
@@ -73736,8 +74117,8 @@ in
})
sources."vscode-jsonrpc-5.0.0-next.2"
sources."vscode-languageserver-5.3.0-next.10"
- sources."vscode-languageserver-protocol-3.15.0-next.9"
- sources."vscode-languageserver-types-3.15.0-next.5"
+ sources."vscode-languageserver-protocol-3.15.0-next.10"
+ sources."vscode-languageserver-types-3.15.0-next.6"
sources."vscode-nls-4.1.1"
sources."vscode-textbuffer-1.0.0"
sources."vscode-uri-1.0.8"
@@ -73806,7 +74187,7 @@ in
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/minimatch-3.0.3"
- sources."@types/node-12.11.7"
+ sources."@types/node-12.12.5"
sources."JSONSelect-0.2.1"
sources."acorn-6.3.0"
sources."acorn-jsx-5.1.0"
@@ -74035,7 +74416,7 @@ in
sources."deepcopy-0.6.3"
sources."deepmerge-4.0.0"
sources."defaults-1.0.3"
- sources."defer-to-connect-1.0.2"
+ sources."defer-to-connect-1.1.0"
sources."define-properties-1.1.3"
sources."define-property-2.0.2"
sources."delayed-stream-1.0.0"
@@ -74063,7 +74444,7 @@ in
sources."error-ex-1.3.2"
sources."es-abstract-1.16.0"
sources."es-to-primitive-1.2.0"
- sources."es5-ext-0.10.51"
+ sources."es5-ext-0.10.52"
sources."es6-error-4.1.1"
sources."es6-iterator-2.0.3"
sources."es6-map-0.1.5"
@@ -74074,7 +74455,7 @@ in
sources."es6-symbol-3.1.1"
];
})
- sources."es6-symbol-3.1.2"
+ sources."es6-symbol-3.1.3"
sources."es6-weak-map-2.0.3"
sources."escape-string-regexp-1.0.5"
sources."escope-3.6.0"
@@ -74168,6 +74549,11 @@ in
sources."kind-of-5.1.0"
];
})
+ (sources."ext-1.1.2" // {
+ dependencies = [
+ sources."type-2.0.0"
+ ];
+ })
sources."extend-3.0.2"
sources."extend-shallow-3.0.2"
(sources."external-editor-3.1.0" // {
@@ -74946,7 +75332,7 @@ in
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
sources."concat-stream-1.6.2"
- sources."console-browserify-1.1.0"
+ sources."console-browserify-1.2.0"
sources."constants-browserify-1.0.0"
sources."copy-concurrently-1.0.5"
sources."copy-descriptor-0.1.1"
@@ -74956,7 +75342,6 @@ in
sources."create-hmac-1.1.7"
sources."crypto-browserify-3.12.0"
sources."cyclist-1.0.1"
- sources."date-now-0.1.4"
sources."debug-2.6.9"
sources."decode-uri-component-0.2.0"
sources."define-property-2.0.2"
@@ -75211,7 +75596,7 @@ in
sources."source-list-map-2.0.1"
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.2"
- (sources."source-map-support-0.5.13" // {
+ (sources."source-map-support-0.5.16" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -75293,7 +75678,7 @@ in
];
})
sources."util-deprecate-1.0.2"
- sources."vm-browserify-1.1.0"
+ sources."vm-browserify-1.1.2"
sources."watchpack-1.6.0"
(sources."webpack-sources-1.4.3" // {
dependencies = [
@@ -75319,10 +75704,10 @@ in
webpack-cli = nodeEnv.buildNodePackage {
name = "webpack-cli";
packageName = "webpack-cli";
- version = "3.3.9";
+ version = "3.3.10";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
- sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
+ url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz";
+ sha512 = "u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==";
};
dependencies = [
sources."ansi-regex-4.1.0"
@@ -75665,7 +76050,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.0"
- sources."@types/node-10.17.0"
+ sources."@types/node-10.17.3"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.3.0"
sources."async-limiter-1.0.1"
@@ -76075,7 +76460,7 @@ in
];
})
sources."bin-version-check-3.0.0"
- sources."boolean-2.0.2"
+ sources."boolean-2.0.3"
(sources."boxen-1.3.0" // {
dependencies = [
sources."camelcase-4.1.0"
@@ -76140,7 +76525,7 @@ in
sources."config-chain-1.1.12"
sources."configstore-3.1.2"
sources."copy-descriptor-0.1.1"
- sources."core-js-3.3.4"
+ sources."core-js-3.3.6"
sources."core-util-is-1.0.2"
sources."create-error-class-3.0.2"
sources."cross-spawn-6.0.5"
@@ -76541,7 +76926,7 @@ in
sources."responselike-1.0.2"
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
- sources."roarr-2.14.2"
+ sources."roarr-2.14.3"
sources."root-check-1.0.0"
sources."run-async-2.3.0"
sources."rx-4.1.0"
@@ -76768,7 +77153,7 @@ in
];
})
sources."yeoman-doctor-4.0.0"
- (sources."yeoman-environment-2.5.0" // {
+ (sources."yeoman-environment-2.6.0" // {
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index 885535aab23..3ee042958fc 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -2047,13 +2047,13 @@ let
sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
};
};
- "temp-0.9.0" = {
+ "temp-0.9.1" = {
name = "temp";
packageName = "temp";
- version = "0.9.0";
+ version = "0.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz";
- sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==";
+ url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz";
+ sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==";
};
};
"to-object-path-0.3.0" = {
@@ -2749,7 +2749,7 @@ in
})
sources."strip-ansi-3.0.1"
sources."tar-4.4.13"
- sources."temp-0.9.0"
+ sources."temp-0.9.1"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix
index 1850bb2f082..b4cb67b020e 100644
--- a/pkgs/development/node-packages/node-packages-v13.nix
+++ b/pkgs/development/node-packages/node-packages-v13.nix
@@ -400,13 +400,13 @@ let
sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==";
};
};
- "graceful-fs-4.2.2" = {
+ "graceful-fs-4.2.3" = {
name = "graceful-fs";
packageName = "graceful-fs";
- version = "4.2.2";
+ version = "4.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
- sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+ sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
};
};
"har-schema-2.0.0" = {
@@ -1111,13 +1111,13 @@ let
sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
};
};
- "temp-0.9.0" = {
+ "temp-0.9.1" = {
name = "temp";
packageName = "temp";
- version = "0.9.0";
+ version = "0.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz";
- sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==";
+ url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz";
+ sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==";
};
};
"tough-cookie-2.4.3" = {
@@ -1320,7 +1320,7 @@ in
sources."gauge-2.7.4"
sources."getpass-0.1.7"
sources."glob-7.1.5"
- sources."graceful-fs-4.2.2"
+ sources."graceful-fs-4.2.3"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
@@ -1417,7 +1417,7 @@ in
})
sources."strip-ansi-3.0.1"
sources."tar-4.4.13"
- sources."temp-0.9.0"
+ sources."temp-0.9.1"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index f17f94387f3..00678ca420d 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -1,18 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
, attrs, click, toml, appdirs, aiohttp, aiohttp-cors
-, glibcLocales, pytest }:
+, glibcLocales, typed-ast, pathspec, regex
+, setuptools_scm, pytest }:
buildPythonPackage rec {
pname = "black";
- version = "19.3b0";
+ version = "19.10b0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "073kd5rs02lisp6n3h7yai9lix520xnaa6c7rdmp2sci9pyhz5b8";
+ sha256 = "0f8mr0yzj78q1dx7v6ggbgfir2wv0n5z2shfbbvfdq7910xbgvf2";
};
+ nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytest glibcLocales ];
# Necessary for the tests to pass on Darwin with sandbox enabled.
@@ -22,12 +24,11 @@ buildPythonPackage rec {
# Don't know why these tests fails
checkPhase = ''
LC_ALL="en_US.UTF-8" pytest \
- --deselect tests/test_black.py::BlackTestCase::test_expression_diff \
--deselect tests/test_black.py::BlackTestCase::test_cache_multiple_files \
--deselect tests/test_black.py::BlackTestCase::test_failed_formatting_does_not_get_cached
'';
- propagatedBuildInputs = [ attrs appdirs click toml aiohttp aiohttp-cors ];
+ propagatedBuildInputs = [ attrs appdirs click toml aiohttp aiohttp-cors pathspec regex typed-ast ];
meta = with stdenv.lib; {
description = "The uncompromising Python code formatter";
diff --git a/pkgs/development/python-modules/portend/black-19.10b0.patch b/pkgs/development/python-modules/portend/black-19.10b0.patch
new file mode 100644
index 00000000000..e781139e319
--- /dev/null
+++ b/pkgs/development/python-modules/portend/black-19.10b0.patch
@@ -0,0 +1,13 @@
+diff --git a/test_portend.py b/test_portend.py
+index b2de8c2..3f90276 100644
+--- a/test_portend.py
++++ b/test_portend.py
+@@ -21,7 +21,7 @@ def socket_infos():
+
+
+ def id_for_info(info):
+- af, = info[:1]
++ (af,) = info[:1]
+ return str(af)
+
+
\ No newline at end of file
diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index b7d730d6ae0..9cc88983a30 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -10,6 +10,7 @@ buildPythonPackage rec {
sha256 = "19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9";
};
+ patches = [ ./black-19.10b0.patch ];
postPatch = ''
substituteInPlace pytest.ini --replace "--flake8" ""
'';
diff --git a/pkgs/development/python-modules/pytest-black/black-version.patch b/pkgs/development/python-modules/pytest-black/black-version.patch
new file mode 100644
index 00000000000..93bb4180930
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-black/black-version.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 5c9ce5f..84b148a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -26,6 +26,6 @@ setup(
+ python_requires=">=2.7",
+ install_requires=[
+ "pytest>=3.5.0",
+- 'black==19.3b0; python_version >= "3.6"',
++ 'black; python_version >= "3.6"',
+ "toml",
+ ],
+ use_scm_version=True,
\ No newline at end of file
diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix
index 508dbdf0863..b129f9eec4b 100644
--- a/pkgs/development/python-modules/pytest-black/default.nix
+++ b/pkgs/development/python-modules/pytest-black/default.nix
@@ -14,6 +14,7 @@ buildPythonPackage rec {
sha256 = "03gwwy1h3qnfh6vpfhgsa5ag53a9sw1g42sc2s8a2hilwb7yrfvm";
};
+ patches = [ ./black-version.patch ];
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ black pytest toml ];
diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix
index 4321c025b56..714c7418897 100644
--- a/pkgs/development/python-modules/qrcode/default.nix
+++ b/pkgs/development/python-modules/qrcode/default.nix
@@ -5,6 +5,7 @@
, pillow
, pymaging_png
, mock
+, setuptools
}:
buildPythonPackage rec {
@@ -16,7 +17,7 @@ buildPythonPackage rec {
sha256 = "505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369";
};
- propagatedBuildInputs = [ six pillow pymaging_png ];
+ propagatedBuildInputs = [ six pillow pymaging_png setuptools ];
checkInputs = [ mock ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index d500448dfe7..4d7eff7fd02 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/pkgs/development/python-modules/spacy/models.json
@@ -76,6 +76,18 @@
"sha256": "0gxmknd68kajak8jr443799bfd69pp5j0jnmcbnyx5abzyq6wkzx",
"license": "cc-by-sa-40"
},
+{
+ "pname": "lt_core_news_sm",
+ "version": "2.2.0",
+ "sha256": "1j63xnp96qavg8c960y83z752mmvp9qx92r458lydrg1ixmffx9r",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "nb_core_news_sm",
+ "version": "2.2.0",
+ "sha256": "0s0wf3kxrhdzfkgrbxjc53hzin3w8v06iivazh6bpf6rhbiwzfr0",
+ "license": "mit"
+},
{
"pname": "nl_core_news_sm",
"version": "2.2.1",
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index ee48da2f5b0..86daec23d95 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "spyder-kernels";
- version = "1.6.0";
+ version = "0.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "e374452af89f507b345431338c6655465b5c15d0b5e49f703be8c30bbe1d1202";
+ sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 7222f18d5f9..c2dfcab556f 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -14,6 +14,8 @@ buildPythonPackage rec {
sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1";
};
+ nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
+
propagatedBuildInputs = [
jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
@@ -47,6 +49,11 @@ buildPythonPackage rec {
cp -r $desktopItem/share/applications/ $out/share
'';
+ dontWrapQtApps = true;
+ makeWrapperArgs = [
+ "\${qtWrapperArgs[@]}"
+ ];
+
meta = with stdenv.lib; {
description = "Scientific python development environment";
longDescription = ''
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index afb23ed5438..cd78084d60b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -454,6 +454,7 @@ let
randomForest = [ pkgs.libiconv ];
sundialr = [ pkgs.libiconv ];
ucminf = [ pkgs.libiconv ];
+ glmnet = [ pkgs.libiconv ];
};
packagesRequireingX = [
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix
new file mode 100644
index 00000000000..cbb6a38f67a
--- /dev/null
+++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -0,0 +1,22 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+ pname = "editorconfig-checker";
+ version = "2.0.2";
+
+ src = fetchFromGitHub {
+ owner = "editorconfig-checker";
+ repo = "editorconfig-checker";
+ rev = "${version}";
+ sha256 = "0v2ml9r8b5admi3sv80wa1pwl9qnz03q2p84vgcmgg2nv1v6yxf3";
+ };
+
+ modSha256 = "09b1v9gyh6827yqlfxxxq3lcqhd5snn3n7gdlbjmga3wyp2x4g2r";
+
+ meta = with lib; {
+ description = "A tool to verify that your files are in harmony with your .editorconfig";
+ homepage = "https://editorconfig-checker.github.io/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ uri-canva ];
+ };
+}
diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix
index 152792dcee2..b8202f94ce9 100644
--- a/pkgs/development/tools/misc/fsatrace/default.nix
+++ b/pkgs/development/tools/misc/fsatrace/default.nix
@@ -2,23 +2,26 @@
stdenv.mkDerivation rec {
pname = "fsatrace";
- version = "0.0.1-160";
+ version = "0.0.1-324";
src = fetchFromGitHub {
owner = "jacereda";
repo = "fsatrace";
- rev = "2bf89d836e0156e68f121b0ffeedade7c9381f77";
- sha256 = "0bndfmm0y738azwzf6m6xg6gjnrwcqlfjsampk67vga40yylwkbw";
+ rev = "41fbba17da580f81ababb32ec7e6e5fd49f11473";
+ sha256 = "1ihm2v723idd6m0kc1z9v73hmfvh2v0vjs8wvx5w54jaxh3lmj1y";
};
- preConfigure = ''
- mkdir -p $out/libexec/${pname}-${version}
- export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version}
+ installDir = "libexec/${pname}-${version}";
+
+ makeFlags = [ "INSTALLDIR=$(out)/$(installDir)" ];
+
+ preInstall = ''
+ mkdir -p $out/$installDir
'';
postInstall = ''
mkdir -p $out/bin
- ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/
+ ln -s $out/$installDir/fsatrace $out/bin/fsatrace
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index a02bb2c9f2f..815d5aac406 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lttng-tools";
- version = "2.10.8";
+ version = "2.11.0";
src = fetchurl {
url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
- sha256 = "03dkwvmiqbr7dcnrk8hw8xd9i0vrx6xxz8wal56mfypxz52i2jk6";
+ sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 3faaa48458e..6f8ef1b30a9 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -4,12 +4,13 @@ with python3;
pkgs.buildPythonApplication rec {
pname = "pypi2nix";
- version = "2.0.0";
+ version = "2.0.1";
src = pkgs.fetchPypi {
inherit pname version;
- sha256 = "0w9z07kdnfs96230jag8xgz4wx337bb3q3bvqxn3r31x8fsmz6rr";
+ sha256 = "138fwd3cznkfa6w3a5s4fbflh88q26hk4grlmq73dcbk06ykf84k";
};
checkInputs = with pkgs; [ pytest ];
+ buildInputs = with pkgs; [ setuptools_scm ];
propagatedBuildInputs = with pkgs; [
attrs
click
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index ca1c2fa45e9..b39425ad873 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -3,7 +3,7 @@
rustPlatform.buildRustPackage rec {
pname = "rust-bindgen";
- version = "0.51.0";
+ version = "0.51.1";
RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
@@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec {
owner = "rust-lang";
repo = pname;
rev = "v${version}";
- sha256 = "1hlak8b57pndmdfkpfl17xxc91a6b239698bcm4yzlvliyscjgz1";
+ sha256 = "1agqfwac2av1b1c2bfzn0hw3178s4l94fadfx8a25dy1k87wmhfm";
};
- cargoSha256 = "1311d0wjjj99m59zd2n6r4aq6lwbbpyj54ha2z9g4yd1hn344r91";
+ cargoSha256 = "09m0ki1ald1csfzfvlc63r6k8m9ndxy9js6mfwqyfm4lj8kpbr3f";
libclang = llvmPackages.libclang.lib; #for substituteAll
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index a665b466ef4..9457a08556a 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -19,8 +19,8 @@ buildRustPackage rec {
cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i";
- buildInputs = [ makeWrapper ]
- ++ stdenv.lib.optional stdenv.isDarwin Security;
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
RUST_SRC_PATH = rustPlatform.rustcSrc;
diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix
index 8db830b3284..95f54050184 100644
--- a/pkgs/development/tools/wiiload/default.nix
+++ b/pkgs/development/tools/wiiload/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, zlib }:
stdenv.mkDerivation rec {
- version = "v0.5.1";
+ version = "0.5.1";
pname = "wiiload";
nativeBuildInputs = [ autoconf automake ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "devkitPro";
repo = "wiiload";
- rev = version;
+ rev = "v${version}";
sha256 = "0dffy603zggkqv7g1a2jninmi64vy519gpgkdfhjnijhdm9gs5m3";
};
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 675564b789b..68a28ddfeba 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, makeWrapper, fetchurl, dpkg
-, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
-, gdk-pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk
-, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
+{ stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat
+, fontconfig, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2
+, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
-, libudev0-shim, glibc, curl, openssl, autoPatchelfHook
-}:
+, libudev0-shim, glibc, curl, openssl, autoPatchelfHook }:
let
runtimeLibs = stdenv.lib.makeLibraryPath [
@@ -18,19 +16,16 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
- version = "6.6.2";
+ version = "7.0.3";
src = fetchurl {
- url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
- sha256 = "0hlny3lac7whdbpp0pcyaa30h6x9536jsg95gj9irw2qjsx74xa7";
+ url =
+ "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
+ sha256 = "14mkvza7q6l2hn763pjy6zavcg1fmzanys3930w32g07vq3xi97l";
};
- nativeBuildInputs = [
- autoPatchelfHook
- dpkg
- makeWrapper
- gobject-introspection wrapGAppsHook
- ];
+ nativeBuildInputs =
+ [ autoPatchelfHook dpkg makeWrapper gobject-introspection wrapGAppsHook ];
buildInputs = [
alsaLib
@@ -87,11 +82,11 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://insomnia.rest/;
+ homepage = "https://insomnia.rest/";
description = "The most intuitive cross-platform REST API Client";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ markus1189 ];
+ maintainers = with maintainers; [ markus1189 babariviere ];
};
}
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 2179c2bff76..47632408e79 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -8,22 +8,17 @@
stdenv.mkDerivation rec {
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
- version = "0.23.2";
+ version = "0.24.0";
src = fetchFromGitHub {
owner = "crawl";
repo = "crawl";
rev = version;
- sha256 = "1d6mip4rvp81839yf2xm63hf34aza5wg4g5z5hi5275j94szaacs";
+ sha256 = "1cdjd33z04gj70manavihc3lj9ckpmd75n09vvyw01z41s33fzs0";
};
- patches = [
- ./crawl_purify.patch # Patch hard-coded paths and remove force library builds
- (fetchpatch { # Use a nice high-res app icon
- url = "https://github.com/crawl/crawl/commit/2aa1166087e44e6585b26cedf1fe81b3f3ba547f.patch";
- sha256 = "1jqrdv4wy18shg1fdabdb421232hg5micphkixcyzxd1lrmvadg0";
- })
- ];
+ # Patch hard-coded paths and remove force library builds
+ patches = [ ./crawl_purify.patch ];
nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ];
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index 1bf4bde9ef2..f96f61764b5 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -11,13 +11,13 @@
let
pname = "shattered-pixel-dungeon";
- version = "0.7.5e";
+ version = "0.7.5f";
src = fetchFromGitHub {
owner = "00-Evan";
repo = "shattered-pixel-dungeon-gdx";
rev = "v${version}";
- sha256 = "1wy5qlfsq7dqvn4g0glm1v60xildv44ww3p396wmgi390c9zg18d";
+ sha256 = "05awbbc7np9li50shdbpv9dgdgry6lra8d5gibwn578m2g9srbxx";
};
postPatch = ''
diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index c4d5dcb41e7..af13ae2e7e1 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -18,11 +18,11 @@ let
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "1.5.10";
+ version = "1.6.0";
src = fetchurl {
url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2";
- sha256 = "0mc5dgh2x9nbili7gy6srjhb23ckalf08wqq2amyjr5rq392jvd7";
+ sha256 = "1z1w4ycgl5wbm0sv7577vcdfwwf4k7vaf2njzyb21rvqjizpbkwr";
};
prePatch = ''
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 73dd2bdec5e..19902174a83 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -430,8 +430,8 @@ self: super: {
youcompleteme = super.youcompleteme.overrideAttrs(old: {
buildPhase = ''
substituteInPlace plugin/youcompleteme.vim \
- --replace "'ycm_python_interpreter_path', '''" \
- "'ycm_python_interpreter_path', '${python3}/bin/python'"
+ --replace "'ycm_path_to_python_interpreter', '''" \
+ "'ycm_path_to_python_interpreter', '${python3}/bin/python3'"
rm -r third_party/ycmd
ln -s ${ycmd}/lib/ycmd third_party
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
index c9723c944ab..1a1c1ec39d7 100644
--- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -2,7 +2,7 @@
let
- version = "1.43_4";
+ version = "1.43_5";
# Updated according to https://github.com/patjak/bcwc_pcie/pull/81/files
@@ -10,8 +10,8 @@ let
# and https://github.com/patjak/bcwc_pcie/blob/5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c/firmware/extract-firmware.sh
# From the Makefile:
- dmgUrl = "https://support.apple.com/downloads/DL1877/en_US/osxupd10.11.5.dmg";
- dmgRange = "205261917-208085450"; # the whole download is 1.3GB, this cuts it down to 2MB
+ dmgUrl = "https://updates.cdn-apple.com/2019/cert/041-88431-20191011-e7ee7d98-2878-4cd9-bc0a-d98b3a1e24b1/OSXUpd10.11.5.dmg";
+ dmgRange = "204909802-207733123"; # the whole download is 1.3GB, this cuts it down to 2MB
# Notes:
# 1. Be sure to update the sha256 below in the fetch_url
# 2. Be sure to update the homepage in the meta
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = dmgUrl;
- sha256 = "0xqkl4yds0n9fdjvnk0v5mj382q02crry6wm2q7j3ncdqwsv02sv";
+ sha256 = "0s8crlh8rvpanzk1w4z3hich0a3mw0m5xhpcg07bxy02calhpdk1";
curlOpts = "-r ${dmgRange}";
};
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "facetimehd firmware";
- homepage = https://support.apple.com/downloads/DL1877;
+ homepage = https://support.apple.com/kb/DL1877;
license = licenses.unfree;
maintainers = with maintainers; [ womfoo grahamc ];
platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 10d382d4620..4c718549817 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.152";
+ version = "4.14.153";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1amhwbdg7rki9i2q7mqp4vg5rzi8snps5rx891xy1aj1sgcry8x9";
+ sha256 = "08bsyawda0yjy4sgr817ich1xihm8c7dicns8bzk1pcpb884pfai";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index b20636aa9de..a7b79f1cd0f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.82";
+ version = "4.19.83";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0parrg1ayi677zinkqq8n1bz863s0gj92j3ix67jis2y5in6vnaq";
+ sha256 = "1pahsqsjf2ylbx3nqf5a74n7a4cwmsqxdplqb7k23lkivw4lifh2";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index b8bc0425bcb..3fa457bdc5c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.199";
+ version = "4.4.200";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1w35j5w9jjlnwl0bis376gh3l6jsy9vpvcpaihr4pj872jcv0f8p";
+ sha256 = "02g8h62nq0xrfkxfxxwamdnmkw19p2x5lnrmqszlvgx1ymhfsnfm";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 898d3186958..4768005a421 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.199";
+ version = "4.9.200";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1mby7ymcx6f9phacbaq2n9rr0rfv0r2dis2lk7j0wclfj3q3298g";
+ sha256 = "1z7gf36mh022nihdg4dlkdscr01jvbwikkm6jsbwcvdbv0s5qq2b";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
index c01aa1f0c61..1eac7ad05f2 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.3.9";
+ version = "5.3.10";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "12p98z12hnrgvfssmi1003l7fgx5d0zc9pwsfwjhxp9fffm7j9fp";
+ sha256 = "08ls1nb0yw6apbx219wj4ax8mw57fjcp0496k2sz5sxhiywf0ql1";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 8b62ce76409..1061653949f 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "mbpfan";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "dgraziotin";
repo = "mbpfan";
rev = "v${version}";
- sha256 = "0aijyxrqh01x0s80yr4cgxgd001iiqqph65pxvby7f0wz8lnxnqj";
+ sha256 = "0qcrxw4dx2fnq5hswzid2wi97zpn0k7kimprkl35nmsgz348xspr";
};
installPhase = ''
mkdir -p $out/bin $out/etc
diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/os-specific/linux/xf86-input-cmt/default.nix
index 2422b70b068..9f9b278d6f7 100644
--- a/pkgs/os-specific/linux/xf86-input-cmt/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-cmt/default.nix
@@ -2,7 +2,7 @@
utilmacros, libgestures, libevdevc }:
stdenv.mkDerivation rec {
- name = "xf86-input-cmt-${version}";
+ pname = "xf86-input-cmt";
version = "2.0.2";
src = fetchFromGitHub {
owner = "hugegreenbug";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Chromebook touchpad driver.";
license = licenses.bsd3;
platforms = platforms.linux;
- homepage = "www.github.com/hugegreenbug/xf86-input-cmt";
+ homepage = "https://www.github.com/hugegreenbug/xf86-input-cmt";
maintainers = with maintainers; [ kcalvinalvin ];
};
}
diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix
index b5f6af3e483..27dabd2a2eb 100644
--- a/pkgs/servers/home-assistant/esphome.nix
+++ b/pkgs/servers/home-assistant/esphome.nix
@@ -1,4 +1,4 @@
-{ lib, python3, platformio, esptool, git, protobuf3_7, fetchpatch }:
+{ lib, python3, platformio, esptool, git, protobuf3_10, fetchpatch }:
let
python = python3.override {
@@ -11,24 +11,19 @@ let
};
});
protobuf = super.protobuf.override {
- protobuf = protobuf3_7;
+ protobuf = protobuf3_10;
};
+
};
};
in python.pkgs.buildPythonApplication rec {
pname = "esphome";
- version = "1.13.6";
+ version = "1.14.1";
src = python.pkgs.fetchPypi {
inherit pname version;
- sha256 = "53148fc43c6cc6736cb7aa4cc1189caa305812061f55289ff916f8bd731ac623";
- };
-
- patches = fetchpatch {
- url = https://github.com/esphome/esphome/pull/694.patch;
- includes = [ "esphome/voluptuous_schema.py" ];
- sha256 = "0i2v1d6mcgc94i9rkaqmls7iyfbaisdji41sfc7bh7cf2j824im9";
+ sha256 = "1hw1q2fck9429077w207rk65a1krzyi6qya5pzjkpw4av5s0v0g3";
};
ESPHOME_USE_SUBPROCESS = "";
@@ -36,8 +31,16 @@ in python.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python.pkgs; [
voluptuous pyyaml paho-mqtt colorlog
tornado protobuf tzlocal pyserial ifaddr
+ protobuf
];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "protobuf==3.10.0" "protobuf~=3.10" \
+ --replace "paho-mqtt==1.4.0" "paho-mqtt~=1.4" \
+ --replace "tornado==5.1.1" "tornado~=5.1"
+ '';
+
makeWrapperArgs = [
# platformio is used in esphomeyaml/platformio_api.py
# esptool is used in esphomeyaml/__main__.py
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index fdc2b3fd2c4..5a768178ee7 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "opensmtpd";
- version = "6.4.2p1";
+ version = "6.6.1p1";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib libressl db pam ];
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
- sha256 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd";
+ sha256 = "1ngil8j13m2rq07g94j4yjr6zmaimzy8wbfr17shi7rxnazys6zb";
};
patches = [
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
# See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap`
# requirement
postPatch = ''
- substituteInPlace smtpd/parse.y \
- --replace "/usr/libexec/" "$out/libexec/opensmtpd/"
substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true"
substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555"
sh bootstrap
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 4a3e860d358..a7c9421f46a 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mergerfs";
- version = "2.28.2";
+ version = "2.28.3";
src = fetchFromGitHub {
owner = "trapexit";
repo = pname;
rev = version;
- sha256 = "14h32acx2fcbyjf1f80vb86q845zwcjszd99a307ybdfhlv18r2m";
+ sha256 = "1w6p3svc2yknp6swqg8lax6n9b31lyplb3j7r8nv14hbq4hymylx";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
new file mode 100644
index 00000000000..b86e5ad997a
--- /dev/null
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "fselect";
+ version = "0.6.7";
+
+ src = fetchFromGitHub {
+ owner = "jhspetersson";
+ repo = "fselect";
+ rev = version;
+ sha256 = "0pg3ahx8rmzr585qa4vphd1vxcm1r3sx5iyi8ghg5nn6sibqy0z4";
+ };
+
+ cargoSha256 = "0yf3xkxxlb9252r869wbiv3b3kpz4p5gp556sic63bp0acig6a76";
+
+ meta = with stdenv.lib; {
+ description = "Find files with SQL-like queries";
+ homepage = "https://github.com/jhspetersson/fselect";
+ license = with licenses; [ asl20 mit ];
+ maintainers = [ maintainers.filalex77 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix
index c51d3cc2702..534a500c7bc 100644
--- a/pkgs/tools/misc/venus/default.nix
+++ b/pkgs/tools/misc/venus/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchurl, python, pythonPackages, libxslt, libxml2, makeWrapper }:
-
-let
- rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b";
-in
+{ stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }:
stdenv.mkDerivation rec {
- name = "venus-${rev}";
+ pname = "venus";
+ version = "unstable-2011-02-18";
- src = fetchurl {
- url = "https://github.com/rubys/venus/tarball/${rev}";
- name = "${name}.tar.bz";
- sha256 = "0lsc9d83grbi3iwm8ppaig4h9vbmd5h4vvz83lmpnyp7zqfka7dy";
+ src = fetchFromGitHub {
+ owner = "rubys";
+ repo = "venus";
+ rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b";
+ sha256 = "10yyx4jaxxbwhica12aiw119aywghcr7b24gs9lrmafpa6xd3an2";
};
preConfigure = ''
diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix
index 69ec50bd575..60389f6862b 100644
--- a/pkgs/tools/misc/vimpager/build.nix
+++ b/pkgs/tools/misc/vimpager/build.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Use Vim as PAGER";
- homepage = "https://www.vim.org/scripts/script.php?script_id = 1723";
+ homepage = "https://www.vim.org/scripts/script.php?script_id=1723";
license = with licenses; [ bsd2 mit vim ];
platforms = platforms.unix;
};
diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix
index 75a05108b8b..95012208129 100644
--- a/pkgs/tools/networking/cadaver/default.nix
+++ b/pkgs/tools/networking/cadaver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, openssl }:
+{ stdenv, fetchurl, fetchpatch, openssl, readline }:
stdenv.mkDerivation rec {
name = "cadaver-0.23.3";
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
})
];
- configureFlags = [ "--with-ssl" ];
+ configureFlags = [ "--with-ssl" "--with-readline" ];
- buildInputs = [ openssl ];
+ buildInputs = [ openssl readline ];
meta = with stdenv.lib; {
description = "A command-line WebDAV client";
diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/tools/networking/cloud-custodian/default.nix
new file mode 100644
index 00000000000..a57d9f13d78
--- /dev/null
+++ b/pkgs/tools/networking/cloud-custodian/default.nix
@@ -0,0 +1,48 @@
+{ lib, buildPythonApplication, fetchPypi
+, argcomplete
+, boto3
+, botocore
+, certifi
+, dateutil
+, jsonpatch
+, jsonschema
+, pyyaml
+, tabulate
+, urllib3
+}:
+
+buildPythonApplication rec {
+ pname = "cloud-custodian";
+ version = "0.8.45.1";
+
+ src = fetchPypi {
+ pname = "c7n";
+ inherit version;
+ sha256 = "0c199gdmpm83xfghrbzp02xliyxiygsnx2fvb35j9qpf37wzzp3z";
+ };
+
+ propagatedBuildInputs = [
+ argcomplete
+ boto3
+ botocore
+ certifi
+ dateutil
+ jsonpatch
+ jsonschema
+ pyyaml
+ tabulate
+ urllib3
+ ];
+
+ # Requires tox, many packages, and network access
+ checkPhase = ''
+ $out/bin/custodian --help
+ '';
+
+ meta = with lib; {
+ description = "Rules engine for cloud security, cost optimization, and governance";
+ homepage = "https://cloudcustodian.io";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ bhipple ];
+ };
+}
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index d8711d516dc..2b5f52b51aa 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,7 +1,9 @@
{ useLua ? !stdenv.isDarwin
, usePcre ? true
-, stdenv, fetchurl
-, openssl, zlib, lua5_3 ? null, pcre ? null
+, withPrometheusExporter ? true
+, stdenv, lib, fetchurl
+, openssl, zlib
+, lua5_3 ? null, pcre ? null, systemd ? null
}:
assert useLua -> lua5_3 != null;
@@ -9,39 +11,47 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
- version = "1.9.8";
+ version = "2.0.8";
src = fetchurl {
url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
- sha256 = "1via9k84ycrdr8qh4qchcbqgpv0gynm3ra23nwsvqwfqvc0376id";
+ sha256 = "02i87hr1dfhrk6nvvcig4m9bpww7hyl6qcxcl20rfvxd2n2iwzn3";
};
buildInputs = [ openssl zlib ]
- ++ stdenv.lib.optional useLua lua5_3
- ++ stdenv.lib.optional usePcre pcre;
+ ++ lib.optional useLua lua5_3
+ ++ lib.optional usePcre pcre
+ ++ lib.optional stdenv.isLinux systemd;
# TODO: make it work on bsd as well
makeFlags = [
"PREFIX=\${out}"
("TARGET=" + (if stdenv.isSunOS then "solaris"
- else if stdenv.isLinux then "linux2628"
+ else if stdenv.isLinux then "linux-glibc"
else if stdenv.isDarwin then "osx"
else "generic"))
];
+
buildFlags = [
"USE_OPENSSL=yes"
"USE_ZLIB=yes"
- ] ++ stdenv.lib.optionals usePcre [
+ ] ++ lib.optionals usePcre [
"USE_PCRE=yes"
"USE_PCRE_JIT=yes"
- ] ++ stdenv.lib.optionals useLua [
+ ] ++ lib.optionals useLua [
"USE_LUA=yes"
"LUA_LIB=${lua5_3}/lib"
"LUA_INC=${lua5_3}/include"
- ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc"
- ++ stdenv.lib.optional stdenv.isLinux "USE_GETADDRINFO=1";
+ ] ++ lib.optionals stdenv.isLinux [
+ "USE_SYSTEMD=yes"
+ "USE_GETADDRINFO=1"
+ ] ++ lib.optionals withPrometheusExporter [
+ "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o"
+ ] ++ lib.optional stdenv.isDarwin "CC=cc";
- meta = {
+ enableParallelBuilding = true;
+
+ meta = with lib; {
description = "Reliable, high performance TCP/HTTP load balancer";
longDescription = ''
HAProxy is a free, very fast and reliable solution offering high
@@ -51,9 +61,9 @@ stdenv.mkDerivation rec {
tens of thousands of connections is clearly realistic with todays
hardware.
'';
- homepage = http://haproxy.1wt.eu;
- maintainers = with stdenv.lib.maintainers; [ fuzzy-id ];
- platforms = with stdenv.lib.platforms; linux ++ darwin;
- license = stdenv.lib.licenses.gpl2;
+ homepage = "https://haproxy.org";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ fuzzy-id ];
+ platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 9ae981e0369..4e1894db98c 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }:
+{ stdenv, fetchFromGitHub, fetchpatch, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }:
stdenv.mkDerivation rec {
pname = "keepalived";
- version = "1.4.2";
+ version = "1.4.5";
src = fetchFromGitHub {
owner = "acassen";
repo = "keepalived";
rev = "v${version}";
- sha256 = "154yxs6kwpi9yc4pa45ba3z3bfwzgmmmja5nk3d9mxq6w6s1swcy";
+ sha256 = "12r80rcfxrys826flaqcdlfhcr7q4ccsd62ra1svy9545vf02qmx";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2018-19115.patch";
+ url = "https://github.com/acassen/keepalived/pull/961/commits/f28015671a4b04785859d1b4b1327b367b6a10e9.patch";
+ sha256 = "1jnwk7x4qdgv7fb4jzw6sihv62n8wv04myhgwm2vxn8nfkcgd1mm";
+ })
+ ];
+
buildInputs = [
libnfnetlink
libnl
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix
index 7db0e59beab..3c1a8d11042 100644
--- a/pkgs/tools/networking/network-manager/openconnect/default.nix
+++ b/pkgs/tools/networking/network-manager/openconnect/default.nix
@@ -1,14 +1,31 @@
-{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, autoreconfHook, networkmanager, gcr, libsecret, file
-, gtk3, withGnome ? true, gnome3, kmod, fetchpatch }:
+{ stdenv
+, fetchurl
+, substituteAll
+, glib
+, libxml2
+, openconnect
+, intltool
+, pkgconfig
+, autoreconfHook
+, networkmanager
+, gcr
+, libsecret
+, file
+, gtk3
+, withGnome ? true
+, gnome3
+, kmod
+, fetchpatch
+}:
let
- pname = "NetworkManager-openconnect";
+ pname = "NetworkManager-openconnect";
version = "1.2.6";
in stdenv.mkDerivation {
- name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+ name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m";
};
@@ -17,6 +34,7 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch;
inherit kmod openconnect;
})
+
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/merge_requests/9.patch";
@@ -24,10 +42,22 @@ in stdenv.mkDerivation {
})
];
- buildInputs = [ openconnect networkmanager ]
- ++ stdenv.lib.optionals withGnome [ gtk3 gcr libsecret ];
+ buildInputs = [
+ glib
+ libxml2
+ openconnect
+ networkmanager
+ ] ++ stdenv.lib.optionals withGnome [
+ gtk3
+ gcr
+ libsecret
+ ];
- nativeBuildInputs = [ intltool pkgconfig file ];
+ nativeBuildInputs = [
+ intltool
+ pkgconfig
+ file
+ ];
configureFlags = [
"--with-gnome=${if withGnome then "yes" else "no"}"
@@ -43,7 +73,7 @@ in stdenv.mkDerivation {
};
meta = with stdenv.lib; {
- description = "NetworkManager's OpenConnect plugin";
+ description = "NetworkManager’s OpenConnect plugin";
inherit (networkmanager.meta) maintainers platforms;
license = licenses.gpl2Plus;
};
diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix
index f83a1498825..2be1db764e1 100644
--- a/pkgs/tools/package-management/xbps/default.nix
+++ b/pkgs/tools/package-management/xbps/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xbps";
- version = "0.57";
+ version = "0.57.1";
src = fetchFromGitHub {
owner = "void-linux";
repo = "xbps";
rev = version;
- sha256 = "1aaa0h265lx85hmcvg7zpg7iiq6dzzlyxqazn1s387ss709i5gxn";
+ sha256 = "0adxhhvn5r6hwwqp42iwwfrslmps30ycndi6v39934v38rf0wx9s";
};
nativeBuildInputs = [ pkgconfig which ];
diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix
index c72bc6d8b9e..d0cda57e2d0 100644
--- a/pkgs/tools/security/bettercap/default.nix
+++ b/pkgs/tools/security/bettercap/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "bettercap";
- version = "2.24";
+ version = "2.26.1";
goPackagePath = "github.com/bettercap/bettercap";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1f8bzxbcyf0bpyqj6hz4l8dp5xknnb537xy9y5skcznp03i44h55";
+ sha256 = "10qsknyzfpzfpm4gp98jwvw6qmkmx23nw88sbnpl2rlr725l560c";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/security/bettercap/deps.nix b/pkgs/tools/security/bettercap/deps.nix
index ef09a821317..12aeb1918c6 100644
--- a/pkgs/tools/security/bettercap/deps.nix
+++ b/pkgs/tools/security/bettercap/deps.nix
@@ -1,336 +1,534 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
- goPackagePath = "github.com/adrianmo/go-nmea";
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "v0.3.1";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+ };
+ }
+ {
+ goPackagePath = "github.com/adrianmo/go-nmea";
fetch = {
type = "git";
url = "https://github.com/adrianmo/go-nmea";
- rev = "a32116e4989e2b0e17c057ee378b4d5246add74e";
+ rev = "v1.1.0";
sha256 = "167iwpwdwfbyghqfrzdfvfpvsmj92x7qqy6sx6yngdw21wd0m44f";
};
}
{
- goPackagePath = "github.com/antchfx/jsonquery";
+ goPackagePath = "github.com/antchfx/jsonquery";
fetch = {
type = "git";
url = "https://github.com/antchfx/jsonquery";
- rev = "a2896be8c82bb2229d1cf26204863180e34b2b31";
- sha256 = "0mh6v21i3v3sxqjln7vph6wx3sm79p99010in9am1wh7k30rrjl5";
+ rev = "v1.0.0";
+ sha256 = "04xk7ib059xzl1y87ah41q7vzl3xp99mq8nyccx8hlsng1nc0haw";
};
}
{
- goPackagePath = "github.com/antchfx/xpath";
+ goPackagePath = "github.com/antchfx/xpath";
fetch = {
type = "git";
url = "https://github.com/antchfx/xpath";
- rev = "ce1d48779e67a1ddfb380995fe532b2e0015919c";
- sha256 = "0brd75mhd5ix7rz1ijhbggyp53v6g8kz9bc2n7g6zwavzxarfj5p";
+ rev = "v1.1.0";
+ sha256 = "0bgin15841q009yxbyqfqk5b2yk2f4a1mswjkgiqxgarmql0mpsy";
};
}
{
- goPackagePath = "github.com/bettercap/gatt";
+ goPackagePath = "github.com/bettercap/gatt";
fetch = {
type = "git";
url = "https://github.com/bettercap/gatt";
- rev = "fac16c0ad797bbccae1fe4acf49761b98f7516e7";
- sha256 = "08pyg4caw7lzb230l3k4rwgvn68zz6kmrlsdapaf3wa216pphyd9";
+ rev = "569d3d9372bb";
+ sha256 = "0ncg6wd4wkr12l4bs7vyyrd08imyd5y1vdyp7f9shjq9nzv3rzcz";
};
}
{
- goPackagePath = "github.com/bettercap/nrf24";
+ goPackagePath = "github.com/bettercap/nrf24";
fetch = {
type = "git";
url = "https://github.com/bettercap/nrf24";
- rev = "aa37e6d0e0eb125cee9ec71ed694db2ad58b509a";
+ rev = "aa37e6d0e0eb";
sha256 = "1y6ffcj94hk7slajqw3lqpdxzx6iqpj2i2zpsvggg6kfaa1iklnj";
};
}
{
- goPackagePath = "github.com/bettercap/readline";
+ goPackagePath = "github.com/bettercap/readline";
fetch = {
type = "git";
url = "https://github.com/bettercap/readline";
- rev = "62c6fe6193755f722b8b8788aa7357be55a50ff1";
- sha256 = "1qd2qhjps26x4pin2614w732giy89p22b2qww4wg15zz5g2365nk";
+ rev = "9cec905dd291";
+ sha256 = "1lsnyckg2l78hz4la8dhwvjsyff706khw10nxds5afzl4mrih3vn";
};
}
{
- goPackagePath = "github.com/bettercap/recording";
+ goPackagePath = "github.com/bettercap/recording";
fetch = {
type = "git";
url = "https://github.com/bettercap/recording";
- rev = "3ce1dcf032e391eb321311b34cdf31c6fc9523f5";
+ rev = "3ce1dcf032e3";
sha256 = "1arh12iz15anyrqr4q496lpd0gx5nf2cwyr5rv17rawqqz8ydg23";
};
}
{
- goPackagePath = "github.com/chifflier/nfqueue-go";
+ goPackagePath = "github.com/chifflier/nfqueue-go";
fetch = {
type = "git";
url = "https://github.com/chifflier/nfqueue-go";
- rev = "61ca646babef3bd4dea1deb610bfb0005c0a1298";
+ rev = "61ca646babef";
sha256 = "1i1q2xl86f3s9x3j2ffxprwqhcrkh4w23hh4ib7jksxvaq36v33l";
};
}
{
- goPackagePath = "github.com/dustin/go-humanize";
+ goPackagePath = "github.com/chzyer/logex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chzyer/logex";
+ rev = "v1.1.10";
+ sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4";
+ };
+ }
+ {
+ goPackagePath = "github.com/chzyer/test";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chzyer/test";
+ rev = "a1ea475d72b1";
+ sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k";
+ };
+ }
+ {
+ 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/dustin/go-humanize";
fetch = {
type = "git";
url = "https://github.com/dustin/go-humanize";
- rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
+ rev = "v1.0.0";
sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
};
}
{
- goPackagePath = "github.com/elazarl/goproxy";
+ goPackagePath = "github.com/elazarl/goproxy";
fetch = {
type = "git";
url = "https://github.com/elazarl/goproxy";
- rev = "9d40249d3c2f14d1a9d75e070a738362adeb5a83";
- sha256 = "0hpzna9dvs2ff0bj8baz3sc5gg49vqmb0cbi6p061lmwl09cd00i";
+ rev = "473e67f1d7d2";
+ sha256 = "1xsrdlcgl088phanm81pskym2ry8z1nizvq3lsq0c7cvzb6mrw4p";
};
}
{
- goPackagePath = "github.com/evilsocket/islazy";
+ goPackagePath = "github.com/evilsocket/islazy";
fetch = {
type = "git";
url = "https://github.com/evilsocket/islazy";
- rev = "c5c7a41bb1c20e6df409825ed24af8de5fb7fb70";
+ rev = "v1.10.4";
sha256 = "1ayc4di6584yajybh724mcmng069q38j1dpljgi8fhsyhb4sila3";
};
}
{
- goPackagePath = "github.com/gobwas/glob";
+ goPackagePath = "github.com/gobwas/glob";
fetch = {
type = "git";
url = "https://github.com/gobwas/glob";
- rev = "e7a84e9525fe90abcda167b604e483cc959ad4aa";
+ rev = "e7a84e9525fe";
sha256 = "1v6vjklq06wqddv46ihajahaj1slv0imgaivlxr8bsx59i90js5q";
};
}
{
- goPackagePath = "github.com/google/go-github";
+ goPackagePath = "github.com/google/go-github";
fetch = {
type = "git";
url = "https://github.com/google/go-github";
- rev = "e48060a28fac52d0f1cb758bc8b87c07bac4a87d";
- sha256 = "0a15gsqpshcipd4vmm0dzxgi99pfk0c5b60n3czfw2px864mg7x9";
+ rev = "v17.0.0";
+ sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4";
};
}
{
- goPackagePath = "github.com/google/go-querystring";
+ goPackagePath = "github.com/google/go-querystring";
fetch = {
type = "git";
url = "https://github.com/google/go-querystring";
- rev = "44c6ddd0a2342c386950e880b658017258da92fc";
+ rev = "v1.0.0";
sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
};
}
{
- goPackagePath = "github.com/google/gopacket";
+ goPackagePath = "github.com/google/gopacket";
fetch = {
type = "git";
url = "https://github.com/google/gopacket";
- rev = "v1.1.16";
- sha256 = "1vnjgjz52l1bzrhx70qpvmwandf8v13zhiaj3rdljsphdp5cgadi";
+ rev = "v1.1.17";
+ sha256 = "192af5z18nnafn35gdy4wahlx6ggbhlnxzlm1yvxjxawfwnilidn";
};
}
{
- goPackagePath = "github.com/google/gousb";
+ goPackagePath = "github.com/google/gousb";
fetch = {
type = "git";
url = "https://github.com/google/gousb";
- rev = "64d82086770b8b671e1e7f162372dd37f1f5efba";
- sha256 = "1kjgg8cdp8wz9rck4nh48pcia741p7a8w2nikhzxsscn0ld33109";
+ rev = "18f4c1d8a750";
+ sha256 = "1i7ffkq395x0v1186j9bhfgy67wlq6s840xkyx8wn87w55yd05rh";
};
}
{
- goPackagePath = "github.com/gorilla/mux";
+ goPackagePath = "github.com/google/renameio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/renameio";
+ rev = "v0.1.0";
+ sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/mux";
fetch = {
type = "git";
url = "https://github.com/gorilla/mux";
- rev = "c5c6c98bc25355028a63748a498942a6398ccd22";
- sha256 = "0im4da3hqxb6zr8g3m640qz234f5gs0a8hqhcz35mkvfqlv48f62";
+ rev = "v1.7.3";
+ sha256 = "0vr38zdad3zgg7q7nn24knl8axngj7cgmlwa93m17yhsnlvqi531";
};
}
{
- goPackagePath = "github.com/gorilla/websocket";
+ goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
- rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d";
- sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
+ rev = "v1.4.1";
+ sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv";
};
}
{
- goPackagePath = "github.com/hashicorp/mdns";
+ goPackagePath = "github.com/hashicorp/mdns";
fetch = {
type = "git";
url = "https://github.com/hashicorp/mdns";
- rev = "06dd1a31b32c42d4d6c2cf8dbce70597d1118f54";
+ rev = "v1.0.1";
sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j";
};
}
{
- goPackagePath = "github.com/inconshreveable/go-vhost";
+ goPackagePath = "github.com/inconshreveable/go-vhost";
fetch = {
type = "git";
url = "https://github.com/inconshreveable/go-vhost";
- rev = "06d84117953b22058c096b49a429ebd4f3d3d97b";
+ rev = "06d84117953b";
sha256 = "0wliilsybm7xf5h685a23rsm8bnlhkr332pkdkhf32q16sr1a9rk";
};
}
{
- goPackagePath = "github.com/jpillora/go-tld";
+ goPackagePath = "github.com/jpillora/go-tld";
fetch = {
type = "git";
url = "https://github.com/jpillora/go-tld";
- rev = "f16ca3b7b383d3f0373109cac19147de3e8ae2d1";
+ rev = "f16ca3b7b383";
sha256 = "19v8bj14w0lcvysaw84klf5dg6ka351ixz9r6cd9mksdd80nvzcq";
};
}
{
- goPackagePath = "github.com/kr/binarydist";
+ goPackagePath = "github.com/kisielk/gotool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/gotool";
+ rev = "v1.0.0";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/binarydist";
fetch = {
type = "git";
url = "https://github.com/kr/binarydist";
- rev = "88f551ae580780cc79d12ab4c218ba1ca346b83a";
+ rev = "v0.1.0";
sha256 = "0hz1yqlxmkdib8xsdkkvn4ian4i69jmfapadim9fhj632d6jpi7w";
};
}
{
- goPackagePath = "github.com/malfunkt/iprange";
+ 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/malfunkt/iprange";
fetch = {
type = "git";
url = "https://github.com/malfunkt/iprange";
- rev = "3a31f5ed42d2d8a1fc46f1be91fd693bdef2dd52";
+ rev = "v0.9.0";
sha256 = "0gv5w678r74jval675xp0y1hzpf7mm5m9apa1rz9krxc9zd0ycr8";
};
}
{
- goPackagePath = "github.com/mattn/go-colorable";
+ goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
- rev = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045";
- sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p";
+ rev = "v0.1.4";
+ sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz";
};
}
{
- goPackagePath = "github.com/mattn/go-isatty";
+ goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
- rev = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7";
- sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd";
+ rev = "v0.0.10";
+ sha256 = "0jf4hwfwd2cpxrlyv0jzcia809q2bjw7y1m3ciaj2s8lj2jqyf6r";
};
}
{
- goPackagePath = "github.com/mdlayher/dhcp6";
+ goPackagePath = "github.com/mdlayher/dhcp6";
fetch = {
type = "git";
url = "https://github.com/mdlayher/dhcp6";
- rev = "2a67805d7d0b0bad6c1103058981afdea583b459";
+ rev = "2a67805d7d0b";
sha256 = "0xn7canpik3lrz73dcz4jzapq1bfxpnashvjvnvshcpa2n1lh8yw";
};
}
{
- goPackagePath = "github.com/mdlayher/raw";
- fetch = {
- type = "git";
- url = "https://github.com/mdlayher/raw";
- rev = "480b93709cce56651807d3fdeb260a5a7c4e2d5f";
- sha256 = "0a0zlznk67nhpmgp21hxsbhyl5lvlkmwy5xvm3d3q0yaq0rqnh2x";
- };
- }
- {
- goPackagePath = "github.com/mgutz/ansi";
+ goPackagePath = "github.com/mgutz/ansi";
fetch = {
type = "git";
url = "https://github.com/mgutz/ansi";
- rev = "9520e82c474b0a04dd04f8a40959027271bab992";
+ rev = "9520e82c474b";
sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j";
};
}
{
- goPackagePath = "github.com/mgutz/logxi";
+ goPackagePath = "github.com/mgutz/logxi";
fetch = {
type = "git";
url = "https://github.com/mgutz/logxi";
- rev = "aebf8a7d67ab4625e0fd4a665766fef9a709161b";
+ rev = "aebf8a7d67ab";
sha256 = "1f8sqibkzz9wfplvvblz9s0xvvmhkd2af8ghcsmjw8818gcrzsqx";
};
}
{
- goPackagePath = "github.com/miekg/dns";
+ goPackagePath = "github.com/miekg/dns";
fetch = {
type = "git";
url = "https://github.com/miekg/dns";
- rev = "8aa92d4e02c501ba21e26fb92cf2fb9f23f56917";
- sha256 = "1niymj11xv82ghif3p7i60bgj0lqskwm7fmrzfjchd8wxwbk4bbi";
+ rev = "v1.1.22";
+ sha256 = "1iv9jznakz8f5swiir0z4zilr9ypavnsc0g4zi1r0vad6npy7zfl";
};
}
{
- goPackagePath = "github.com/pkg/errors";
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "v1.1.0";
+ sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
- rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4";
+ rev = "v0.8.1";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
- goPackagePath = "github.com/robertkrimen/otto";
+ 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/robertkrimen/otto";
fetch = {
type = "git";
url = "https://github.com/robertkrimen/otto";
- rev = "15f95af6e78dcd2030d8195a138bd88d4f403546";
+ rev = "15f95af6e78d";
sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf";
};
}
{
- goPackagePath = "github.com/tarm/serial";
+ goPackagePath = "github.com/rogpeppe/go-charset";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rogpeppe/go-charset";
+ rev = "2471d30d28b4";
+ sha256 = "1cmkhwkqx1smnsvrr9ah2x5qav0i6vdiq8x4j8j812xspfl69zwx";
+ };
+ }
+ {
+ goPackagePath = "github.com/rogpeppe/go-internal";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rogpeppe/go-internal";
+ rev = "v1.3.0";
+ sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.0";
+ sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ };
+ }
+ {
+ goPackagePath = "github.com/tarm/serial";
fetch = {
type = "git";
url = "https://github.com/tarm/serial";
- rev = "98f6abe2eb07edd42f6dfa2a934aea469acc29b7";
+ rev = "98f6abe2eb07";
sha256 = "1yj4jiv2f3x3iawxdflrlmdan0k9xsbnccgc9yz658rmif1ag3pb";
};
}
{
- goPackagePath = "golang.org/x/crypto";
+ goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "a29dc8fdc73485234dbef99ebedb95d2eced08de";
- sha256 = "07f0jj4haqs0ywc1akk1qjwn5msl2j0pry1rxjkkbfcq4r6ihc1p";
+ rev = "87dc89f01550";
+ sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
};
}
{
- goPackagePath = "golang.org/x/net";
+ goPackagePath = "golang.org/x/mod";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/mod";
+ rev = "4bf6d317e70e";
+ sha256 = "19lg1ly3j31anx92p0hynic1gjk417wwxphfdrb2cq1c19kj3r17";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "9ce7a6920f093fc0b908c4a5f66ae049110f417e";
- sha256 = "1kbs85jsqbv4v89ii2zam4b8dhmllhsrf46njmi09x0w6s0b9cbk";
+ rev = "da9a3fd4c582";
+ sha256 = "0iavs400534jn7drmdphx0f18vgg060p2r59xw5d85ji1l5rin1l";
};
}
{
- goPackagePath = "golang.org/x/sys";
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "112230192c58";
+ sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "d89cdac9e8725f2aefce25fcbfef41134c9ad412";
- sha256 = "0iazr13ir6i267nb2w81lc3pr740wdjs86nsliwpf90kkgzn853f";
+ rev = "727590c5006e";
+ sha256 = "0891pfmc73hyr6hrsq1mkk3lasxa8fz4vlnljnzz6yihmhz9ab6a";
};
}
{
- goPackagePath = "gopkg.in/sourcemap.v1";
+ goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
- url = "https://github.com/go-sourcemap/sourcemap";
- rev = "6e83acea0053641eff084973fee085f0c193c61a";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.2";
+ sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "2ca718005c18";
+ sha256 = "1nl4cw8vrfigab0hij86vl2mmhfmyim69r7vy5qk2v60g8frvgxg";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/xerrors";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/xerrors";
+ rev = "a985d3407aa7";
+ sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/errgo.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/errgo.v2";
+ rev = "v2.1.0";
+ sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/sourcemap.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/sourcemap.v1";
+ rev = "v1.0.5";
sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4";
};
}
-]
\ No newline at end of file
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "v0.0.0-2019.2.1";
+ sha256 = "1frpy4pl9yp6j00mjj2yss3k8hip0cc7b5i5mz61n3dlw0kga9z1";
+ };
+ }
+]
diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix
index e2bbf1037d8..03347f5f787 100644
--- a/pkgs/tools/security/tpm2-tools/default.nix
+++ b/pkgs/tools/security/tpm2-tools/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "tpm2-tools";
- version = "4.0";
+ version = "4.0.1";
src = fetchurl {
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "02p0wj87fnrpsijd2zaqcxqxicqs36q7vakp6y8and920x36jb0y";
+ sha256 = "zOw/ymNwNBoQLFwu8d205c0kK/G7xsUdlp93/HjKZ9E=";
};
nativeBuildInputs = [ pandoc pkgconfig makeWrapper ];
diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix
index 8cea90b6758..42060aed295 100644
--- a/pkgs/tools/system/yeshup/default.nix
+++ b/pkgs/tools/system/yeshup/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "yeshup-${builtins.substring 0 7 rev}";
- rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08";
+ pname = "yeshup";
+ version = "unstable-2013-10-29";
src = fetchFromGitHub {
owner = "RhysU";
repo = "yeshup";
- inherit rev;
+ rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08";
sha256 = "1wwbc158y46jsmdi1lp0m3dlbr9kvzvwxfvzj6646cpy9d6h21v9";
};
diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
index 133b9968850..5cac5a9f90e 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "coloursum";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "091flc5ymx0y43ld6bdmig5cy479b90bkmwv3yaysi5kpr28skvh";
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
meta = with stdenv.lib; {
description = "Colourise your checksum output";
homepage = "https://github.com/ticky/coloursum";
diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix
index 12e68689934..403adaf71b6 100644
--- a/pkgs/tools/text/transifex-client/default.nix
+++ b/pkgs/tools/text/transifex-client/default.nix
@@ -15,9 +15,9 @@ buildPythonApplication rec {
};
prePatch = ''
- substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3<2.0" \
- --replace "six==1.11.0" "six<2.0.0" \
- --replace "python-slugify==1.2.6" "python-slugify<4.0.0"
+ substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3>=1.24" \
+ --replace "six==1.11.0" "six>=1.11.0" \
+ --replace "python-slugify==1.2.6" "python-slugify>=1.2.6"
'';
# Requires external resources
diff --git a/pkgs/tools/text/xml/sablotron/default.nix b/pkgs/tools/text/xml/sablotron/default.nix
deleted file mode 100644
index 131bf3ae68c..00000000000
--- a/pkgs/tools/text/xml/sablotron/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, expat} :
-
-stdenv.mkDerivation {
- name = "sablotron-1.0.3";
- src = fetchurl {
- url = "mirror://sourceforge/project/sablotron/sablotron-1.0.3/Sablot-1.0.3.tar.gz";
- sha256 = "0qpk3dlfp3bn2hbq0fzx1bzifv8cgqb9aicn59d303cdlynkgix0";
- };
- buildInputs = [expat];
-
- meta = {
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0147cc259d3..0a87dc27f93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -780,6 +780,8 @@ in
bunny = callPackage ../tools/package-management/bunny { };
+ calls = callPackage ../applications/networking/calls { };
+
certigo = callPackage ../tools/admin/certigo { };
chezmoi = callPackage ../tools/misc/chezmoi { };
@@ -807,6 +809,8 @@ in
claws = callPackage ../tools/misc/claws { };
+ cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { };
+
codespell = with python3Packages; toPythonApplication codespell;
cozy = callPackage ../applications/audio/cozy-audiobooks { };
@@ -1454,7 +1458,9 @@ in
colorls = callPackage ../tools/system/colorls { };
- coloursum = callPackage ../tools/text/coloursum { };
+ coloursum = callPackage ../tools/text/coloursum {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
compsize = callPackage ../os-specific/linux/compsize { };
@@ -1496,6 +1502,8 @@ in
dateutils = callPackage ../tools/misc/dateutils { };
+ datovka = libsForQt5.callPackage ../applications/networking/datovka { };
+
ddar = callPackage ../tools/backup/ddar { };
ddate = callPackage ../tools/misc/ddate { };
@@ -1684,6 +1692,8 @@ in
firestarter = callPackage ../applications/misc/firestarter { };
+ fselect = callPackage ../tools/misc/fselect { };
+
fsmon = callPackage ../tools/misc/fsmon { };
fsql = callPackage ../tools/misc/fsql { };
@@ -4653,6 +4663,8 @@ in
libircclient = callPackage ../development/libraries/libircclient { };
+ libisds = callPackage ../development/libraries/libisds { };
+
libite = callPackage ../development/libraries/libite { };
liblangtag = callPackage ../development/libraries/liblangtag {
@@ -6101,8 +6113,6 @@ in
s6-portable-utils = skawarePackages.s6-portable-utils;
- sablotron = callPackage ../tools/text/xml/sablotron { };
-
safecopy = callPackage ../tools/system/safecopy { };
safe-rm = callPackage ../tools/system/safe-rm { };
@@ -7670,6 +7680,7 @@ in
crystal_0_27
crystal_0_29
crystal_0_30
+ crystal_0_31
crystal
crystal2nix;
@@ -8268,6 +8279,8 @@ in
inherit installjdk pluginSupport;
});
+ jasmin = callPackage ../development/compilers/jasmin { };
+
javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
julia_07 = callPackage ../development/compilers/julia/0.7.nix {
@@ -8610,6 +8623,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
rustracerd = callPackage ../development/tools/rust/racerd {
+ inherit (rustPackages_1_38_0) rustPlatform;
inherit (darwin.apple_sdk.frameworks) Security;
};
rust-bindgen = callPackage ../development/tools/rust/bindgen { };
@@ -9750,6 +9764,8 @@ in
drush = callPackage ../development/tools/misc/drush { };
+ editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
+
editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
eggdbus = callPackage ../development/tools/misc/eggdbus { };
@@ -10563,9 +10579,11 @@ in
stdenv = gcc6Stdenv;
};
- arrow-cpp = callPackage ../development/libraries/arrow-cpp {
+ arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
gtest = gtest.override { static = true; };
- };
+ } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+ stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
+ });
assimp = callPackage ../development/libraries/assimp { };
@@ -13757,6 +13775,8 @@ in
qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { };
+ randomx = callPackage ../development/libraries/randomx { };
+
resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
rhino = callPackage ../development/libraries/java/rhino {
@@ -18466,6 +18486,8 @@ in
epic5 = callPackage ../applications/networking/irc/epic5 { };
+ epr = callPackage ../applications/misc/epr { };
+
eq10q = callPackage ../applications/audio/eq10q { };
errbot = callPackage ../applications/networking/errbot {
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix
index a36c89fac0a..ceb2d5e16f7 100644
--- a/pkgs/top-level/emscripten-packages.nix
+++ b/pkgs/top-level/emscripten-packages.nix
@@ -81,7 +81,8 @@ rec {
});
xmlmirror = pkgs.buildEmscriptenPackage rec {
- name = "xmlmirror";
+ pname = "xmlmirror";
+ version = "unstable-2016-06-05";
buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
nativeBuildInputs = [ pkgconfig zlib ];
@@ -113,7 +114,7 @@ rec {
installPhase = ''
mkdir -p $out/share
- mkdir -p $doc/share/${name}
+ mkdir -p $doc/share/${pname}
cp Demo* $out/share
cp -R codemirror-5.12 $out/share
@@ -124,7 +125,7 @@ rec {
cp *.html $out/share
cp *.json $out/share
cp *.rng $out/share
- cp README.md $doc/share/${name}
+ cp README.md $doc/share/${pname}
'';
checkPhase = ''