diff --git a/doc/stdenv/cross-compilation.xml b/doc/stdenv/cross-compilation.xml
index 5476c9a4893..bea56a0c2fc 100644
--- a/doc/stdenv/cross-compilation.xml
+++ b/doc/stdenv/cross-compilation.xml
@@ -244,7 +244,7 @@
- Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
+ Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed ar.
diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml
index 0b59f90eb49..49699d7168d 100644
--- a/doc/stdenv/stdenv.xml
+++ b/doc/stdenv/stdenv.xml
@@ -1717,7 +1717,7 @@ someVar=$(stripHash $name)
- The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of envBuildBuildHooks`, envBuildHostHooks`, envBuildTargetHooks`, envHostHostHooks`, envHostTargetHooks`, or envTargetTargetHooks`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
+ The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of envBuildBuildHooks, envBuildHostHooks, envBuildTargetHooks, envHostHostHooks, envHostTargetHooks, or envTargetTargetHooks. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index eefc9560f16..6751d00f451 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1484,6 +1484,16 @@
}
];
};
+ d-goldin = {
+ email = "dgoldin+github@protonmail.ch";
+ github = "d-goldin";
+ githubId = 43349662;
+ name = "Dima";
+ keys = [{
+ longkeyid = "rsa4096/BAB1D15FB7B4D4CE";
+ fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";
+ }];
+ };
dadada = {
name = "dadada";
email = "dadada@dadada.li";
@@ -4491,6 +4501,12 @@
githubId = 16974598;
name = "Mike Playle";
};
+ mkaito = {
+ email = "chris@mkaito.net";
+ github = "mkaito";
+ githubId = 20434;
+ name = "Christian Höppner";
+ };
mkazulak = {
email = "kazulakm@gmail.com";
github = "mulderr";
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 4980a99e646..6f88a2f571e 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -186,6 +186,13 @@
The osquery module has been removed.
+
+
+ Going forward, ~/bin in the users home directory will no longer be in PATH by default.
+ If you depend on this you should set the option environment.homeBinInPath to true.
+ The aforementioned option was added this release.
+
+
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index b79e16cd797..a0a20228a74 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -122,7 +122,7 @@ in
description = ''
Include ~/bin/ in $PATH.
'';
- default = true;
+ default = false;
type = types.bool;
};
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 1e18e927ec6..fcb30187fa2 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -111,9 +111,10 @@ in
config = mkIf enabled {
assertions = [
{
- assertion = with config.services.xserver.displayManager; gdm.enable -> !gdm.wayland;
- message = "NVIDIA drivers don't support wayland, set services.xserver.displayManager.gdm.wayland=false";
+ assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable;
+ message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`";
}
+
{
assertion = !optimusCfg.enable ||
(optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != "");
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index c5f9d1f9b72..7b13beea1ca 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -36,17 +36,25 @@ in {
'';
};
+ config = mkOption {
+ type = with types; attrsOf (attrsOf (oneOf [ bool int str ]));
+ example = {
+ General = {
+ ControllerMode = "bredr";
+ };
+ };
+ description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf).";
+ };
+
extraConfig = mkOption {
- type = types.lines;
- default = "";
+ type = with types; nullOr lines;
+ default = null;
example = ''
[General]
ControllerMode = bredr
'';
description = ''
Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf).
-
- NOTE: We already include [Policy], so any configuration under the Policy group should come first.
'';
};
};
@@ -56,16 +64,18 @@ in {
###### implementation
config = mkIf cfg.enable {
+ warnings = optional (cfg.extraConfig != null) "hardware.bluetooth.`extraConfig` is deprecated, please use hardware.bluetooth.`config`.";
+
+ hardware.bluetooth.config = {
+ Policy = {
+ AutoEnable = mkDefault cfg.powerOnBoot;
+ };
+ };
environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
environment.etc = singleton {
- source = pkgs.writeText "main.conf" ''
- [Policy]
- AutoEnable=${lib.boolToString cfg.powerOnBoot}
-
- ${cfg.extraConfig}
- '';
+ source = pkgs.writeText "main.conf" (generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig);
target = "bluetooth/main.conf";
};
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 35b513bac57..53f32b8fadc 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -197,6 +197,9 @@ in
services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey;
})] ++ [(mkIf config.services.rspamd.enable {
services.prometheus.exporters.rspamd.url = mkDefault "http://localhost:11334/stat";
+ })] ++ [(mkIf config.services.nginx.enable {
+ systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ];
+ systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ];
})] ++ (mapAttrsToList (name: conf:
mkExporterConf {
inherit name;
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index c66011afccb..875ab70bfc7 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -115,7 +115,7 @@ in
type = types.package;
default = pkgs.samba;
defaultText = "pkgs.samba";
- example = literalExample "pkgs.samba3";
+ example = literalExample "pkgs.samba4Full";
description = ''
Defines which package should be used for the samba server.
'';
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 294c0d70ede..8f05c3949fb 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -236,9 +236,12 @@ in {
${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do
DEVTYPE=
- source /sys/class/net/$i/uevent
- if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
- ifaces="$ifaces''${ifaces:+ -N} -i$i"
+ UEVENT_PATH=/sys/class/net/$i/uevent
+ if [ -e "$UEVENT_PATH" ]; then
+ source "$UEVENT_PATH"
+ if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
+ ifaces="$ifaces''${ifaces:+ -N} -i$i"
+ fi
fi
done
'' else ''
diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml
index 79cece551d3..69d1170e452 100644
--- a/nixos/modules/services/web-apps/matomo-doc.xml
+++ b/nixos/modules/services/web-apps/matomo-doc.xml
@@ -84,12 +84,6 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
Issues
-
-
- Matomo's file integrity check will warn you. This is due to the patches
- necessary for NixOS, you can safely ignore this.
-
-
Matomo will warn you that the JavaScript tracker is not writable. This is
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 0af9ccfcf3e..912ec5bd38e 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -126,11 +126,21 @@ in
wayland = mkOption {
default = true;
description = ''
- Allow GDM run on Wayland instead of Xserver
+ Allow GDM to run on Wayland instead of Xserver.
+ Note to enable Wayland with Nvidia you need to
+ enable the .
'';
type = types.bool;
};
+ nvidiaWayland = mkOption {
+ default = false;
+ description = ''
+ Whether to allow wayland to be used with the proprietary
+ NVidia graphics driver.
+ '';
+ };
+
autoSuspend = mkOption {
default = true;
description = ''
@@ -237,6 +247,19 @@ in
services.dbus.packages = [ gdm ];
+ # We duplicate upstream's udev rules manually to make wayland with nvidia configurable
+ services.udev.extraRules = ''
+ # disable Wayland on Cirrus chipsets
+ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-disable-wayland"
+ # disable Wayland on Hi1710 chipsets
+ ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-disable-wayland"
+ ${optionalString (!cfg.gdm.nvidiaWayland) ''
+ DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-disable-wayland"
+ ''}
+ # disable Wayland when modesetting is disabled
+ IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-disable-wayland"
+ '';
+
systemd.user.services.dbus.wantedBy = [ "default.target" ];
programs.dconf.profiles.gdm =
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 641cf9faadc..12a80a12d19 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -214,7 +214,17 @@ while (my ($unit, $state) = each %{$activePrev}) {
# Reload the changed mount unit to force a remount.
$unitsToReload{$unit} = 1;
recordUnit($reloadListFile, $unit);
- } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) {
+ } elsif ($unit =~ /\.socket$/) {
+ my $unitInfo = parseUnit($newUnitFile);
+ # If a socket unit has been changed, the corresponding
+ # service unit has to be stopped before the socket can
+ # be restarted. The service will be started again on demand.
+ my $serviceUnit = $unitInfo->{'Unit'} // "$baseName.service";
+ $unitsToStop{$serviceUnit} = 1;
+ $unitsToStop{$unit} = 1;
+ $unitsToStart{$unit} = 1;
+ recordUnit($startListFile, $unit);
+ } elsif ($unit =~ /\.path$/ || $unit =~ /\.slice$/) {
# FIXME: do something?
} else {
my $unitInfo = parseUnit($newUnitFile);
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 689f881cbea..678ce3c2880 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -63,8 +63,7 @@ in rec {
#(all nixos.tests.containers)
(all nixos.tests.containers-imperative)
- (all nixos.tests.containers-ipv4)
- (all nixos.tests.containers-ipv6)
+ (all nixos.tests.containers-ip)
nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 84af457801a..74c16e990f3 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -32,8 +32,7 @@ in rec {
tests = {
inherit (nixos'.tests)
containers-imperative
- containers-ipv4
- containers-ipv6
+ containers-ip
firewall
ipv6
login
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7945a239f6a..df65ef249e8 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -53,8 +53,7 @@ in
containers-extra_veth = handleTest ./containers-extra_veth.nix {};
containers-hosts = handleTest ./containers-hosts.nix {};
containers-imperative = handleTest ./containers-imperative.nix {};
- containers-ipv4 = handleTest ./containers-ipv4.nix {};
- containers-ipv6 = handleTest ./containers-ipv6.nix {};
+ containers-ip = handleTest ./containers-ip.nix {};
containers-macvlans = handleTest ./containers-macvlans.nix {};
containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {};
containers-restart_networking = handleTest ./containers-restart_networking.nix {};
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index 38db64eb793..2c8e8fa5370 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -7,7 +7,7 @@ let
containerIp6 = "fc00::2/7";
in
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-bridge";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ];
@@ -61,43 +61,42 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.pathsInNixDB = [ pkgs.stdenv ];
};
- testScript =
- ''
- $machine->waitForUnit("default.target");
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
+ testScript = ''
+ machine.wait_for_unit("default.target")
+ assert "webserver" in machine.succeed("nixos-container list")
- # Start the webserver container.
- $machine->succeed("nixos-container status webserver") =~ /up/ or die;
+ with subtest("Start the webserver container"):
+ assert "up" in machine.succeed("nixos-container status webserver")
- # Check if bridges exist inside containers
- $machine->succeed("nixos-container run webserver -- ip link show eth0");
- $machine->succeed("nixos-container run web-noip -- ip link show eth0");
+ with subtest("Bridges exist inside containers"):
+ machine.succeed(
+ "nixos-container run webserver -- ip link show eth0",
+ "nixos-container run web-noip -- ip link show eth0",
+ )
- "${containerIp}" =~ /([^\/]+)\/([0-9+])/;
- my $ip = $1;
- chomp $ip;
- $machine->succeed("ping -n -c 1 $ip");
- $machine->succeed("curl --fail http://$ip/ > /dev/null");
+ ip = "${containerIp}".split("/")[0]
+ machine.succeed(f"ping -n -c 1 {ip}")
+ machine.succeed(f"curl --fail http://{ip}/ > /dev/null")
- "${containerIp6}" =~ /([^\/]+)\/([0-9+])/;
- my $ip6 = $1;
- chomp $ip6;
- $machine->succeed("ping -n -c 1 $ip6");
- $machine->succeed("curl --fail http://[$ip6]/ > /dev/null");
+ ip6 = "${containerIp6}".split("/")[0]
+ machine.succeed(f"ping -n -c 1 {ip6}")
+ machine.succeed(f"curl --fail http://[{ip6}]/ > /dev/null")
- # Check that nixos-container show-ip works in case of an ipv4 address with
- # subnetmask in CIDR notation.
- my $result = $machine->succeed("nixos-container show-ip webserver");
- chomp $result;
- $result eq $ip or die;
+ with subtest(
+ "nixos-container show-ip works in case of an ipv4 address "
+ + "with subnetmask in CIDR notation."
+ ):
+ result = machine.succeed("nixos-container show-ip webserver").rstrip()
+ assert result == ip
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
- $machine->fail("curl --fail --connect-timeout 2 http://[$ip6]/ > /dev/null");
-
- # Destroying a declarative container should fail.
- $machine->fail("nixos-container destroy webserver");
- '';
+ with subtest("Stop the container"):
+ machine.succeed("nixos-container stop webserver")
+ machine.fail(
+ f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null",
+ f"curl --fail --connect-timeout 2 http://[{ip6}]/ > /dev/null",
+ )
+ # Destroying a declarative container should fail.
+ machine.fail("nixos-container destroy webserver")
+ '';
})
diff --git a/nixos/tests/containers-ephemeral.nix b/nixos/tests/containers-ephemeral.nix
index 1ef8717d9a0..692554ac0ba 100644
--- a/nixos/tests/containers-ephemeral.nix
+++ b/nixos/tests/containers-ephemeral.nix
@@ -1,6 +1,6 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-ephemeral";
machine = { pkgs, ... }: {
@@ -16,10 +16,10 @@ import ./make-test.nix ({ pkgs, ...} : {
services.nginx = {
enable = true;
virtualHosts.localhost = {
- root = (pkgs.runCommand "localhost" {} ''
+ root = pkgs.runCommand "localhost" {} ''
mkdir "$out"
echo hello world > "$out/index.html"
- '');
+ '';
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
@@ -28,29 +28,27 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
+ assert "webserver" in machine.succeed("nixos-container list")
- # Start the webserver container.
- $machine->succeed("nixos-container start webserver");
+ machine.succeed("nixos-container start webserver")
- # Check that container got its own root folder
- $machine->succeed("ls /run/containers/webserver");
+ with subtest("Container got its own root folder"):
+ machine.succeed("ls /run/containers/webserver")
- # Check that container persistent directory is not created
- $machine->fail("ls /var/lib/containers/webserver");
+ with subtest("Container persistent directory is not created"):
+ machine.fail("ls /var/lib/containers/webserver")
# Since "start" returns after the container has reached
# multi-user.target, we should now be able to access it.
- my $ip = $machine->succeed("nixos-container show-ip webserver");
- chomp $ip;
- $machine->succeed("ping -n -c1 $ip");
- $machine->succeed("curl --fail http://$ip/ > /dev/null");
+ ip = machine.succeed("nixos-container show-ip webserver").rstrip()
+ machine.succeed(f"ping -n -c1 {ip}")
+ machine.succeed(f"curl --fail http://{ip}/ > /dev/null")
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
+ with subtest("Stop the container"):
+ machine.succeed("nixos-container stop webserver")
+ machine.fail(f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null")
- # Check that container's root folder was removed
- $machine->fail("ls /run/containers/webserver");
+ with subtest("Container's root folder was removed"):
+ machine.fail("ls /run/containers/webserver")
'';
})
diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix
index 8cf298c6225..d6fb4a761ee 100644
--- a/nixos/tests/containers-hosts.nix
+++ b/nixos/tests/containers-hosts.nix
@@ -1,6 +1,6 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-hosts";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ montag451 ];
@@ -42,11 +42,11 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
- $machine->waitForUnit("default.target");
+ start_all()
+ machine.wait_for_unit("default.target")
- # Ping the containers using the entries added in /etc/hosts
- $machine->succeed("ping -n -c 1 simple.containers");
- $machine->succeed("ping -n -c 1 netmask.containers");
+ with subtest("Ping the containers using the entries added in /etc/hosts"):
+ for host in "simple.containers", "netmask.containers":
+ machine.succeed(f"ping -n -c 1 {host}")
'';
})
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 2e7e4b2f1d6..61df74042cb 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -1,6 +1,6 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-imperative";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ];
@@ -36,95 +36,99 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = let
- tmpfilesContainerConfig = pkgs.writeText "container-config-tmpfiles" ''
- {
- systemd.tmpfiles.rules = [ "d /foo - - - - -" ];
- systemd.services.foo = {
- serviceConfig.Type = "oneshot";
- script = "ls -al /foo";
- wantedBy = [ "multi-user.target" ];
- };
- }
- ''; in
- ''
- # Make sure we have a NixOS tree (required by ‘nixos-container create’).
- $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2");
+ tmpfilesContainerConfig = pkgs.writeText "container-config-tmpfiles" ''
+ {
+ systemd.tmpfiles.rules = [ "d /foo - - - - -" ];
+ systemd.services.foo = {
+ serviceConfig.Type = "oneshot";
+ script = "ls -al /foo";
+ wantedBy = [ "multi-user.target" ];
+ };
+ }
+ '';
+ in ''
+ with subtest("Make sure we have a NixOS tree (required by ‘nixos-container create’)"):
+ machine.succeed("PAGER=cat nix-env -qa -A nixos.hello >&2")
- # Create some containers imperatively.
- my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name");
- chomp $id1;
- $machine->log("created container $id1");
+ id1, id2 = None, None
- my $id2 = $machine->succeed("nixos-container create foo --ensure-unique-name");
- chomp $id2;
- $machine->log("created container $id2");
+ with subtest("Create some containers imperatively"):
+ id1 = machine.succeed("nixos-container create foo --ensure-unique-name").rstrip()
+ machine.log(f"created container {id1}")
- die if $id1 eq $id2;
+ id2 = machine.succeed("nixos-container create foo --ensure-unique-name").rstrip()
+ machine.log(f"created container {id2}")
- # Put the root of $id2 into a bind mount.
- $machine->succeed(
- "mv /var/lib/containers/$id2 /id2-bindmount",
- "mount --bind /id2-bindmount /var/lib/containers/$id1"
- );
+ assert id1 != id2
- my $ip1 = $machine->succeed("nixos-container show-ip $id1");
- chomp $ip1;
- my $ip2 = $machine->succeed("nixos-container show-ip $id2");
- chomp $ip2;
- die if $ip1 eq $ip2;
+ with subtest(f"Put the root of {id2} into a bind mount"):
+ machine.succeed(
+ f"mv /var/lib/containers/{id2} /id2-bindmount",
+ f"mount --bind /id2-bindmount /var/lib/containers/{id1}",
+ )
- # Create a directory and a file we can later check if it still exists
- # after destruction of the container.
- $machine->succeed(
- "mkdir /nested-bindmount",
- "echo important data > /nested-bindmount/dummy",
- );
+ ip1 = machine.succeed(f"nixos-container show-ip {id1}").rstrip()
+ ip2 = machine.succeed(f"nixos-container show-ip {id2}").rstrip()
+ assert ip1 != ip2
- # Create a directory with a dummy file and bind-mount it into both
- # containers.
- foreach ($id1, $id2) {
- my $importantPath = "/var/lib/containers/$_/very/important/data";
- $machine->succeed(
- "mkdir -p $importantPath",
- "mount --bind /nested-bindmount $importantPath"
- );
- }
+ with subtest(
+ "Create a directory and a file we can later check if it still exists "
+ + "after destruction of the container"
+ ):
+ machine.succeed("mkdir /nested-bindmount")
+ machine.succeed("echo important data > /nested-bindmount/dummy")
- # Start one of them.
- $machine->succeed("nixos-container start $id1");
+ with subtest(
+ "Create a directory with a dummy file and bind-mount it into both containers."
+ ):
+ for id in id1, id2:
+ important_path = f"/var/lib/containers/{id}/very/important/data"
+ machine.succeed(
+ f"mkdir -p {important_path}",
+ f"mount --bind /nested-bindmount {important_path}",
+ )
- # Execute commands via the root shell.
- $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
+ with subtest("Start one of them"):
+ machine.succeed(f"nixos-container start {id1}")
- # Execute a nix command via the root shell. (regression test for #40355)
- $machine->succeed("nixos-container run $id1 -- nix-instantiate -E 'derivation { name = \"empty\"; builder = \"false\"; system = \"false\"; }'");
+ with subtest("Execute commands via the root shell"):
+ assert "Linux" in machine.succeed(f"nixos-container run {id1} -- uname")
- # Stop and start (regression test for #4989)
- $machine->succeed("nixos-container stop $id1");
- $machine->succeed("nixos-container start $id1");
+ with subtest("Execute a nix command via the root shell. (regression test for #40355)"):
+ machine.succeed(
+ f"nixos-container run {id1} -- nix-instantiate -E "
+ + '\'derivation { name = "empty"; builder = "false"; system = "false"; }\' '
+ )
- # Ensure tmpfiles are present
- $machine->log("creating container tmpfiles");
- $machine->succeed("nixos-container create tmpfiles --config-file ${tmpfilesContainerConfig}");
- $machine->log("created, starting…");
- $machine->succeed("nixos-container start tmpfiles");
- $machine->log("done starting, investigating…");
- $machine->succeed("echo \$(nixos-container run tmpfiles -- systemctl is-active foo.service) | grep -q active;");
- $machine->succeed("nixos-container destroy tmpfiles");
+ with subtest("Stop and start (regression test for #4989)"):
+ machine.succeed(f"nixos-container stop {id1}")
+ machine.succeed(f"nixos-container start {id1}")
- # Execute commands via the root shell.
- $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
+ with subtest("tmpfiles are present"):
+ machine.log("creating container tmpfiles")
+ machine.succeed(
+ "nixos-container create tmpfiles --config-file ${tmpfilesContainerConfig}"
+ )
+ machine.log("created, starting…")
+ machine.succeed("nixos-container start tmpfiles")
+ machine.log("done starting, investigating…")
+ machine.succeed(
+ "echo $(nixos-container run tmpfiles -- systemctl is-active foo.service) | grep -q active;"
+ )
+ machine.succeed("nixos-container destroy tmpfiles")
- # Destroy the containers.
- $machine->succeed("nixos-container destroy $id1");
- $machine->succeed("nixos-container destroy $id2");
+ with subtest("Execute commands via the root shell"):
+ assert "Linux" in machine.succeed(f"nixos-container run {id1} -- uname")
- $machine->succeed(
- # Check whether destruction of any container has killed important data
- "grep -qF 'important data' /nested-bindmount/dummy",
- # Ensure that the container path is gone
- "test ! -e /var/lib/containers/$id1"
- );
+ with subtest("Destroy the containers"):
+ for id in id1, id2:
+ machine.succeed(f"nixos-container destroy {id}")
+
+ with subtest("Check whether destruction of any container has killed important data"):
+ machine.succeed("grep -qF 'important data' /nested-bindmount/dummy")
+
+ with subtest("Ensure that the container path is gone"):
+ print(machine.succeed("ls -lsa /var/lib/containers"))
+ machine.succeed(f"test ! -e /var/lib/containers/{id1}")
'';
-
})
diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix
new file mode 100644
index 00000000000..8583a08c625
--- /dev/null
+++ b/nixos/tests/containers-ip.nix
@@ -0,0 +1,77 @@
+# Test for NixOS' container support.
+
+let
+ webserverFor = hostAddress: localAddress: {
+ inherit hostAddress localAddress;
+ privateNetwork = true;
+ config = {
+ services.httpd = {
+ enable = true;
+ adminAddr = "foo@example.org";
+ };
+ networking.firewall.allowedTCPPorts = [ 80 ];
+ };
+ };
+
+in import ./make-test-python.nix ({ pkgs, ...} : {
+ name = "containers-ipv4-ipv6";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ aristid aszlig eelco kampfschlaefer ];
+ };
+
+ machine =
+ { pkgs, ... }: {
+ imports = [ ../modules/installer/cd-dvd/channel.nix ];
+ virtualisation = {
+ writableStore = true;
+ memorySize = 768;
+ };
+
+ containers.webserver4 = webserverFor "10.231.136.1" "10.231.136.2";
+ containers.webserver6 = webserverFor "fc00::2" "fc00::1";
+ virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+ };
+
+ testScript = { nodes, ... }: ''
+ import time
+
+
+ def curl_host(ip):
+ # put [] around ipv6 addresses for curl
+ host = ip if ":" not in ip else f"[{ip}]"
+ return f"curl --fail --connect-timeout 2 http://{host}/ > /dev/null"
+
+
+ def get_ip(container):
+ # need to distinguish because show-ip won't work for ipv6
+ if container == "webserver4":
+ ip = machine.succeed(f"nixos-container show-ip {container}").rstrip()
+ assert ip == "${nodes.machine.config.containers.webserver4.localAddress}"
+ return ip
+ return "${nodes.machine.config.containers.webserver6.localAddress}"
+
+
+ for container in "webserver4", "webserver6":
+ assert container in machine.succeed("nixos-container list")
+
+ with subtest(f"Start container {container}"):
+ machine.succeed(f"nixos-container start {container}")
+ # wait 2s for container to start and network to be up
+ time.sleep(2)
+
+ # Since "start" returns after the container has reached
+ # multi-user.target, we should now be able to access it.
+
+ ip = get_ip(container)
+ with subtest(f"{container} reacts to pings and HTTP requests"):
+ machine.succeed(f"ping -n -c1 {ip}")
+ machine.succeed(curl_host(ip))
+
+ with subtest(f"Stop container {container}"):
+ machine.succeed(f"nixos-container stop {container}")
+ machine.fail(curl_host(ip))
+
+ # Destroying a declarative container should fail.
+ machine.fail(f"nixos-container destroy {container}")
+ '';
+})
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
deleted file mode 100644
index ace68ff2df8..00000000000
--- a/nixos/tests/containers-ipv4.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test for NixOS' container support.
-
-import ./make-test.nix ({ pkgs, ...} : {
- name = "containers-ipv4";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco kampfschlaefer ];
- };
-
- machine =
- { pkgs, ... }:
- { imports = [ ../modules/installer/cd-dvd/channel.nix ];
- virtualisation.writableStore = true;
- virtualisation.memorySize = 768;
-
- containers.webserver =
- { privateNetwork = true;
- hostAddress = "10.231.136.1";
- localAddress = "10.231.136.2";
- config =
- { services.httpd.enable = true;
- services.httpd.adminAddr = "foo@example.org";
- networking.firewall.allowedTCPPorts = [ 80 ];
- system.stateVersion = "18.03";
- };
- };
-
- virtualisation.pathsInNixDB = [ pkgs.stdenv ];
- };
-
- testScript =
- ''
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
-
- # Start the webserver container.
- $machine->succeed("nixos-container start webserver");
-
- # wait two seconds for the container to start and the network to be up
- sleep 2;
-
- # Since "start" returns after the container has reached
- # multi-user.target, we should now be able to access it.
- my $ip = $machine->succeed("nixos-container show-ip webserver");
- chomp $ip;
- $machine->succeed("ping -n -c1 $ip");
- $machine->succeed("curl --fail http://$ip/ > /dev/null");
-
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
-
- # Destroying a declarative container should fail.
- $machine->fail("nixos-container destroy webserver");
- '';
-
-})
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
deleted file mode 100644
index a9499d192bd..00000000000
--- a/nixos/tests/containers-ipv6.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-# Test for NixOS' container support.
-
-let
- hostIp = "fc00::2";
- localIp = "fc00::1";
-in
-
-import ./make-test.nix ({ pkgs, ...} : {
- name = "containers-ipv6";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco kampfschlaefer ];
- };
-
- machine =
- { pkgs, ... }:
- { imports = [ ../modules/installer/cd-dvd/channel.nix ];
- virtualisation.writableStore = true;
- virtualisation.memorySize = 768;
-
- containers.webserver =
- { privateNetwork = true;
- hostAddress6 = hostIp;
- localAddress6 = localIp;
- config =
- { services.httpd.enable = true;
- services.httpd.adminAddr = "foo@example.org";
- networking.firewall.allowedTCPPorts = [ 80 ];
- };
- };
-
- virtualisation.pathsInNixDB = [ pkgs.stdenv ];
- };
-
- testScript =
- ''
- $machine->waitForUnit("default.target");
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
-
- # Start the webserver container.
- $machine->succeed("nixos-container start webserver");
-
- # wait two seconds for the container to start and the network to be up
- sleep 2;
-
- # Since "start" returns after the container has reached
- # multi-user.target, we should now be able to access it.
- my $ip = "${localIp}";
- chomp $ip;
- $machine->succeed("ping -n -c 1 $ip");
- $machine->succeed("curl --fail http://[$ip]/ > /dev/null");
-
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://[$ip]/ > /dev/null");
-
- # Destroying a declarative container should fail.
- $machine->fail("nixos-container destroy webserver");
- '';
-
-})
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index f41dea91b1e..35aff91e85b 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -1,7 +1,7 @@
-import ./make-test.nix ({ pkgs, lib, ...} :
+import ./make-test-python.nix ({ pkgs, lib, ...} :
let
client_base = {
-
+
containers.test1 = {
autoStart = true;
config = {
@@ -48,18 +48,25 @@ in {
c1System = nodes.client_c1.config.system.build.toplevel;
c2System = nodes.client_c2.config.system.build.toplevel;
in ''
- $client->start();
- $client->waitForUnit("default.target");
- $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_base ]] >&2");
+ client.start()
+ client.wait_for_unit("default.target")
- $client->succeed("${c1System}/bin/switch-to-configuration test >&2");
- $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2");
- $client->succeed("systemctl status httpd -M test1 >&2");
+ assert "client_base" in client.succeed("nixos-container run test1 cat /etc/check")
- $client->succeed("${c2System}/bin/switch-to-configuration test >&2");
- $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2");
- $client->fail("systemctl status httpd -M test1 >&2");
- $client->succeed("systemctl status nginx -M test1 >&2");
+ with subtest("httpd is available after activating config1"):
+ client.succeed(
+ "${c1System}/bin/switch-to-configuration test >&2",
+ "[[ $(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2",
+ "systemctl status httpd -M test1 >&2",
+ )
+
+ with subtest("httpd is not available any longer after switching to config2"):
+ client.succeed(
+ "${c2System}/bin/switch-to-configuration test >&2",
+ "[[ $(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2",
+ "systemctl status nginx -M test1 >&2",
+ )
+ client.fail("systemctl status httpd -M test1 >&2")
'';
})
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index e29fe6bbf03..171e8f01c7b 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -1,6 +1,6 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-tmpfs";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ kampka ];
@@ -31,49 +31,63 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.pathsInNixDB = [ pkgs.stdenv ];
};
- testScript =
- ''
- $machine->waitForUnit("default.target");
- $machine->succeed("nixos-container list") =~ /tmpfs/ or die;
+ testScript = ''
+ machine.wait_for_unit("default.target")
+ assert "tmpfs" in machine.succeed("nixos-container list")
- # Start the tmpfs container.
- #$machine->succeed("nixos-container status tmpfs") =~ /up/ or die;
-
- # Verify that /var is mounted as a tmpfs
- #$machine->succeed("nixos-container run tmpfs -- systemctl status var.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
- $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var 2>/dev/null");
-
- # Verify that /var/log is mounted as a tmpfs
- $machine->succeed("nixos-container run tmpfs -- systemctl status var-log.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
- $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var/log 2>/dev/null");
-
- # Verify that /some/random/path is mounted as a tmpfs
- $machine->succeed("nixos-container run tmpfs -- systemctl status some-random-path.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
- $machine->succeed("nixos-container run tmpfs -- mountpoint -q /some/random/path 2>/dev/null");
-
- # Verify that files created in the container in a non-tmpfs directory are visible on the host.
- # This establishes legitimacy for the following tests
- $machine->succeed("nixos-container run tmpfs -- touch /root/test.file 2>/dev/null");
- $machine->succeed("nixos-container run tmpfs -- ls -l /root | grep -q test.file 2>/dev/null");
- $machine->succeed("test -e /var/lib/containers/tmpfs/root/test.file");
+ with subtest("tmpfs container is up"):
+ assert "up" in machine.succeed("nixos-container status tmpfs")
- # Verify that /some/random/path is writable and that files created there
- # are not in the hosts container dir but in the tmpfs
- $machine->succeed("nixos-container run tmpfs -- touch /some/random/path/test.file 2>/dev/null");
- $machine->succeed("nixos-container run tmpfs -- test -e /some/random/path/test.file 2>/dev/null");
+ def tmpfs_cmd(command):
+ return f"nixos-container run tmpfs -- {command} 2>/dev/null"
- $machine->fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file");
- # Verify that files created in the hosts container dir in a path where a tmpfs file system has been mounted
- # are not visible to the container as the do not exist in the tmpfs
- $machine->succeed("touch /var/lib/containers/tmpfs/var/test.file");
+ with subtest("/var is mounted as a tmpfs"):
+ machine.succeed(tmpfs_cmd("mountpoint -q /var"))
- $machine->succeed("test -e /var/lib/containers/tmpfs/var/test.file");
- $machine->succeed("ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null");
+ with subtest("/var/log is mounted as a tmpfs"):
+ assert "What: tmpfs" in machine.succeed(
+ tmpfs_cmd("systemctl status var-log.mount --no-pager")
+ )
+ machine.succeed(tmpfs_cmd("mountpoint -q /var/log"))
- $machine->fail("nixos-container run tmpfs -- ls -l /var | grep -q test.file 2>/dev/null");
+ with subtest("/some/random/path is mounted as a tmpfs"):
+ assert "What: tmpfs" in machine.succeed(
+ tmpfs_cmd("systemctl status some-random-path.mount --no-pager")
+ )
+ machine.succeed(tmpfs_cmd("mountpoint -q /some/random/path"))
+ with subtest(
+ "files created in the container in a non-tmpfs directory are visible on the host."
+ ):
+ # This establishes legitimacy for the following tests
+ machine.succeed(
+ tmpfs_cmd("touch /root/test.file"),
+ tmpfs_cmd("ls -l /root | grep -q test.file"),
+ "test -e /var/lib/containers/tmpfs/root/test.file",
+ )
+
+ with subtest(
+ "/some/random/path is writable and that files created there are not "
+ + "in the hosts container dir but in the tmpfs"
+ ):
+ machine.succeed(
+ tmpfs_cmd("touch /some/random/path/test.file"),
+ tmpfs_cmd("test -e /some/random/path/test.file"),
+ )
+ machine.fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file")
+
+ with subtest(
+ "files created in the hosts container dir in a path where a tmpfs "
+ + "file system has been mounted are not visible to the container as "
+ + "the do not exist in the tmpfs"
+ ):
+ machine.succeed(
+ "touch /var/lib/containers/tmpfs/var/test.file",
+ "test -e /var/lib/containers/tmpfs/var/test.file",
+ "ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null",
+ )
+ machine.fail(tmpfs_cmd("ls -l /var | grep -q test.file"))
'';
-
})
diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix
index a4f524ceb27..8a161027c2a 100644
--- a/nixos/tests/iftop.nix
+++ b/nixos/tests/iftop.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
with lib;
@@ -18,17 +18,16 @@ with lib;
};
testScript = ''
- subtest "machine with iftop enabled", sub {
- $withIftop->waitForUnit("default.target");
- # limit to eth1 (eth0 is the test driver's control interface)
- # and don't try name lookups
- $withIftop->succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'");
- };
- subtest "machine without iftop", sub {
- $withoutIftop->waitForUnit("default.target");
- # check that iftop is there but user alice lacks capabilities
- $withoutIftop->succeed("iftop -t -s 1 -n -i eth1");
- $withoutIftop->fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'");
- };
+ with subtest("machine with iftop enabled"):
+ withIftop.wait_for_unit("default.target")
+ # limit to eth1 (eth0 is the test driver's control interface)
+ # and don't try name lookups
+ withIftop.succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'")
+
+ with subtest("machine without iftop"):
+ withoutIftop.wait_for_unit("default.target")
+ # check that iftop is there but user alice lacks capabilitie
+ withoutIftop.succeed("iftop -t -s 1 -n -i eth1")
+ withoutIftop.fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'")
'';
})
diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix
index f30bd2e2e76..f09d0926d22 100644
--- a/nixos/tests/kernel-latest.nix
+++ b/nixos/tests/kernel-latest.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-latest";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
@@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->succeed("uname -s | grep 'Linux'");
- $machine->succeed("uname -a | grep '${pkgs.linuxPackages_latest.kernel.version}'");
+ assert "Linux" in machine.succeed("uname -s")
+ assert "${pkgs.linuxPackages_latest.kernel.version}" in machine.succeed("uname -a")
'';
})
diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix
index 28717fa6a84..bad706d63c0 100644
--- a/nixos/tests/kernel-lts.nix
+++ b/nixos/tests/kernel-lts.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-lts";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
@@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->succeed("uname -s | grep 'Linux'");
- $machine->succeed("uname -a | grep '${pkgs.linuxPackages.kernel.version}'");
+ assert "Linux" in machine.succeed("uname -s")
+ assert "${pkgs.linuxPackages.kernel.version}" in machine.succeed("uname -a")
'';
})
diff --git a/nixos/tests/kernel-testing.nix b/nixos/tests/kernel-testing.nix
index 276d2de12bb..b7e10ebd5bd 100644
--- a/nixos/tests/kernel-testing.nix
+++ b/nixos/tests/kernel-testing.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-testing";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
@@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->succeed("uname -s | grep 'Linux'");
- $machine->succeed("uname -a | grep '${pkgs.linuxPackages_testing.kernel.modDirVersion}'");
+ assert "Linux" in machine.succeed("uname -s")
+ assert "${pkgs.linuxPackages_testing.kernel.modDirVersion}" in machine.succeed("uname -a")
'';
})
diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix
index b120599c51d..31f5627d25c 100644
--- a/nixos/tests/memcached.nix
+++ b/nixos/tests/memcached.nix
@@ -1,28 +1,24 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "memcached";
- nodes = {
- machine =
- { ... }:
- {
- imports = [ ../modules/profiles/minimal.nix ];
- services.memcached.enable = true;
- };
+ machine = {
+ imports = [ ../modules/profiles/minimal.nix ];
+ services.memcached.enable = true;
};
testScript = let
- testScript = pkgs.writeScript "testScript.py" ''
- #!${pkgs.python3.withPackages (p: [p.memcached])}/bin/python
-
+ testScript = pkgs.writers.writePython3 "test_memcache" {
+ libraries = with pkgs.python3Packages; [ memcached ];
+ } ''
import memcache
c = memcache.Client(['localhost:11211'])
c.set('key', 'value')
assert 'value' == c.get('key')
'';
in ''
- startAll;
- $machine->waitForUnit("memcached.service");
- $machine->waitForOpenPort("11211");
- $machine->succeed("${testScript}");
+ machine.start()
+ machine.wait_for_unit("memcached.service")
+ machine.wait_for_open_port(11211)
+ machine.succeed("${testScript}")
'';
})
diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix
index 6a6f602726d..b67b26a7934 100644
--- a/nixos/tests/ndppd.nix
+++ b/nixos/tests/ndppd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "ndppd";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ fpletz ];
@@ -52,9 +52,9 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
};
testScript = ''
- startAll;
- $server->waitForUnit("multi-user.target");
- $upstream->waitForUnit("multi-user.target");
- $upstream->waitUntilSucceeds("ping -c5 fd42::2");
+ start_all()
+ server.wait_for_unit("multi-user.target")
+ upstream.wait_for_unit("multi-user.target")
+ upstream.wait_until_succeeds("ping -c5 fd42::2")
'';
})
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
index bfb97ec3f23..75862feb202 100644
--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixos/tests/nextcloud/basic.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ...}: let
+import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "notproduction";
adminuser = "root";
in {
@@ -50,11 +50,15 @@ in {
diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
'';
in ''
- startAll();
- $nextcloud->waitForUnit("multi-user.target");
- $nextcloud->succeed("curl -sSf http://nextcloud/login");
- $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
- $client->waitForUnit("multi-user.target");
- $client->succeed("${withRcloneEnv} ${diffSharedFile}");
+ start_all()
+ nextcloud.wait_for_unit("multi-user.target")
+ nextcloud.succeed("curl -sSf http://nextcloud/login")
+ nextcloud.succeed(
+ "${withRcloneEnv} ${copySharedFile}"
+ )
+ client.wait_for_unit("multi-user.target")
+ client.succeed(
+ "${withRcloneEnv} ${diffSharedFile}"
+ )
'';
})
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
index aaf37ee4c81..b9ba5888187 100644
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ...}: let
+import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "hunter2";
adminuser = "root";
in {
@@ -85,13 +85,16 @@ in {
diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
'';
in ''
- startAll();
- $nextcloud->waitForUnit("multi-user.target");
- $nextcloud->succeed("${configureMemcached}");
- $nextcloud->succeed("curl -sSf http://nextcloud/login");
- $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
- $client->waitForUnit("multi-user.target");
- $client->succeed("${withRcloneEnv} ${diffSharedFile}");
-
+ start_all()
+ nextcloud.wait_for_unit("multi-user.target")
+ nextcloud.succeed("${configureMemcached}")
+ nextcloud.succeed("curl -sSf http://nextcloud/login")
+ nextcloud.succeed(
+ "${withRcloneEnv} ${copySharedFile}"
+ )
+ client.wait_for_unit("multi-user.target")
+ client.succeed(
+ "${withRcloneEnv} ${diffSharedFile}"
+ )
'';
})
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
index f655aba9d45..324853350af 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ...}: let
+import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "hunter2";
adminuser = "custom-admin-username";
in {
@@ -85,12 +85,16 @@ in {
diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
'';
in ''
- startAll();
- $nextcloud->waitForUnit("multi-user.target");
- $nextcloud->succeed("${configureRedis}");
- $nextcloud->succeed("curl -sSf http://nextcloud/login");
- $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
- $client->waitForUnit("multi-user.target");
- $client->succeed("${withRcloneEnv} ${diffSharedFile}");
+ start_all()
+ nextcloud.wait_for_unit("multi-user.target")
+ nextcloud.succeed("${configureRedis}")
+ nextcloud.succeed("curl -sSf http://nextcloud/login")
+ nextcloud.succeed(
+ "${withRcloneEnv} ${copySharedFile}"
+ )
+ client.wait_for_unit("multi-user.target")
+ client.succeed(
+ "${withRcloneEnv} ${diffSharedFile}"
+ )
'';
})
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 6ff19be1bb9..c0434f20754 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -28,7 +28,8 @@ import ./make-test-python.nix ({ pkgs, ...} :
with subtest("Test we can see usernames in elementary-greeter"):
machine.wait_for_text("${user.description}")
- machine.wait_for_text("${bob.description}")
+ # OCR was struggling with this one.
+ # machine.wait_for_text("${bob.description}")
machine.screenshot("elementary_greeter_lightdm")
with subtest("Login with elementary-greeter"):
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
index bb5932c3641..8e7f34d06e3 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixos/tests/rabbitmq.nix
@@ -1,21 +1,21 @@
# This test runs rabbitmq and checks if rabbitmq is up and running.
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "rabbitmq";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco offline ];
};
- nodes = {
- one = { ... }: {
- services.rabbitmq.enable = true;
- };
+ machine = {
+ services.rabbitmq.enable = true;
};
testScript = ''
- startAll;
+ machine.start()
- $one->waitForUnit("rabbitmq.service");
- $one->waitUntilSucceeds("su -s ${pkgs.stdenv.shell} rabbitmq -c \"rabbitmqctl status\"");
+ machine.wait_for_unit("rabbitmq.service")
+ machine.wait_until_succeeds(
+ 'su -s ${pkgs.stdenv.shell} rabbitmq -c "rabbitmqctl status"'
+ )
'';
})
diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix
index 196a04aca30..1518aaacc8a 100644
--- a/nixos/tests/xmpp/ejabberd.nix
+++ b/nixos/tests/xmpp/ejabberd.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ... }: {
+import ../make-test-python.nix ({ pkgs, ... }: {
name = "ejabberd";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ajs124 ];
@@ -248,13 +248,21 @@ import ../make-test.nix ({ pkgs, ... }: {
};
testScript = { nodes, ... }: ''
- $server->waitForUnit('ejabberd.service');
- $server->succeed('su ejabberd -s $(which ejabberdctl) status|grep started') =~ /ejabberd is running/;
- $server->succeed('su ejabberd -s $(which ejabberdctl) register azurediamond example.com hunter2');
- $server->succeed('su ejabberd -s $(which ejabberdctl) register cthon98 example.com nothunter2');
- $server->fail('su ejabberd -s $(which ejabberdctl) register asdf wrong.domain');
- $client->succeed('send-message');
- $server->succeed('su ejabberd -s $(which ejabberdctl) unregister cthon98 example.com');
- $server->succeed('su ejabberd -s $(which ejabberdctl) unregister azurediamond example.com');
+ ejabberd_prefix = "su ejabberd -s $(which ejabberdctl) "
+
+ server.wait_for_unit("ejabberd.service")
+
+ assert "status: started" in server.succeed(ejabberd_prefix + "status")
+
+ server.succeed(
+ ejabberd_prefix + "register azurediamond example.com hunter2",
+ ejabberd_prefix + "register cthon98 example.com nothunter2",
+ )
+ server.fail(ejabberd_prefix + "register asdf wrong.domain")
+ client.succeed("send-message")
+ server.succeed(
+ ejabberd_prefix + "unregister cthon98 example.com",
+ ejabberd_prefix + "unregister azurediamond example.com",
+ )
'';
})
diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
index 0d757e8cef3..3a7dea07d53 100644
--- a/nixos/tests/xss-lock.nix
+++ b/nixos/tests/xss-lock.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
with lib;
@@ -26,15 +26,19 @@ with lib;
};
testScript = ''
- startAll;
+ def perform_xsslock_test(machine, lockCmd):
+ machine.start()
+ machine.wait_for_x()
+ machine.wait_for_unit("xss-lock.service", "alice")
+ machine.fail(f"pgrep {lockCmd}")
+ machine.succeed("su -l alice -c 'xset dpms force standby'")
+ machine.wait_until_succeeds(f"pgrep {lockCmd}")
- ${concatStringsSep "\n" (mapAttrsToList (name: lockCmd: ''
- ${"$"+name}->start;
- ${"$"+name}->waitForX;
- ${"$"+name}->waitForUnit("xss-lock.service", "alice");
- ${"$"+name}->fail("pgrep ${lockCmd}");
- ${"$"+name}->succeed("su -l alice -c 'xset dpms force standby'");
- ${"$"+name}->waitUntilSucceeds("pgrep ${lockCmd}");
- '') { simple = "i3lock"; custom_lockcmd = "xlock"; })}
+
+ with subtest("simple"):
+ perform_xsslock_test(simple, "i3lock")
+
+ with subtest("custom_cmd"):
+ perform_xsslock_test(custom_lockcmd, "xlock")
'';
})
diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix
index e4ac2fbbcdc..b91554f5716 100644
--- a/pkgs/applications/audio/bsequencer/default.nix
+++ b/pkgs/applications/audio/bsequencer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSEQuencer";
- version = "0.4";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
- rev = "v${version}";
- sha256 = "0c3bm2z6z2bjjv1cy50383zr81h99rcb2frmxad0r7lhi27mjyqn";
+ rev = "${version}";
+ sha256 = "08xwz5v8wrar0rx7qdr9pkpjz2k9sw6bn5glhpn6sp6453fabf8q";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix
index 8fbac6daf46..3273d7de68c 100644
--- a/pkgs/applications/audio/bslizr/default.nix
+++ b/pkgs/applications/audio/bslizr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSlizr";
- version = "1.2.0";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = "${version}";
- sha256 = "1xqhpppfj47nzmyksbqgfvvi5j807g96hqla544w2f752zz4yi0s";
+ sha256 = "0q92ygz17iiriwzqylmaxd5ml2bhqy3n6c3f7g71n4hn9z3bl3s1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index 63ae9278c5d..136f6fc1427 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -11,17 +11,17 @@ let
++ lib.optional withPortAudio "portaudio_backend";
in
rustPlatform.buildRustPackage rec {
- pname = "ncspot-unstable";
- version = "2019-10-12";
+ pname = "ncspot";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
- rev = "4defded54646958268a20787917e4721ae96407d";
- sha256 = "1w3cmilwjzk3pfnq97qgz6hzxgjgi27dm8jq7maw87qyl3v17gyg";
+ rev = "v${version}";
+ sha256 = "0ldisr45w6ys1j62qv99ssqfg5q9dwrrzxh2maggyrx1zqdlsk6m";
};
- cargoSha256 = "1w1fk39pragfy2i2myw99mqf63w6fw4nr2kri8ily2iqc6g9xpgw";
+ cargoSha256 = "0k765hinqxfm30li1z66m1chsv69v6hiz109q2zlkxzg937qbnjh";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix
new file mode 100644
index 00000000000..146e13f34de
--- /dev/null
+++ b/pkgs/applications/audio/noise-repellent/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }:
+
+stdenv.mkDerivation rec {
+ pname = "noise-repellent";
+ version = "unstable-2018-12-29";
+
+ src = fetchFromGitHub {
+ owner = "lucianodato";
+ repo = pname;
+ rev = "9efdd0b41ec184a792087c87cbf5382f455e33ec";
+ sha256 = "0pn9cxapfvb5l62q86bchyfll1290vi0rhrzarb1jpc4ix7kz53c";
+ fetchSubmodules = true;
+ };
+
+ mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
+
+ nativeBuildInputs = [ meson ninja pkgconfig ];
+ buildInputs = [
+ fftwFloat lv2
+ ];
+
+ meta = with stdenv.lib; {
+ description = "An lv2 plugin for broadband noise reduction";
+ homepage = https://github.com/lucianodato/noise-repellent;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];
+ };
+}
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 0c806a89015..95dab9f18b9 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
- version = "0.20.5";
+ version = "0.20.6";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
- sha256 = "1adps3g99m7cxs58c48g2dgyihfv0v8d198klzcbbf4dq0s5v45c";
+ sha256 = "1a65pykdjkiic67fcs8cg2qrvzzrqifa93r1bzza3gdyfdvgv3ww";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix
index e5f149a0efe..02744e50647 100644
--- a/pkgs/applications/blockchains/dogecoin.nix
+++ b/pkgs/applications/blockchains/dogecoin.nix
@@ -7,13 +7,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.14.1";
+ version = "1.14.2";
src = fetchFromGitHub {
owner = "dogecoin";
repo = "dogecoin";
rev = "v${version}";
- sha256 = "0nmbi5gmms16baqs3fmdp2xm0yf8wawnyz80gcmca4j5ph2zka1v";
+ sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index fe7a5f991dd..cfdb8dbdc60 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -1,22 +1,39 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
+{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "go-ethereum";
- version = "1.9.7";
-
- goPackagePath = "github.com/ethereum/go-ethereum";
-
- # Fix for usb-related segmentation faults on darwin
- propagatedBuildInputs =
- stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+ version = "1.9.8";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "07110dj91wmkpwz7iy0lmxx3y9wjxjrhk3rhkfdil74cxm0wkkn2";
+ sha256 = "0v4hchy6h3282347ps11iv7klcr60bmghha78rnp0iqpx2k8pqb4";
};
+ modSha256 = "1l10p6a4qq77pfx7jmipkcg2qg6w3hg83q5a37yid3apily2scfa";
+
+ subPackages = [
+ "cmd/abigen"
+ "cmd/bootnode"
+ "cmd/checkpoint-admin"
+ "cmd/clef"
+ "cmd/devp2p"
+ "cmd/ethkey"
+ "cmd/evm"
+ "cmd/faucet"
+ "cmd/geth"
+ "cmd/p2psim"
+ "cmd/puppeth"
+ "cmd/rlpdump"
+ "cmd/utils"
+ "cmd/wnode"
+ ];
+
+ # Fix for usb-related segmentation faults on darwin
+ propagatedBuildInputs =
+ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+
meta = with stdenv.lib; {
homepage = "https://geth.ethereum.org/";
description = "Official golang implementation of the Ethereum protocol";
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 1852d72d326..f6114b3c213 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,37 +1,29 @@
-{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost
-, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
-, libsnark, withGui }:
+{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x
+, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent }:
let librustzcash = callPackage ./librustzcash {};
in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.0.13";
+ pname = "zcash";
+ version = "2.1.0-1";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
- sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz";
+ sha256 = "05bnn4lxrrcv1ha3jdfrgwg4ar576161n3j9d4gpc14ww3zgf9vz";
};
- # Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o"
- # fails with "fatal error: test/data/merkle_roots.json.h: No such file or directory"
- enableParallelBuilding = false;
-
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib
- protobuf libevent libsodium librustzcash libsnark ]
- ++ optionals stdenv.isLinux [ utillinux ]
- ++ optionals withGui [ qt4 qrencode ];
+ buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib
+ protobuf libevent libsodium librustzcash ]
+ ++ optionals stdenv.isLinux [ utillinux ];
- configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
- ] ++ optionals withGui [ "--with-gui=qt4" ];
+ configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ];
patchPhase = ''
- sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac
sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am
'';
@@ -42,7 +34,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Peer-to-peer, anonymous electronic cash system";
homepage = https://z.cash/;
- maintainers = with maintainers; [ rht ];
+ maintainers = with maintainers; [ rht tkerber ];
license = licenses.mit;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 634d4e8538a..31703f8fb2a 100644
--- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
@@ -2,28 +2,30 @@
rustPlatform.buildRustPackage rec {
pname = "librustzcash-unstable";
- version = "2017-03-17";
+ version = "2018-10-27";
src = fetchFromGitHub {
owner = "zcash";
repo = "librustzcash";
- rev = "91348647a86201a9482ad4ad68398152dc3d635e";
- sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c";
+ rev = "06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5";
+ sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv";
};
- cargoSha256 = "1xlq8vkzfyr5q8gxvzkwi8r1kxg4rg8l1ckdwfdxlkhnw0yscbra";
+ cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1";
installPhase = ''
mkdir -p $out/lib
cp target/release/librustzcash.a $out/lib/
mkdir -p $out/include
- cp include/librustzcash.h $out/include/
+ cp librustzcash/include/librustzcash.h $out/include/
'';
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Rust-language assets for Zcash";
homepage = https://github.com/zcash/librustzcash;
- maintainers = with maintainers; [ rht ];
+ maintainers = with maintainers; [ rht tkerber ];
license = with licenses; [ mit asl20 ];
platforms = platforms.unix;
};
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 1497fe19991..e2a7a9fe5c4 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
- version = "3.9.6";
+ version = "4.0.1";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
- sha256 = "0jnl461dg2s5panrw12707bv34g6wxc1pxc90awnja13yq0z6bfc";
+ sha256 = "13jwxwvwb9nnjxcnh9vfi22n4c00bhdypl84wrpdg5xw9325zhvy";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; [
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index 3d6d04db553..3df2ab4ab40 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pdfcpu";
- version = "0.2.5";
+ version = "0.3";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
- sha256 = "0fgdq8byb9pp9wiq3dm0vxw32kbspczqnk41agxpzjf303zmv75y";
+ sha256 = "03v4wc531dwmbjqgs3y3ncdn6g3xirv1w6h1mfgglb6sjll8jxp5";
};
modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs";
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 24f788ef468..4b4148bdc63 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -52,16 +52,16 @@ let
];
in buildRustPackage rec {
pname = "alacritty";
- version = "0.3.3";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "jwilm";
repo = pname;
rev = "v${version}";
- sha256 = "1h9zid7bi19qga3a8a2d4x3ma9wf1njmj74s4xnw7nzqqf3dh750";
+ sha256 = "0adaqdbma6gskb2g14yscrgr9gch5wf2g2clchplv72c2qr1k427";
};
- cargoSha256 = "1rxb5ljgvn881jkxm8772kf815mmp08ci7sqmn2x1jwdcrphhxr1";
+ cargoSha256 = "1r267g8f986nxh8ms5yhp50qy1yl8gly2jr78p738qqc6frlxlhv";
nativeBuildInputs = [
cmake
@@ -76,10 +76,6 @@ in buildRustPackage rec {
++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
outputs = [ "out" "terminfo" ];
- postPatch = ''
- substituteInPlace alacritty_terminal/src/config/mouse.rs \
- --replace xdg-open ${xdg_utils}/bin/xdg-open
- '';
postBuild = lib.optionalString stdenv.isDarwin "make app";
@@ -118,7 +114,7 @@ in buildRustPackage rec {
description = "GPU-accelerated terminal emulator";
homepage = https://github.com/jwilm/alacritty;
license = with licenses; [ asl20 ];
- maintainers = with maintainers; [ mic92 ];
+ maintainers = with maintainers; [ filalex77 mic92 ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
};
}
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index b1cd6a36e08..1a9789114dc 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.10.6";
+ version = "1.11.1";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0jbfp072rnb3pkqp10xds57bnlcn87vqjaz68nhpzkwvwhs3hr4w";
+ sha256 = "08py1f48ylw83712h8313rxz55igbszxcwr2yxkchpr4233avzph";
};
doCheck = false;
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 840f4c32e52..c2065d94353 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "hugo";
- version = "0.58.3";
+ version = "0.60.0";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
- sha256 = "00dhb6xilkwr9yhncpyc6alzqw77ch3vd85dc7lzsmhw1c80n0lc";
+ sha256 = "0g8rq79xp7c9p31xc0anfjyz7xp8n7qzv3vmvg2nmzl7nayg88aa";
};
- modSha256 = "0d6zc7hxb246zsvwsjz4ds6gdd2m95x6l3djh3mmciwfg9cd7prx";
+ modSha256 = "12h1ik1hgs4lkmk699wpa34rnycnm03qyr2vp1y5lywz1h93by20";
buildFlags = "-tags extended";
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 857cc6c7456..a3cbdabeacf 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "josm";
- version = "15390";
+ version = "15492";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "1wxncd3mjd4j14svgpmvrxc0nkzfkpn0xlci7m7wp9hfp1l81v9f";
+ sha256 = "0x7ndcrlvrvk2fd4pyn10npr3778khcwg6xzzh19vdw4glh5zfcl";
};
buildInputs = [ jdk11 makeWrapper ];
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index e87d09b50cc..cd04fdb2574 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.14.6";
+ version = "0.15.0";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51";
+ sha256 = "1gh8lcyqpkwvmjxwiq5d43sd43bg3c49fyy2x8drqdzj34gc49qg";
};
buildInputs = [
diff --git a/pkgs/applications/misc/slic3r/boost-compile-error.patch b/pkgs/applications/misc/slic3r/boost-compile-error.patch
new file mode 100644
index 00000000000..4dbdb85f743
--- /dev/null
+++ b/pkgs/applications/misc/slic3r/boost-compile-error.patch
@@ -0,0 +1,12 @@
+diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp
+index cc0b2983..0f39f5a3 100644
+--- a/xs/src/libslic3r/GCodeSender.hpp
++++ b/xs/src/libslic3r/GCodeSender.hpp
+@@ -9,6 +9,7 @@
+ #include
+ #include
+ #include
++#include
+
+ namespace Slic3r {
+
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index cf9e93b87b3..8dbd0cd5776 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
-, which, perlPackages, boost
+{ lib, stdenv, fetchgit, perl, makeWrapper
+, makeDesktopItem, which, perlPackages, boost
}:
stdenv.mkDerivation rec {
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp
'';
+ # note the boost-compile-error is fixed in
+ # https://github.com/slic3r/Slic3r/commit/90f108ae8e7a4315f82e317f2141733418d86a68
+ # this patch can be probably be removed in the next version after 1.3.0
+ patches = lib.optional (lib.versionAtLeast boost.version "1.56.0") ./boost-compile-error.patch;
+
buildPhase = ''
export SLIC3R_NO_AUTO=true
export LD=$CXX
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 816ae664f8e..857dcfaf69f 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
}:
mkDerivation rec {
- version = "0.10.2";
+ version = "0.10.3";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
- sha256 = "09iq1rr70wwy5xk0jmfnwzvnigq409hvs2viy1j0khn9jhvnk6z0";
+ sha256 = "12s1v65h4z051k4gi1b5f3z4hpbgqnhkjnz2xv5bdwhs24zxrrif";
};
buildInputs = [ qtbase cpp-utilities qtutilities ]
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 7b13d748fe0..8f2f5a2cf7e 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null;
let
pdfjs = let
- version = "2.2.228";
+ version = "2.3.200";
in
fetchzip rec {
name = "pdfjs-${version}";
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
- sha256 = "0yik4vfnz46j844jfw1gq5cshgzry42kpy2d5rr7fbn9fjf98bw6";
+ sha256 = "1fpxsw0hzahccyng08acvc7g0gk29j2x701p6w6fg1718mvcrm1q";
stripRoot = false;
};
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "1.8.1";
+ version = "1.8.2";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "0ckffbw2zlg0afz4rgyywzdprnqs74va5qj0xqlaqc14ziiypxnw";
+ sha256 = "0walddppjb61k3dyq22cngkaw6alzn75k5npvnawla2l153irw5s";
};
# Needs tox
diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix
index 02368990a01..5179cc9090d 100644
--- a/pkgs/applications/networking/cawbird/default.nix
+++ b/pkgs/applications/networking/cawbird/default.nix
@@ -1,6 +1,23 @@
-{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala
-, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
-, glib-networking, python3 }:
+{ stdenv
+, fetchFromGitHub
+, glib
+, gtk3
+, json-glib
+, sqlite
+, libsoup
+, gettext
+, gspell
+, vala
+, meson
+, ninja
+, pkgconfig
+, gnome3
+, gst_all_1
+, wrapGAppsHook
+, gobject-introspection
+, glib-networking
+, python3
+}:
stdenv.mkDerivation rec {
version = "1.0.3.1";
@@ -14,13 +31,34 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- meson ninja vala pkgconfig wrapGAppsHook python3
+ meson
+ ninja
+ vala
+ pkgconfig
+ wrapGAppsHook
+ python3
gobject-introspection # for setup hook
];
buildInputs = [
- glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
- ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
+ glib
+ gtk3
+ json-glib
+ sqlite
+ libsoup
+ gettext
+ gnome3.dconf
+ gspell
+ glib-networking
+ ] ++ (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-bad
+ (gst-plugins-good.override {
+ gtkSupport = true;
+ })
+ gst-libav
+ ]);
postPatch = ''
chmod +x data/meson_post_install.py # patchShebangs requires executable file
@@ -30,7 +68,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Native GTK Twitter client for the Linux desktop";
longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
- homepage = https://ibboard.co.uk/cawbird/;
+ homepage = "https://ibboard.co.uk/cawbird/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ];
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 2893f21357b..a368473b0c8 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.54.0.85";
+ version = "8.54.0.91";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -63,7 +63,7 @@ let
"https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
- sha256 = "09k260g9qy4n8vy6wr2jb5mm27cvqyapmv8vj4ff2j72f3ad31vm";
+ sha256 = "1hnha8sqk78zxkjqg62npmg6dymi5fnyj2bmxlwpgi61v3pyxj94";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index ff659959876..e7c9d50cb9b 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "balsa";
- version = "2.5.7";
+ version = "2.5.9";
src = fetchurl {
url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2";
- sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx";
+ sha256 = "19gs1qfvbk9qx4rjmgrmvid00kl9k153zjjx8zjii2lz09w7g19i";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 9f05020f2c3..587cc40aada 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imapfilter";
- version = "2.6.14";
+ version = "2.6.16";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
- sha256 = "09aq9gw1vz0zl6k4fb4zdm6cpjhddsl13asfjx3qy21pbw0azmj6";
+ sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck";
};
makeFlagsArray = "PREFIX=$(out)";
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index a463a2c5f3a..bf2d0396f69 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -124,7 +124,7 @@ self = stdenv.mkDerivation {
setupHook = writeText "setupHook.sh" ''
addCoqPath () {
if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
- export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
+ export COQPATH="''${COQPATH-}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
fi
}
diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh
index fc2b697d8a8..b26cf9b779f 100644
--- a/pkgs/applications/science/misc/root/setup-hook.sh
+++ b/pkgs/applications/science/misc/root/setup-hook.sh
@@ -1,9 +1,13 @@
thisroot () {
# Workaround thisroot.sh dependency on man
- if [ -z "${MANPATH}" ]; then
+ if [ -z "${MANPATH-}" ]; then
MANPATH=:
fi
+ local oldOpts="-u"
+ shopt -qo nounset || oldOpts="+u"
+ set +u
source @out@/bin/thisroot.sh
+ set "$oldOpts"
}
postHooks+=(thisroot)
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 68e10ed4e3e..d57ffd75d7f 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -129,6 +129,8 @@ let
git-subrepo = callPackage ./git-subrepo { };
+ git-subtrac = callPackage ./git-subtrac { };
+
git-sync = callPackage ./git-sync { };
git-test = callPackage ./git-test { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index aafaa6659d3..32d3465016c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "2.12.1";
+ version = "2.12.2";
src = fetchPypi {
inherit pname version;
- sha256 = "114kq396zq45jlibn1lp0nk4lmanj4w1bcn48gi7xzdm0y1nkzfq";
+ sha256 = "0kmwm9rwngxm2qdlv6nvxyhwpfa0i95kbrmasrj1qqdz7rmyyzmi";
};
nativeBuildInputs = [ installShellFiles pbr ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
new file mode 100644
index 00000000000..07c63ea0119
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "git-subtrac";
+ version = "0.01";
+
+ src = fetchFromGitHub {
+ owner = "apenwarr";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1w6gd0x1902lzpqr74gsdrnxq36f6v14bv8h0vhlrfhbwbsih7n6";
+ };
+
+ modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs";
+
+ meta = with lib; {
+ description = "Keep the content for your git submodules all in one place: the parent repo";
+ homepage = "https://github.com/apenwarr/git-subtrac";
+ license = licenses.asl20;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 722bbc11b30..b2a9c2a28fc 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
{
- "version": "12.4.3",
- "repo_hash": "1qsd3qxvvb3rbyrlyrqvrday4c9s2krgics99ch7v74hprj3xfq9",
+ "version": "12.5.2",
+ "repo_hash": "18mviak37rkpj92m0hzh79rjbfsk8p91r5zzjp7y3y4qjnsf2a8p",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v12.4.3-ee",
+ "rev": "v12.5.2-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "1.67.0",
- "GITLAB_PAGES_VERSION": "1.11.0",
+ "GITALY_SERVER_VERSION": "1.72.1",
+ "GITLAB_PAGES_VERSION": "1.12.0",
"GITLAB_SHELL_VERSION": "10.2.0",
- "GITLAB_WORKHORSE_VERSION": "8.14.0"
+ "GITLAB_WORKHORSE_VERSION": "8.14.1"
}
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 545894cc1e5..60035990ed0 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -64,6 +64,11 @@ let
# Fixup "resolved"-entries in yarn.lock to match our offline cache
${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
+ # fixup_yarn_lock currently doesn't correctly fix the dagre-d3
+ # url, so we have to do it manually
+ ${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \
+ '"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock
+
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules/
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 9478dc9a84b..841f6bfdefc 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -4,13 +4,13 @@ source 'https://rubygems.org'
gem 'bundler', '>= 1.17.3'
gem 'rugged', '~> 0.28'
-gem 'github-linguist', '~> 6.1', require: 'linguist'
+gem 'github-linguist', '~> 7.5', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.0'
gem 'activesupport', '~> 5.2.3'
-gem 'rdoc', '~> 4.2'
+gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.24.0'
gem 'sentry-raven', '~> 2.9.0', require: false
gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false
@@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.5.0'
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 8.9.0'
-gem 'google-protobuf', '~> 3.7.1'
+gem 'google-protobuf', '~> 3.8.0'
group :development, :test do
gem 'rubocop', '~> 0.69', require: false
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index cb292af8cc3..90c4e1bccea 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -49,10 +49,10 @@ GEM
ffi (1.11.1)
gemojione (3.3.0)
json
- github-linguist (6.4.1)
+ github-linguist (7.5.1)
charlock_holmes (~> 0.7.6)
escape_utils (~> 1.2.0)
- mime-types (>= 1.19)
+ mini_mime (~> 1.0)
rugged (>= 0.25.1)
github-markup (1.7.0)
gitlab-gollum-lib (4.2.7.7)
@@ -81,12 +81,12 @@ GEM
gitlab-markup (1.7.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
- google-protobuf (3.7.1)
+ google-protobuf (3.8.0)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
- grpc (1.19.0)
- google-protobuf (~> 3.1)
- googleapis-common-protos-types (~> 1.0.0)
+ grpc (1.24.0)
+ google-protobuf (~> 3.8)
+ googleapis-common-protos-types (~> 1.0)
hashdiff (0.3.9)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
@@ -99,7 +99,7 @@ GEM
licensee (8.9.2)
rugged (~> 0.24)
listen (0.5.3)
- loofah (2.2.3)
+ loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
@@ -108,12 +108,13 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
+ mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.3.0)
multi_json (1.13.1)
multipart-post (2.0.0)
- nokogiri (1.10.4)
+ nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
@@ -138,14 +139,14 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
- rails-html-sanitizer (1.2.0)
- loofah (~> 2.2, >= 2.2.2)
+ rails-html-sanitizer (1.3.0)
+ loofah (~> 2.3)
rainbow (3.0.0)
rbtrace (0.4.11)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
- rdoc (4.3.0)
+ rdoc (6.2.0)
redis (4.1.2)
rouge (3.11.0)
rspec (3.8.0)
@@ -217,18 +218,18 @@ DEPENDENCIES
bundler (>= 1.17.3)
factory_bot
faraday (~> 0.12)
- github-linguist (~> 6.1)
+ github-linguist (~> 7.5)
gitlab-gollum-lib (~> 4.2.7.7)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.5.0)
gitlab-markup (~> 1.7.0)
- google-protobuf (~> 3.7.1)
- grpc (~> 1.19.0)
+ google-protobuf (~> 3.8.0)
+ grpc (~> 1.24.0)
licensee (~> 8.9.0)
listen (~> 0.5.0)
pry (~> 0.12.2)
rbtrace
- rdoc (~> 4.2)
+ rdoc (~> 6.0)
rspec
rspec-parameterized
rubocop (~> 0.69)
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index dd17618dc74..2c764162230 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -17,14 +17,14 @@ let
};
};
in buildGoPackage rec {
- version = "1.67.0";
+ version = "1.72.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "1mj2l15hnxwqmyc8xn79d6qpmpqbqw2ishalr8qvn83nzdsbk8l3";
+ sha256 = "0gnhw7p8fgy3w15828qjgkkxcd4dg7gf1hpanc3xqawb8jqpfc91";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 34c30f71054..5f3a324a802 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -18,6 +18,42 @@
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
+ {
+ goPackagePath = "github.com/Joker/hpp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Joker/hpp";
+ rev = "6893e659854a";
+ sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5";
+ };
+ }
+ {
+ goPackagePath = "github.com/Joker/jade";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Joker/jade";
+ rev = "v1.0.0";
+ sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf";
+ };
+ }
+ {
+ goPackagePath = "github.com/Shopify/goreferrer";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Shopify/goreferrer";
+ rev = "ec9c9a553398";
+ sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn";
+ };
+ }
+ {
+ goPackagePath = "github.com/ajg/form";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ajg/form";
+ rev = "v1.5.1";
+ sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a";
+ };
+ }
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
@@ -36,6 +72,15 @@
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
+ {
+ goPackagePath = "github.com/aymerick/raymond";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aymerick/raymond";
+ rev = "v2.0.2";
+ sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3";
+ };
+ }
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
@@ -81,6 +126,15 @@
sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
};
}
+ {
+ goPackagePath = "github.com/codegangsta/inject";
+ fetch = {
+ type = "git";
+ url = "https://github.com/codegangsta/inject";
+ rev = "33e0aa1cb7c0";
+ sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj";
+ };
+ }
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
@@ -90,6 +144,42 @@
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
+ {
+ goPackagePath = "github.com/dgrijalva/jwt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgrijalva/jwt-go";
+ rev = "v3.2.0";
+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+ };
+ }
+ {
+ goPackagePath = "github.com/eknkc/amber";
+ fetch = {
+ type = "git";
+ url = "https://github.com/eknkc/amber";
+ rev = "cdade1c07385";
+ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/structs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/structs";
+ rev = "v1.1.0";
+ sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q";
+ };
+ }
+ {
+ goPackagePath = "github.com/flosch/pongo2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/flosch/pongo2";
+ rev = "bbf5a6c351f4";
+ sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq";
+ };
+ }
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
@@ -99,15 +189,69 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
+ {
+ goPackagePath = "github.com/gavv/monotime";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gavv/monotime";
+ rev = "30dba4353424";
+ sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g";
+ };
+ }
{
goPackagePath = "github.com/getsentry/raven-go";
fetch = {
type = "git";
url = "https://github.com/getsentry/raven-go";
- rev = "v0.1.2";
+ rev = "v0.1.0";
sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
};
}
+ {
+ goPackagePath = "github.com/getsentry/sentry-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getsentry/sentry-go";
+ rev = "v0.3.0";
+ sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1";
+ };
+ }
+ {
+ goPackagePath = "github.com/gin-contrib/sse";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gin-contrib/sse";
+ rev = "5545eab6dad3";
+ sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5";
+ };
+ }
+ {
+ goPackagePath = "github.com/gin-gonic/gin";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gin-gonic/gin";
+ rev = "v1.4.0";
+ sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-check/check";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-check/check";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-errors/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-errors/errors";
+ rev = "v1.0.1";
+ sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
+ };
+ }
{
goPackagePath = "github.com/go-kit/kit";
fetch = {
@@ -126,6 +270,15 @@
sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
};
}
+ {
+ goPackagePath = "github.com/go-martini/martini";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-martini/martini";
+ rev = "22fa46961aab";
+ sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh";
+ };
+ }
{
goPackagePath = "github.com/go-stack/stack";
fetch = {
@@ -153,15 +306,6 @@
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
- {
- goPackagePath = "github.com/golang/lint";
- fetch = {
- type = "git";
- url = "https://github.com/golang/lint";
- rev = "06c8688daad7";
- sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
- };
- }
{
goPackagePath = "github.com/golang/mock";
fetch = {
@@ -176,8 +320,26 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "v1.3.1";
- sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+ rev = "v1.3.2";
+ sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.2.0";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-querystring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-querystring";
+ rev = "v1.0.0";
+ sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
};
}
{
@@ -189,6 +351,24 @@
sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
};
}
+ {
+ goPackagePath = "github.com/gopherjs/gopherjs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/gopherjs";
+ rev = "0766667cb4d1";
+ sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/schema";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/schema";
+ rev = "v1.1.0";
+ sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9";
+ };
+ }
{
goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
fetch = {
@@ -216,6 +396,51 @@
sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
};
}
+ {
+ goPackagePath = "github.com/imkira/go-interpol";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imkira/go-interpol";
+ rev = "v1.1.0";
+ sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph";
+ };
+ }
+ {
+ goPackagePath = "github.com/iris-contrib/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iris-contrib/blackfriday";
+ rev = "v2.0.0";
+ sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im";
+ };
+ }
+ {
+ goPackagePath = "github.com/iris-contrib/formBinder";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iris-contrib/formBinder";
+ rev = "v5.0.0";
+ sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg";
+ };
+ }
+ {
+ goPackagePath = "github.com/iris-contrib/go.uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iris-contrib/go.uuid";
+ rev = "v2.0.0";
+ sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35";
+ };
+ }
+ {
+ goPackagePath = "github.com/iris-contrib/httpexpect";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iris-contrib/httpexpect";
+ rev = "ebe99fcebbce";
+ sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c";
+ };
+ }
{
goPackagePath = "github.com/json-iterator/go";
fetch = {
@@ -225,6 +450,42 @@
sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
};
}
+ {
+ goPackagePath = "github.com/jtolds/gls";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jtolds/gls";
+ rev = "v4.20.0";
+ sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
+ };
+ }
+ {
+ goPackagePath = "github.com/juju/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/juju/errors";
+ rev = "089d3ea4e4d5";
+ sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r";
+ };
+ }
+ {
+ goPackagePath = "github.com/juju/loggo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/juju/loggo";
+ rev = "584905176618";
+ sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4";
+ };
+ }
+ {
+ goPackagePath = "github.com/juju/testing";
+ fetch = {
+ type = "git";
+ url = "https://github.com/juju/testing";
+ rev = "472a3e8b2073";
+ sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4";
+ };
+ }
{
goPackagePath = "github.com/julienschmidt/httprouter";
fetch = {
@@ -234,6 +495,42 @@
sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
};
}
+ {
+ goPackagePath = "github.com/k0kubun/colorstring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/k0kubun/colorstring";
+ rev = "9440f1994b88";
+ sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj";
+ };
+ }
+ {
+ goPackagePath = "github.com/kataras/golog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kataras/golog";
+ rev = "99c81de45f40";
+ sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p";
+ };
+ }
+ {
+ goPackagePath = "github.com/kataras/iris";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kataras/iris";
+ rev = "v11.1.1";
+ sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg";
+ };
+ }
+ {
+ goPackagePath = "github.com/kataras/pio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kataras/pio";
+ rev = "ea782b38602d";
+ sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj";
+ };
+ }
{
goPackagePath = "github.com/kelseyhightower/envconfig";
fetch = {
@@ -244,12 +541,21 @@
};
}
{
- goPackagePath = "github.com/kisielk/gotool";
+ goPackagePath = "github.com/klauspost/compress";
fetch = {
type = "git";
- url = "https://github.com/kisielk/gotool";
- rev = "v1.0.0";
- sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ url = "https://github.com/klauspost/compress";
+ rev = "v1.4.0";
+ sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
+ };
+ }
+ {
+ goPackagePath = "github.com/klauspost/cpuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/klauspost/cpuid";
+ rev = "e7e905edc00e";
+ sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf";
};
}
{
@@ -270,6 +576,51 @@
sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
};
}
+ {
+ goPackagePath = "github.com/kr/pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.1";
+ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+ };
+ }
+ {
+ goPackagePath = "github.com/labstack/echo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/labstack/echo";
+ rev = "v4.1.10";
+ sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h";
+ };
+ }
+ {
+ goPackagePath = "github.com/labstack/gommon";
+ fetch = {
+ type = "git";
+ url = "https://github.com/labstack/gommon";
+ rev = "v0.3.0";
+ sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
+ };
+ }
{
goPackagePath = "github.com/libgit2/git2go";
fetch = {
@@ -288,6 +639,33 @@
sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
};
}
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "v0.1.2";
+ sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "v0.0.9";
+ sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/goveralls";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/goveralls";
+ rev = "v0.0.2";
+ sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp";
+ };
+ }
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
@@ -297,6 +675,15 @@
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
+ {
+ goPackagePath = "github.com/microcosm-cc/bluemonday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/microcosm-cc/bluemonday";
+ rev = "v1.0.2";
+ sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2";
+ };
+ }
{
goPackagePath = "github.com/modern-go/concurrent";
fetch = {
@@ -315,6 +702,15 @@
sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
};
}
+ {
+ goPackagePath = "github.com/moul/http2curl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/moul/http2curl";
+ rev = "v1.0.0";
+ sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0";
+ };
+ }
{
goPackagePath = "github.com/mwitkow/go-conntrack";
fetch = {
@@ -329,8 +725,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
- rev = "v1.7.0";
- sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+ rev = "v1.10.1";
+ sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d";
};
}
{
@@ -338,8 +734,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
- rev = "v1.4.3";
- sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+ rev = "v1.7.0";
+ sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y";
};
}
{
@@ -360,13 +756,22 @@
sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
};
}
+ {
+ goPackagePath = "github.com/pingcap/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pingcap/errors";
+ rev = "v0.11.1";
+ sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp";
+ };
+ }
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
- rev = "v0.8.0";
- sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ rev = "v0.8.1";
+ sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
@@ -414,6 +819,33 @@
sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
};
}
+ {
+ goPackagePath = "github.com/ryanuber/columnize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ryanuber/columnize";
+ rev = "v2.1.0";
+ sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
+ };
+ }
+ {
+ goPackagePath = "github.com/sergi/go-diff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sergi/go-diff";
+ rev = "v1.0.0";
+ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/sanitized_anchor_name";
+ rev = "v1.0.0";
+ sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
+ };
+ }
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
@@ -423,6 +855,24 @@
sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
};
}
+ {
+ goPackagePath = "github.com/smartystreets/assertions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/smartystreets/assertions";
+ rev = "b2de0cb4f26d";
+ sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
+ };
+ }
+ {
+ goPackagePath = "github.com/smartystreets/goconvey";
+ fetch = {
+ type = "git";
+ url = "https://github.com/smartystreets/goconvey";
+ rev = "505e41936337";
+ sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m";
+ };
+ }
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
@@ -437,8 +887,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "v1.3.0";
- sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ rev = "v1.4.0";
+ sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
};
}
{
@@ -477,6 +927,123 @@
sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
};
}
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ugorji/go";
+ rev = "v1.1.4";
+ sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/negroni";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/negroni";
+ rev = "v1.0.0";
+ sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp";
+ };
+ }
+ {
+ goPackagePath = "github.com/valyala/bytebufferpool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/valyala/bytebufferpool";
+ rev = "v1.0.0";
+ sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+ };
+ }
+ {
+ goPackagePath = "github.com/valyala/fasthttp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/valyala/fasthttp";
+ rev = "v1.4.0";
+ sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956";
+ };
+ }
+ {
+ goPackagePath = "github.com/valyala/fasttemplate";
+ fetch = {
+ type = "git";
+ url = "https://github.com/valyala/fasttemplate";
+ rev = "v1.0.1";
+ sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq";
+ };
+ }
+ {
+ goPackagePath = "github.com/valyala/tcplisten";
+ fetch = {
+ type = "git";
+ url = "https://github.com/valyala/tcplisten";
+ rev = "ceec8f93295a";
+ sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf";
+ };
+ }
+ {
+ goPackagePath = "github.com/xeipuuv/gojsonpointer";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xeipuuv/gojsonpointer";
+ rev = "df4f5c81cb3b";
+ sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn";
+ };
+ }
+ {
+ goPackagePath = "github.com/xeipuuv/gojsonreference";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xeipuuv/gojsonreference";
+ rev = "bd5ef7bd5415";
+ sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
+ };
+ }
+ {
+ goPackagePath = "github.com/xeipuuv/gojsonschema";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xeipuuv/gojsonschema";
+ rev = "v1.1.0";
+ sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg";
+ };
+ }
+ {
+ goPackagePath = "github.com/yalp/jsonpath";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yalp/jsonpath";
+ rev = "5cc68e5049a0";
+ sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b";
+ };
+ }
+ {
+ goPackagePath = "github.com/yudai/gojsondiff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yudai/gojsondiff";
+ rev = "v1.0.0";
+ sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2";
+ };
+ }
+ {
+ goPackagePath = "github.com/yudai/golcs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yudai/golcs";
+ rev = "ecda9a501e82";
+ sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq";
+ };
+ }
+ {
+ goPackagePath = "github.com/yudai/pp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yudai/pp";
+ rev = "v2.0.1";
+ sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk";
+ };
+ }
{
goPackagePath = "gitlab.com/gitlab-org/labkit";
fetch = {
@@ -500,8 +1067,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "20be4c3c3ed5";
- sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb";
+ rev = "4def268fd1a4";
+ sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
};
}
{
@@ -509,8 +1076,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/lint";
- rev = "06c8688daad7";
- sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+ rev = "d0100b6bd8b3";
+ sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7";
};
}
{
@@ -536,8 +1103,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
- rev = "37e7f081c4d4";
- sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
+ rev = "112230192c58";
+ sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
};
}
{
@@ -545,8 +1112,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "953cdadca894";
- sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1";
+ rev = "fde4db37ae7a";
+ sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3";
};
}
{
@@ -563,8 +1130,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
- rev = "6cd1fcedba52";
- sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d";
+ rev = "2c0ae7006135";
+ sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk";
};
}
{
@@ -590,8 +1157,8 @@
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
- rev = "v1.16.0";
- sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg";
+ rev = "v1.24.0";
+ sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6";
};
}
{
@@ -630,6 +1197,33 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
+ {
+ goPackagePath = "gopkg.in/go-playground/assert.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/go-playground/assert.v1";
+ rev = "v1.2.1";
+ sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/go-playground/validator.v8";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/go-playground/validator.v8";
+ rev = "v8.18.2";
+ sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/mgo.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/mgo.v2";
+ rev = "9856a29383ce";
+ sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
+ };
+ }
{
goPackagePath = "gopkg.in/tomb.v1";
fetch = {
@@ -653,8 +1247,8 @@
fetch = {
type = "git";
url = "https://github.com/dominikh/go-tools";
- rev = "88497007e858";
- sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc";
+ rev = "ea95bdfd59fc";
+ sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic";
};
}
]
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index a5140972ef0..47e1c3b3568 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -224,15 +224,15 @@
version = "3.3.0";
};
github-linguist = {
- dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
+ dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf";
+ sha256 = "092bq7bjfj2yvss2ig6jb71j0h04cigq79xxfis37j315iixl12j";
type = "gem";
};
- version = "6.4.1";
+ version = "7.5.1";
};
github-markup = {
source = {
@@ -308,10 +308,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
+ sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.0";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@@ -330,10 +330,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs";
+ sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf";
type = "gem";
};
- version = "1.19.0";
+ version = "1.24.0";
};
hashdiff = {
groups = ["default" "development" "test"];
@@ -418,10 +418,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
+ sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x";
type = "gem";
};
- version = "2.2.3";
+ version = "2.3.0";
};
memoizable = {
dependencies = ["thread_safe"];
@@ -459,6 +459,16 @@
};
version = "3.2019.0331";
};
+ mini_mime = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
@@ -507,10 +517,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+ sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
type = "gem";
};
- version = "1.10.4";
+ version = "1.10.5";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -640,10 +650,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
+ sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
type = "gem";
};
- version = "1.2.0";
+ version = "1.3.0";
};
rainbow = {
source = {
@@ -663,12 +673,14 @@
version = "0.4.11";
};
rdoc = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c";
+ sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9";
type = "gem";
};
- version = "4.3.0";
+ version = "6.2.0";
};
redis = {
groups = ["default"];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
index d5ea22f960b..5b5d0b99bcf 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
@@ -162,15 +162,6 @@
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
- {
- goPackagePath = "github.com/golang/lint";
- fetch = {
- type = "git";
- url = "https://github.com/golang/lint";
- rev = "06c8688daad7";
- sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
- };
- }
{
goPackagePath = "github.com/golang/mock";
fetch = {
@@ -261,15 +252,6 @@
sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
};
}
- {
- goPackagePath = "github.com/kisielk/gotool";
- fetch = {
- type = "git";
- url = "https://github.com/kisielk/gotool";
- rev = "v1.0.0";
- sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
- };
- }
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index aa8cf7c164c..4f3322f3d0f 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
buildGoPackage rec {
pname = "gitlab-workhorse";
- version = "8.14.0";
+ version = "8.14.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "1cqx75h4x4chjvp72kzbln8qkm5p7p2w7x8bdd99g38kf21wxxaq";
+ sha256 = "19flb9b9l9214ykwgjphcqrinncnfvhis7nrvcr4ns6rlpxnc9dl";
};
goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 920f778c053..d27bc276088 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -8,12 +8,12 @@ gem 'bootsnap', '~> 1.4'
gem 'nakayoshi_fork', '~> 0.0.4'
# Responders respond_to and respond_with
-gem 'responders', '~> 2.0'
+gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
# Default values for AR models
-gem 'default_value_for', '~> 3.2.0'
+gem 'default_value_for', '~> 3.3.0'
# Supported DBs
gem 'pg', '~> 1.1'
@@ -42,7 +42,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'omniauth_openid_connect', '~> 0.3.1'
+gem 'omniauth_openid_connect', '~> 0.3.3'
gem "omniauth-ultraauth", '~> 0.0.2'
gem 'omniauth-salesforce', '~> 1.0.5'
gem 'rack-oauth2', '~> 1.9.3'
@@ -64,7 +64,7 @@ gem 'u2f', '~> 0.2.1'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 1.2.2', require: 'zip'
+gem 'rubyzip', '~> 1.3.0', require: 'zip'
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0.2'
@@ -72,7 +72,7 @@ gem 'acme-client', '~> 2.0.2'
gem 'browser', '~> 2.5'
# GPG
-gem 'gpgme', '~> 2.0.18'
+gem 'gpgme', '~> 2.0.19'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
@@ -136,7 +136,7 @@ gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.2.0'
+gem 'deckar01-task_list', '2.2.1'
gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
@@ -151,7 +151,7 @@ gem 'asciidoctor-plantuml', '0.0.9'
gem 'rouge', '~> 3.11.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.4'
+gem 'nokogiri', '~> 1.10.5'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -159,6 +159,7 @@ gem 'icalendar'
# Diffs
gem 'diffy', '~> 3.1.0'
+gem 'diff_match_patch', '~> 0.1.0'
# Application server
gem 'rack', '~> 2.0.7'
@@ -175,7 +176,7 @@ group :puma do
end
# State machine
-gem 'state_machines-activerecord', '~> 0.5.1'
+gem 'state_machines-activerecord', '~> 0.6.0'
# Issue tags
gem 'acts-as-taggable-on', '~> 6.0'
@@ -259,9 +260,6 @@ gem 'loofah', '~> 2.2'
# Working with license
gem 'licensee', '~> 8.9'
-# Protect against bruteforcing
-gem 'rack-attack', '~> 4.4.1'
-
# Ace editor
gem 'ace-rails-ap', '~> 4.1.0'
@@ -293,10 +291,13 @@ gem 'base32', '~> 0.3.0'
gem "gitlab-license", "~> 1.0"
+# Protect against bruteforcing
+gem 'rack-attack', '~> 6.2.0'
+
# Sentry integration
gem 'sentry-raven', '~> 2.9'
-gem 'premailer-rails', '~> 1.9.7'
+gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.5'
@@ -331,7 +332,6 @@ group :metrics do
end
group :development do
- gem 'foreman', '~> 0.84.0'
gem 'brakeman', '~> 4.2', require: false
gem 'danger', '~> 6.0', require: false
@@ -388,7 +388,6 @@ group :development, :test do
gem 'benchmark-ips', '~> 2.3.0', require: false
- gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.17'
gem 'stackprof', '~> 0.2.10', require: false
@@ -398,6 +397,11 @@ group :development, :test do
gem 'timecop', '~> 0.8.0'
end
+# Gems required in omnibus-gitlab pipeline
+group :development, :test, :omnibus do
+ gem 'license_finder', '~> 5.4', require: false
+end
+
group :test do
gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'
@@ -407,6 +411,7 @@ group :test do
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.10.0'
gem 'rspec_junit_formatter'
+ gem 'guard-rspec'
end
gem 'octokit', '~> 4.9'
@@ -446,18 +451,18 @@ group :ed25519 do
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.65.0'
+gem 'gitaly', '~> 1.70.0'
-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.24.0'
-gem 'google-protobuf', '~> 3.7.1'
+gem 'google-protobuf', '~> 3.8.0'
gem 'toml-rb', '~> 1.0.0', require: false
# Feature toggles
-gem 'flipper', '~> 0.13.0'
-gem 'flipper-active_record', '~> 0.13.0'
-gem 'flipper-active_support_cache_store', '~> 0.13.0'
+gem 'flipper', '~> 0.17.1'
+gem 'flipper-active_record', '~> 0.17.1'
+gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5'
# Structured logging
@@ -469,3 +474,5 @@ gem 'gitlab-net-dns', '~> 0.9.1'
# Countries list
gem 'countries', '~> 3.0'
+
+gem 'retriable', '~> 3.1.2'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 18160932c56..15465cd6b03 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -50,8 +50,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- acts-as-taggable-on (6.0.0)
- activerecord (~> 5.0)
+ acts-as-taggable-on (6.5.0)
+ activerecord (>= 5.0, < 6.1)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
@@ -80,14 +80,16 @@ GEM
encryptor (~> 3.0.0)
attr_required (1.0.1)
awesome_print (1.8.0)
- aws-sdk (2.9.32)
- aws-sdk-resources (= 2.9.32)
- aws-sdk-core (2.9.32)
+ aws-eventstream (1.0.3)
+ aws-sdk (2.11.374)
+ aws-sdk-resources (= 2.11.374)
+ aws-sdk-core (2.11.374)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.9.32)
- aws-sdk-core (= 2.9.32)
- aws-sigv4 (1.0.0)
+ aws-sdk-resources (2.11.374)
+ aws-sdk-core (= 2.11.374)
+ aws-sigv4 (1.1.0)
+ aws-eventstream (~> 1.0, >= 1.0.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
@@ -171,9 +173,9 @@ GEM
unicode_utils (~> 1.4)
crack (0.4.3)
safe_yaml (~> 1.0.0)
- crass (1.0.4)
+ crass (1.0.5)
creole (0.5.0)
- css_parser (1.5.0)
+ css_parser (1.7.0)
addressable
daemons (1.2.6)
danger (6.0.9)
@@ -192,12 +194,12 @@ GEM
database_cleaner (1.7.0)
debug_inspector (0.0.3)
debugger-ruby_core_source (1.3.8)
- deckar01-task_list (2.2.0)
+ deckar01-task_list (2.2.1)
html-pipeline
declarative (0.0.10)
declarative-option (0.1.0)
- default_value_for (3.2.0)
- activerecord (>= 3.2.0, < 6.0)
+ default_value_for (3.3.0)
+ activerecord (>= 3.2.0, < 6.1)
derailed_benchmarks (1.3.5)
benchmark-ips (~> 2)
get_process_mem (~> 0)
@@ -222,6 +224,7 @@ GEM
railties
rotp (~> 2.0)
diff-lcs (1.3)
+ diff_match_patch (0.1.0)
diffy (3.1.0)
discordrb-webhooks-blackst0ne (3.3.0)
rest-client (~> 2.0)
@@ -285,13 +288,13 @@ GEM
fast_gettext (1.6.0)
ffaker (2.10.0)
ffi (1.11.1)
- flipper (0.13.0)
- flipper-active_record (0.13.0)
- activerecord (>= 3.2, < 6)
- flipper (~> 0.13.0)
- flipper-active_support_cache_store (0.13.0)
- activesupport (>= 3.2, < 6)
- flipper (~> 0.13.0)
+ flipper (0.17.1)
+ flipper-active_record (0.17.1)
+ activerecord (>= 4.2, < 7)
+ flipper (~> 0.17.1)
+ flipper-active_support_cache_store (0.17.1)
+ activesupport (>= 4.2, < 7)
+ flipper (~> 0.17.1)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
@@ -332,10 +335,8 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
- font-awesome-rails (4.7.0.4)
- railties (>= 3.2, < 6.0)
- foreman (0.84.0)
- thor (~> 0.19.1)
+ font-awesome-rails (4.7.0.5)
+ railties (>= 3.2, < 6.1)
formatador (0.2.5)
fugit (1.2.1)
et-orbi (~> 1.1, >= 1.1.8)
@@ -358,12 +359,12 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
git (1.5.0)
- gitaly (1.65.0)
+ gitaly (1.70.0)
grpc (~> 1.0)
github-markup (1.7.0)
- gitlab-labkit (0.5.2)
- actionpack (~> 5)
- activesupport (~> 5)
+ gitlab-labkit (0.7.0)
+ actionpack (>= 5.0.0, < 6.1.0)
+ activesupport (>= 5.0.0, < 6.1.0)
grpc (~> 1.19)
jaeger-client (~> 0.10)
opentracing (~> 0.4)
@@ -400,7 +401,7 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.7.1)
+ google-protobuf (3.8.0)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.6.6)
@@ -410,7 +411,7 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
- gpgme (2.0.18)
+ gpgme (2.0.19)
mini_portile2 (~> 2.3)
grape (1.1.0)
activesupport
@@ -440,11 +441,25 @@ GEM
graphql (~> 1.6)
html-pipeline (~> 2.8)
sass (~> 3.4)
- grpc (1.19.0)
- google-protobuf (~> 3.1)
- googleapis-common-protos-types (~> 1.0.0)
+ grpc (1.24.0)
+ google-protobuf (~> 3.8)
+ googleapis-common-protos-types (~> 1.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
+ guard (2.15.1)
+ formatador (>= 0.2.4)
+ listen (>= 2.7, < 4.0)
+ lumberjack (>= 1.0.12, < 2.0)
+ nenv (~> 0.1)
+ notiffany (~> 0.0)
+ pry (>= 0.9.12)
+ shellany (~> 0.0)
+ thor (>= 0.18.1)
+ guard-compat (1.2.1)
+ guard-rspec (4.7.3)
+ guard (~> 2.1)
+ guard-compat (~> 1.1)
+ rspec (>= 2.99.0, < 4.0)
haml (5.0.4)
temple (>= 0.8.0)
tilt
@@ -508,7 +523,7 @@ GEM
atlassian-jwt
multipart-post
oauth (~> 0.5, >= 0.5.0)
- jmespath (1.3.1)
+ jmespath (1.4.0)
js_regex (3.1.1)
character_set (~> 1.1)
regexp_parser (~> 1.1)
@@ -560,15 +575,20 @@ GEM
xml-simple
licensee (8.9.2)
rugged (~> 0.24)
+ listen (3.1.5)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ ruby_dep (~> 1.2)
locale (2.1.2)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
- loofah (2.3.0)
+ loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
+ lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_room (0.9.1)
@@ -584,7 +604,7 @@ GEM
mime-types-data (3.2019.0331)
mimemagic (0.3.2)
mini_magick (4.9.5)
- mini_mime (1.0.1)
+ mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.3.1)
@@ -597,16 +617,20 @@ GEM
mustermann (~> 1.0.0)
nakayoshi_fork (0.0.4)
nap (1.1.0)
+ nenv (0.3.0)
net-ldap (0.16.0)
net-ntp (2.1.3)
net-ssh (5.2.0)
netrc (0.11.0)
nio4r (2.3.1)
no_proxy_fix (0.1.2)
- nokogiri (1.10.4)
+ nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
+ notiffany (0.1.3)
+ nenv (~> 0.1)
+ shellany (~> 0.0)
numerizer (0.1.1)
oauth (0.5.4)
oauth2 (1.4.1)
@@ -675,12 +699,12 @@ GEM
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0)
- omniauth_openid_connect (0.3.1)
+ omniauth_openid_connect (0.3.3)
addressable (~> 2.5)
- omniauth (~> 1.3)
+ omniauth (~> 1.9)
openid_connect (~> 1.1)
open4 (1.3.4)
- openid_connect (1.1.6)
+ openid_connect (1.1.8)
activemodel
attr_required (>= 1.0.0)
json-jwt (>= 1.5.0)
@@ -703,12 +727,12 @@ GEM
pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
- premailer (1.10.4)
+ premailer (1.11.1)
addressable
- css_parser (>= 1.4.10)
+ css_parser (>= 1.6.0)
htmlentities (>= 4.0.0)
- premailer-rails (1.9.7)
- actionmailer (>= 3, < 6)
+ premailer-rails (1.10.3)
+ actionmailer (>= 3)
premailer (~> 1.7, >= 1.7.9)
proc_to_ast (0.1.0)
coderay
@@ -724,7 +748,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
- public_suffix (3.1.0)
+ public_suffix (3.1.1)
puma (3.12.0)
puma_worker_killer (0.1.0)
get_process_mem (~> 0.2)
@@ -734,8 +758,8 @@ GEM
rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
- rack-attack (4.4.1)
- rack
+ rack-attack (6.2.0)
+ rack (>= 1.0, < 3)
rack-cors (1.0.2)
rack-oauth2 (1.9.3)
activesupport
@@ -763,10 +787,10 @@ GEM
bundler (>= 1.3.0)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
- rails-controller-testing (1.0.2)
- actionpack (~> 5.x, >= 5.0.1)
- actionview (~> 5.x, >= 5.0.1)
- activesupport (~> 5.x)
+ rails-controller-testing (1.0.4)
+ actionpack (>= 5.0.1.x)
+ actionview (>= 5.0.1.x)
+ activesupport (>= 5.0.1.x)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
@@ -798,25 +822,25 @@ GEM
recaptcha (4.13.1)
json
recursive-open-struct (1.1.0)
- redis (4.1.2)
- redis-actionpack (5.0.2)
- actionpack (>= 4.0, < 6)
+ redis (4.1.3)
+ redis-actionpack (5.1.0)
+ actionpack (>= 4.0, < 7)
redis-rack (>= 1, < 3)
redis-store (>= 1.1.0, < 2)
- redis-activesupport (5.0.7)
- activesupport (>= 3, < 6)
+ redis-activesupport (5.2.0)
+ activesupport (>= 3, < 7)
redis-store (>= 1.3, < 2)
redis-namespace (1.6.0)
redis (>= 3.0.4)
- redis-rack (2.0.5)
+ redis-rack (2.0.6)
rack (>= 1.5, < 3)
redis-store (>= 1.2, < 2)
redis-rails (5.0.2)
redis-actionpack (>= 5.0, < 6)
redis-activesupport (>= 5.0, < 6)
redis-store (>= 1.2, < 2)
- redis-store (1.6.0)
- redis (>= 2.2, < 5)
+ redis-store (1.8.1)
+ redis (>= 4, < 5)
regexp_parser (1.5.1)
regexp_property_values (0.3.4)
representable (3.0.4)
@@ -824,9 +848,9 @@ GEM
declarative-option (< 0.2.0)
uber (< 0.2.0)
request_store (1.3.1)
- responders (2.4.1)
- actionpack (>= 4.2.0, < 6.0)
- railties (>= 4.2.0, < 6.0)
+ responders (3.0.0)
+ actionpack (>= 5.0)
+ railties (>= 5.0)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
@@ -897,11 +921,12 @@ GEM
ruby-progressbar (1.10.1)
ruby-saml (1.7.2)
nokogiri (>= 1.5.10)
+ ruby_dep (1.5.0)
ruby_parser (3.13.1)
sexp_processor (~> 4.9)
rubyntlm (0.6.2)
rubypants (0.2.0)
- rubyzip (1.2.2)
+ rubyzip (1.3.0)
rugged (0.28.3.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
@@ -938,6 +963,7 @@ GEM
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
sexp_processor (4.12.0)
+ shellany (0.0.1)
shoulda-matchers (4.0.1)
activesupport (>= 4.2.0)
sidekiq (5.2.7)
@@ -978,11 +1004,11 @@ GEM
sshkey (2.0.0)
stackprof (0.2.10)
state_machines (0.5.0)
- state_machines-activemodel (0.5.1)
- activemodel (>= 4.1, < 6.0)
+ state_machines-activemodel (0.7.1)
+ activemodel (>= 4.1)
state_machines (>= 0.5.0)
- state_machines-activerecord (0.5.1)
- activerecord (>= 4.1, < 6.0)
+ state_machines-activerecord (0.6.0)
+ activerecord (>= 4.1)
state_machines-activemodel (>= 0.5.0)
swd (1.1.2)
activesupport (>= 3)
@@ -1127,12 +1153,13 @@ DEPENDENCIES
creole (~> 0.5.0)
danger (~> 6.0)
database_cleaner (~> 1.7.0)
- deckar01-task_list (= 2.2.0)
- default_value_for (~> 3.2.0)
+ deckar01-task_list (= 2.2.1)
+ default_value_for (~> 3.3.0)
derailed_benchmarks
device_detector
devise (~> 4.6)
devise-two-factor (~> 3.0.0)
+ diff_match_patch (~> 0.1.0)
diffy (~> 3.1.0)
discordrb-webhooks-blackst0ne (~> 3.3)
doorkeeper (~> 4.3)
@@ -1149,9 +1176,9 @@ DEPENDENCIES
faraday_middleware-aws-signers-v4
fast_blank
ffaker (~> 2.10)
- flipper (~> 0.13.0)
- flipper-active_record (~> 0.13.0)
- flipper-active_support_cache_store (~> 0.13.0)
+ flipper (~> 0.17.1)
+ flipper-active_record (~> 0.17.1)
+ flipper-active_support_cache_store (~> 0.17.1)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
fog-aws (~> 3.5)
@@ -1161,14 +1188,13 @@ DEPENDENCIES
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
- foreman (~> 0.84.0)
fugit (~> 1.2.1)
fuubar (~> 2.2.0)
gemojione (~> 3.3)
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly (~> 1.65.0)
+ gitaly (~> 1.70.0)
github-markup (~> 1.7.0)
gitlab-labkit (~> 0.5)
gitlab-license (~> 1.0)
@@ -1181,8 +1207,8 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
- google-protobuf (~> 3.7.1)
- gpgme (~> 2.0.18)
+ google-protobuf (~> 3.8.0)
+ gpgme (~> 2.0.19)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.1)
@@ -1190,8 +1216,9 @@ DEPENDENCIES
graphiql-rails (~> 1.4.10)
graphql (~> 1.9.11)
graphql-docs (~> 1.6.0)
- grpc (~> 1.19.0)
+ grpc (~> 1.24.0)
gssapi
+ guard-rspec
haml_lint (~> 0.31.0)
hamlit (~> 2.8.8)
hangouts-chat (~> 0.0.5)
@@ -1226,7 +1253,7 @@ DEPENDENCIES
net-ldap
net-ntp
net-ssh (~> 5.2)
- nokogiri (~> 1.10.4)
+ nokogiri (~> 1.10.5)
oauth2 (~> 1.4)
octokit (~> 4.9)
omniauth (~> 1.8)
@@ -1246,17 +1273,17 @@ DEPENDENCIES
omniauth-twitter (~> 1.4)
omniauth-ultraauth (~> 0.0.2)
omniauth_crowd (~> 2.2.0)
- omniauth_openid_connect (~> 0.3.1)
+ omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12)
pg (~> 1.1)
- premailer-rails (~> 1.9.7)
+ premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.9.10)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)
puma_worker_killer
rack (~> 2.0.7)
- rack-attack (~> 4.4.1)
+ rack-attack (~> 6.2.0)
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0)
@@ -1275,7 +1302,8 @@ DEPENDENCIES
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
request_store (~> 1.3)
- responders (~> 2.0)
+ responders (~> 3.0)
+ retriable (~> 3.1.2)
rouge (~> 3.11.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
@@ -1291,7 +1319,7 @@ DEPENDENCIES
ruby-prof (~> 1.0.0)
ruby-progressbar
ruby_parser (~> 3.8)
- rubyzip (~> 1.2.2)
+ rubyzip (~> 1.3.0)
rugged (~> 0.28)
sanitize (~> 4.6)
sassc-rails (~> 2.1.0)
@@ -1312,7 +1340,7 @@ DEPENDENCIES
sprockets (~> 3.7.0)
sshkey (~> 2.0)
stackprof (~> 0.2.10)
- state_machines-activerecord (~> 0.5.1)
+ state_machines-activerecord (~> 0.6.0)
sys-filesystem (~> 1.1.6)
test-prof (~> 0.10.0)
thin (~> 1.7.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 84a984ea2b3..dc9c8128d2f 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -146,10 +146,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
+ sha256 = "1nvhd986xa6llyjnhikq4h1nrcf5b9r9s11if25qsj8358inrpga";
type = "gem";
};
- version = "6.0.0";
+ version = "6.5.0";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -309,16 +309,26 @@
};
version = "1.8.0";
};
+ aws-eventstream = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
aws-sdk = {
dependencies = ["aws-sdk-resources"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn";
+ sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0";
type = "gem";
};
- version = "2.9.32";
+ version = "2.11.374";
};
aws-sdk-core = {
dependencies = ["aws-sigv4" "jmespath"];
@@ -326,10 +336,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x";
+ sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9";
type = "gem";
};
- version = "2.9.32";
+ version = "2.11.374";
};
aws-sdk-resources = {
dependencies = ["aws-sdk-core"];
@@ -337,20 +347,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi";
+ sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4";
type = "gem";
};
- version = "2.9.32";
+ version = "2.11.374";
};
aws-sigv4 = {
+ dependencies = ["aws-eventstream"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
+ sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs";
type = "gem";
};
- version = "1.0.0";
+ version = "1.1.0";
};
axiom-types = {
dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
@@ -814,10 +825,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+ sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
type = "gem";
};
- version = "1.0.4";
+ version = "1.0.5";
};
creole = {
groups = ["default"];
@@ -835,10 +846,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy";
+ sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
type = "gem";
};
- version = "1.5.0";
+ version = "1.7.0";
};
daemons = {
groups = ["default" "development"];
@@ -901,10 +912,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
+ sha256 = "09k7rlxsl7pd5kn3wyswgqi0hhbmlj40b66l4mf8v9mqf3c7v0yk";
type = "gem";
};
- version = "2.2.0";
+ version = "2.2.1";
};
declarative = {
groups = ["default"];
@@ -932,10 +943,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla";
+ sha256 = "08hwnnqm3bxd4n627isliq79zysdlmfkf813403v0b4mkhika5my";
type = "gem";
};
- version = "3.2.0";
+ version = "3.3.0";
};
derailed_benchmarks = {
dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"];
@@ -1001,6 +1012,16 @@
};
version = "1.3";
};
+ diff_match_patch = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03n4g4w2pwiygmqq5lfhqrpbs9g6kv0jhb3vrffz3vgaryzmfq5k";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
diffy = {
groups = ["default"];
platforms = [];
@@ -1374,10 +1395,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw";
+ sha256 = "01gbn1qmcvn49gjcbvd5fga57qc8l3915kb04ikkffvb6n09q7f7";
type = "gem";
};
- version = "0.13.0";
+ version = "0.17.1";
};
flipper-active_record = {
dependencies = ["activerecord" "flipper"];
@@ -1385,10 +1406,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1";
+ sha256 = "154q9xajqs64gxa9fv4hwpad44x3rmwgpldrb941i8wi37dpzskg";
type = "gem";
};
- version = "0.13.0";
+ version = "0.17.1";
};
flipper-active_support_cache_store = {
dependencies = ["activesupport" "flipper"];
@@ -1396,10 +1417,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk";
+ sha256 = "0mkbyn3mx3f411x4z1l1djc9vix3wrfzd5rhrmxb83iqp60r42hg";
type = "gem";
};
- version = "0.13.0";
+ version = "0.17.1";
};
flowdock = {
dependencies = ["httparty" "multi_json"];
@@ -1517,21 +1538,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj";
+ sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz";
type = "gem";
};
- version = "4.7.0.4";
- };
- foreman = {
- dependencies = ["thor"];
- groups = ["development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0";
- type = "gem";
- };
- version = "0.84.0";
+ version = "4.7.0.5";
};
formatador = {
groups = ["default"];
@@ -1645,10 +1655,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h8jzwifqgkrgh9d05g0vsdkyrnk75i53lmm3pfp9rj47gvn1z1j";
+ sha256 = "0b705d2fmdisirf3hydakswdr8jq786wbqn053gvxgssrwcdlrq3";
type = "gem";
};
- version = "1.65.0";
+ version = "1.70.0";
};
github-markup = {
groups = ["default"];
@@ -1666,10 +1676,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h";
+ sha256 = "0r2zkxkj2l78c6qgr6k9lgcp7w6x7r703259rbsbrg7cfnjm43b7";
type = "gem";
};
- version = "0.5.2";
+ version = "0.7.0";
};
gitlab-license = {
groups = ["default"];
@@ -1794,10 +1804,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
+ sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.0";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@@ -1827,10 +1837,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
+ sha256 = "0jbqajngi5ndqfarw9dxkhbphva0j71jav5wfym3fsiisvk5gg6p";
type = "gem";
};
- version = "2.0.18";
+ version = "2.0.19";
};
grape = {
dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
@@ -1914,10 +1924,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs";
+ sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf";
type = "gem";
};
- version = "1.19.0";
+ version = "1.24.0";
};
gssapi = {
dependencies = ["ffi"];
@@ -1930,6 +1940,38 @@
};
version = "1.2.0";
};
+ guard = {
+ dependencies = ["formatador" "listen" "lumberjack" "nenv" "notiffany" "pry" "shellany" "thor"];
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "000hn5cdqz3wl99b245q958c5byi2dlsqi814q5gmyljv7i47zwf";
+ type = "gem";
+ };
+ version = "2.15.1";
+ };
+ guard-compat = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
+ guard-rspec = {
+ dependencies = ["guard" "guard-compat" "rspec"];
+ groups = ["test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4";
+ type = "gem";
+ };
+ version = "4.7.3";
+ };
haml = {
dependencies = ["temple" "tilt"];
groups = ["default" "development" "test"];
@@ -2241,10 +2283,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
+ sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
type = "gem";
};
- version = "1.3.1";
+ version = "1.4.0";
};
js_regex = {
dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
@@ -2450,6 +2492,17 @@
};
version = "8.9.2";
};
+ listen = {
+ dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+ type = "gem";
+ };
+ version = "3.1.5";
+ };
locale = {
groups = ["default" "development"];
platforms = [];
@@ -2477,10 +2530,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x";
+ sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.1";
+ };
+ lumberjack = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06im7gcg42x77yhz2w5da2ly9xz0n0c36y5ks7xs53v0l9g0vf5n";
+ type = "gem";
+ };
+ version = "1.0.13";
};
mail = {
dependencies = ["mini_mime"];
@@ -2605,10 +2668,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
+ sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
mini_portile2 = {
groups = ["default" "development" "test"];
@@ -2721,6 +2784,16 @@
};
version = "1.1.0";
};
+ nenv = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0r97jzknll9bhd8yyg2bngnnkj8rjhal667n7d32h8h7ny7nvpnr";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
net-ldap = {
groups = ["default"];
platforms = [];
@@ -2787,10 +2860,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+ sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
type = "gem";
};
- version = "1.10.4";
+ version = "1.10.5";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -2803,6 +2876,17 @@
};
version = "1.5.0";
};
+ notiffany = {
+ dependencies = ["nenv" "shellany"];
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk";
+ type = "gem";
+ };
+ version = "0.1.3";
+ };
numerizer = {
groups = ["default"];
platforms = [];
@@ -3071,10 +3155,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb";
+ sha256 = "0awybp2jnai0w2qfgqnr3f478g3nbg5r0vcm6pa5g8k5f4rs19qr";
type = "gem";
};
- version = "0.3.1";
+ version = "0.3.3";
};
open4 = {
groups = ["default" "development"];
@@ -3092,10 +3176,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd";
+ sha256 = "0r50vwf9hsf6r8gx5mwqs3w3w92l864ikiz9d0fcibqsr1489pbg";
type = "gem";
};
- version = "1.1.6";
+ version = "1.1.8";
};
opentracing = {
groups = ["default"];
@@ -3206,10 +3290,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf";
+ sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h";
type = "gem";
};
- version = "1.10.4";
+ version = "1.11.1";
};
premailer-rails = {
dependencies = ["actionmailer" "premailer"];
@@ -3217,10 +3301,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim";
+ sha256 = "0bqi7d4f15vy3f1g0xb3bxmncfbzv9dd3ilhqj0plvw64xqbkp3w";
type = "gem";
};
- version = "1.9.7";
+ version = "1.10.3";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
@@ -3299,10 +3383,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
+ sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
type = "gem";
};
- version = "3.1.0";
+ version = "3.1.1";
};
puma = {
groups = ["puma"];
@@ -3372,10 +3456,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1";
+ sha256 = "1sqjqwa18c0l59zdymcvvvnh5nk3pjggnzaydb2q1qbrk3rypcnq";
type = "gem";
};
- version = "4.4.1";
+ version = "6.2.0";
};
rack-cors = {
groups = ["default"];
@@ -3458,10 +3542,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16kdkk73mhhs73iz3i1i0ryjm84dadiyh817b3nh8acdi490jyhy";
+ sha256 = "1m1rklj6pvzi4fydxcmcv4q0xd7913hhhw1hw530nfz1wkl7vjlf";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.4";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -3640,10 +3724,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
+ sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh";
type = "gem";
};
- version = "4.1.2";
+ version = "4.1.3";
};
redis-actionpack = {
dependencies = ["actionpack" "redis-rack" "redis-store"];
@@ -3651,10 +3735,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63";
+ sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz";
type = "gem";
};
- version = "5.0.2";
+ version = "5.1.0";
};
redis-activesupport = {
dependencies = ["activesupport" "redis-store"];
@@ -3662,10 +3746,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y1df62gpqgy0yrlmgl05rp4kb0xvn0kylprhv1k32bs33dgpv62";
+ sha256 = "14a3z8810j02ysvg53f3mvcfb4rw34m91yfd19zy9y5lb3yv2g59";
type = "gem";
};
- version = "5.0.7";
+ version = "5.2.0";
};
redis-namespace = {
dependencies = ["redis"];
@@ -3684,10 +3768,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi";
+ sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb";
type = "gem";
};
- version = "2.0.5";
+ version = "2.0.6";
};
redis-rails = {
dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
@@ -3706,10 +3790,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b";
+ sha256 = "1isqzzds9kszc2nn8jiy8ikry01qspn7637ba9z2k6sk7vky46d9";
type = "gem";
};
- version = "1.6.0";
+ version = "1.8.1";
};
regexp_parser = {
groups = ["default" "development" "test"];
@@ -3758,10 +3842,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18lqbiyc7234vd6iwxia5yvvzg6bdvdwl2nm4a5y7ia5fxjl3kqm";
+ sha256 = "1p7pqcfq33q1z4xlp4qm94w4h3fzc1yvr3cny16d00i8b20v4rx2";
type = "gem";
};
- version = "2.4.1";
+ version = "3.0.0";
};
rest-client = {
dependencies = ["http-cookie" "mime-types" "netrc"];
@@ -4052,6 +4136,16 @@
};
version = "1.7.2";
};
+ ruby_dep = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
ruby_parser = {
dependencies = ["sexp_processor"];
groups = ["default"];
@@ -4084,14 +4178,14 @@
version = "0.2.0";
};
rubyzip = {
- groups = ["default" "development" "test"];
+ groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+ sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l";
type = "gem";
};
- version = "1.2.2";
+ version = "1.3.0";
};
rugged = {
groups = ["default"];
@@ -4243,6 +4337,16 @@
};
version = "4.12.0";
};
+ shellany = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf";
+ type = "gem";
+ };
+ version = "0.0.1";
+ };
shoulda-matchers = {
dependencies = ["activesupport"];
groups = ["test"];
@@ -4439,10 +4543,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l";
+ sha256 = "05c2dw3115zj3pmyyqh2iypc7afj8ibhrghisg0d61z7gzmir1rd";
type = "gem";
};
- version = "0.5.1";
+ version = "0.7.1";
};
state_machines-activerecord = {
dependencies = ["activerecord" "state_machines-activemodel"];
@@ -4450,10 +4554,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3";
+ sha256 = "12g7yqy11fpfiprzc86pwa9jjky1h3haxj37kg47467fgg43p511";
type = "gem";
};
- version = "0.5.1";
+ version = "0.6.0";
};
swd = {
dependencies = ["activesupport" "attr_required" "httpclient"];
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index a2231f813e8..1aeb459f64c 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix
+#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix-moretea.yarn2nix
import click
import click_log
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index cff2603129d..04c0b44f4ac 100644
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -41,14 +41,6 @@
sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f";
};
}
- {
- name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
- path = fetchurl {
- name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz";
- sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4";
- };
- }
{
name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
path = fetchurl {
@@ -209,14 +201,6 @@
sha1 = "56d11312bd9248fa619591d02472be6e8cb32540";
};
}
- {
- name = "_babel_parser___parser_7.1.3.tgz";
- path = fetchurl {
- name = "_babel_parser___parser_7.1.3.tgz";
- url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz";
- sha1 = "2c92469bac2b7fbff810b67fca07bd138b48af77";
- };
- }
{
name = "_babel_parser___parser_7.6.2.tgz";
path = fetchurl {
@@ -241,22 +225,6 @@
sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4";
};
}
- {
- name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz";
- sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0";
- };
- }
- {
- name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz";
- sha1 = "ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a";
- };
- }
{
name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
path = fetchurl {
@@ -265,38 +233,6 @@
sha1 = "e532202db4838723691b10a67b8ce509e397c506";
};
}
- {
- name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz";
- sha1 = "2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145";
- };
- }
- {
- name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz";
- sha1 = "ccd5ed05b06d700688ff1db01a9dd27155e0d2a0";
- };
- }
- {
- name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz";
- sha1 = "94dc2cdc505cafc4e225c0014335a01648056bf7";
- };
- }
- {
- name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz";
- sha1 = "39233aa801145e7d8072077cdb2d25f781c1ffd7";
- };
- }
{
name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
path = fetchurl {
@@ -305,30 +241,6 @@
sha1 = "568ecc446c6148ae6b267f02551130891e29f317";
};
}
- {
- name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz";
- sha1 = "8a5cea6c42a7c87446959e02fff5fad012c56f57";
- };
- }
- {
- name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz";
- sha1 = "41c360d59481d88e0ce3a3f837df10121a769b39";
- };
- }
- {
- name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz";
- sha1 = "646854daf4cd22fd6733f6076013a936310443ac";
- };
- }
{
name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz";
path = fetchurl {
@@ -345,22 +257,6 @@
sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5";
};
}
- {
- name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz";
- sha1 = "ae454f4c21c6c2ce8cb2397dc332ae8b420c5441";
- };
- }
- {
- name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz";
- sha1 = "4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06";
- };
- }
{
name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz";
path = fetchurl {
@@ -369,14 +265,6 @@
sha1 = "19ddc493c7b5d47afdd4291e740c609a83c9fae4";
};
}
- {
- name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz";
- sha1 = "2d9e452d370f139000e51db65d0a85dc60c64739";
- };
- }
{
name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz";
path = fetchurl {
@@ -393,22 +281,6 @@
sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f";
};
}
- {
- name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz";
- sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b";
- };
- }
- {
- name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz";
- sha1 = "f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a";
- };
- }
{
name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
path = fetchurl {
@@ -417,46 +289,6 @@
sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612";
};
}
- {
- name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz";
- sha1 = "edd83b7adc2e0d059e2467ca96c650ab6d2f3820";
- };
- }
- {
- name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz";
- sha1 = "8d257838c6b3b779db52c0224443459bd27fb039";
- };
- }
- {
- name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz";
- sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c";
- };
- }
- {
- name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz";
- sha1 = "68fe85b0c0da67125f87bf239c68051b06c66309";
- };
- }
- {
- name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz";
- sha1 = "91474d4d400604e4c6cbd4d77cd6cb3b8565576c";
- };
- }
{
name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz";
path = fetchurl {
@@ -473,38 +305,6 @@
sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470";
};
}
- {
- name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz";
- sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7";
- };
- }
- {
- name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz";
- sha1 = "fcab7388530e96c6f277ce494c55caa6c141fcfb";
- };
- }
- {
- name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz";
- sha1 = "f75083dfd5ade73e783db729bbd87e7b9efb7624";
- };
- }
- {
- name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz";
- sha1 = "7470fe070c2944469a756752a69a6963135018be";
- };
- }
{
name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
path = fetchurl {
@@ -521,30 +321,6 @@
sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c";
};
}
- {
- name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz";
- sha1 = "a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff";
- };
- }
- {
- name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz";
- sha1 = "8ea7c2c22847c797748bf07752722a317079dc1e";
- };
- }
- {
- name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz";
- sha1 = "79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8";
- };
- }
{
name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
path = fetchurl {
@@ -625,14 +401,6 @@
sha1 = "a63868289e5b4007f7054d46491af51435766008";
};
}
- {
- name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz";
- sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7";
- };
- }
{
name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz";
path = fetchurl {
@@ -737,38 +505,6 @@
sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905";
};
}
- {
- name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz";
- sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0";
- };
- }
- {
- name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz";
- sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba";
- };
- }
- {
- name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz";
- sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b";
- };
- }
- {
- name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz";
- sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290";
- };
- }
{
name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz";
path = fetchurl {
@@ -841,30 +577,6 @@
sha1 = "abbb3ed785c7fe4220d4c82a53621d71fc0c75d3";
};
}
- {
- name = "_babel_preset_flow___preset_flow_7.0.0.tgz";
- path = fetchurl {
- name = "_babel_preset_flow___preset_flow_7.0.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz";
- sha1 = "afd764835d9535ec63d8c7d4caf1c06457263da2";
- };
- }
- {
- name = "_babel_preset_react___preset_react_7.0.0.tgz";
- path = fetchurl {
- name = "_babel_preset_react___preset_react_7.0.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz";
- sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0";
- };
- }
- {
- name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz";
- path = fetchurl {
- name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz";
- sha1 = "999aaec79ee8f0a763042c68c06539c97c6e0646";
- };
- }
{
name = "_babel_standalone___standalone_7.5.5.tgz";
path = fetchurl {
@@ -938,27 +650,27 @@
};
}
{
- name = "_gitlab_svgs___svgs_1.78.0.tgz";
+ name = "_gitlab_svgs___svgs_1.82.0.tgz";
path = fetchurl {
- name = "_gitlab_svgs___svgs_1.78.0.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.78.0.tgz";
- sha1 = "469493bd6cdd254eb5d1271edeab22bbbee2f4c4";
+ name = "_gitlab_svgs___svgs_1.82.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.82.0.tgz";
+ sha1 = "c059c460afc13ebfe9df370521ca8963fa5afb80";
};
}
{
- name = "_gitlab_ui___ui_5.36.0.tgz";
+ name = "_gitlab_ui___ui_7.11.0.tgz";
path = fetchurl {
- name = "_gitlab_ui___ui_5.36.0.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.36.0.tgz";
- sha1 = "3087b23c138ad1c222f6b047e533f253371bc618";
+ name = "_gitlab_ui___ui_7.11.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-7.11.0.tgz";
+ sha1 = "b5c981f3b1edbf0ad75bcca8fa1cd81017676b3b";
};
}
{
- name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz";
+ name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz";
path = fetchurl {
- name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.3.tgz";
- sha1 = "b49c4a6fd8af3a1517d7e7d04096562f8bcb5d14";
+ name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.2.0.tgz";
+ sha1 = "8d6757917193c1023012bb4a316dc1a97309a27a";
};
}
{
@@ -1073,6 +785,62 @@
sha1 = "17adc7d380457379cd14cbb64a435ea196cc4a6e";
};
}
+ {
+ name = "_sentry_browser___browser_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_browser___browser_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.1.tgz";
+ sha1 = "1f8435e2a325d7a09f830065ebce40a2b3c708a4";
+ };
+ }
+ {
+ name = "_sentry_core___core_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_core___core_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.1.tgz";
+ sha1 = "3eb2b7662cac68245931ee939ec809bf7a639d0e";
+ };
+ }
+ {
+ name = "_sentry_hub___hub_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_hub___hub_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.1.tgz";
+ sha1 = "a52acd9fead7f3779d96e9965c6978aecc8b9cad";
+ };
+ }
+ {
+ name = "_sentry_minimal___minimal_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_minimal___minimal_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.1.tgz";
+ sha1 = "56afc537737586929e25349765e37a367958c1e1";
+ };
+ }
+ {
+ name = "_sentry_types___types_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_types___types_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.1.tgz";
+ sha1 = "4c4c1d4d891b6b8c2c3c7b367d306a8b1350f090";
+ };
+ }
+ {
+ name = "_sentry_utils___utils_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_utils___utils_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.1.tgz";
+ sha1 = "cf37ad55f78e317665cd8680f202d307fa77f1d0";
+ };
+ }
+ {
+ name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz";
+ path = fetchurl {
+ name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz";
+ url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.13.tgz";
+ sha1 = "4fd5fe1e0088c63b2a26be231c5a2a4ca79b1596";
+ };
+ }
{
name = "_types_anymatch___anymatch_1.3.0.tgz";
path = fetchurl {
@@ -1433,6 +1201,22 @@
sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc";
};
}
+ {
+ name = "_wry_context___context_0.4.4.tgz";
+ path = fetchurl {
+ name = "_wry_context___context_0.4.4.tgz";
+ url = "https://registry.yarnpkg.com/@wry/context/-/context-0.4.4.tgz";
+ sha1 = "e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8";
+ };
+ }
+ {
+ name = "_wry_equality___equality_0.1.9.tgz";
+ path = fetchurl {
+ name = "_wry_equality___equality_0.1.9.tgz";
+ url = "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.9.tgz";
+ sha1 = "b13e18b7a8053c6858aa6c85b54911fb31e3a909";
+ };
+ }
{
name = "_xtuc_ieee754___ieee754_1.2.0.tgz";
path = fetchurl {
@@ -1457,14 +1241,6 @@
sha1 = "e77a97fbd345b76d83245edcd17d393b1b41fb31";
};
}
- {
- name = "JSONStream___JSONStream_1.3.5.tgz";
- path = fetchurl {
- name = "JSONStream___JSONStream_1.3.5.tgz";
- url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz";
- sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0";
- };
- }
{
name = "abab___abab_2.0.0.tgz";
path = fetchurl {
@@ -1658,27 +1434,27 @@
};
}
{
- name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz";
+ name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz";
path = fetchurl {
- name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz";
- url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz";
- sha1 = "265d1ee67b0bf0aca9c37629d410bfae44e62953";
+ name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz";
+ url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz";
+ sha1 = "826861d20baca4abc45f7ca7a874105905b8525d";
};
}
{
- name = "apollo_cache___apollo_cache_1.2.1.tgz";
+ name = "apollo_cache___apollo_cache_1.3.2.tgz";
path = fetchurl {
- name = "apollo_cache___apollo_cache_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz";
- sha1 = "aae71eb4a11f1f7322adc343f84b1a39b0693644";
+ name = "apollo_cache___apollo_cache_1.3.2.tgz";
+ url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz";
+ sha1 = "df4dce56240d6c95c613510d7e409f7214e6d26a";
};
}
{
- name = "apollo_client___apollo_client_2.5.1.tgz";
+ name = "apollo_client___apollo_client_2.6.4.tgz";
path = fetchurl {
- name = "apollo_client___apollo_client_2.5.1.tgz";
- url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz";
- sha1 = "36126ed1d32edd79c3713c6684546a3bea80e6d1";
+ name = "apollo_client___apollo_client_2.6.4.tgz";
+ url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz";
+ sha1 = "872c32927263a0d34655c5ef8a8949fbb20b6140";
};
}
{
@@ -1697,14 +1473,6 @@
sha1 = "64eb231082f182b0395ef7ab903600627f6c7fe8";
};
}
- {
- name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz";
- path = fetchurl {
- name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz";
- url = "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz";
- sha1 = "7b94589fe7f969777efd18a129043c78430800ae";
- };
- }
{
name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz";
path = fetchurl {
@@ -1730,19 +1498,11 @@
};
}
{
- name = "apollo_utilities___apollo_utilities_1.2.1.tgz";
+ name = "apollo_utilities___apollo_utilities_1.3.2.tgz";
path = fetchurl {
- name = "apollo_utilities___apollo_utilities_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz";
- sha1 = "1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c";
- };
- }
- {
- name = "append_buffer___append_buffer_1.0.2.tgz";
- path = fetchurl {
- name = "append_buffer___append_buffer_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz";
- sha1 = "d8220cf466081525efea50614f3de6514dfa58f1";
+ name = "apollo_utilities___apollo_utilities_1.3.2.tgz";
+ url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz";
+ sha1 = "8cbdcf8b012f664cd6cb5767f6130f5aed9115c9";
};
}
{
@@ -2121,14 +1881,6 @@
sha1 = "66f06136eefce87797539c0d63f1769cc3915984";
};
}
- {
- name = "babelify___babelify_10.0.0.tgz";
- path = fetchurl {
- name = "babelify___babelify_10.0.0.tgz";
- url = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz";
- sha1 = "fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5";
- };
- }
{
name = "babylon___babylon_7.0.0_beta.19.tgz";
path = fetchurl {
@@ -2297,14 +2049,6 @@
sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a";
};
}
- {
- name = "body___body_5.1.0.tgz";
- path = fetchurl {
- name = "body___body_5.1.0.tgz";
- url = "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz";
- sha1 = "e4ba0ce410a46936323367609ecb4e6553125069";
- };
- }
{
name = "bonjour___bonjour_3.5.0.tgz";
path = fetchurl {
@@ -2457,14 +2201,6 @@
sha1 = "9ac78d3ed5d915804fd87acb158bc797147a1719";
};
}
- {
- name = "buffer_equal___buffer_equal_1.0.0.tgz";
- path = fetchurl {
- name = "buffer_equal___buffer_equal_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz";
- sha1 = "59616b498304d556abd466966b22eeda3eca5fbe";
- };
- }
{
name = "buffer_from___buffer_from_1.1.1.tgz";
path = fetchurl {
@@ -2489,14 +2225,6 @@
sha1 = "f73e13b1e42f196fe2fd67d001c7d7107edd7c23";
};
}
- {
- name = "buffer_shims___buffer_shims_1.0.0.tgz";
- path = fetchurl {
- name = "buffer_shims___buffer_shims_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz";
- sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
- };
- }
{
name = "buffer_xor___buffer_xor_1.0.3.tgz";
path = fetchurl {
@@ -2521,14 +2249,6 @@
sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
};
}
- {
- name = "bytes___bytes_1.0.0.tgz";
- path = fetchurl {
- name = "bytes___bytes_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz";
- sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
- };
- }
{
name = "bytes___bytes_3.0.0.tgz";
path = fetchurl {
@@ -2577,14 +2297,6 @@
sha1 = "9948cae353aec0a1fcb1eafda2300816ec85387e";
};
}
- {
- name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
- path = fetchurl {
- name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz";
- sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db";
- };
- }
{
name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
path = fetchurl {
@@ -2993,14 +2705,6 @@
sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5";
};
}
- {
- name = "clone_buffer___clone_buffer_1.0.0.tgz";
- path = fetchurl {
- name = "clone_buffer___clone_buffer_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz";
- sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58";
- };
- }
{
name = "clone_deep___clone_deep_4.0.1.tgz";
path = fetchurl {
@@ -3017,30 +2721,6 @@
sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f";
};
}
- {
- name = "clone_stats___clone_stats_1.0.0.tgz";
- path = fetchurl {
- name = "clone_stats___clone_stats_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz";
- sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680";
- };
- }
- {
- name = "clone___clone_2.1.2.tgz";
- path = fetchurl {
- name = "clone___clone_2.1.2.tgz";
- url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz";
- sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
- };
- }
- {
- name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
- path = fetchurl {
- name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz";
- sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec";
- };
- }
{
name = "co___co_4.6.0.tgz";
path = fetchurl {
@@ -3137,14 +2817,6 @@
sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828";
};
}
- {
- name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz";
- path = fetchurl {
- name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz";
- url = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz";
- sha1 = "419cd7fb3258b1ed838dc0953167a25e152f5b59";
- };
- }
{
name = "commander___commander_2.20.0.tgz";
path = fetchurl {
@@ -3241,14 +2913,6 @@
sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34";
};
}
- {
- name = "concat_stream___concat_stream_1.5.2.tgz";
- path = fetchurl {
- name = "concat_stream___concat_stream_1.5.2.tgz";
- url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz";
- sha1 = "708978624d856af41a5a741defdd261da752c266";
- };
- }
{
name = "config_chain___config_chain_1.1.12.tgz";
path = fetchurl {
@@ -3345,14 +3009,6 @@
sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b";
};
}
- {
- name = "continuable_cache___continuable_cache_0.3.1.tgz";
- path = fetchurl {
- name = "continuable_cache___continuable_cache_0.3.1.tgz";
- url = "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz";
- sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f";
- };
- }
{
name = "convert_source_map___convert_source_map_1.6.0.tgz";
path = fetchurl {
@@ -3553,6 +3209,14 @@
sha1 = "a230f64f568310e1498009940790ec99545bca7e";
};
}
+ {
+ name = "crypto_random_string___crypto_random_string_3.0.1.tgz";
+ path = fetchurl {
+ name = "crypto_random_string___crypto_random_string_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.0.1.tgz";
+ sha1 = "29d7dc759d577a768afb3b7b2765dd9bd7ffe36a";
+ };
+ }
{
name = "css_b64_images___css_b64_images_0.2.5.tgz";
path = fetchurl {
@@ -3617,6 +3281,14 @@
sha1 = "37741919903b868565e1c09ea747445cd18983ee";
};
}
+ {
+ name = "cssfontparser___cssfontparser_1.2.1.tgz";
+ path = fetchurl {
+ name = "cssfontparser___cssfontparser_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz";
+ sha1 = "f4022fc8f9700c68029d542084afbaf425a3f3e3";
+ };
+ }
{
name = "cssom___cssom_0.3.4.tgz";
path = fetchurl {
@@ -3946,27 +3618,27 @@
};
}
{
- name = "d3___d3_5.9.2.tgz";
+ name = "d3___d3_5.12.0.tgz";
path = fetchurl {
- name = "d3___d3_5.9.2.tgz";
- url = "https://registry.yarnpkg.com/d3/-/d3-5.9.2.tgz";
- sha1 = "64e8a7e9c3d96d9e6e4999d2c8a2c829767e67f5";
+ name = "d3___d3_5.12.0.tgz";
+ url = "https://registry.yarnpkg.com/d3/-/d3-5.12.0.tgz";
+ sha1 = "0ddeac879c28c882317cd439b495290acd59ab61";
};
}
{
- name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz";
+ name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b";
path = fetchurl {
- name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz";
- url = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz";
- sha1 = "aa071bb71d3c4d67426925906f3f6ddead49c1a3";
+ name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b";
+ url = "https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b";
+ sha1 = "7400df3f5fe80538fde43d0201e1570e1d689004";
};
}
{
- name = "dagre_layout___dagre_layout_0.8.8.tgz";
+ name = "dagre___dagre_0.8.4.tgz";
path = fetchurl {
- name = "dagre_layout___dagre_layout_0.8.8.tgz";
- url = "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz";
- sha1 = "9b6792f24229f402441c14162c1049e3f261f6d9";
+ name = "dagre___dagre_0.8.4.tgz";
+ url = "https://registry.yarnpkg.com/dagre/-/dagre-0.8.4.tgz";
+ sha1 = "26b9fb8f7bdc60c6110a0458c375261836786061";
};
}
{
@@ -4066,11 +3738,11 @@
};
}
{
- name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz";
+ name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz";
path = fetchurl {
- name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.0.tgz";
- sha1 = "5cc3ea06f01d3d786b1a667064a462eb5d069bd3";
+ name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.1.tgz";
+ sha1 = "e1e8a16c4fd6e153e51fd9258fdbee067ebcd86b";
};
}
{
@@ -4161,14 +3833,6 @@
sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d";
};
}
- {
- name = "defined___defined_1.0.0.tgz";
- path = fetchurl {
- name = "defined___defined_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz";
- sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
- };
- }
{
name = "del___del_2.2.2.tgz";
path = fetchurl {
@@ -4241,14 +3905,6 @@
sha1 = "978857442c44749e4206613e37946205826abd80";
};
}
- {
- name = "detab___detab_2.0.2.tgz";
- path = fetchurl {
- name = "detab___detab_2.0.2.tgz";
- url = "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz";
- sha1 = "074970d1a807b045d0258a4235df5928dd683561";
- };
- }
{
name = "detect_file___detect_file_1.0.0.tgz";
path = fetchurl {
@@ -4281,14 +3937,6 @@
sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c";
};
}
- {
- name = "detective___detective_4.7.1.tgz";
- path = fetchurl {
- name = "detective___detective_4.7.1.tgz";
- url = "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz";
- sha1 = "0eca7314338442febb6d65da54c10bb1c82b246e";
- };
- }
{
name = "di___di_0.0.1.tgz";
path = fetchurl {
@@ -4313,14 +3961,6 @@
sha1 = "800c0dd1e0a8bfbc95835c202ad220fe317e5a12";
};
}
- {
- name = "diff___diff_4.0.1.tgz";
- path = fetchurl {
- name = "diff___diff_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz";
- sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff";
- };
- }
{
name = "diffie_hellman___diffie_hellman_5.0.2.tgz";
path = fetchurl {
@@ -4369,14 +4009,6 @@
sha1 = "0449a8f6bb247f563020b78a5485dea95ae2e094";
};
}
- {
- name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz";
- path = fetchurl {
- name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz";
- sha1 = "36f2154f556ee4f1e60311d391cd23de5187ed57";
- };
- }
{
name = "doctrine___doctrine_1.5.0.tgz";
path = fetchurl {
@@ -4401,14 +4033,6 @@
sha1 = "dad8cb7be38e04ee3f56842e6cf81af46c1249ba";
};
}
- {
- name = "documentation___documentation_12.0.3.tgz";
- path = fetchurl {
- name = "documentation___documentation_12.0.3.tgz";
- url = "https://registry.yarnpkg.com/documentation/-/documentation-12.0.3.tgz";
- sha1 = "32f91da8e5cb4104f69db9fd32c87773a1ad6240";
- };
- }
{
name = "dom_serialize___dom_serialize_2.2.1.tgz";
path = fetchurl {
@@ -4489,14 +4113,6 @@
sha1 = "fbe7acbb9918e0706489072ef663effeef8a79f3";
};
}
- {
- name = "duplexer2___duplexer2_0.1.4.tgz";
- path = fetchurl {
- name = "duplexer2___duplexer2_0.1.4.tgz";
- url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz";
- sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
- };
- }
{
name = "duplexer3___duplexer3_0.1.4.tgz";
path = fetchurl {
@@ -4585,14 +4201,6 @@
sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
};
}
- {
- name = "emoji_regex___emoji_regex_6.1.1.tgz";
- path = fetchurl {
- name = "emoji_regex___emoji_regex_6.1.1.tgz";
- url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz";
- sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e";
- };
- }
{
name = "emoji_regex___emoji_regex_7.0.3.tgz";
path = fetchurl {
@@ -4713,14 +4321,6 @@
sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf";
};
}
- {
- name = "error___error_7.0.2.tgz";
- path = fetchurl {
- name = "error___error_7.0.2.tgz";
- url = "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz";
- sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02";
- };
- }
{
name = "es_abstract___es_abstract_1.13.0.tgz";
path = fetchurl {
@@ -5545,14 +5145,6 @@
sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07";
};
}
- {
- name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz";
- path = fetchurl {
- name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz";
- sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb";
- };
- }
{
name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz";
path = fetchurl {
@@ -5649,14 +5241,6 @@
sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e";
};
}
- {
- name = "get_port___get_port_4.2.0.tgz";
- path = fetchurl {
- name = "get_port___get_port_4.2.0.tgz";
- url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz";
- sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119";
- };
- }
{
name = "get_stdin___get_stdin_4.0.1.tgz";
path = fetchurl {
@@ -5737,38 +5321,6 @@
sha1 = "882679cefc71888eb6e69297e6b2dc14c0384fef";
};
}
- {
- name = "git_up___git_up_2.1.0.tgz";
- path = fetchurl {
- name = "git_up___git_up_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz";
- sha1 = "2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c";
- };
- }
- {
- name = "git_url_parse___git_url_parse_10.1.0.tgz";
- path = fetchurl {
- name = "git_url_parse___git_url_parse_10.1.0.tgz";
- url = "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz";
- sha1 = "a27813218f8777e91d15f1c121b83bf14721b67e";
- };
- }
- {
- name = "github_slugger___github_slugger_1.2.0.tgz";
- path = fetchurl {
- name = "github_slugger___github_slugger_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz";
- sha1 = "8ada3286fd046d8951c3c952a8d7854cfd90fd9a";
- };
- }
- {
- name = "github_slugger___github_slugger_1.2.1.tgz";
- path = fetchurl {
- name = "github_slugger___github_slugger_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz";
- sha1 = "47e904e70bf2dccd0014748142d31126cfd49508";
- };
- }
{
name = "glob_parent___glob_parent_3.1.0.tgz";
path = fetchurl {
@@ -5785,14 +5337,6 @@
sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954";
};
}
- {
- name = "glob_stream___glob_stream_6.1.0.tgz";
- path = fetchurl {
- name = "glob_stream___glob_stream_6.1.0.tgz";
- url = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz";
- sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
- };
- }
{
name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz";
path = fetchurl {
@@ -5857,14 +5401,6 @@
sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97";
};
}
- {
- name = "globals_docs___globals_docs_2.4.0.tgz";
- path = fetchurl {
- name = "globals_docs___globals_docs_2.4.0.tgz";
- url = "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz";
- sha1 = "f2c647544eb6161c7c38452808e16e693c2dafbb";
- };
- }
{
name = "globals___globals_11.12.0.tgz";
path = fetchurl {
@@ -5962,11 +5498,11 @@
};
}
{
- name = "graphlibrary___graphlibrary_2.2.0.tgz";
+ name = "graphlib___graphlib_2.1.7.tgz";
path = fetchurl {
- name = "graphlibrary___graphlibrary_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz";
- sha1 = "017a14899775228dec4497a39babfdd6bf56eac6";
+ name = "graphlib___graphlib_2.1.7.tgz";
+ url = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz";
+ sha1 = "b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc";
};
}
{
@@ -6153,38 +5689,6 @@
sha1 = "340dedbe6290187151c1ea1d777a3448935df846";
};
}
- {
- name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz";
- path = fetchurl {
- name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz";
- sha1 = "423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4";
- };
- }
- {
- name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz";
- path = fetchurl {
- name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz";
- sha1 = "4e60d66336bd67e52354d581967467029a933f2e";
- };
- }
- {
- name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz";
- path = fetchurl {
- name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz";
- sha1 = "3666b05afb62bd69f8f5e6c94db04dea19438e2a";
- };
- }
- {
- name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz";
- path = fetchurl {
- name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz";
- sha1 = "6d161b307bd0693b5ec000c7c7e8b5445109ee34";
- };
- }
{
name = "he___he_1.2.0.tgz";
path = fetchurl {
@@ -6193,14 +5697,6 @@
sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f";
};
}
- {
- name = "highlight.js___highlight.js_9.15.8.tgz";
- path = fetchurl {
- name = "highlight.js___highlight.js_9.15.8.tgz";
- url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz";
- sha1 = "f344fda123f36f1a65490e932cf90569e4999971";
- };
- }
{
name = "highlight.js___highlight.js_9.13.1.tgz";
path = fetchurl {
@@ -6281,14 +5777,6 @@
sha1 = "41f57708c9e6b7b46a00a22317d614c4a2bab166";
};
}
- {
- name = "html_void_elements___html_void_elements_1.0.4.tgz";
- path = fetchurl {
- name = "html_void_elements___html_void_elements_1.0.4.tgz";
- url = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz";
- sha1 = "95e8bb5ecd6b88766569c2645f2b5f1591db9ba5";
- };
- }
{
name = "htmlparser2___htmlparser2_3.10.0.tgz";
path = fetchurl {
@@ -6441,14 +5929,6 @@
sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
};
}
- {
- name = "immutable_tuple___immutable_tuple_0.4.9.tgz";
- path = fetchurl {
- name = "immutable_tuple___immutable_tuple_0.4.9.tgz";
- url = "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.9.tgz";
- sha1 = "473ebdd6c169c461913a454bf87ef8f601a20ff0";
- };
- }
{
name = "import_fresh___import_fresh_2.0.0.tgz";
path = fetchurl {
@@ -6657,14 +6137,6 @@
sha1 = "554f2933e7385cc46e94351977ca2081170a206e";
};
}
- {
- name = "is_absolute___is_absolute_1.0.0.tgz";
- path = fetchurl {
- name = "is_absolute___is_absolute_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz";
- sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576";
- };
- }
{
name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
path = fetchurl {
@@ -6921,14 +6393,6 @@
sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
};
}
- {
- name = "is_negated_glob___is_negated_glob_1.0.0.tgz";
- path = fetchurl {
- name = "is_negated_glob___is_negated_glob_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
- sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
- };
- }
{
name = "is_npm___is_npm_1.0.0.tgz";
path = fetchurl {
@@ -7065,14 +6529,6 @@
sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d";
};
}
- {
- name = "is_relative___is_relative_1.0.0.tgz";
- path = fetchurl {
- name = "is_relative___is_relative_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz";
- sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d";
- };
- }
{
name = "is_resolvable___is_resolvable_1.1.0.tgz";
path = fetchurl {
@@ -7089,14 +6545,6 @@
sha1 = "11a060568b67339444033d0125a61a20d564fb34";
};
}
- {
- name = "is_ssh___is_ssh_1.3.1.tgz";
- path = fetchurl {
- name = "is_ssh___is_ssh_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz";
- sha1 = "f349a8cadd24e65298037a522cf7520f2e81a0f3";
- };
- }
{
name = "is_stream___is_stream_1.1.0.tgz";
path = fetchurl {
@@ -7121,14 +6569,6 @@
sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
};
}
- {
- name = "is_unc_path___is_unc_path_1.0.0.tgz";
- path = fetchurl {
- name = "is_unc_path___is_unc_path_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz";
- sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d";
- };
- }
{
name = "is_utf8___is_utf8_0.2.1.tgz";
path = fetchurl {
@@ -7137,14 +6577,6 @@
sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
};
}
- {
- name = "is_valid_glob___is_valid_glob_1.0.0.tgz";
- path = fetchurl {
- name = "is_valid_glob___is_valid_glob_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz";
- sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa";
- };
- }
{
name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz";
path = fetchurl {
@@ -7337,6 +6769,14 @@
sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
};
}
+ {
+ name = "jest_canvas_mock___jest_canvas_mock_2.1.2.tgz";
+ path = fetchurl {
+ name = "jest_canvas_mock___jest_canvas_mock_2.1.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.1.2.tgz";
+ sha1 = "0d16c9f91534f773fd132fc289f2e6b6db8faa28";
+ };
+ }
{
name = "jest_changed_files___jest_changed_files_24.8.0.tgz";
path = fetchurl {
@@ -7801,14 +7241,6 @@
sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
};
}
- {
- name = "jsonparse___jsonparse_1.3.1.tgz";
- path = fetchurl {
- name = "jsonparse___jsonparse_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz";
- sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
- };
- }
{
name = "jsprim___jsprim_1.4.1.tgz";
path = fetchurl {
@@ -7977,14 +7409,6 @@
sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
};
}
- {
- name = "lazystream___lazystream_1.0.0.tgz";
- path = fetchurl {
- name = "lazystream___lazystream_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz";
- sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
- };
- }
{
name = "lcid___lcid_1.0.0.tgz";
path = fetchurl {
@@ -8001,14 +7425,6 @@
sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf";
};
}
- {
- name = "lead___lead_1.0.0.tgz";
- path = fetchurl {
- name = "lead___lead_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz";
- sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42";
- };
- }
{
name = "left_pad___left_pad_1.3.0.tgz";
path = fetchurl {
@@ -8065,14 +7481,6 @@
sha1 = "c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db";
};
}
- {
- name = "livereload_js___livereload_js_2.4.0.tgz";
- path = fetchurl {
- name = "livereload_js___livereload_js_2.4.0.tgz";
- url = "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz";
- sha1 = "447c31cf1ea9ab52fc20db615c5ddf678f78009c";
- };
- }
{
name = "load_json_file___load_json_file_1.1.0.tgz";
path = fetchurl {
@@ -8185,6 +7593,22 @@
sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
};
}
+ {
+ name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
+ path = fetchurl {
+ name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
+ url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
+ sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
+ };
+ }
+ {
+ name = "lodash.isstring___lodash.isstring_4.0.1.tgz";
+ path = fetchurl {
+ name = "lodash.isstring___lodash.isstring_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz";
+ sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
+ };
+ }
{
name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz";
path = fetchurl {
@@ -8513,46 +7937,6 @@
sha1 = "c12ebe16fffc84573d3e19767726de226e95f649";
};
}
- {
- name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz";
- path = fetchurl {
- name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz";
- sha1 = "2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7";
- };
- }
- {
- name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz";
- path = fetchurl {
- name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz";
- sha1 = "db06b8b585be959a2dcd2f87f472ba9b756f3675";
- };
- }
- {
- name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz";
- path = fetchurl {
- name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz";
- sha1 = "132001b266031192348d3366a6b011f28e54dc40";
- };
- }
- {
- name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz";
- path = fetchurl {
- name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz";
- sha1 = "7d85421021343b33de1552fc71cb8e5b4ae7536d";
- };
- }
- {
- name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz";
- path = fetchurl {
- name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz";
- sha1 = "395eeb877f067f9d2165d990d77c7eea6f740934";
- };
- }
{
name = "mdurl___mdurl_1.0.1.tgz";
path = fetchurl {
@@ -8642,11 +8026,11 @@
};
}
{
- name = "mermaid___mermaid_8.2.6.tgz";
+ name = "mermaid___mermaid_8.4.2.tgz";
path = fetchurl {
- name = "mermaid___mermaid_8.2.6.tgz";
- url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.6.tgz";
- sha1 = "e73f396461a435c39a998819171c2114f59e46e1";
+ name = "mermaid___mermaid_8.4.2.tgz";
+ url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.2.tgz";
+ sha1 = "91d3d8e9541e72eed7a78d0e882db11564fab3bb";
};
}
{
@@ -8833,14 +8217,6 @@
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
}
- {
- name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz";
- path = fetchurl {
- name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz";
- url = "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz";
- sha1 = "99db5bb08f7eab55e4c31f6b7c722c6a2144ba74";
- };
- }
{
name = "moment_mini___moment_mini_2.22.1.tgz";
path = fetchurl {
@@ -9153,22 +8529,6 @@
sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03";
};
}
- {
- name = "normalize_url___normalize_url_1.9.1.tgz";
- path = fetchurl {
- name = "normalize_url___normalize_url_1.9.1.tgz";
- url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz";
- sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c";
- };
- }
- {
- name = "now_and_later___now_and_later_2.0.1.tgz";
- path = fetchurl {
- name = "now_and_later___now_and_later_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz";
- sha1 = "8e579c8685764a7cc02cb680380e94f43ccb1f7c";
- };
- }
{
name = "npm_bundled___npm_bundled_1.0.6.tgz";
path = fetchurl {
@@ -9362,11 +8722,11 @@
};
}
{
- name = "optimism___optimism_0.6.9.tgz";
+ name = "optimism___optimism_0.10.3.tgz";
path = fetchurl {
- name = "optimism___optimism_0.6.9.tgz";
- url = "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz";
- sha1 = "19258ff8b3be0cea29ac35f06bff818e026e30bb";
+ name = "optimism___optimism_0.10.3.tgz";
+ url = "https://registry.yarnpkg.com/optimism/-/optimism-0.10.3.tgz";
+ sha1 = "163268fdc741dea2fb50f300bedda80356445fd7";
};
}
{
@@ -9385,14 +8745,6 @@
sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
};
}
- {
- name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz";
- path = fetchurl {
- name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz";
- sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
- };
- }
{
name = "orderedmap___orderedmap_1.0.0.tgz";
path = fetchurl {
@@ -9609,6 +8961,14 @@
sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
};
}
+ {
+ name = "parse_color___parse_color_1.0.0.tgz";
+ path = fetchurl {
+ name = "parse_color___parse_color_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz";
+ sha1 = "7b748b95a83f03f16a94f535e52d7f3d94658619";
+ };
+ }
{
name = "parse_entities___parse_entities_1.2.0.tgz";
path = fetchurl {
@@ -9617,22 +8977,6 @@
sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4";
};
}
- {
- name = "parse_filepath___parse_filepath_1.0.2.tgz";
- path = fetchurl {
- name = "parse_filepath___parse_filepath_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz";
- sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891";
- };
- }
- {
- name = "parse_git_config___parse_git_config_0.2.0.tgz";
- path = fetchurl {
- name = "parse_git_config___parse_git_config_0.2.0.tgz";
- url = "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-0.2.0.tgz";
- sha1 = "272833fdd15fea146fb75d336d236b963b6ff706";
- };
- }
{
name = "parse_json___parse_json_2.2.0.tgz";
path = fetchurl {
@@ -9657,22 +9001,6 @@
sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
};
}
- {
- name = "parse_path___parse_path_3.0.4.tgz";
- path = fetchurl {
- name = "parse_path___parse_path_3.0.4.tgz";
- url = "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz";
- sha1 = "a48b7b529da41f34d9d1428602a39b29fc7180e4";
- };
- }
- {
- name = "parse_url___parse_url_3.0.2.tgz";
- path = fetchurl {
- name = "parse_url___parse_url_3.0.2.tgz";
- url = "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz";
- sha1 = "602787a7063a795d72b8673197505e72f60610be";
- };
- }
{
name = "parse5___parse5_4.0.0.tgz";
path = fetchurl {
@@ -9793,22 +9121,6 @@
sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c";
};
}
- {
- name = "path_root_regex___path_root_regex_0.1.2.tgz";
- path = fetchurl {
- name = "path_root_regex___path_root_regex_0.1.2.tgz";
- url = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz";
- sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d";
- };
- }
- {
- name = "path_root___path_root_0.1.1.tgz";
- path = fetchurl {
- name = "path_root___path_root_0.1.1.tgz";
- url = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz";
- sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7";
- };
- }
{
name = "path_to_regexp___path_to_regexp_0.1.7.tgz";
path = fetchurl {
@@ -10194,11 +9506,11 @@
};
}
{
- name = "postcss___postcss_7.0.18.tgz";
+ name = "postcss___postcss_7.0.21.tgz";
path = fetchurl {
- name = "postcss___postcss_7.0.18.tgz";
- url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz";
- sha1 = "4b9cda95ae6c069c67a4d933029eddd4838ac233";
+ name = "postcss___postcss_7.0.21.tgz";
+ url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz";
+ sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17";
};
}
{
@@ -10257,14 +9569,6 @@
sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff";
};
}
- {
- name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
- path = fetchurl {
- name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
- sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
- };
- }
{
name = "process_nextick_args___process_nextick_args_1.0.7.tgz";
path = fetchurl {
@@ -10273,6 +9577,14 @@
sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
};
}
+ {
+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+ path = fetchurl {
+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+ sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
+ };
+ }
{
name = "process___process_0.11.10.tgz";
path = fetchurl {
@@ -10305,14 +9617,6 @@
sha1 = "bf90bc71f6065d255ea2bdc0fe6520485c1b45db";
};
}
- {
- name = "property_information___property_information_4.2.0.tgz";
- path = fetchurl {
- name = "property_information___property_information_4.2.0.tgz";
- url = "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz";
- sha1 = "f0e66e07cbd6fed31d96844d958d153ad3eb486e";
- };
- }
{
name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz";
path = fetchurl {
@@ -10433,14 +9737,6 @@
sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
};
}
- {
- name = "protocols___protocols_1.4.7.tgz";
- path = fetchurl {
- name = "protocols___protocols_1.4.7.tgz";
- url = "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz";
- sha1 = "95f788a4f0e979b291ffefcf5636ad113d037d32";
- };
- }
{
name = "proxy_addr___proxy_addr_2.0.5.tgz";
path = fetchurl {
@@ -10561,14 +9857,6 @@
sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
};
}
- {
- name = "query_string___query_string_4.3.4.tgz";
- path = fetchurl {
- name = "query_string___query_string_4.3.4.tgz";
- url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz";
- sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb";
- };
- }
{
name = "querystring_es3___querystring_es3_0.2.1.tgz";
path = fetchurl {
@@ -10633,14 +9921,6 @@
sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810";
};
}
- {
- name = "raven_js___raven_js_3.22.1.tgz";
- path = fetchurl {
- name = "raven_js___raven_js_3.22.1.tgz";
- url = "https://registry.yarnpkg.com/raven-js/-/raven-js-3.22.1.tgz";
- sha1 = "1117f00dfefaa427ef6e1a7d50bbb1fb998a24da";
- };
- }
{
name = "raw_body___raw_body_2.4.0.tgz";
path = fetchurl {
@@ -10649,14 +9929,6 @@
sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332";
};
}
- {
- name = "raw_body___raw_body_1.1.7.tgz";
- path = fetchurl {
- name = "raw_body___raw_body_1.1.7.tgz";
- url = "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz";
- sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425";
- };
- }
{
name = "raw_loader___raw_loader_3.1.0.tgz";
path = fetchurl {
@@ -10761,14 +10033,6 @@
sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
};
}
- {
- name = "readable_stream___readable_stream_2.1.5.tgz";
- path = fetchurl {
- name = "readable_stream___readable_stream_2.1.5.tgz";
- url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz";
- sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
- };
- }
{
name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz";
path = fetchurl {
@@ -10929,22 +10193,6 @@
sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
};
}
- {
- name = "remark_html___remark_html_8.0.0.tgz";
- path = fetchurl {
- name = "remark_html___remark_html_8.0.0.tgz";
- url = "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz";
- sha1 = "9fcb859a6f3cb40f3ef15402950f1a62ec301b3a";
- };
- }
- {
- name = "remark_parse___remark_parse_5.0.0.tgz";
- path = fetchurl {
- name = "remark_parse___remark_parse_5.0.0.tgz";
- url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz";
- sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95";
- };
- }
{
name = "remark_parse___remark_parse_6.0.3.tgz";
path = fetchurl {
@@ -10953,30 +10201,6 @@
sha1 = "c99131052809da482108413f87b0ee7f52180a3a";
};
}
- {
- name = "remark_reference_links___remark_reference_links_4.0.4.tgz";
- path = fetchurl {
- name = "remark_reference_links___remark_reference_links_4.0.4.tgz";
- url = "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz";
- sha1 = "190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab";
- };
- }
- {
- name = "remark_slug___remark_slug_5.1.2.tgz";
- path = fetchurl {
- name = "remark_slug___remark_slug_5.1.2.tgz";
- url = "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz";
- sha1 = "715ecdef8df1226786204b1887d31ab16aa24609";
- };
- }
- {
- name = "remark_stringify___remark_stringify_5.0.0.tgz";
- path = fetchurl {
- name = "remark_stringify___remark_stringify_5.0.0.tgz";
- url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz";
- sha1 = "336d3a4d4a6a3390d933eeba62e8de4bd280afba";
- };
- }
{
name = "remark_stringify___remark_stringify_6.0.4.tgz";
path = fetchurl {
@@ -10985,14 +10209,6 @@
sha1 = "16ac229d4d1593249018663c7bddf28aafc4e088";
};
}
- {
- name = "remark_toc___remark_toc_5.1.1.tgz";
- path = fetchurl {
- name = "remark_toc___remark_toc_5.1.1.tgz";
- url = "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz";
- sha1 = "8c229d6f834cdb43fde6685e2d43248d3fc82d78";
- };
- }
{
name = "remark___remark_10.0.1.tgz";
path = fetchurl {
@@ -11001,38 +10217,6 @@
sha1 = "3058076dc41781bf505d8978c291485fe47667df";
};
}
- {
- name = "remark___remark_9.0.0.tgz";
- path = fetchurl {
- name = "remark___remark_9.0.0.tgz";
- url = "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz";
- sha1 = "c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60";
- };
- }
- {
- name = "remote_origin_url___remote_origin_url_0.4.0.tgz";
- path = fetchurl {
- name = "remote_origin_url___remote_origin_url_0.4.0.tgz";
- url = "https://registry.yarnpkg.com/remote-origin-url/-/remote-origin-url-0.4.0.tgz";
- sha1 = "4d3e2902f34e2d37d1c263d87710b77eb4086a30";
- };
- }
- {
- name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
- path = fetchurl {
- name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz";
- sha1 = "c2bf1e377520d324f623892e33c10cac2c252b53";
- };
- }
- {
- name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz";
- path = fetchurl {
- name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz";
- sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523";
- };
- }
{
name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
path = fetchurl {
@@ -11201,14 +10385,6 @@
sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69";
};
}
- {
- name = "resolve_options___resolve_options_1.1.0.tgz";
- path = fetchurl {
- name = "resolve_options___resolve_options_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz";
- sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131";
- };
- }
{
name = "resolve_url___resolve_url_0.2.1.tgz";
path = fetchurl {
@@ -11337,14 +10513,6 @@
sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
};
}
- {
- name = "safe_json_parse___safe_json_parse_1.0.1.tgz";
- path = fetchurl {
- name = "safe_json_parse___safe_json_parse_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz";
- sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57";
- };
- }
{
name = "safe_regex___safe_regex_1.1.0.tgz";
path = fetchurl {
@@ -11370,11 +10538,11 @@
};
}
{
- name = "sanitize_html___sanitize_html_1.16.3.tgz";
+ name = "sanitize_html___sanitize_html_1.20.1.tgz";
path = fetchurl {
- name = "sanitize_html___sanitize_html_1.16.3.tgz";
- url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.16.3.tgz";
- sha1 = "96c1b44a36ff7312e1c22a14b05274370ac8bd56";
+ name = "sanitize_html___sanitize_html_1.20.1.tgz";
+ url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz";
+ sha1 = "f6effdf55dd398807171215a62bfc21811bacf85";
};
}
{
@@ -11777,14 +10945,6 @@
sha1 = "d976bbe800af7bd20ae08598d582393508993c0d";
};
}
- {
- name = "sort_keys___sort_keys_1.1.2.tgz";
- path = fetchurl {
- name = "sort_keys___sort_keys_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz";
- sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad";
- };
- }
{
name = "sortablejs___sortablejs_1.10.0.tgz";
path = fetchurl {
@@ -11865,14 +11025,6 @@
sha1 = "5302f8169031735226544092e64981f751750383";
};
}
- {
- name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz";
- path = fetchurl {
- name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz";
- url = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz";
- sha1 = "27910835ae00d0adfcdbd0ad7e611fb9544351fa";
- };
- }
{
name = "spdx_correct___spdx_correct_1.0.2.tgz";
path = fetchurl {
@@ -12033,14 +11185,6 @@
sha1 = "d229e372d2199ddf5d283bbe34ac1f7d2529c2fc";
};
}
- {
- name = "stream_array___stream_array_1.1.2.tgz";
- path = fetchurl {
- name = "stream_array___stream_array_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz";
- sha1 = "9e5f7345f2137c30ee3b498b9114e80b52bb7eb5";
- };
- }
{
name = "stream_browserify___stream_browserify_2.0.1.tgz";
path = fetchurl {
@@ -12049,14 +11193,6 @@
sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
};
}
- {
- name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
- path = fetchurl {
- name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz";
- sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
- };
- }
{
name = "stream_each___stream_each_1.2.2.tgz";
path = fetchurl {
@@ -12089,14 +11225,6 @@
sha1 = "8167d8496ed9f19f05ee4b158d9611321b8cacd9";
};
}
- {
- name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz";
- path = fetchurl {
- name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
- sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
- };
- }
{
name = "string_length___string_length_2.0.0.tgz";
path = fetchurl {
@@ -12105,14 +11233,6 @@
sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
};
}
- {
- name = "string_template___string_template_0.2.1.tgz";
- path = fetchurl {
- name = "string_template___string_template_0.2.1.tgz";
- url = "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz";
- sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
- };
- }
{
name = "string_width___string_width_1.0.2.tgz";
path = fetchurl {
@@ -12145,14 +11265,6 @@
sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff";
};
}
- {
- name = "string_decoder___string_decoder_0.10.31.tgz";
- path = fetchurl {
- name = "string_decoder___string_decoder_0.10.31.tgz";
- url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz";
- sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
- };
- }
{
name = "string_decoder___string_decoder_1.1.1.tgz";
path = fetchurl {
@@ -12161,6 +11273,14 @@
sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
};
}
+ {
+ name = "string_decoder___string_decoder_0.10.31.tgz";
+ path = fetchurl {
+ name = "string_decoder___string_decoder_0.10.31.tgz";
+ url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz";
+ sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+ };
+ }
{
name = "stringify_entities___stringify_entities_1.3.2.tgz";
path = fetchurl {
@@ -12289,14 +11409,6 @@
sha1 = "1bc4c4ce878107e7c396b19226d91ba28268911a";
};
}
- {
- name = "subarg___subarg_1.0.0.tgz";
- path = fetchurl {
- name = "subarg___subarg_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz";
- sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
- };
- }
{
name = "sugarss___sugarss_2.0.0.tgz";
path = fetchurl {
@@ -12497,14 +11609,6 @@
sha1 = "7307ddd6cd9acadb349132fbf6c18d78c88a5e62";
};
}
- {
- name = "through2_filter___through2_filter_3.0.0.tgz";
- path = fetchurl {
- name = "through2_filter___through2_filter_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz";
- sha1 = "700e786df2367c2c88cd8aa5be4cf9c1e7831254";
- };
- }
{
name = "through2___through2_2.0.5.tgz";
path = fetchurl {
@@ -12569,14 +11673,6 @@
sha1 = "82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c";
};
}
- {
- name = "tiny_lr___tiny_lr_1.1.1.tgz";
- path = fetchurl {
- name = "tiny_lr___tiny_lr_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz";
- sha1 = "9fa547412f238fedb068ee295af8b682c98b2aab";
- };
- }
{
name = "tiptap_commands___tiptap_commands_1.4.0.tgz";
path = fetchurl {
@@ -12625,14 +11721,6 @@
sha1 = "23640dd7b42d00433911140820e5cf440e521dd1";
};
}
- {
- name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz";
- path = fetchurl {
- name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz";
- url = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz";
- sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b";
- };
- }
{
name = "to_array___to_array_0.1.4.tgz";
path = fetchurl {
@@ -12689,14 +11777,6 @@
sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce";
};
}
- {
- name = "to_through___to_through_2.0.0.tgz";
- path = fetchurl {
- name = "to_through___to_through_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz";
- sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6";
- };
- }
{
name = "toggle_selection___toggle_selection_1.0.6.tgz";
path = fetchurl {
@@ -12737,14 +11817,6 @@
sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
};
}
- {
- name = "trim_lines___trim_lines_1.1.2.tgz";
- path = fetchurl {
- name = "trim_lines___trim_lines_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz";
- sha1 = "c8adbdbdae21bb5c2766240a661f693afe23e59b";
- };
- }
{
name = "trim_newlines___trim_newlines_1.0.0.tgz";
path = fetchurl {
@@ -12817,14 +11889,6 @@
sha1 = "027b69fa823225e551cace3ef03b11f6ab37c1d7";
};
}
- {
- name = "ts_invariant___ts_invariant_0.2.1.tgz";
- path = fetchurl {
- name = "ts_invariant___ts_invariant_0.2.1.tgz";
- url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz";
- sha1 = "3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f";
- };
- }
{
name = "ts_invariant___ts_invariant_0.3.2.tgz";
path = fetchurl {
@@ -12833,6 +11897,14 @@
sha1 = "89a2ffeb70879b777258df1df1c59383c35209b0";
};
}
+ {
+ name = "ts_invariant___ts_invariant_0.4.4.tgz";
+ path = fetchurl {
+ name = "ts_invariant___ts_invariant_0.4.4.tgz";
+ url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz";
+ sha1 = "97a523518688f93aafad01b0e80eb803eb2abd86";
+ };
+ }
{
name = "ts_jest___ts_jest_24.0.0.tgz";
path = fetchurl {
@@ -12881,6 +11953,14 @@
sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
};
}
+ {
+ name = "type_fest___type_fest_0.5.2.tgz";
+ path = fetchurl {
+ name = "type_fest___type_fest_0.5.2.tgz";
+ url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz";
+ sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2";
+ };
+ }
{
name = "type_is___type_is_1.6.18.tgz";
path = fetchurl {
@@ -12929,14 +12009,6 @@
sha1 = "9fe1536a10a664a65266a1e3ccf85fd36302bc9c";
};
}
- {
- name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
- path = fetchurl {
- name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
- url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz";
- sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
- };
- }
{
name = "undefsafe___undefsafe_2.0.2.tgz";
path = fetchurl {
@@ -13017,14 +12089,6 @@
sha1 = "5a533f31b4317ea76f17d807fa0d116546111dd0";
};
}
- {
- name = "unified___unified_6.2.0.tgz";
- path = fetchurl {
- name = "unified___unified_6.2.0.tgz";
- url = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz";
- sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba";
- };
- }
{
name = "unified___unified_7.1.0.tgz";
path = fetchurl {
@@ -13065,14 +12129,6 @@
sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
};
}
- {
- name = "unique_stream___unique_stream_2.3.1.tgz";
- path = fetchurl {
- name = "unique_stream___unique_stream_2.3.1.tgz";
- url = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz";
- sha1 = "c65d110e9a4adf9a6c5948b28053d9a8d04cbeac";
- };
- }
{
name = "unique_string___unique_string_1.0.0.tgz";
path = fetchurl {
@@ -13081,14 +12137,6 @@
sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
};
}
- {
- name = "unist_builder___unist_builder_1.0.4.tgz";
- path = fetchurl {
- name = "unist_builder___unist_builder_1.0.4.tgz";
- url = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz";
- sha1 = "e1808aed30bd72adc3607f25afecebef4dd59e17";
- };
- }
{
name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz";
path = fetchurl {
@@ -13097,14 +12145,6 @@
sha1 = "9be49cfbae5ca1566b27536670a92836bf2f8d6d";
};
}
- {
- name = "unist_util_generated___unist_util_generated_1.1.4.tgz";
- path = fetchurl {
- name = "unist_util_generated___unist_util_generated_1.1.4.tgz";
- url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz";
- sha1 = "2261c033d9fc23fae41872cdb7663746e972c1a7";
- };
- }
{
name = "unist_util_is___unist_util_is_2.1.2.tgz";
path = fetchurl {
@@ -13113,14 +12153,6 @@
sha1 = "1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db";
};
}
- {
- name = "unist_util_position___unist_util_position_3.0.3.tgz";
- path = fetchurl {
- name = "unist_util_position___unist_util_position_3.0.3.tgz";
- url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz";
- sha1 = "fff942b879538b242096c148153826664b1ca373";
- };
- }
{
name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz";
path = fetchurl {
@@ -13137,14 +12169,6 @@
sha1 = "3f37fcf351279dcbca7480ab5889bb8a832ee1c6";
};
}
- {
- name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz";
- path = fetchurl {
- name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz";
- sha1 = "de2a2bc8d3febfa606652673a91455b6a36fb9f3";
- };
- }
{
name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz";
path = fetchurl {
@@ -13361,14 +12385,6 @@
sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
};
}
- {
- name = "value_or_function___value_or_function_3.0.0.tgz";
- path = fetchurl {
- name = "value_or_function___value_or_function_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz";
- sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813";
- };
- }
{
name = "vary___vary_1.1.2.tgz";
path = fetchurl {
@@ -13401,46 +12417,6 @@
sha1 = "5833ae078a1dfa2d96e9647886cd32993ab313e1";
};
}
- {
- name = "vfile_message___vfile_message_2.0.1.tgz";
- path = fetchurl {
- name = "vfile_message___vfile_message_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz";
- sha1 = "951881861c22fc1eb39f873c0b93e336a64e8f6d";
- };
- }
- {
- name = "vfile_reporter___vfile_reporter_6.0.0.tgz";
- path = fetchurl {
- name = "vfile_reporter___vfile_reporter_6.0.0.tgz";
- url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz";
- sha1 = "753119f51dec9289b7508b457afc0cddf5e07f2e";
- };
- }
- {
- name = "vfile_sort___vfile_sort_2.2.1.tgz";
- path = fetchurl {
- name = "vfile_sort___vfile_sort_2.2.1.tgz";
- url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz";
- sha1 = "74e714f9175618cdae96bcaedf1a3dc711d87567";
- };
- }
- {
- name = "vfile_statistics___vfile_statistics_1.1.3.tgz";
- path = fetchurl {
- name = "vfile_statistics___vfile_statistics_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz";
- sha1 = "e9c87071997fbcb4243764d2c3805e0bb0820c60";
- };
- }
- {
- name = "vfile___vfile_2.3.0.tgz";
- path = fetchurl {
- name = "vfile___vfile_2.3.0.tgz";
- url = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz";
- sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a";
- };
- }
{
name = "vfile___vfile_3.0.1.tgz";
path = fetchurl {
@@ -13449,38 +12425,6 @@
sha1 = "47331d2abe3282424f4a4bb6acd20a44c4121803";
};
}
- {
- name = "vfile___vfile_4.0.1.tgz";
- path = fetchurl {
- name = "vfile___vfile_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz";
- sha1 = "fc3d43a1c71916034216bf65926d5ee3c64ed60c";
- };
- }
- {
- name = "vinyl_fs___vinyl_fs_3.0.3.tgz";
- path = fetchurl {
- name = "vinyl_fs___vinyl_fs_3.0.3.tgz";
- url = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz";
- sha1 = "c85849405f67428feabbbd5c5dbdd64f47d31bc7";
- };
- }
- {
- name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz";
- path = fetchurl {
- name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz";
- sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16";
- };
- }
- {
- name = "vinyl___vinyl_2.2.0.tgz";
- path = fetchurl {
- name = "vinyl___vinyl_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz";
- sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86";
- };
- }
{
name = "visibilityjs___visibilityjs_1.2.4.tgz";
path = fetchurl {
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 371d9d83e29..2ce855d3a7f 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
- version = "0.49";
+ version = "0.51";
pname = "gource";
src = fetchurl {
url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
+ sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index 13afe0a4261..698f6df0673 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cntr";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "Mic92";
repo = "cntr";
rev = version;
- sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg";
+ sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0";
};
cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx";
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index fddf1741720..29111399ae9 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -17,7 +17,7 @@
buildGoPackage rec {
project = "cri-o";
- version = "1.16.0";
+ version = "1.16.1";
name = "${project}-${version}${flavor}";
goPackagePath = "github.com/${project}/${project}";
@@ -26,7 +26,7 @@ buildGoPackage rec {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
- sha256 = "1kbg544v7c1apaxrpndgrap0pb5c67d8fazbkgykg6ynskx6n344";
+ sha256 = "0w690zhc55gdqzc31jc34nrzwd253pfb3rq23z51q22nqwmlsh9p";
};
outputs = [ "bin" "out" ];
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index b1c42b099b6..7e8dbf33a7b 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonApplication rec {
- version = "1.24.1";
+ version = "1.25.0";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
- sha256 = "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5";
+ sha256 = "0zlprmsgmj4z627snsl0qmq8y7ggcyqrqm5vxvrvcigl7zywnprc";
};
# lots of networking and other fails
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index a1a38484386..be256b8e591 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -4,10 +4,30 @@
, lib
}:
-args@{ name, bazelFlags ? [], bazelBuildFlags ? [], bazelFetchFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
+args@{
+ name
+, bazelFlags ? []
+, bazelBuildFlags ? []
+, bazelFetchFlags ? []
+, bazelTarget
+, buildAttrs
+, fetchAttrs
+
+# Newer versions of Bazel are moving away from built-in rules_cc and instead
+# allow fetching it as an external dependency in a WORKSPACE file[1]. If
+# removed in the fixed-output fetch phase, building will fail to download it.
+# This can be seen e.g. in #73097
+#
+# This option allows configuring the removal of rules_cc in cases where a
+# project depends on it via an external dependency.
+#
+# [1]: https://github.com/bazelbuild/rules_cc
+, removeRulesCC ? true
+, ...
+}:
let
- fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" ];
+ fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" "removeRulesCC" ];
fBuildAttrs = fArgs // buildAttrs;
fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ];
@@ -60,7 +80,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
# Remove all built in external workspaces, Bazel will recreate them when building
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
- rm -rf $bazelOut/external/{rules_cc,\@rules_cc.marker}
+ ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""}
rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
rm -rf $bazelOut/external/{local_*,\@local_*.marker}
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 931be1a3700..8020ba46f3f 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -42,6 +42,7 @@ Options:
--url url Any url understood by 'git clone'.
--rev ref Any sha1 or references (such as refs/heads/master)
--hash h Expected hash.
+ --branch-name Branch name to check out into
--deepClone Clone the entire repository.
--no-deepClone Make a shallow clone of just the required ref.
--leave-dotGit Keep the .git directories.
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 0a436ff02a3..d051a0f75c1 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -93,7 +93,7 @@ if [ -z "$oldUrl" ]; then
fi
drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"')
-oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or lib.getVersion $attr" | tr -d '"')
+oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"')
if [ -z "$drvName" -o -z "$oldVersion" ]; then
die "Couldn't evaluate name and version from '$attr.name'!"
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index d6d986c699a..cbe4b25bd36 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
- version = "2.3.2";
+ version = "2.3.3";
in fetchzip {
name = "iosevka-bin-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
'';
- sha256 = "1dkfh354scjgzq7kgy4cn70z030wmfgxixqp8p9m6i0ps8gccjgs";
+ sha256 = "1dfm1888rii5kfmkxp5hnx8ycji57cbs5gazpgkxg1mnmn7i35wl";
meta = with stdenv.lib; {
homepage = https://be5invis.github.io/Iosevka/;
diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix
index 4730a67e290..1d0cf04d756 100644
--- a/pkgs/data/fonts/overpass/default.nix
+++ b/pkgs/data/fonts/overpass/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "3.0.3";
+ version = "3.0.4";
in fetchzip rec {
name = "overpass-${version}";
@@ -12,10 +12,10 @@ in fetchzip rec {
mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name}
'';
- sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg";
+ sha256 = "13b4yam0nycclccxidzj2fa3nwms5qji7gfkixdnl4ybf0f56b64";
meta = with lib; {
- homepage = http://overpassfont.org/;
+ homepage = "https://overpassfont.org/";
description = "Font heavily inspired by Highway Gothic";
license = licenses.ofl;
platforms = platforms.all;
diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/data/fonts/rhodium-libre/default.nix
new file mode 100644
index 00000000000..fc89d652592
--- /dev/null
+++ b/pkgs/data/fonts/rhodium-libre/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchFromGitHub }:
+
+let
+ pname = "RhodiumLibre";
+ version = "1.2.0";
+in fetchFromGitHub {
+ name = "${pname}-${version}";
+
+ owner = "DunwichType";
+ repo = pname;
+ rev = version;
+
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf
+ install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf
+ '';
+
+ sha256 = "04ax6bri5vsji465806p8d7zbdf12r5bpvcm9nb8isfqm81ggj0r";
+
+ meta = with lib; {
+ description = "F/OSS/Libre font for Latin and Devanagari";
+ homepage = "https://github.com/DunwichType/RhodiumLibre";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix
new file mode 100644
index 00000000000..f0e13b21dfd
--- /dev/null
+++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub , gtk3 }:
+
+stdenv.mkDerivation rec {
+ pname = "flat-remix-icon-theme";
+ version = "20191018";
+
+ src = fetchFromGitHub {
+ owner = "daniruiz";
+ repo = "flat-remix";
+ rev = version;
+ sha256 = "13ibxvrvri04lb5phm49b6d553jh0aigm57z5i0nsins405gixn9";
+ };
+
+ nativeBuildInputs = [ gtk3 ];
+
+ installPhase = ''
+ mkdir -p $out/share/icons
+ mv Flat-Remix* $out/share/icons/
+ '';
+
+ postFixup = ''
+ for theme in $out/share/icons/*; do
+ gtk-update-icon-cache $theme
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Flat remix is a pretty simple icon theme inspired on material design";
+ homepage = https://drasite.com/flat-remix;
+ license = with licenses; [ gpl3 ];
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ mschneider ];
+ };
+}
+
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 5115c2d8fb4..6ea04910d23 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "gedit";
- version = "3.34.0";
+ version = "3.34.1";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0zjh3p3lns7a7kx3g3v7gkgcqdzyx1zyv8ssr6d5ljfb7hfyb59y";
+ sha256 = "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index ce8215d6391..d59746adc3d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -51,11 +51,11 @@
stdenv.mkDerivation rec {
pname = "gnome-boxes";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1758k5b79kyywdg67b4byqhva9045i13lzg5r62my950c4c2p0pc";
+ sha256 = "1rqdjf61cbi3zcpzr6cfkj3lcfrdlhs20bl65lxw2xrwk4jn0ph5";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 49b44f5f283..12dba8b41e1 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
let
pname = "gnome-maps";
- version = "3.34.1";
+ version = "3.34.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "03nswj60lqznr2j3ld2lgjzr4j9x2gblqx2ip4l2yxnm9kgbm14s";
+ sha256 = "00xslcnhhwslqglgfv2im7vq3awa49y2jxzr8wsby7f713k28vf5";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 61f27f10ae1..bab84eeb78c 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -43,13 +43,13 @@
stdenv.mkDerivation rec {
pname = "evince";
- version = "3.34.1";
+ version = "3.34.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45";
+ sha256 = "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w";
};
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index fa70ecea264..6c293cb55b9 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
- version = "3.34.1";
+ version = "3.34.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1gisymfjhkibqy73pmd0d3fwl43a23d0lvlxzqkycfdn9jh6pxbg";
+ sha256 = "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 8fad9e3c288..6d36b8710b6 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -10,6 +10,7 @@
, sysprof
, desktop-file-utils
, libcap_ng
+, egl-wayland
}:
stdenv.mkDerivation rec {
@@ -26,6 +27,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dxwayland-path=${xwayland}/bin/Xwayland"
"-Dinstalled_tests=false" # TODO: enable these
+ "-Dwayland_eglstream=true"
+ "-Degl_device=true"
];
propagatedBuildInputs = [
@@ -52,7 +55,7 @@ stdenv.mkDerivation rec {
gnome-desktop cairo pango cogl zenity libstartup_notification
geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
- libxkbcommon pipewire xwayland
+ libxkbcommon pipewire xwayland egl-wayland
gnome-settings-daemon sysprof
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index dd7908ba726..9edeb3ea5de 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-taquin";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0vyrfhkfpx83n9p70jssykbndvb3sxwdihqvvvb94rbw7n6c4q4r";
+ sha256 = "1ff3h57wr26np3dlh7smpslba2awxasmhv3y45bn498i3n1vyvsk";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index c679f3f74b8..33cd60f5272 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "iagno";
- version = "3.34.2";
+ version = "3.34.3";
src = fetchurl {
url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0r31k6b8mqgn5c55hi94gpdr776ykq7ww55vq6pmp5irhdwb3gn9";
+ sha256 = "1m9654dbi4vrl59wvbyxz7jf81v4mn4n5lcq7abb42lba965d2z2";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index dc7e0ed222f..808d36dab95 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -27,14 +27,14 @@
let
pname = "gnome-flashback";
- version = "3.34.1";
+ version = "3.34.2";
requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;";
gnome-flashback = stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0xxw5w66gx04amyxhf4xbz0s4bf0rdp7y9nyrf6bb4xdc6b0rfnx";
+ sha256 = "1726xcm2q94nfvb055d3m61m20s0xy3xl1fc3ds3k3rcrn457riv";
};
# make .desktop Execs absolute
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index accedf9a7af..44f72a93c3a 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ant, jre, jdk}:
stdenv.mkDerivation rec {
pname = "abcl";
- version = "1.5.0";
+ version = "1.6.0";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
- sha256 = "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj";
+ sha256 = "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9";
};
configurePhase = ''
mkdir nix-tools
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix
new file mode 100644
index 00000000000..c5a1513b648
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/common.nix
@@ -0,0 +1,206 @@
+args@
+{ version
+, sha256
+, url ? ""
+, name ? ""
+, developerProgram ? false
+, runPatches ? []
+, addOpenGLRunpath
+, alsaLib
+, expat
+, fetchurl
+, fontconfig
+, freetype
+, gcc
+, gdk-pixbuf
+, glib
+, glibc
+, gtk2
+, lib
+, makeWrapper
+, ncurses5
+, perl
+, python27
+, requireFile
+, stdenv
+, unixODBC
+, xorg
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "cudatoolkit";
+ inherit version runPatches;
+
+ dontPatchELF = true;
+ dontStrip = true;
+
+ src =
+ if developerProgram then
+ requireFile {
+ message = ''
+ This nix expression requires that ${args.name} is already part of the store.
+ Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit
+ at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory:
+ nix-prefetch-url file://\$PWD/${args.name}
+ '';
+ inherit (args) name sha256;
+ }
+ else
+ fetchurl {
+ inherit (args) url sha256;
+ };
+
+ outputs = [ "out" "lib" "doc" ];
+
+ nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
+ buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
+ runtimeDependencies = [
+ ncurses5 expat python27 zlib glibc
+ xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
+ gtk2 glib fontconfig freetype unixODBC alsaLib
+ ];
+
+ rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
+
+ unpackPhase = ''
+ sh $src --keep --noexec
+
+ cd pkg/run_files
+ sh cuda-linux*.run --keep --noexec
+ sh cuda-samples*.run --keep --noexec
+ mv pkg ../../$(basename $src)
+ cd ../..
+ rm -rf pkg
+
+ for patch in $runPatches; do
+ sh $patch --keep --noexec
+ mv pkg $(basename $patch)
+ done
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir $out
+ cd $(basename $src)
+ export PERL5LIB=.
+ perl ./install-linux.pl --prefix="$out"
+ cd ..
+ for patch in $runPatches; do
+ cd $(basename $patch)
+ perl ./install_patch.pl --silent --accept-eula --installdir="$out"
+ cd ..
+ done
+
+ rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
+
+ # let's remove the 32-bit libraries, they confuse the lib64->lib mover
+ rm -rf $out/lib
+
+ # Remove some cruft.
+ ${lib.optionalString (lib.versionAtLeast version "7.0") "rm $out/bin/uninstall*"}
+
+ # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
+ if [ -d "$out"/cuda-samples ]; then
+ mv "$out"/cuda-samples "$out"/samples
+ fi
+
+ # Change the #error on GCC > 4.9 to a #warning.
+ sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
+
+ # Fix builds with newer glibc version
+ sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
+
+ # Ensure that cmake can find CUDA.
+ mkdir -p $out/nix-support
+ echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
+
+ # Move some libraries to the lib output so that programs that
+ # depend on them don't pull in this entire monstrosity.
+ mkdir -p $lib/lib
+ mv -v $out/lib64/libcudart* $lib/lib/
+
+ # Remove OpenCL libraries as they are provided by ocl-icd and driver.
+ rm -f $out/lib64/libOpenCL*
+
+ # Set compiler for NVCC.
+ wrapProgram $out/bin/nvcc \
+ --prefix PATH : ${gcc}/bin
+
+ # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
+ wrapProgram $out/bin/nvprof \
+ --prefix LD_LIBRARY_PATH : $out/lib
+ '' + lib.optionalString (lib.versionOlder version "8.0") ''
+ # Hack to fix building against recent Glibc/GCC.
+ echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
+ '' + ''
+ runHook postInstall
+ '';
+
+ postInstall = ''
+ for b in nvvp nsight; do
+ wrapProgram "$out/bin/$b" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+ done
+ '';
+
+ preFixup = ''
+ while IFS= read -r -d ''$'\0' i; do
+ if ! isELF "$i"; then continue; fi
+ echo "patching $i..."
+ if [[ ! $i =~ \.so ]]; then
+ patchelf \
+ --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
+ fi
+ if [[ $i =~ libcudart ]]; then
+ rpath2=
+ else
+ rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
+ fi
+ patchelf --set-rpath "$rpath2" --force-rpath $i
+ done < <(find $out $lib $doc -type f -print0)
+ '';
+
+ # Set RPATH so that libcuda and other libraries in
+ # /run/opengl-driver(-32)/lib can be found. See the explanation in
+ # addOpenGLRunpath. Don't try to figure out which libraries really need
+ # it, just patch all (but not the stubs libraries). Note that
+ # --force-rpath prevents changing RPATH (set above) to RUNPATH.
+ postFixup = ''
+ addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so
+ '';
+
+ # cuda-gdb doesn't run correctly when not using sandboxing, so
+ # temporarily disabling the install check. This should be set to true
+ # when we figure out how to get `cuda-gdb --version` to run correctly
+ # when not using sandboxing.
+ doInstallCheck = false;
+ postInstallCheck = let
+ in ''
+ # Smoke test binaries
+ pushd $out/bin
+ for f in *; do
+ case $f in
+ crt) continue;;
+ nvcc.profile) continue;;
+ nsight_ee_plugins_manage.sh) continue;;
+ uninstall_cuda_toolkit_6.5.pl) continue;;
+ computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version"
+ *) echo "Executing '$f --version':"; ./$f --version;;
+ esac
+ done
+ popd
+ '';
+ passthru = {
+ cc = gcc;
+ majorVersion = lib.versions.majorMinor version;
+ };
+
+ meta = with stdenv.lib; {
+ description = "A compiler for NVIDIA GPUs, math libraries, and tools";
+ homepage = "https://developer.nvidia.com/cuda-toolkit";
+ platforms = [ "x86_64-linux" ];
+ license = licenses.unfree;
+ };
+}
+
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 98c0381216a..9c983a38e4e 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,210 +1,15 @@
-{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib
-, gcc48, gcc49, gcc5, gcc6, gcc7
-, xorg, gtk2, gdk-pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
-, addOpenGLRunpath
+{ lib
+, callPackage
+, fetchurl
+, gcc48
+, gcc49
+, gcc5
+, gcc6
+, gcc7
}:
let
-
- common =
- args@{ gcc, version, sha256
- , url ? ""
- , name ? ""
- , developerProgram ? false
- , python ? python27
- , runPatches ? []
- }:
-
- stdenv.mkDerivation rec {
- pname = "cudatoolkit";
- inherit version runPatches;
-
- dontPatchELF = true;
- dontStrip = true;
-
- src =
- if developerProgram then
- requireFile {
- message = ''
- This nix expression requires that ${args.name} is already part of the store.
- Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit
- at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory:
- nix-prefetch-url file://\$PWD/${args.name}
- '';
- inherit (args) name sha256;
- }
- else
- fetchurl {
- inherit (args) url sha256;
- };
-
- outputs = [ "out" "lib" "doc" ];
-
- nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
- buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
- runtimeDependencies = [
- ncurses5 expat python zlib glibc
- xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
- gtk2 glib fontconfig freetype unixODBC alsaLib
- ];
-
- rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
-
- unpackPhase = ''
- sh $src --keep --noexec
-
- ${lib.optionalString (lib.versionOlder version "10.1") ''
- cd pkg/run_files
- sh cuda-linux*.run --keep --noexec
- sh cuda-samples*.run --keep --noexec
- mv pkg ../../$(basename $src)
- cd ../..
- rm -rf pkg
-
- for patch in $runPatches; do
- sh $patch --keep --noexec
- mv pkg $(basename $patch)
- done
- ''}
- '';
-
- installPhase = ''
- runHook preInstall
- mkdir $out
- ${lib.optionalString (lib.versionOlder version "10.1") ''
- cd $(basename $src)
- export PERL5LIB=.
- perl ./install-linux.pl --prefix="$out"
- cd ..
- for patch in $runPatches; do
- cd $(basename $patch)
- perl ./install_patch.pl --silent --accept-eula --installdir="$out"
- cd ..
- done
- ''}
- ${lib.optionalString (lib.versionAtLeast version "10.1") ''
- cd pkg/builds/cuda-toolkit
- mv * $out/
- ''}
-
- rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
-
- ${lib.optionalString (lib.versionOlder version "10.1") ''
- # let's remove the 32-bit libraries, they confuse the lib64->lib mover
- rm -rf $out/lib
- ''}
-
- # Remove some cruft.
- ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1"))
- "rm $out/bin/uninstall*"}
-
- # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
- if [ -d "$out"/cuda-samples ]; then
- mv "$out"/cuda-samples "$out"/samples
- fi
-
- # Change the #error on GCC > 4.9 to a #warning.
- sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
-
- # Fix builds with newer glibc version
- sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
-
- # Ensure that cmake can find CUDA.
- mkdir -p $out/nix-support
- echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
-
- # Move some libraries to the lib output so that programs that
- # depend on them don't pull in this entire monstrosity.
- mkdir -p $lib/lib
- mv -v $out/lib64/libcudart* $lib/lib/
-
- # Remove OpenCL libraries as they are provided by ocl-icd and driver.
- rm -f $out/lib64/libOpenCL*
- ${lib.optionalString (lib.versionAtLeast version "10.1") ''
- mv $out/lib64 $out/lib
- ''}
-
- # Set compiler for NVCC.
- wrapProgram $out/bin/nvcc \
- --prefix PATH : ${gcc}/bin
-
- # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
- wrapProgram $out/bin/nvprof \
- --prefix LD_LIBRARY_PATH : $out/lib
- '' + lib.optionalString (lib.versionOlder version "8.0") ''
- # Hack to fix building against recent Glibc/GCC.
- echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
- '' + ''
- runHook postInstall
- '';
-
- postInstall = ''
- for b in nvvp nsight; do
- wrapProgram "$out/bin/$b" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
- done
- '';
-
- preFixup = ''
- while IFS= read -r -d ''$'\0' i; do
- if ! isELF "$i"; then continue; fi
- echo "patching $i..."
- if [[ ! $i =~ \.so ]]; then
- patchelf \
- --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
- fi
- if [[ $i =~ libcudart ]]; then
- rpath2=
- else
- rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
- fi
- patchelf --set-rpath "$rpath2" --force-rpath $i
- done < <(find $out $lib $doc -type f -print0)
- '';
-
- # Set RPATH so that libcuda and other libraries in
- # /run/opengl-driver(-32)/lib can be found. See the explanation in
- # addOpenGLRunpath. Don't try to figure out which libraries really need
- # it, just patch all (but not the stubs libraries). Note that
- # --force-rpath prevents changing RPATH (set above) to RUNPATH.
- postFixup = ''
- addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so
- '';
-
- # cuda-gdb doesn't run correctly when not using sandboxing, so
- # temporarily disabling the install check. This should be set to true
- # when we figure out how to get `cuda-gdb --version` to run correctly
- # when not using sandboxing.
- doInstallCheck = false;
- postInstallCheck = let
- in ''
- # Smoke test binaries
- pushd $out/bin
- for f in *; do
- case $f in
- crt) continue;;
- nvcc.profile) continue;;
- nsight_ee_plugins_manage.sh) continue;;
- uninstall_cuda_toolkit_6.5.pl) continue;;
- computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version"
- *) echo "Executing '$f --version':"; ./$f --version;;
- esac
- done
- popd
- '';
- passthru = {
- cc = gcc;
- majorVersion = lib.versions.majorMinor version;
- };
-
- meta = with stdenv.lib; {
- description = "A compiler for NVIDIA GPUs, math libraries, and tools";
- homepage = "https://developer.nvidia.com/cuda-toolkit";
- platforms = [ "x86_64-linux" ];
- license = licenses.unfree;
- };
- };
-
+ common = callPackage ./common.nix;
in rec {
cudatoolkit_6 = common {
version = "6.0.37";
diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 5353862424a..14610af10ae 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -3,11 +3,11 @@
stdenvNoCC.mkDerivation rec {
pname = "fasm-bin";
- version = "1.73.16";
+ version = "1.73.18";
src = fetchurl {
url = "https://flatassembler.net/fasm-${version}.tgz";
- sha256 = "1jaqm7w458ny37fsw3fln17kw31rcsk8kyadci45qcbw6jspmn7k";
+ sha256 = "0m88vi8ac9mlak430nyrg3nxsj0fzy3yli8kk0mqsw8rqw2pfvqb";
};
installPhase = ''
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 149a38231b4..f1126fdeddf 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -18,19 +18,19 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
- version = "0.13.4";
+ version = "0.13.5";
src =
if stdenv.isDarwin
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
- sha256 = "0rqjair1r1yr1k8rva3ly16dv5594f4s8xwpnrz9n7x3f99mk4fx";
+ sha256 = "19bb50m0cd738r353blgy21d842b3yj58xfbplk7bz59jawj9lym";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
- sha256 = "1ajzi5ikgzgdfrgq36r9pc3yc6f7h0qgnqcq414zd66z08mbggng";
+ sha256 = "016wvwypgb4859f0n1lqsqv9a8cca2y8g7d6ffvzx6rncd115gxi";
};
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index 03a62d1e4d8..2a8c07fa0fe 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -4,18 +4,18 @@
stdenv.mkDerivation rec {
pname = "unison-code-manager";
- milestone_id = "M1f";
+ milestone_id = "M1g";
version = "1.0.${milestone_id}-alpha";
src = if (stdenv.isDarwin) then
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
- sha256 = "089nb0b9ghsdbs39sskwa9a6v6s5xwshcfzk9qbbpahzphp1xmfk";
+ sha256 = "186y7y7ffg976w01cbb8am84ajbifb7lcnsc4g3x262mkswr7lry";
}
else
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
- sha256 = "0jq2cspanlw15910khlzfdqdfgkwkr1q4fkmrkj0q8gz70mqi6ri";
+ sha256 = "1ki9car1clpaspnl5jb5qnr6nzv108q279n8m8bjm8azfcnl61ab";
};
# The tarball is just the prebuilt binary, in the archive root.
diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/pkgs/development/interpreters/wasmtime/cargo-lock.patch
index 95513d4437a..56c9879dd6e 100644
--- a/pkgs/development/interpreters/wasmtime/cargo-lock.patch
+++ b/pkgs/development/interpreters/wasmtime/cargo-lock.patch
@@ -1,9 +1,9 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
-index 00000000..9cff614a
+index 00000000..3b45d5eb
--- /dev/null
+++ b/Cargo.lock
-@@ -0,0 +1,2181 @@
+@@ -0,0 +1,2272 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
@@ -31,6 +31,11 @@ index 00000000..9cff614a
+]
+
+[[package]]
++name = "anyhow"
++version = "1.0.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
+name = "arrayref"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -86,6 +91,11 @@ index 00000000..9cff614a
+]
+
+[[package]]
++name = "base64"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
+name = "bincode"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -109,7 +119,7 @@ index 00000000..9cff614a
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -283,48 +293,57 @@ index 00000000..9cff614a
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
-+name = "cranelift-bforest"
-+version = "0.46.1"
++name = "cpu-time"
++version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cranelift-bforest"
++version = "0.49.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cranelift-codegen"
-+version = "0.46.1"
++version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cranelift-bforest 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen-meta 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen-shared 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-bforest 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen-meta 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cranelift-codegen-meta"
-+version = "0.46.1"
++version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cranelift-codegen-shared 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cranelift-codegen-shared"
-+version = "0.46.1"
++version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cranelift-entity"
-+version = "0.46.1"
++version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -332,39 +351,38 @@ index 00000000..9cff614a
+
+[[package]]
+name = "cranelift-frontend"
-+version = "0.46.1"
++version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cranelift-native"
-+version = "0.46.1"
++version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cranelift-wasm"
-+version = "0.46.1"
++version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -386,7 +404,7 @@ index 00000000..9cff614a
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -472,7 +490,7 @@ index 00000000..9cff614a
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -524,16 +542,16 @@ index 00000000..9cff614a
+
+[[package]]
+name = "faerie"
-+version = "0.11.0"
++version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "goblin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -550,7 +568,7 @@ index 00000000..9cff614a
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -619,7 +637,7 @@ index 00000000..9cff614a
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -638,22 +656,17 @@ index 00000000..9cff614a
+
+[[package]]
+name = "glob"
-+version = "0.2.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "goblin"
-+version = "0.0.24"
++version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -711,7 +724,7 @@ index 00000000..9cff614a
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -732,7 +745,7 @@ index 00000000..9cff614a
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -789,21 +802,21 @@ index 00000000..9cff614a
+version = "0.0.0"
+dependencies = [
+ "capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dynasm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dynasmrt 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -838,13 +851,18 @@ index 00000000..9cff614a
+
+[[package]]
+name = "memoffset"
-+version = "0.5.1"
++version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
++name = "more-asserts"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
+name = "multi_mut"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -876,6 +894,27 @@ index 00000000..9cff614a
+]
+
+[[package]]
++name = "num"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-complex"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
+name = "num-integer"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -885,6 +924,26 @@ index 00000000..9cff614a
+]
+
+[[package]]
++name = "num-iter"
++version = "0.1.39"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-rational"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
+name = "num-traits"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -906,6 +965,15 @@ index 00000000..9cff614a
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
++name = "os_pipe"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
+name = "owning_ref"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -928,7 +996,7 @@ index 00000000..9cff614a
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -963,22 +1031,14 @@ index 00000000..9cff614a
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "proc-macro2"
-+version = "0.4.30"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "proc-macro2"
-+version = "1.0.5"
++version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1009,7 +1069,7 @@ index 00000000..9cff614a
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1019,7 +1079,7 @@ index 00000000..9cff614a
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pyo3-derive-backend 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1043,18 +1103,10 @@ index 00000000..9cff614a
+
+[[package]]
+name = "quote"
-+version = "0.6.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1132,7 +1184,7 @@ index 00000000..9cff614a
+
+[[package]]
+name = "raw-cpuid"
-+version = "6.1.0"
++version = "7.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1264,21 +1316,20 @@ index 00000000..9cff614a
+
+[[package]]
+name = "scroll"
-+version = "0.9.2"
++version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "scroll_derive"
-+version = "0.9.5"
++version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1307,7 +1358,7 @@ index 00000000..9cff614a
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1340,7 +1391,7 @@ index 00000000..9cff614a
+
+[[package]]
+name = "smallvec"
-+version = "0.6.10"
++version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
@@ -1373,20 +1424,10 @@ index 00000000..9cff614a
+
+[[package]]
+name = "syn"
-+version = "0.15.44"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "syn"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1396,7 +1437,7 @@ index 00000000..9cff614a
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1404,13 +1445,8 @@ index 00000000..9cff614a
+
+[[package]]
+name = "target-lexicon"
-+version = "0.8.1"
++version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
+
+[[package]]
+name = "tempfile"
@@ -1442,6 +1478,24 @@ index 00000000..9cff614a
+]
+
+[[package]]
++name = "thiserror"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "thiserror-impl 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
+name = "thread_local"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1461,7 +1515,7 @@ index 00000000..9cff614a
+
+[[package]]
+name = "toml"
-+version = "0.5.3"
++version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1473,6 +1527,19 @@ index 00000000..9cff614a
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
++name = "trybuild"
++version = "1.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
+name = "typemap"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1497,11 +1564,6 @@ index 00000000..9cff614a
+
+[[package]]
+name = "unicode-xid"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
@@ -1539,46 +1601,25 @@ index 00000000..9cff614a
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
-+name = "wabt"
-+version = "0.9.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wabt-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wabt-sys"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
+name = "walrus"
-+version = "0.12.0"
++version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus-macro 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "walrus-macro"
-+version = "0.12.0"
++version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1590,48 +1631,57 @@ index 00000000..9cff614a
+
+[[package]]
+name = "wasi-common"
-+version = "0.1.0"
-+source = "git+https://github.com/CraneStation/wasi-common?rev=c3bf040#c3bf04042e03c706088de62acf1cd7aa79f0fa50"
++version = "0.5.0"
+dependencies = [
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi-common-cbindgen 0.5.0",
++ "wasmtime 0.1.0",
++ "wasmtime-environ 0.2.0",
++ "wasmtime-jit 0.2.0",
++ "wasmtime-runtime 0.2.0",
++ "wasmtime-wasi 0.2.0",
++ "wig 0.1.0",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winx 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)",
++ "winx 0.5.0",
+]
+
+[[package]]
+name = "wasi-common-cbindgen"
-+version = "0.1.0"
-+source = "git+https://github.com/CraneStation/wasi-common?rev=c3bf040#c3bf04042e03c706088de62acf1cd7aa79f0fa50"
++version = "0.5.0"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-webidl-bindings"
-+version = "0.5.0"
++version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasmparser"
-+version = "0.37.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "wasmparser"
+version = "0.39.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
@@ -1640,25 +1690,53 @@ index 00000000..9cff614a
+
+[[package]]
+name = "wasmtime"
++version = "0.1.0"
++dependencies = [
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi-common 0.5.0",
++ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasmtime-environ 0.2.0",
++ "wasmtime-jit 0.2.0",
++ "wasmtime-runtime 0.2.0",
++ "wasmtime-wasi 0.2.0",
++ "wasmtime-wast 0.2.0",
++]
++
++[[package]]
++name = "wasmtime-cli"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "faerie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)",
++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)",
-+ "wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-api 0.1.0",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi-common 0.5.0",
++ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasmtime 0.1.0",
+ "wasmtime-debug 0.2.0",
+ "wasmtime-environ 0.2.0",
+ "wasmtime-interface-types 0.2.0",
@@ -1668,50 +1746,23 @@ index 00000000..9cff614a
+ "wasmtime-wasi 0.2.0",
+ "wasmtime-wasi-c 0.2.0",
+ "wasmtime-wast 0.2.0",
-+]
-+
-+[[package]]
-+name = "wasmtime-api"
-+version = "0.1.0"
-+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)",
-+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-environ 0.2.0",
-+ "wasmtime-jit 0.2.0",
-+ "wasmtime-runtime 0.2.0",
-+ "wasmtime-wasi 0.2.0",
-+ "wasmtime-wast 0.2.0",
++ "wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasmtime-debug"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "faerie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-environ 0.2.0",
+]
@@ -1720,15 +1771,13 @@ index 00000000..9cff614a
+name = "wasmtime-environ"
+version = "0.2.0"
+dependencies = [
-+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1736,27 +1785,29 @@ index 00000000..9cff614a
+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lightbeam 0.0.0",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "zstd 0.4.28+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasmtime-interface-types"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-jit 0.2.0",
+ "wasmtime-runtime 0.2.0",
@@ -1766,29 +1817,32 @@ index 00000000..9cff614a
+name = "wasmtime-jit"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-debug 0.2.0",
+ "wasmtime-environ 0.2.0",
+ "wasmtime-runtime 0.2.0",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasmtime-obj"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "faerie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-environ 0.2.0",
+]
+
@@ -1796,15 +1850,15 @@ index 00000000..9cff614a
+name = "wasmtime-py"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pyo3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-environ 0.2.0",
+ "wasmtime-interface-types 0.2.0",
@@ -1817,18 +1871,18 @@ index 00000000..9cff614a
+version = "0.2.0"
+dependencies = [
+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-environ 0.2.0",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1837,19 +1891,20 @@ index 00000000..9cff614a
+name = "wasmtime-rust"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-interface-types 0.2.0",
+ "wasmtime-jit 0.2.0",
+ "wasmtime-rust-macro 0.2.0",
++ "wasmtime-wasi 0.2.0",
+]
+
+[[package]]
+name = "wasmtime-rust-macro"
+version = "0.2.0"
+dependencies = [
-+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1858,12 +1913,12 @@ index 00000000..9cff614a
+name = "wasmtime-wasi"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi-common 0.5.0",
+ "wasmtime-environ 0.2.0",
+ "wasmtime-jit 0.2.0",
+ "wasmtime-runtime 0.2.0",
@@ -1875,12 +1930,13 @@ index 00000000..9cff614a
+dependencies = [
+ "bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-environ 0.2.0",
+ "wasmtime-jit 0.2.0",
+ "wasmtime-runtime 0.2.0",
@@ -1890,16 +1946,31 @@ index 00000000..9cff614a
+name = "wasmtime-wast"
+version = "0.2.0"
+dependencies = [
-+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmtime-environ 0.2.0",
+ "wasmtime-jit 0.2.0",
+ "wasmtime-runtime 0.2.0",
++ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wast"
++version = "3.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wat"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1911,6 +1982,15 @@ index 00000000..9cff614a
+]
+
+[[package]]
++name = "wig"
++version = "0.1.0"
++dependencies = [
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "witx 0.4.0",
++]
++
++[[package]]
+name = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1948,8 +2028,7 @@ index 00000000..9cff614a
+
+[[package]]
+name = "winx"
-+version = "0.1.0"
-+source = "git+https://github.com/CraneStation/wasi-common?rev=c3bf040#c3bf04042e03c706088de62acf1cd7aa79f0fa50"
++version = "0.5.0"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cvt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1957,25 +2036,34 @@ index 00000000..9cff614a
+]
+
+[[package]]
++name = "witx"
++version = "0.4.0"
++dependencies = [
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
+name = "zstd"
-+version = "0.4.28+zstd.1.4.3"
++version = "0.5.1+zstd.1.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "zstd-safe 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "zstd-safe"
-+version = "1.4.13+zstd.1.4.3"
++version = "2.0.3+zstd.1.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "zstd-sys 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "zstd-sys"
-+version = "1.4.13+zstd.1.4.3"
++version = "1.4.15+zstd.1.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1987,6 +2075,7 @@ index 00000000..9cff614a
+"checksum ahash 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "b35dfc96a657c1842b4eb73180b65e37152d4b94d0eb5cb51708aee7826950b4"
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "57114fc2a6cc374bce195d3482057c846e706d252ff3604363449695684d7a0d"
+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
+"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
@@ -1994,6 +2083,7 @@ index 00000000..9cff614a
+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
++"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
+"checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92"
+"checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
@@ -2016,14 +2106,15 @@ index 00000000..9cff614a
+"checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
+"checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-+"checksum cranelift-bforest 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "18c97588946d3e5fe11f8e34ebf8cc65fd3fda50f3ffa2e80c98b2748058f00f"
-+"checksum cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3255935da50302bcb0f7109f2fef27f44b46f1c797dfa7db971379261023adcd"
-+"checksum cranelift-codegen-meta 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd57265ef5e6ff253c378b6261ed8c2e6cb1b15e91624540dbd09b1e5a40e9ca"
-+"checksum cranelift-codegen-shared 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c093398d21f9493ab29445191362592ef621f497e56a8efb15bdf80471978b7a"
-+"checksum cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e915fa58d2a75e3c4b768b7e4760282889915c3fcd9ccb2ad2b3ebec99654a78"
-+"checksum cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46963952cda267bd0177b3f036e50038cd56e7b4c5b09a455b02df727e0f2a16"
-+"checksum cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7ba8a2d69ddd4729199a321bc2f4020e1969a088b468ed6a29dc7a69350be76e"
-+"checksum cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5a802357a6a016bf4c1dcdc6d73a650640eb3b613cc098a1a044a6c3731ca264"
++"checksum cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded"
++"checksum cranelift-bforest 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba29e425110674c89fdc2f79479d767f31003dd9187c29ba2dad57fe4d321670"
++"checksum cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8cb71c7ce1438c41f3d35383fa41eee26f5adf9815c7f5c2e7029a6c9356df2c"
++"checksum cranelift-codegen-meta 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4aa634fd60290d5047d40172028a0aa86458e32a72c76fcce0a317bbbbcca4e5"
++"checksum cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6fa6cf5c2adc031be07cd5bc88145ebb93d9d2a05a28a93136782b2167eacb62"
++"checksum cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "932d5f9622b336e10e8cf843ded09a688ec49f32c32b3101d7c5a7b71cad3dc9"
++"checksum cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d1a3c105c657cd65c20d9183bbd4f2b16bf3548db4b865c065bf7028f3021de"
++"checksum cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba5e34645453b73a9e2def05561f957a9df17253996379dd59c4afe3cf7db0f1"
++"checksum cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23410ae1f5edf7d83e95bf8537e771345ecc2b11e5c7208cbee8151ea3b88e97"
+"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
+"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
+"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
@@ -2040,7 +2131,7 @@ index 00000000..9cff614a
+"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
+"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e"
+"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
-+"checksum faerie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "875d78b92b2a4d9e1e2c7eeccfa30a327d2ee6434db3beb8fd6fd92f41898bc4"
++"checksum faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01fed63609767c70e34203201032c249d60a24578a67ef0ce7cc13ff010e9cf2"
+"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
+"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
+"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
@@ -2053,9 +2144,8 @@ index 00000000..9cff614a
+"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
+"checksum ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a36606a68532b5640dc86bb1f33c64b45c4682aad4c50f3937b317ea387f3d6"
+"checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00"
-+"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-+"checksum goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "e3fa261d919c1ae9d1e4533c4a2f99e10938603c4208d56c05bec7a872b661b0"
++"checksum goblin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6040506480da04a63de51a478e8021892d65d8411f29b2a422c2648bdd8bcb"
+"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
+"checksum hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6587d09be37fb98a11cb08b9000a3f592451c1b1b613ca69d949160e313a430a"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
@@ -2077,15 +2167,21 @@ index 00000000..9cff614a
+"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
+"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-+"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
++"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
++"checksum more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
+"checksum multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "816df386e5557ac1843a96f1ba8a7cbf4ab175d05ccc15c87a3cda27b4fbdece"
+"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
+"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
++"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db"
++"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc"
+"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
++"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e"
++"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454"
+"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
+"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
+"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
++"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22"
+"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
+"checksum paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49"
+"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5"
@@ -2094,14 +2190,12 @@ index 00000000..9cff614a
+"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
+"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
-+"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-+"checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"
++"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
+"checksum pyo3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a00f96312ebe4082db7d93ad062df1818f597660002541c1bbae6752ec583244"
+"checksum pyo3-derive-backend 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a7caa60cb986fca5b488e29d078fb25ae228e01dab080b855168ce061bbef0a"
+"checksum pyo3cls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5ccfa624ed9b5d805079f1ad64b3f1de5d551a946d4cf494f1f032b5572d39f"
+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5ca504a2fdaa08d3517f442fbbba91ac24d1ec4c51ea68688a038765e3b2662"
-+"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
@@ -2111,7 +2205,7 @@ index 00000000..9cff614a
+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+"checksum rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e196346cbbc5c70c77e7b4926147ee8e383a38ee4d15d58a08098b169e492b6"
-+"checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d"
++"checksum raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf"
+"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123"
+"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b"
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
@@ -2127,8 +2221,8 @@ index 00000000..9cff614a
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-+"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383"
-+"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb"
++"checksum scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
++"checksum scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
@@ -2136,28 +2230,29 @@ index 00000000..9cff614a
+"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2"
+"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
+"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
++"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
+"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd710eadff449a1531351b0e43eb81ea404336fa2f56c777427ab0e32a4cf183"
+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6"
-+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203"
-+"checksum target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7975cb2c6f37d77b190bc5004a2bb015971464756fde9514651a525ada2a741a"
++"checksum target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"
+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++"checksum thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f9fb62ff737e573b1e677459bea6fd023cd5d6e868c3242d3cdf3ef2f0554824"
++"checksum thiserror-impl 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "24069c0ba08aab54289d6a25f5036d94afc61e1538bbc42ae5501df141c9027d"
+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-+"checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724"
++"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
++"checksum trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "e6851bf8351876984fbab8a2391de6378947b898410d8714edd12164d2137127"
+"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
+"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
+"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
-+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "63f18aa3b0e35fed5a0048f029558b1518095ffe2a0a31fb87c93dece93a4993"
+"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
@@ -2165,23 +2260,19 @@ index 00000000..9cff614a
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-+"checksum wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3c5c5c1286c6e578416982609f47594265f9d489f9b836157d403ad605a46693"
-+"checksum wabt-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "af5d153dc96aad7dc13ab90835b892c69867948112d95299e522d370c4e13a08"
-+"checksum walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f3bd9559eb5b59d55cc60986e26dc9b3f64377d0b9495e41abd9ede9a6443f"
-+"checksum walrus-macro 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0464a6e0d86be4c95c8c838bcb1910df831e1216a9586feeb02478cd52c4e554"
++"checksum walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85ce93ab0c27412ba41d509f2410fa575ecbfdb4a6aba0e02e79e12c09745485"
++"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76"
+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-+"checksum wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)" = ""
-+"checksum wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)" = ""
-+"checksum wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e407ee3155cb0742acacd0b21060daafe2ad78ea718f2d6b10e7d9d1032aa961"
-+"checksum wasmparser 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7387ba67c13dd9cd01d7d961e733375aee889f828564e190da85b5602eb5eeb"
++"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1"
+"checksum wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5083b449454f7de0b15f131eee17de54b5a71dcb9adcf11df2b2f78fad0cd82"
++"checksum wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86b52202bd73a756b216bbfea019991ff317b1e5f22677da5cef2964696a3245"
++"checksum wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "80db13d155bab63db0f19c24a0e12bf60c3fe346edba8da508ba6962e08c137b"
+"checksum which 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "240a31163872f7e8e49f35b42b58485e35355b07eb009d9f3686733541339a69"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
-+"checksum winx 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)" = ""
-+"checksum zstd 0.4.28+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f4e716acaad66f2daf2526f37a1321674a8814c0b37a366ebe6c97a699f85ddc"
-+"checksum zstd-safe 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bfe4d3b26a0790201848865663e8ffabf091e126e548bc9710ccfa95621ece48"
-+"checksum zstd-sys 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fadc8ebe858f056ab82dffb9d93850b841603bdf663db7cf5e3dbd7f34cc55b2"
++"checksum zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c5d978b793ae64375b80baf652919b148f6a496ac8802922d9999f5a553194f"
++"checksum zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bee25eac9753cfedd48133fa1736cbd23b774e253d89badbeac7d12b23848d3f"
++"checksum zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "89719b034dc22d240d5b407fb0a3fe6d29952c181cff9a9f95c0bd40b4f8f7d8"
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 954b7e73b94..0cdf1aae3f7 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,17 +2,17 @@
rustPlatform.buildRustPackage {
pname = "wasmtime";
- version = "20191018";
+ version = "20191111";
src = fetchFromGitHub {
- owner = "CraneStation";
+ owner = "bytecodealliance";
repo = "wasmtime";
- rev = "ebef2c6b5720fce164af9ded8b7ff3dd5d7e041c";
- sha256 = "15wa0by7lb90qd6fg8i2v1hw7hgbkrh1rqhrf7z850c9ydah6n13";
+ rev = "0006a2af954eba74c79885cb1fe8cdeb68f531c1";
+ sha256 = "0lf3pdkjxcrjmjic7xxyjl5dka3arxi809sp9hm4hih5p2fhf2gw";
fetchSubmodules = true;
};
- cargoSha256 = "07qz6wl32j6gzc9nxv0dr7y6ixmzbzv5j1flkrysdrfidxlldn9k";
+ cargoSha256 = "0mnwaipa2az3vpgbz4m9siz6bfyhmzwz174k678cv158m7mxx12f";
cargoPatches = [ ./cargo-lock.patch ];
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 04ab1331475..ea352772b33 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ace";
- version = "6.5.6";
+ version = "6.5.7";
src = fetchurl {
url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
- sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4";
+ sha256 = "0hvd7y3hs8r3r7qbllfaqrva3jrx5razcnwlws822k66v4r10cbx";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 7adc2a365c5..dc36414fc28 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "cln";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchurl {
url = "${meta.homepage}${pname}-${version}.tar.bz2";
- sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d";
+ sha256 = "0bc43v4fyxwik9gjkvm8jan74bkx9bjssv61lfh9jhhblmj010bq";
};
buildInputs = [ gmp ];
meta = with stdenv.lib; {
description = "C/C++ library for numbers, a part of GiNaC";
- homepage = http://www.ginac.de/CLN/;
+ homepage = https://www.ginac.de/CLN/;
license = licenses.gpl2;
platforms = platforms.unix; # Once had cygwin problems
};
diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix
new file mode 100644
index 00000000000..fa2c3687ba7
--- /dev/null
+++ b/pkgs/development/libraries/egl-wayland/default.nix
@@ -0,0 +1,79 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkgconfig
+, meson
+, ninja
+, libX11
+, mesa
+, libGL
+, wayland
+}:
+
+let
+ eglexternalplatform = stdenv.mkDerivation {
+ pname = "eglexternalplatform";
+ version = "1.1";
+
+ src = fetchFromGitHub {
+ owner = "Nvidia";
+ repo = "eglexternalplatform";
+ rev = "7c8f8e2218e46b1a4aa9538520919747f1184d86";
+ sha256 = "0lr5s2xa1zn220ghmbsiwgmx77l156wk54c7hybia0xpr9yr2nhb";
+ };
+
+ installPhase = ''
+ mkdir -p "$out/include/"
+ cp interface/eglexternalplatform.h "$out/include/"
+ cp interface/eglexternalplatformversion.h "$out/include/"
+
+ substituteInPlace eglexternalplatform.pc \
+ --replace "/usr/include/EGL" "$out/include"
+ mkdir -p "$out/share/pkgconfig"
+ cp eglexternalplatform.pc "$out/share/pkgconfig/"
+ '';
+
+ meta = with lib; {
+ license = licenses.mit;
+ };
+ };
+
+in stdenv.mkDerivation rec {
+ pname = "egl-wayland";
+ version = "1.1.4";
+
+ outputs = [ "out" "dev" ];
+
+ src = fetchFromGitHub {
+ owner = "Nvidia";
+ repo = pname;
+ rev = version;
+ sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d";
+ };
+
+ # Add missing include
+ # https://github.com/NVIDIA/egl-wayland/pull/24
+ patches = [ ./eglmesaext.patch ];
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ ];
+
+ buildInputs = [
+ eglexternalplatform
+ libX11
+ mesa
+ libGL
+ wayland
+ ];
+
+ meta = with lib; {
+ description = "The EGLStream-based Wayland external platform";
+ homepage = https://github.com/NVIDIA/egl-wayland/;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ hedning ];
+ };
+}
diff --git a/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/pkgs/development/libraries/egl-wayland/eglmesaext.patch
new file mode 100644
index 00000000000..9384ecff9b0
--- /dev/null
+++ b/pkgs/development/libraries/egl-wayland/eglmesaext.patch
@@ -0,0 +1,12 @@
+diff --git a/src/wayland-eglsurface.c b/src/wayland-eglsurface.c
+index 01c9cb3..45736b0 100644
+--- a/src/wayland-eglsurface.c
++++ b/src/wayland-eglsurface.c
+@@ -37,6 +37,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #define WL_EGL_WINDOW_DESTROY_CALLBACK_SINCE 3
+
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 6657409a708..6c872272e37 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
- version = "19.3.2";
+ version = "19.3.4";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
- sha256 = "04jmzyciswvfb31h9shkja9183bmm1clw0l0sn1flq76888nngma";
+ sha256 = "1vgh14vdmwr34l6rfzmbpsdwp4xi7qp8lg527p16pm7nv0bwx2zk";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 1736e97f466..dd7b91ffb9a 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgnurl";
- version = "7.66.0";
+ version = "7.67.0";
src = fetchurl {
url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
- sha256 = "03bkzcld384z7i3zh3k9k3pr0xpyqbcr8cxjqya1zqs5lk7i55x5";
+ sha256 = "0ima9hz5d54iyvvih51s8xn6dsfxd3qyzgnj9l7w9f1smia295rb";
};
nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
index 231b426e6a7..50ee7e4d387 100644
--- a/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "libvterm-neovim";
- version = "2019-08-28";
+ version = "2019-10-08";
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
- rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79";
- sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif";
+ rev = "7c72294d84ce20da4c27362dbd7fa4b08cfc91da";
+ sha256 = "111qyxq33x74dwdnqcnzlv9j0n8hxyribd6ppwcsxmyrniyw9qrk";
};
buildInputs = [ perl ];
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix
index edda5148068..3e2a53d81dd 100644
--- a/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/pkgs/development/libraries/physics/applgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
+{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
stdenv.mkDerivation rec {
pname = "applgrid";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
};
- buildInputs = [ gfortran hoppet lhapdf root5 ];
+ # For some reason zlib was only needed after bump to gfortran8
+ buildInputs = [ gfortran hoppet lhapdf root5 zlib ];
patches = [
./bad_code.patch
diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/pkgs/development/libraries/protobuf/3.11.nix
new file mode 100644
index 00000000000..26f8ca13341
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.11.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+ version = "3.11.0";
+ sha256 = "1b0kf02aw1yvpwdax3865057dzrlrdc7dgam05znwq8id5q76ckr";
+}
diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index 679725db307..f9730eb61ae 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "XlsxWriter";
- version = "1.2.1";
+ version = "1.2.6";
# PyPI release tarball doesn't contain tests so let's use GitHub. See:
# https://github.com/jmcnamara/XlsxWriter/issues/327
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "jmcnamara";
repo = pname;
rev = "RELEASE_${version}";
- sha256 = "0br8ib9n17dfprfly93mjkhdhpndb7i4g57lwscvp2s69ssql32s";
+ sha256 = "05y1py5mn1m65bbwhinzv84jd3xj8snvf2795flw0xbxnkn8nd8p";
};
meta = {
diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix
new file mode 100644
index 00000000000..517083a0621
--- /dev/null
+++ b/pkgs/development/python-modules/ansiwrap/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, tox
+, pytest
+, ansicolors
+, coverage
+, pytestcov
+, textwrap3
+}:
+
+buildPythonPackage rec {
+ pname = "ansiwrap";
+ version = "0.8.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7";
+ };
+
+ checkInputs = [
+ tox
+ pytest
+ ansicolors
+ coverage
+ pytestcov
+ ];
+
+ propagatedBuildInputs = [
+ textwrap3
+ ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with lib; {
+ description = "Textwrap, but savvy to ANSI colors and styles";
+ homepage = https://github.com/jonathaneunice/ansiwrap;
+ license = licenses.asl20;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix
index ef69ee91d38..d873700f32a 100644
--- a/pkgs/development/python-modules/atomman/default.nix
+++ b/pkgs/development/python-modules/atomman/default.nix
@@ -1,34 +1,33 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, xmltodict
-, datamodeldict
-, numpy
-, matplotlib
-, scipy
-, pandas
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
, cython
+, datamodeldict
+, matplotlib
, numericalunits
+, numpy
+, pandas
, pytest
+, scipy
+, toolz
+, xmltodict
}:
buildPythonPackage rec {
- version = "1.2.8";
+ version = "1.3.0";
pname = "atomman";
+ disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "0ed099fdceca2d733e81afb08d777e8e852a6e53660d6d268f3739b8d323ced9";
+ src = fetchFromGitHub {
+ owner = "usnistgov";
+ repo = "atomman";
+ rev = "v${version}";
+ sha256 = "09pfykd96wmw00s3kgabghykjn8b4yjml4ybpi7kwy7ygdmzcx51";
};
checkInputs = [ pytest ];
- propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits ];
-
- # tests not included with Pypi release
- doCheck = false;
+ propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits toolz ];
checkPhase = ''
- py.test tests
+ py.test tests -k 'not test_atomic'
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index 1e49edab25f..d9c90cfa049 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
- version = "0.4.0";
+ version = "0.6.0";
# No tests available in PyPI tarball
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "v${version}";
- sha256 = "1z2l9qm6mxp90zl64i9j2cmlzn8n7sc8yfpqh14fi9ay887ayjs1";
+ sha256 = "0bvph58wrw9in5irdbv103knvw2dhqs3kapqv5lpaac9dn7lsk6q";
};
# Package is not compatible with Python 3.5
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index b43ec658f5e..298ce22daa6 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "aws-sam-translator";
- version = "1.15.1";
+ version = "1.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "11c62c00f37b57c39a55d7a29d93f4704a88549c29a6448ebc953147173fbe85";
+ sha256 = "0xvfbhiqdqy4qs4z8v2p7z3l01w5af948bmf400s5jsq2hnxl6nv";
};
# Tests are not included in the PyPI package
diff --git a/pkgs/development/python-modules/azure-cli-core/default.nix b/pkgs/development/python-modules/azure-cli-core/default.nix
deleted file mode 100644
index a4d05b4c11e..00000000000
--- a/pkgs/development/python-modules/azure-cli-core/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ stdenv
-, lib
-, python
-, buildPythonPackage
-, fetchPypi
-, adal
-, antlr4-python3-runtime
-, argcomplete
-, azure-cli-telemetry
-, colorama
-, jmespath
-, humanfriendly
-, knack
-, msrest
-, msrestazure
-, paramiko
-, pygments
-, pyjwt
-, pyopenssl
-, pyyaml
-, requests
-, six
-, tabulate
-, azure-mgmt-resource
-, pyperclip
-, psutil
-, enum34
-, futures
-, antlr4-python2-runtime
-, ndg-httpsclient
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "azure-cli-core";
- version = "2.0.75";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "6fde38f4448542c0cf7b13201b702c6927180e7294221b8f67e2c834f22ae1bc";
- };
-
- propagatedBuildInputs = [
- adal
- argcomplete
- azure-cli-telemetry
- colorama
- jmespath
- humanfriendly
- knack
- msrest
- msrestazure
- paramiko
- pygments
- pyjwt
- pyopenssl
- pyyaml
- requests
- six
- tabulate
- azure-mgmt-resource
- pyperclip
- psutil
- ]
- ++ lib.optionals isPy3k [ antlr4-python3-runtime ]
- ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ];
-
- # Remove overly restrictive version contraints and obsolete namespace setup
- prePatch = ''
- substituteInPlace setup.py \
- --replace "wheel==0.30.0" "wheel" \
- --replace "azure-mgmt-resource==2.1.0" "azure-mgmt-resource"
- substituteInPlace setup.cfg \
- --replace "azure-namespace-package = azure-cli-nspkg" ""
- '';
-
- # Prevent these __init__'s from violating PEP420, only needed for python2
- postInstall = lib.optionalString isPy3k ''
- rm $out/${python.sitePackages}/azure/__init__.py \
- $out/${python.sitePackages}/azure/cli/__init__.py
- '';
-
- # Tests are not included in sdist package
- doCheck = false;
-
- meta = with lib; {
- homepage = https://github.com/Azure/azure-cli;
- description = "Next generation multi-platform command line experience for Azure";
- platforms = platforms.all;
- license = licenses.mit;
- maintainers = with maintainers; [ jonringer ];
- };
-}
diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/pkgs/development/python-modules/azure-cli-telemetry/default.nix
deleted file mode 100644
index 202e0a013b9..00000000000
--- a/pkgs/development/python-modules/azure-cli-telemetry/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv
-, lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, python
-, applicationinsights
-, portalocker
-}:
-
-buildPythonPackage rec {
- pname = "azure-cli-telemetry";
- version = "1.0.4";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1f239d544d309c29e827982cc20113eb57037dba16db6cdd2e0283e437e0e577";
- };
-
- propagatedBuildInputs = [
- applicationinsights
- portalocker
- ];
-
- # tests are not published to pypi
- doCheck = false;
-
- # Remove overly restrictive version contraints and obsolete namespace setup
- prePatch = ''
- substituteInPlace setup.py \
- --replace "applicationinsights>=0.11.1,<0.12" "applicationinsights"
- substituteInPlace setup.cfg \
- --replace "azure-namespace-package = azure-cli-nspkg" ""
- rm azure_bdist_wheel.py # we'll fix PEP420 namespacing
- '';
-
- # Prevent these __init__'s from violating PEP420, only needed for python2
- postInstall = lib.optionalString isPy3k ''
- rm $out/${python.sitePackages}/azure/__init__.py \
- $out/${python.sitePackages}/azure/cli/__init__.py
- '';
-
- meta = with lib; {
- homepage = https://github.com/Azure/azure-cli;
- description = "Next generation multi-platform command line experience for Azure";
- platforms = platforms.all;
- license = licenses.mit;
- maintainers = with maintainers; [ jonringer ];
- };
-}
diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix
index 40c2493c151..997682ca865 100644
--- a/pkgs/development/python-modules/babelgladeextractor/default.nix
+++ b/pkgs/development/python-modules/babelgladeextractor/default.nix
@@ -3,23 +3,21 @@
, buildPythonPackage
, fetchPypi
, Babel
-, lxml
}:
buildPythonPackage rec {
pname = "babelgladeextractor";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchPypi {
pname = "BabelGladeExtractor";
inherit version;
extension = "tar.bz2";
- sha256 = "18m5vi3sj2h26ibmb6fzfjs2lscg757ivk1bjgkn1haf9gdwyjj6";
+ sha256 = "1jhs12pliz54dbnigib1h8ywfzsj1g32c1vhspvg46f5983nvf93";
};
propagatedBuildInputs = [
Babel
- lxml # TODO: remove in 0.7.0
];
# Tests missing
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 7ad3489553c..6d0364676f9 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -1,9 +1,10 @@
{ stdenv, fetchPypi, fetchpatch
, buildPythonApplication, python, pythonOlder
-, mock, nose, pathpy, pyhamcrest, pytest
+, mock, nose, pathpy, pyhamcrest, pytest_4
, glibcLocales, parse, parse-type, six
, traceback2
}:
+
buildPythonApplication rec {
pname = "behave";
version = "1.2.6";
@@ -21,7 +22,7 @@ buildPythonApplication rec {
})
];
- checkInputs = [ mock nose pathpy pyhamcrest pytest ];
+ checkInputs = [ mock nose pathpy pyhamcrest pytest_4 ];
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2;
diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix
index c1ff24711e8..e7d2c2f3714 100644
--- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "imbalanced-learn";
- version = "0.5.0";
+ version = "0.4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "5df760537886678ef9e25f5bad96d194c5fc66f62de84488069acf5d4b0119d5";
+ sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083";
};
propagatedBuildInputs = [ scikitlearn ];
diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index cd9781dbc88..56e1de49f20 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -1,7 +1,9 @@
{ stdenv
+, lib
, fetchpatch
, buildPythonPackage
, fetchPypi
+, pythonOlder
, swig2
, openssl
, typing
@@ -28,7 +30,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ swig2 ];
buildInputs = [ swig2 openssl ];
- propagatedBuildInputs = [ typing ];
+ propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing;
preConfigure = ''
substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${openssl.dev}'"
diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
new file mode 100644
index 00000000000..ffe0fbc5da5
--- /dev/null
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -0,0 +1,70 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ansiwrap
+, click
+, future
+, pyyaml
+, nbformat
+, nbconvert
+, six
+, tqdm
+, jupyter_client
+, requests
+, entrypoints
+, tenacity
+, futures
+, backports_tempfile
+, isPy27
+, pytest
+, pytestcov
+, pytest-mock
+}:
+
+buildPythonPackage rec {
+ pname = "papermill";
+ version = "1.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "04dadaabdeb129c7414079f77b9f9a4a08f1322549aa99e20e4a12700ee23509";
+ };
+
+ propagatedBuildInputs = [
+ ansiwrap
+ click
+ future
+ pyyaml
+ nbformat
+ nbconvert
+ six
+ tqdm
+ jupyter_client
+ requests
+ entrypoints
+ tenacity
+ ] ++ lib.optionals isPy27 [
+ futures
+ backports_tempfile
+ ];
+
+ checkInputs = [
+ pytest
+ pytestcov
+ pytest-mock
+ ];
+
+ checkPhase = ''
+ HOME=$(mktemp -d) pytest
+ '';
+
+ # the test suite depends on cloud resources azure/aws
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Parametrize and run Jupyter and nteract Notebooks";
+ homepage = https://github.com/nteract/papermill;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix
index a2fd5118b3e..f770fecd5e5 100644
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/pkgs/development/python-modules/papis/default.nix
@@ -3,7 +3,7 @@
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, pylibgen, click, python-slugify, habanero, isbnlib
, prompt_toolkit, pygments, stevedore, tqdm, lxml
-, python-doi, isPy3k
+, python-doi, isPy3k, pythonOlder
#, optional, dependencies
, whoosh, pytest
, stdenv
@@ -12,6 +12,7 @@
buildPythonPackage rec {
pname = "papis";
version = "0.9";
+ disabled = !isPy3k;
# Missing tests on Pypi
src = fetchFromGitHub {
@@ -32,9 +33,14 @@ buildPythonPackage rec {
whoosh
];
- disabled = !isPy3k;
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "lxml<=4.3.5" "lxml~=4.3" \
+ --replace "python-slugify>=1.2.6,<4" "python-slugify"
+ '';
- doCheck = !stdenv.isDarwin;
+ # pytest seems to hang with python3.8
+ doCheck = !stdenv.isDarwin && pythonOlder "3.8";
checkInputs = ([
pytest
diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix
new file mode 100644
index 00000000000..bd3c58c7dcc
--- /dev/null
+++ b/pkgs/development/python-modules/pony/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, python, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "pony";
+ version = "0.7.11";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "05vyvsbcb99vjjs7qpbwy8j4m854w74z8di6zqsv8p9wbm38s06i";
+ };
+
+ doCheck = true;
+
+ # stripping the tests
+ postInstall = ''
+ rm -rf $out/${python.sitePackages}/pony/orm/tests
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Pony is a Python ORM with beautiful query syntax";
+ homepage = "https://ponyorm.org/";
+ maintainers = with maintainers; [ d-goldin ];
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
index 41b7aa78bab..e33aee6c1c9 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -1,4 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi, mock, testscenarios, docutils, lockfile }:
+{ lib, buildPythonPackage, fetchPypi
+, docutils
+, lockfile
+, mock
+, pytest
+, testscenarios
+, twine
+}:
buildPythonPackage rec {
pname = "python-daemon";
@@ -9,12 +16,22 @@ buildPythonPackage rec {
sha256 = "57c84f50a04d7825515e4dbf3a31c70cc44414394a71608dee6cfde469e81766";
};
- # A test fail within chroot builds.
- doCheck = false;
-
- buildInputs = [ mock testscenarios ];
+ nativeBuildInputs = [ twine ];
propagatedBuildInputs = [ docutils lockfile ];
+ checkInputs = [ pytest mock testscenarios ];
+ checkPhase = ''
+ pytest -k 'not detaches_process_context \
+ and not standard_stream_file_descriptors'
+ '';
+
+ pythonImportsCheck = [
+ "daemon"
+ "daemon.daemon"
+ "daemon.pidfile"
+ "daemon.runner"
+ ];
+
meta = with lib; {
description = "Library to implement a well-behaved Unix daemon process";
homepage = "https://pagure.io/python-daemon/";
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index 252eafec465..09732252437 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchFromGitHub
, numpy
@@ -26,14 +27,14 @@
buildPythonPackage rec {
pname = "sunpy";
- version = "1.0.2";
+ version = "1.0.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "sunpy";
repo = pname;
rev = "v${version}";
- sha256 = "0dmfzxxsjjax9wf2ljyl4z07pxbshrj828zi5qnsa9rgk4148q9x";
+ sha256 = "0j2yfhfxgi95rig8cfp9lvszb7694gq90jvs0xrb472hwnzgh2sk";
};
propagatedBuildInputs = [
@@ -67,8 +68,11 @@ buildPythonPackage rec {
export HOME=$(mktemp -d)
'';
+ # darwin has write permission issues
+ doCheck = stdenv.isLinux;
+ # ignore documentation tests
checkPhase = ''
- pytest sunpy -k "not test_rotation"
+ pytest sunpy -k 'not rst'
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix
new file mode 100644
index 00000000000..5b8e10db83e
--- /dev/null
+++ b/pkgs/development/python-modules/textwrap3/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, tox
+, pytest
+, coverage
+, pytestcov
+}:
+
+buildPythonPackage rec {
+ pname = "textwrap3";
+ version = "0.9.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "5008eeebdb236f6303dcd68f18b856d355f6197511d952ba74bc75e40e0c3414";
+ };
+
+ checkInputs = [
+ tox
+ pytest
+ coverage
+ pytestcov
+ ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with lib; {
+ description = "Textwrap from Python 3.6 backport plus a few tweaks";
+ homepage = https://github.com/jonathaneunice/textwrap3;
+ license = licenses.psfl;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 0564e390410..f98b3411242 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -3,6 +3,7 @@
, backports_lzma
, cachetools
, lz4
+, pandas
, pytestrunner
, pytest
, pkgconfig
@@ -27,6 +28,7 @@ buildPythonPackage rec {
checkInputs = [
lz4
mock
+ pandas
pkgconfig
pytest
requests
diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index bd5f9eb40b8..19e2ed95328 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -4,14 +4,14 @@
}:
buildPythonPackage rec {
- version = "1.0.15";
+ version = "1.0.16";
pname = "xmlschema";
src = fetchFromGitHub {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
- sha256 = "1s8ggvy2s7513cxcal3r37rn1bhpkxhq3hs5m9pgvmrysxjdz8lb";
+ sha256 = "0mxvpafkaxib3qiz3zl7fbsgjaq9hbx4kb0w646azwhg7n7nxghj";
};
propagatedBuildInputs = [ elementpath ];
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index 67abd284952..12cce3e8d46 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -5,12 +5,11 @@
let
py = python.override {
packageOverrides = self: super: {
-
- aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec {
- version = "1.14.0";
+ flask = super.flask.overridePythonAttrs (oldAttrs: rec {
+ version = "1.0.2";
src = oldAttrs.src.override {
inherit version;
- sha256 = "1cghn1m7ana9s8kyg61dwp9mrism5l04vy5rj1wnmksz8vzmnq9w";
+ sha256 = "0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92";
};
});
@@ -34,11 +33,11 @@ with py.pkgs;
buildPythonApplication rec {
pname = "aws-sam-cli";
- version = "0.22.0";
+ version = "0.34.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1flbvqlj5llz7nrszmcf00v2a1pa36alv90r1l8lwn8zid5aabkn";
+ sha256 = "1ndgcbd6zr23lvmqn4wikgvnlwl0gj0wgyawaspwm3b0jlvxadik";
};
# Tests are not included in the PyPI package
@@ -58,6 +57,7 @@ buildPythonApplication rec {
requests
serverlessrepo
six
+ tomlkit
];
# fix over-restrictive version bounds
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 4a5a1d4d44c..377c2710b2e 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -22,11 +22,11 @@
}:
let
- version = "1.1.0";
+ version = "1.2.0";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "1awm5wa4y4c37zy7d1ass83amwq5992wydkj5v9jx0zp7b4shrjb";
+ sha256 = "0vpfpm3l3zp6749b23ysqqf1la029jzq43ks60q6f5mr3056pd4w";
};
# Update with `eval $(nix-build -A bazel.updater)`,
@@ -50,7 +50,7 @@ let
else srcs."java_tools_javac11_linux-v6.1.zip")
srcs."coverage_output_generator-v2.0.zip"
srcs.build_bazel_rules_nodejs
- srcs."android_tools_pkg-0.11.tar.gz"
+ srcs."android_tools_pkg-0.12.tar.gz"
srcs."0.28.3.tar.gz"
srcs.rules_pkg
srcs.rules_cc
diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json
index 152cce5093e..e86e6a1c945 100644
--- a/pkgs/development/tools/build-managers/bazel/src-deps.json
+++ b/pkgs/development/tools/build-managers/bazel/src-deps.json
@@ -55,11 +55,11 @@
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
]
},
- "android_tools_pkg-0.11.tar.gz": {
- "name": "android_tools_pkg-0.11.tar.gz",
- "sha256": "6fc50151063bffdda700038ea7df99c89d54dc066e9377a5baff60d55d482ad2",
+ "android_tools_pkg-0.12.tar.gz": {
+ "name": "android_tools_pkg-0.12.tar.gz",
+ "sha256": "96c4eef4d195dd95e43a4259cf5b82a1e34f67333439e91955bbdc0e1c8e7a31",
"urls": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.11.tar.gz"
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.12.tar.gz"
]
},
"bazel_j2objc": {
@@ -108,11 +108,11 @@
},
"com_google_googletest": {
"name": "com_google_googletest",
- "sha256": "0fb00ff413f6b9b80ccee44a374ca7a18af7315aea72a43c62f2acd1ca74e9b5",
- "strip_prefix": "googletest-f13bbe2992d188e834339abe6f715b2b2f840a77",
+ "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
+ "strip_prefix": "googletest-release-1.10.0",
"urls": [
- "https://mirror.bazel.build/github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz",
- "https://github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz"
+ "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz",
+ "https://github.com/google/googletest/archive/release-1.10.0.tar.gz"
]
},
"coverage_output_generator-v2.0.zip": {
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index d5c74201418..d30c0aaeb49 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,7 +1,7 @@
{ lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }:
bundlerEnv {
- pname = "chef-dk";
+ name = "chef-dk-2.4.17";
ruby = ruby_2_4;
gemdir = ./.;
diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
index cdc4e6db2c2..adee52d967e 100644
--- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "gocd-agent-${version}-${rev}";
- version = "16.9.0";
- rev = "4001";
+ version = "19.3.0";
+ rev = "8959";
src = fetchurl {
url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip";
- sha256 = "1xcwwjf2khhng6v1y7dvi579y2j643al9n0x80m0c46qb9mzd04x";
+ sha256 = "1nirdv82i8x4s1dyb0rmxldh8avappd4g3mbbl6xp7r7s0drcprp";
};
meta = with stdenv.lib; {
description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
index 8982ca5f77a..c0fabdeb5a1 100644
--- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix
+++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "gocd-server-${version}-${rev}";
- version = "16.9.0";
- rev = "4001";
+ version = "19.3.0";
+ rev = "8959";
src = fetchurl {
url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip";
- sha256 = "0x5pmjbhrka6p27drkrca7872vgsjxaa5j0cbxsa2ds02wrn57a7";
+ sha256 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index ab32674f188..5e06e9f771d 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
pname = "grabserial";
- version = "1.9.8";
+ version = "1.9.9";
src = fetchFromGitHub {
owner = "tbird20d";
repo = "grabserial";
rev = "v${version}";
- sha256 = "1xmy3js4hzsxlkxc172hkjzxsc34mmg3vfz61h24c7svmfzyhbd5";
+ sha256 = "0cwrajkh605gfhshrlpbc32gmx86a8kv3pq7cv713k60sgqrgpqx";
};
propagatedBuildInputs = [ pythonPackages.pyserial ];
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index f2c926a6f39..228a82f6008 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation {
pname = "irony-server";
- inherit (irony) version;
+ inherit (irony) src version;
nativeBuildInputs = [ cmake ];
- buildInputs = [ llvmPackages.libclang ];
+ buildInputs = [ llvmPackages.libclang llvmPackages.llvm ];
dontUseCmakeBuildDir = true;
@@ -15,13 +15,11 @@ stdenv.mkDerivation {
"-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
];
- src = irony.src;
-
- meta = {
+ meta = with stdenv.lib; {
description = "The server part of irony.";
homepage = "https://melpa.org/#/irony";
- maintainers = [ stdenv.lib.maintainers.deepfire ];
- platforms = stdenv.lib.platforms.unix;
- license = stdenv.lib.licenses.free;
+ maintainers = [ maintainers.deepfire ];
+ platforms = platforms.unix;
+ license = licenses.free;
};
}
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
index c7eaafd9c7a..288e8bf9699 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "elfkickers";
- version = "3.1";
+ version = "3.1a";
src = fetchurl {
url = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz";
- sha256 = "0n0sypjrdm3ramv0sby4sdh3i3j9d0ihadr951wa08ypdnq3yrkd";
+ sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6";
};
makeFlags = [ "CC=cc prefix=$(out)" ];
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index d85cd1a8216..01ed6603018 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, python }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "uncrustify";
- version = "0.67";
+ version = "0.70.1";
src = fetchFromGitHub {
owner = product;
repo = product;
rev = name;
- sha256 = "0hf8c93aj1hjg6cc77x6p7nf7ddp8mn4b6a9gpcrvmx8w81afpd3";
+ sha256 = "0zr3vxhd947zdvwccw3cj0vsriaawcpfjq3x94v9887hsi8fk87b";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake python ];
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix
index cc33b675954..e62827c67b4 100644
--- a/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/pkgs/development/tools/ofono-phonesim/default.nix
@@ -1,27 +1,21 @@
{ stdenv
, mkDerivation
-, fetchFromGitHub
+, fetchgit
, autoreconfHook
, pkgconfig
, qtbase
-, qtscript
}:
mkDerivation {
pname = "ofono-phonesim";
- version = "unstable-2014-04-22";
+ version = "unstable-2019-11-18";
- src = fetchFromGitHub {
- owner = "jpakkane";
- repo = "ofono-phonesim";
- rev = "baa41f04e6a86c5289d7185cad8a6f08a5c3ed0a";
- sha256 = "0ywalvvf3dfbn81ml21gji1n2hywh2nmakynakjzyyskcqjn2wiz";
+ src = fetchgit {
+ url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git";
+ rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541";
+ sha256 = "sha256:1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp";
};
- patches = [
- ./qt5-compat.patch
- ];
-
nativeBuildInputs = [
autoreconfHook
pkgconfig
@@ -29,7 +23,6 @@ mkDerivation {
buildInputs = [
qtbase
- qtscript
];
makeFlags = [
@@ -39,7 +32,7 @@ mkDerivation {
meta = with stdenv.lib; {
description = "Phone Simulator for modem testing";
- homepage = https://github.com/jpakkane/ofono-phonesim;
+ homepage = "https://01.org/ofono";
license = licenses.gpl2;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
diff --git a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch b/pkgs/development/tools/ofono-phonesim/qt5-compat.patch
deleted file mode 100644
index e2e9dcebd6b..00000000000
--- a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2436292..993df87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,18 +21,18 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
- fi
- ])
-
--PKG_CHECK_MODULES(QT, QtCore QtGui QtXml QtNetwork QtScript QtDBus, dummy=yes,
-+PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5Script Qt5DBus, dummy=yes,
- AC_MSG_ERROR(Qt is required))
- AC_SUBST(QT_CFLAGS)
- AC_SUBST(QT_LIBS)
-
- AC_MSG_CHECKING(for moc)
--MOC="`$PKG_CONFIG --variable=moc_location QtCore`"
-+MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`"
- AC_SUBST(MOC)
- AC_MSG_RESULT($MOC)
-
- AC_MSG_CHECKING(for uic)
--UIC="`$PKG_CONFIG --variable=uic_location QtCore`"
-+UIC="`$PKG_CONFIG --variable=uic_location Qt5Core`"
- AC_SUBST(UIC)
- AC_MSG_RESULT($UIC)
-
-diff --git a/src/control.cpp b/src/control.cpp
-index e1838a6..880da68 100644
---- a/src/control.cpp
-+++ b/src/control.cpp
-@@ -22,7 +22,7 @@
- #include
- #include
- #include
--#include
-+#include
- #include
- #include
- #include
-@@ -31,7 +31,7 @@
- #include
- #include
- #include
--#include
-+#include
-
- #define TWO_BYTE_MAX 65535
- #define FOUR_CHAR 4
diff --git a/pkgs/development/tools/overcommit/Gemfile b/pkgs/development/tools/overcommit/Gemfile
new file mode 100644
index 00000000000..39325c7561b
--- /dev/null
+++ b/pkgs/development/tools/overcommit/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'overcommit'
diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock
new file mode 100644
index 00000000000..bf88c1bb148
--- /dev/null
+++ b/pkgs/development/tools/overcommit/Gemfile.lock
@@ -0,0 +1,17 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ childprocess (3.0.0)
+ iniparse (1.4.4)
+ overcommit (0.51.0)
+ childprocess (>= 0.6.3, < 4)
+ iniparse (~> 1.4)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ overcommit
+
+BUNDLED WITH
+ 1.17.3
diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix
new file mode 100644
index 00000000000..84529ca4b6f
--- /dev/null
+++ b/pkgs/development/tools/overcommit/default.nix
@@ -0,0 +1,15 @@
+{ lib, bundlerApp }:
+
+bundlerApp {
+ pname = "overcommit";
+ gemdir = ./.;
+ exes = [ "overcommit" ];
+
+ meta = with lib; {
+ description = "Tool to manage and configure Git hooks";
+ homepage = https://github.com/sds/overcommit;
+ license = licenses.mit;
+ maintainers = with maintainers; [ filalex77 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/development/tools/overcommit/gemset.nix
new file mode 100644
index 00000000000..b7d58c0ea70
--- /dev/null
+++ b/pkgs/development/tools/overcommit/gemset.nix
@@ -0,0 +1,33 @@
+{
+ childprocess = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
+ iniparse = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xbik6838gfh5yq9ahh1m7dzszxlk0g7x5lvhb8amk60mafkrgws";
+ type = "gem";
+ };
+ version = "1.4.4";
+ };
+ overcommit = {
+ dependencies = ["childprocess" "iniparse"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fjrrm9dy9mry5ss96sizn6xcphia5l54ydz9c31phipm61nwmfk";
+ type = "gem";
+ };
+ version = "0.51.0";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 43b3a88f6ee..41fc993c62f 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
- version = "0.4.15";
+ version = "0.4.16";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
- sha256 = "155b4azkrr0qfg52mk7934zavwsbl28i28hi1inb23d509hrr5ky";
+ sha256 = "0cf539y20hlwxbk0zfs1and99hkb0fqg7m3a6dfd80hwx0dm0xmx";
};
- cargoSha256 = "050q4rk1x3jghinxg6gszi993a6zbg41vg535dlvvsqi36l278qc";
+ cargoSha256 = "1bspciy7sfx887hwxmckrnjy7b6kpy6g51yraw25yl302mzzng21";
buildInputs = [ llvmPackages.libclang ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-rustPlatform.buildRustPackage-in-.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-0.2.55.patch
similarity index 75%
rename from pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-rustPlatform.buildRustPackage-in-.patch
rename to pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-0.2.55.patch
index e564717a56f..3866483f9ed 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-rustPlatform.buildRustPackage-in-.patch
+++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-0.2.55.patch
@@ -1,26 +1,26 @@
-From 3d3c33a610856b861204ccb111777e9edd8799b8 Mon Sep 17 00:00:00 2001
+From 26c538a9da9047597f9fd437d8b83502aca3f932 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch
-Date: Thu, 3 Oct 2019 22:26:12 +0200
-Subject: [PATCH] Add cargo.lock for `rustPlatform.buildRustPackage` in nixpkgs
+Date: Tue, 26 Nov 2019 22:40:30 +0100
+Subject: [PATCH] Add cargo.lock for 0.2.55
---
- Cargo.lock | 2221 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 2221 insertions(+)
+ Cargo.lock | 2237 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 2237 insertions(+)
create mode 100644 Cargo.lock
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
-index 00000000..d7d32a06
+index 00000000..f256688d
--- /dev/null
+++ b/Cargo.lock
-@@ -0,0 +1,2221 @@
+@@ -0,0 +1,2237 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "add"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
@@ -37,17 +37,19 @@ index 00000000..d7d32a06
+]
+
+[[package]]
++name = "anyhow"
++version = "1.0.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
+name = "arrayref"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "arrayvec"
-+version = "0.4.11"
++version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
+
+[[package]]
+name = "ascii"
@@ -80,9 +82,9 @@ index 00000000..d7d32a06
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -92,7 +94,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -102,33 +104,33 @@ index 00000000..d7d32a06
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "autocfg"
-+version = "0.1.6"
++version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "backtrace"
-+version = "0.3.38"
++version = "0.3.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
++ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
-+version = "0.1.31"
++version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -137,7 +139,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -155,16 +157,16 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "bitflags"
-+version = "1.2.0"
++version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "blake2b_simd"
-+version = "0.5.8"
++version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -174,7 +176,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -189,25 +191,24 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "c2-chacha"
-+version = "0.2.2"
++version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "canvas"
+version = "0.1.0"
+dependencies = [
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
+name = "cc"
-+version = "1.0.45"
++version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
@@ -219,17 +220,16 @@ index 00000000..d7d32a06
+name = "char"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
+name = "chrono"
-+version = "0.4.9"
++version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -242,9 +242,9 @@ index 00000000..d7d32a06
+name = "closures"
+version = "0.1.0"
+dependencies = [
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -252,7 +252,7 @@ index 00000000..d7d32a06
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -266,15 +266,15 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
+name = "console_log"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -284,32 +284,32 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "crossbeam-deque"
-+version = "0.7.1"
++version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-epoch"
-+version = "0.7.2"
++version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-queue"
-+version = "0.1.2"
++version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -322,14 +322,24 @@ index 00000000..d7d32a06
+]
+
+[[package]]
-+name = "curl"
-+version = "0.4.24"
++name = "crossbeam-utils"
++version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "curl-sys 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "curl"
++version = "0.4.25"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -337,14 +347,14 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "curl-sys"
-+version = "0.4.22"
++version = "0.4.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -368,7 +378,7 @@ index 00000000..d7d32a06
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -380,7 +390,7 @@ index 00000000..d7d32a06
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -388,8 +398,8 @@ index 00000000..d7d32a06
+name = "dom"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -407,7 +417,7 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "env_logger"
-+version = "0.7.0"
++version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -424,59 +434,59 @@ index 00000000..d7d32a06
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure"
-+version = "0.1.5"
++version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure_derive"
-+version = "0.1.5"
++version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fetch"
+version = "0.1.0"
+dependencies = [
-+ "js-sys 0.3.28",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-futures 0.4.1",
-+ "web-sys 0.3.28",
++ "js-sys 0.3.32",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-futures 0.4.5",
++ "web-sys 0.3.32",
+]
+
+[[package]]
+name = "filetime"
-+version = "0.2.7"
++version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "float-cmp"
-+version = "0.4.0"
++version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -512,11 +522,11 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "getrandom"
-+version = "0.1.12"
++version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -538,7 +548,7 @@ index 00000000..d7d32a06
+name = "guide-supported-types-examples"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
@@ -546,14 +556,22 @@ index 00000000..d7d32a06
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hello_world"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -574,7 +592,7 @@ index 00000000..d7d32a06
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -584,7 +602,7 @@ index 00000000..d7d32a06
+dependencies = [
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -607,7 +625,7 @@ index 00000000..d7d32a06
+name = "import_js"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
@@ -626,24 +644,24 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "js-sys"
-+version = "0.3.28"
++version = "0.3.32"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-futures 0.4.1",
-+ "wasm-bindgen-test 0.3.1",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-futures 0.4.5",
++ "wasm-bindgen-test 0.3.5",
+]
+
+[[package]]
+name = "julia_set"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -658,7 +676,7 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "libc"
-+version = "0.2.62"
++version = "0.2.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
@@ -666,9 +684,9 @@ index 00000000..d7d32a06
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -705,7 +723,7 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "memoffset"
-+version = "0.5.1"
++version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -742,7 +760,7 @@ index 00000000..d7d32a06
+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -751,15 +769,10 @@ index 00000000..d7d32a06
+name = "no-std"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
-+name = "nodrop"
-+version = "0.1.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
+name = "nom"
+version = "4.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -778,8 +791,8 @@ index 00000000..d7d32a06
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -787,9 +800,9 @@ index 00000000..d7d32a06
+version = "0.1.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -798,7 +811,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -806,36 +819,37 @@ index 00000000..d7d32a06
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-traits"
-+version = "0.2.8"
++version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num_cpus"
-+version = "1.10.1"
++version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "openssl"
-+version = "0.10.25"
++version = "0.10.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -848,19 +862,19 @@ index 00000000..d7d32a06
+version = "111.6.0+1.1.1d"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "openssl-sys"
-+version = "0.9.50"
++version = "0.9.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -874,8 +888,8 @@ index 00000000..d7d32a06
+version = "0.1.0"
+dependencies = [
+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -915,7 +929,7 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "pkg-config"
-+version = "0.3.16"
++version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
@@ -931,16 +945,16 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "ppv-lite86"
-+version = "0.2.5"
++version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "predicates"
-+version = "1.0.1"
++version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "float-cmp 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -970,7 +984,7 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "proc-macro2"
-+version = "1.0.4"
++version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -994,7 +1008,7 @@ index 00000000..d7d32a06
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1003,7 +1017,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1016,7 +1030,7 @@ index 00000000..d7d32a06
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1026,8 +1040,8 @@ index 00000000..d7d32a06
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1044,8 +1058,8 @@ index 00000000..d7d32a06
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1056,7 +1070,7 @@ index 00000000..d7d32a06
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -1065,7 +1079,7 @@ index 00000000..d7d32a06
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -1087,7 +1101,7 @@ index 00000000..d7d32a06
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1119,7 +1133,7 @@ index 00000000..d7d32a06
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1131,7 +1145,7 @@ index 00000000..d7d32a06
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1142,7 +1156,7 @@ index 00000000..d7d32a06
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -1156,24 +1170,24 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "rayon"
-+version = "1.2.0"
++version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rayon-core"
-+version = "1.6.0"
++version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1182,13 +1196,13 @@ index 00000000..d7d32a06
+dependencies = [
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.28",
-+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "js-sys 0.3.32",
++ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)",
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-futures 0.4.1",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-futures 0.4.5",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -1197,8 +1211,8 @@ index 00000000..d7d32a06
+source = "git+https://github.com/alexcrichton/raytracer?branch=update-deps#42faa13859f7d8d47fd18be785c108003a207786"
+dependencies = [
+ "image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1219,7 +1233,7 @@ index 00000000..d7d32a06
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1253,8 +1267,8 @@ index 00000000..d7d32a06
+name = "request-animation-frame"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -1263,14 +1277,14 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1285,7 +1299,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -1293,7 +1307,7 @@ index 00000000..d7d32a06
+name = "rust-duck-typed-interfaces"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
@@ -1311,22 +1325,22 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "ryu"
-+version = "1.0.0"
++version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "safemem"
-+version = "0.3.2"
++version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "sample"
+version = "0.1.0"
+dependencies = [
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-futures 0.4.1",
-+ "wasm-bindgen-test 0.3.1",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-futures 0.4.5",
++ "wasm-bindgen-test 0.3.5",
+]
+
+[[package]]
@@ -1368,30 +1382,30 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "serde"
-+version = "1.0.101"
++version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
-+version = "1.0.101"
++version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_json"
-+version = "1.0.40"
++version = "1.0.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1406,7 +1420,7 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "smallvec"
-+version = "0.6.10"
++version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
@@ -1415,7 +1429,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1442,23 +1456,23 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "syn"
-+version = "1.0.5"
++version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synstructure"
-+version = "0.10.2"
++version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1476,7 +1490,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1514,7 +1528,7 @@ index 00000000..d7d32a06
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1522,7 +1536,7 @@ index 00000000..d7d32a06
+version = "0.1.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
@@ -1533,7 +1547,7 @@ index 00000000..d7d32a06
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1545,9 +1559,9 @@ index 00000000..d7d32a06
+dependencies = [
+ "askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -1555,15 +1569,15 @@ index 00000000..d7d32a06
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "toml"
-+version = "0.5.3"
++version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1573,15 +1587,15 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "trybuild"
-+version = "1.0.16"
++version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1596,7 +1610,7 @@ index 00000000..d7d32a06
+name = "typescript-tests"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
@@ -1617,15 +1631,15 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "unicode-normalization"
-+version = "0.1.8"
++version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-segmentation"
-+version = "1.3.0"
++version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
@@ -1660,27 +1674,27 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "walrus"
-+version = "0.12.0"
++version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus-macro 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "walrus-macro"
-+version = "0.12.0"
++version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
@@ -1690,217 +1704,217 @@ index 00000000..d7d32a06
+
+[[package]]
+name = "wasm-bindgen"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.28",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-futures 0.4.1",
-+ "wasm-bindgen-macro 0.2.51",
-+ "wasm-bindgen-test 0.3.1",
++ "js-sys 0.3.32",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-futures 0.4.5",
++ "wasm-bindgen-macro 0.2.55",
++ "wasm-bindgen-test 0.3.5",
+ "wasm-bindgen-test-crate-a 0.1.0",
+ "wasm-bindgen-test-crate-b 0.1.0",
+]
+
+[[package]]
+name = "wasm-bindgen-anyref-xform"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
+ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-shared 0.2.51",
++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-shared 0.2.55",
+]
+
+[[package]]
+name = "wasm-bindgen-benchmark"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
+name = "wasm-bindgen-cli"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "curl 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
++ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-cli-support 0.2.51",
-+ "wasm-bindgen-shared 0.2.51",
++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-cli-support 0.2.55",
++ "wasm-bindgen-shared 0.2.55",
+]
+
+[[package]]
+name = "wasm-bindgen-cli-support"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-anyref-xform 0.2.51",
-+ "wasm-bindgen-multi-value-xform 0.2.51",
-+ "wasm-bindgen-shared 0.2.51",
-+ "wasm-bindgen-threads-xform 0.2.51",
-+ "wasm-bindgen-wasm-conventions 0.2.51",
-+ "wasm-bindgen-wasm-interpreter 0.2.51",
-+ "wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-anyref-xform 0.2.55",
++ "wasm-bindgen-multi-value-xform 0.2.55",
++ "wasm-bindgen-shared 0.2.55",
++ "wasm-bindgen-threads-xform 0.2.55",
++ "wasm-bindgen-wasm-conventions 0.2.55",
++ "wasm-bindgen-wasm-interpreter 0.2.55",
++ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
-+version = "0.4.1"
++version = "0.4.5"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-test 0.3.1",
-+ "web-sys 0.3.28",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-test 0.3.5",
++ "web-sys 0.3.32",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "trybuild 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-futures 0.4.1",
-+ "wasm-bindgen-macro-support 0.2.51",
++ "trybuild 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-futures 0.4.5",
++ "wasm-bindgen-macro-support 0.2.55",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
-+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-backend 0.2.51",
-+ "wasm-bindgen-shared 0.2.51",
++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-backend 0.2.55",
++ "wasm-bindgen-shared 0.2.55",
+]
+
+[[package]]
+name = "wasm-bindgen-multi-value-xform"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-paint"
+version = "0.1.0"
+dependencies = [
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
-+version = "0.2.51"
++version = "0.2.55"
+
+[[package]]
+name = "wasm-bindgen-test"
-+version = "0.3.1"
++version = "0.3.5"
+dependencies = [
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.28",
++ "js-sys 0.3.32",
+ "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-futures 0.4.1",
-+ "wasm-bindgen-test-macro 0.3.1",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-futures 0.4.5",
++ "wasm-bindgen-test-macro 0.3.5",
+]
+
+[[package]]
+name = "wasm-bindgen-test-crate-a"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
+name = "wasm-bindgen-test-crate-b"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
+name = "wasm-bindgen-test-macro"
-+version = "0.3.1"
++version = "0.3.5"
+dependencies = [
-+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-threads-xform"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-wasm-conventions 0.2.51",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-wasm-conventions 0.2.55",
+]
+
+[[package]]
+name = "wasm-bindgen-wasm-conventions"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-wasm-interpreter"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-webidl"
-+version = "0.2.51"
++version = "0.2.55"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-backend 0.2.51",
++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-backend 0.2.55",
+ "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
@@ -1908,81 +1922,81 @@ index 00000000..d7d32a06
+name = "wasm-in-wasm"
+version = "0.1.0"
+dependencies = [
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
+name = "wasm-webidl-bindings"
-+version = "0.5.0"
++version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm2js"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
++ "wasm-bindgen 0.2.55",
+]
+
+[[package]]
+name = "wasmparser"
-+version = "0.37.2"
++version = "0.39.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "web-sys"
-+version = "0.3.28"
++version = "0.3.32"
+dependencies = [
-+ "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.28",
++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "js-sys 0.3.32",
+ "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-futures 0.4.1",
-+ "wasm-bindgen-test 0.3.1",
-+ "wasm-bindgen-webidl 0.2.51",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-futures 0.4.5",
++ "wasm-bindgen-test 0.3.5",
++ "wasm-bindgen-webidl 0.2.55",
+]
+
+[[package]]
+name = "webaudio"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
+name = "webgl"
+version = "0.1.0"
+dependencies = [
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
+name = "webidl-tests"
+version = "0.1.0"
+dependencies = [
-+ "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.28",
-+ "wasm-bindgen 0.2.51",
-+ "wasm-bindgen-test 0.3.1",
-+ "wasm-bindgen-webidl 0.2.51",
++ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "js-sys 0.3.32",
++ "wasm-bindgen 0.2.55",
++ "wasm-bindgen-test 0.3.5",
++ "wasm-bindgen-webidl 0.2.55",
+]
+
+[[package]]
+name = "websockets"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
@@ -2033,76 +2047,79 @@ index 00000000..d7d32a06
+name = "without-a-bundler"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[[package]]
+name = "without-a-bundler-no-modules"
+version = "0.1.0"
+dependencies = [
-+ "wasm-bindgen 0.2.51",
-+ "web-sys 0.3.28",
++ "wasm-bindgen 0.2.55",
++ "web-sys 0.3.32",
+]
+
+[metadata]
+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
++"checksum anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1072d8f55592084072d2d3cb23a4b680a8543c00f10d446118e85ad3718142"
+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-+"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+"checksum ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
+"checksum askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5"
+"checksum askama_derive 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083"
+"checksum askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71"
+"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e"
+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-+"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
-+"checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5"
-+"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
++"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
++"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
-+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
-+"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182"
++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++"checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
+"checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
+"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-+"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
-+"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
++"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
++"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68"
++"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
+"checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
+"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-+"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
-+"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
-+"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
++"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
++"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
++"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-+"checksum curl 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "d08ad3cb89d076a36b0ce5749eec2c9964f70c0c58480ab6b75a91ec4fc206d8"
-+"checksum curl-sys 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9a9a4e417722876332136a00cacf92c2ceb331fab4b52b6a1ad16c6cd79255"
++"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
++"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283"
++"checksum curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340"
+"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
+"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+"checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
-+"checksum env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39ecdb7dd54465526f0a56d666e3b2dd5f3a218665a030b6e4ad9e70fa95d8fa"
++"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+"checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597"
-+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
-+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
-+"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469"
-+"checksum float-cmp 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "134a8fa843d80a51a5b77d36d42bc2def9edcb0262c914861d08129fd1926600"
++"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
++"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
++"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
++"checksum float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e"
+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a"
+"checksum futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
-+"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
++"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
+"checksum gif 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f"
+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
++"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+"checksum id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
@@ -2113,43 +2130,42 @@ index 00000000..d7d32a06
+"checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
-+"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
++"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
+"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+"checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-+"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
++"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
+"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
+"checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
-+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
+"checksum normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e0a1a39eab95caf4f5556da9289b9e68f0aafac901b2ce80daaf020d3b733a8"
+"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
+"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e"
+"checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-+"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
-+"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
-+"checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449"
++"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
++"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
++"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+"checksum openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "b9c2da1de8a7a3f860919c01540b03a6db16de042405a8a07a5e9d0b4b825d9c"
-+"checksum openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)" = "2c42dcccb832556b5926bc9ae61e8775f2a61e725ab07ab3d1e7fcf8ae62c3b6"
++"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-+"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+"checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82"
-+"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
-+"checksum predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "53e09015b0d3f5a0ec2d4428f7559bb7b3fff341b4e159fedd1d57fac8b939ff"
++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
++"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4"
+"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
+"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
+"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-+"checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc"
++"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
@@ -2169,8 +2185,8 @@ index 00000000..d7d32a06
+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-+"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123"
-+"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b"
++"checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd"
++"checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791"
+"checksum raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)" = ""
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
@@ -2182,26 +2198,26 @@ index 00000000..d7d32a06
+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-+"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
-+"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
++"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
++"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
+"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-+"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
-+"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
-+"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
++"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702"
++"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
++"checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
++"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
+"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
+"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
+"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6"
+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
-+"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
++"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
++"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
@@ -2211,24 +2227,24 @@ index 00000000..d7d32a06
+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+"checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
+"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
-+"checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724"
++"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
+"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
-+"checksum trybuild 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "10d8f366221c5a5ff8a62faa005e186fdce758949d34a9140b64a062951bae68"
++"checksum trybuild 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "b75e31d624df08744532e935f1d4bfedd319a277d5a162c5b15f6ced59307575"
+"checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-+"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
-+"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
++"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
++"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-+"checksum walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f3bd9559eb5b59d55cc60986e26dc9b3f64377d0b9495e41abd9ede9a6443f"
-+"checksum walrus-macro 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0464a6e0d86be4c95c8c838bcb1910df831e1216a9586feeb02478cd52c4e554"
++"checksum walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85ce93ab0c27412ba41d509f2410fa575ecbfdb4a6aba0e02e79e12c09745485"
++"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76"
+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-+"checksum wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e407ee3155cb0742acacd0b21060daafe2ad78ea718f2d6b10e7d9d1032aa961"
-+"checksum wasmparser 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7387ba67c13dd9cd01d7d961e733375aee889f828564e190da85b5602eb5eeb"
++"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1"
++"checksum wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c702914acda5feeeffbc29e4d953e5b9ce79d8b98da4dbf18a77086e116c5470"
+"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
index 2fd30ecc6b1..26f37c5dc74 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
- version = "0.2.51";
+ version = "0.2.55";
src = fetchFromGitHub {
owner = "rustwasm";
repo = "wasm-bindgen";
rev = version;
- sha256 = "1pfkwak11k3ghvv985c20vhg4cyvf131a1f7k3sv5snw2klww7vm";
+ sha256 = "13pcfrdf3nk4mrc7lqpz9qjdh7gfpqf849iywcyjk3f9y8sm46ii";
};
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkgconfig ];
- cargoSha256 = "06zk2yzwpl569q5mgn56gprsfxxvyz4a2i949lls13daq1kal5pa";
- cargoPatches = [ ./0001-Add-cargo.lock-for-rustPlatform.buildRustPackage-in-.patch ];
+ cargoSha256 = "0mpq40llddqj7syi07pfhr48kndx35f1hyf5pvx5zdnfz29a924v";
+ cargoPatches = [ ./0001-Add-cargo.lock-for-0.2.55.patch ];
cargoBuildFlags = [ "-p" pname ];
meta = with lib; {
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 7e3b4b952f1..76f68e50750 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "cups-filters";
- version = "1.25.11";
+ version = "1.25.12";
src = fetchurl {
url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
- sha256 = "0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh";
+ sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 6c037eb9f22..9f092f91e2e 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "fs-uae";
- version = "3.0.0";
+ version = "3.0.2";
src = fetchurl {
url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz";
- sha256 = "0r69i6rh472lj4qwqfcfh17xmlw4x6mhqzr9hhpkbb4byyw6h592";
+ sha256 = "1awakxs3rlbm0bxpi37cbavi5fpb89wszksyw62as4nz3qsdrpjf";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index f7663c8e447..0c30e76b3fa 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -4,24 +4,27 @@
}:
let
- buildUBoot = { version ? "2019.10"
- , filesToInstall
- , installDir ? "$out"
- , defconfig
- , extraConfig ? ""
- , extraPatches ? []
- , extraMakeFlags ? []
- , extraMeta ? {}
- , ... } @ args:
- stdenv.mkDerivation ({
-
+ defaultVersion = "2019.10";
+ defaultSrc = fetchurl {
+ url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
+ sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd";
+ };
+ buildUBoot = {
+ version ? null
+ , src ? null
+ , filesToInstall
+ , installDir ? "$out"
+ , defconfig
+ , extraConfig ? ""
+ , extraPatches ? []
+ , extraMakeFlags ? []
+ , extraMeta ? {}
+ , ... } @ args: stdenv.mkDerivation ({
pname = "uboot-${defconfig}";
- inherit version;
- src = fetchurl {
- url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
- sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd";
- };
+ version = if src == null then defaultVersion else version;
+
+ src = if src == null then defaultSrc else src;
patches = [
(fetchpatch {
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 92a47bc5d13..0ef93ac569a 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -21,18 +21,54 @@ import xml.etree.ElementTree as ET
from datetime import datetime
from multiprocessing.dummy import Pool
from pathlib import Path
-from typing import Dict, List, Optional, Tuple, Union, Any
+from typing import Dict, List, Optional, Tuple, Union, Any, Callable
from urllib.parse import urljoin, urlparse
from tempfile import NamedTemporaryFile
-ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry"
-ATOM_LINK = "{http://www.w3.org/2005/Atom}link"
-ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated"
+ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here
+ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # "
+ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # "
ROOT = Path(__file__).parent
DEFAULT_IN = ROOT.joinpath("vim-plugin-names")
DEFAULT_OUT = ROOT.joinpath("generated.nix")
+import time
+from functools import wraps
+
+
+def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2):
+ """Retry calling the decorated function using an exponential backoff.
+
+ http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/
+ original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry
+ (BSD licensed)
+
+ :param ExceptionToCheck: the exception on which to retry
+ :param tries: number of times to try (not retry) before giving up
+ :param delay: initial delay between retries in seconds
+ :param backoff: backoff multiplier e.g. value of 2 will double the delay
+ each retry
+ """
+
+ def deco_retry(f: Callable) -> Callable:
+ @wraps(f)
+ def f_retry(*args: Any, **kwargs: Any) -> Any:
+ mtries, mdelay = tries, delay
+ while mtries > 1:
+ try:
+ return f(*args, **kwargs)
+ except ExceptionToCheck as e:
+ print(f"{str(e)}, Retrying in {mdelay} seconds...")
+ time.sleep(mdelay)
+ mtries -= 1
+ mdelay *= backoff
+ return f(*args, **kwargs)
+
+ return f_retry # true decorator
+
+ return deco_retry
+
class Repo:
def __init__(self, owner: str, name: str) -> None:
@@ -45,9 +81,12 @@ class Repo:
def __repr__(self) -> str:
return f"Repo({self.owner}, {self.name})"
+ @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
def has_submodules(self) -> bool:
try:
- urllib.request.urlopen(self.url("blob/master/.gitmodules")).close()
+ urllib.request.urlopen(
+ self.url("blob/master/.gitmodules"), timeout=10
+ ).close()
except urllib.error.HTTPError as e:
if e.code == 404:
return False
@@ -55,8 +94,9 @@ class Repo:
raise
return True
+ @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
def latest_commit(self) -> Tuple[str, datetime]:
- with urllib.request.urlopen(self.url("commits/master.atom")) as req:
+ with urllib.request.urlopen(self.url("commits/master.atom"), timeout=10) as req:
xml = req.read()
root = ET.fromstring(xml)
latest_entry = root.find(ATOM_ENTRY)
@@ -69,7 +109,7 @@ class Repo:
updated_tag is not None and updated_tag.text is not None
), f"No updated tag found feed entry {xml}"
updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ")
- return Path(url.path).name, updated
+ return Path(str(url.path)).name, updated
def prefetch_git(self, ref: str) -> str:
data = subprocess.check_output(
@@ -210,20 +250,17 @@ def check_results(
sys.exit(1)
-def parse_plugin_line(line: str) -> Tuple[str, str, str]:
+def parse_plugin_line(line: str) -> Tuple[str, str, Optional[str]]:
+ name, repo = line.split("/")
try:
- name, repo = line.split("/")
- try:
- repo, alias = repo.split(" as ")
- return (name, repo, alias.strip())
- except ValueError:
- # no alias defined
- return (name, repo.strip(), None)
+ repo, alias = repo.split(" as ")
+ return (name, repo, alias.strip())
except ValueError:
- return (None, None, None)
+ # no alias defined
+ return (name, repo.strip(), None)
-def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str]]:
+def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, Optional[str]]]:
plugins = []
with open(plugin_file) as f:
for line in f:
@@ -385,7 +422,7 @@ def main() -> None:
try:
# synchronous variant for debugging
- # results = map(prefetch_with_cache, plugins)
+ # results = list(map(prefetch_with_cache, plugin_names))
pool = Pool(processes=30)
results = pool.map(prefetch_with_cache, plugin_names)
finally:
diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix
index 53fcf7d6843..7f0ba5498df 100644
--- a/pkgs/os-specific/linux/alsa-firmware/default.nix
+++ b/pkgs/os-specific/linux/alsa-firmware/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "alsa-firmware-1.0.29";
+ name = "alsa-firmware-1.2.1";
src = fetchurl {
url = "mirror://alsa/firmware/${name}.tar.bz2";
- sha256 = "0gfcyj5anckjn030wcxx5v2xk2s219nyf99s9m833275b5wz2piw";
+ sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf";
};
configureFlags = [
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 6f23d190318..8b1faf788e5 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "alsa-utils";
- version = "1.1.9";
+ version = "1.2.1";
src = fetchurl {
url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
- sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx";
+ sha256 = "039c19b7091is0czl9jlrfczp7pp1jpdri0vvc4k07gl3skhn48b";
};
patchPhase = ''
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 35bd141ae46..19a393cbc7c 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.202";
+ version = "4.4.203";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0adrmps7izfqy0yn4440isxvigslwzk1a375r9kh86idwbmcxb7x";
+ sha256 = "02krniihix9mb9bc0ffs03q4i9grjhwymnfp10h1r6gmxa554qlj";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 4ada201263f..70b2580b664 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "microcode-intel";
- version = "20191113";
+ version = "20191115";
src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
- sha256 = "04138j9n14197ybkh2vxfjy21wcgvbd183ya4b6k262y9nzjmvsa";
+ sha256 = "0pzi5qmrcrdf6nsds4bvyq1hnvv9d1dlrvqrbzcrpxk84rcjwq1x";
};
nativeBuildInputs = [ iucode-tool libarchive ];
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
description = "Microcode for Intel processors";
license = licenses.unfreeRedistributableFirmware;
platforms = platforms.linux;
+ maintainers = with maintainers; [ andir ];
};
}
diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix
index 355108f56e4..a6bf67db098 100644
--- a/pkgs/os-specific/linux/openrazer/driver.nix
+++ b/pkgs/os-specific/linux/openrazer/driver.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (common // {
nativeBuildInputs = kernel.moduleBuildDependencies;
buildFlags = [
- "KERNELDIR=${kernel.dev}/lib/modules/${kernel.version}/build"
+ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
installPhase = ''
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index d7fb5b55468..4d403e7d938 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "atlassian-confluence";
- version = "7.0.2";
+ version = "7.0.3";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
- sha256 = "00ma2l6gknlpaf2k26md9fskgzcllky3vv89sb1izsrxl8la1dhq";
+ sha256 = "1anmhfdy4q74wchzha8fd2bd5hx0a2v3bgp9p5yvb8cal31zqcpd";
};
buildPhase = ''
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 40a116f5665..e13967d7af1 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
- version = "9.14.7";
+ version = "9.14.8";
src = fetchurl {
url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
- sha256 = "07998nx0yv3xy8c62b1ira9qygsgvpljwcgb47ypzxq8b57gb86f";
+ sha256 = "0xm0xrpgxq6gk6r6aa2w0lygnq02y1p614dmyjdmlsfnrrsslig5";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix
index 06663a87bcd..cce37fd8e6b 100644
--- a/pkgs/servers/gotify/default.nix
+++ b/pkgs/servers/gotify/default.nix
@@ -10,13 +10,15 @@
buildGoModule rec {
pname = "gotify-server";
- version = "2.0.10";
+ # Note that when this is updated, along with the hash, the `ui.nix` file
+ # should include the same changes to the version and the sha256.
+ version = "2.0.11";
src = fetchFromGitHub {
owner = "gotify";
repo = "server";
rev = "v${version}";
- sha256 = "0f7y6gkxikdfjhdxplkv494ss2b0fqmibd2kl9nifabggfz5gjal";
+ sha256 = "0zrylyaxy1cks1wlzyf0di8in2braj4pfriyqa24vipwrlnhvgs6";
};
modSha256 = "19mghbs1jasb7vxdw13mmwsbk5sfg3y2vvddr73c82lq0f8g2iha";
diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix
index e1277a2db21..a47e5279585 100644
--- a/pkgs/servers/gotify/ui.nix
+++ b/pkgs/servers/gotify/ui.nix
@@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec {
packageJSON = ./package.json;
yarnNix = ./yarndeps.nix;
- version = "2.0.8";
+ version = "2.0.11";
src_all = fetchFromGitHub {
owner = "gotify";
repo = "server";
rev = "v${version}";
- sha256 = "17bxs3wcazrxippf3i9w7d2mq8lf0v5m4bn3nl2zb8v8dl3lsc9a";
+ sha256 = "0zrylyaxy1cks1wlzyf0di8in2braj4pfriyqa24vipwrlnhvgs6";
};
src = "${src_all}/ui";
diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix
index 02886c27f04..0e81e890a9f 100644
--- a/pkgs/servers/gotify/yarndeps.nix
+++ b/pkgs/servers/gotify/yarndeps.nix
@@ -705,6 +705,14 @@
sha1 = "c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd";
};
}
+ {
+ name = "_babel_runtime___runtime_7.6.3.tgz";
+ path = fetchurl {
+ name = "_babel_runtime___runtime_7.6.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz";
+ sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f";
+ };
+ }
{
name = "_babel_template___template_7.4.4.tgz";
path = fetchurl {
@@ -890,11 +898,11 @@
};
}
{
- name = "_material_ui_icons___icons_4.4.3.tgz";
+ name = "_material_ui_icons___icons_4.5.1.tgz";
path = fetchurl {
- name = "_material_ui_icons___icons_4.4.3.tgz";
- url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.4.3.tgz";
- sha1 = "5d4346ddbb2673a1b57ebc78fd6d50bcd88711db";
+ name = "_material_ui_icons___icons_4.5.1.tgz";
+ url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.5.1.tgz";
+ sha1 = "6963bad139e938702ece85ca43067688018f04f8";
};
}
{
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 3edbed22b6b..b0a4a84b2fa 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
-, substituteAll, gd, geoip
+, substituteAll, gd, geoip, perl
, withDebug ? false
, withStream ? true
, withMail ? false
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
inherit sha256;
};
- buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ]
+ buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]
++ mapModules "inputs";
configureFlags = [
@@ -52,8 +52,6 @@ stdenv.mkDerivation {
"--with-http_stub_status_module"
"--with-threads"
"--with-pcre-jit"
- # Install destination problems
- # "--with-http_perl_module"
] ++ optional withDebug [
"--with-debug"
] ++ optional withStream [
@@ -65,6 +63,10 @@ stdenv.mkDerivation {
] ++ optional withMail [
"--with-mail"
"--with-mail_ssl_module"
+ ] ++ optional (perl != null) [
+ "--with-http_perl_module"
+ "--with-perl=${perl}/bin/perl"
+ "--with-perl_modules_path=lib/perl5"
]
++ optional (gd != null) "--with-http_image_filter_module"
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
index 410687d0335..e8af00b277b 100644
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "postgres_exporter";
- version = "0.7.0";
+ version = "0.8.0";
goPackagePath = "github.com/wrouesnel/postgres_exporter";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "wrouesnel";
repo = "postgres_exporter";
rev = "v${version}";
- sha256 = "0xi61090kmkp1cid3hx00csfa4w8nvaw8ky0w004czwqlyids6jg";
+ sha256 = "0mid2kvskab3a32jscygg5jh0741nr7dvxzj4v029yiiqcx55nrc";
};
doCheck = true;
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index a629a2a27e2..d7767567195 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "prometheus_varnish_exporter";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "jonnenauha";
repo = "prometheus_varnish_exporter";
rev = version;
- sha256 = "1lvs44936n3s9z6c5169jbvx390n5g0qk4pcrmnkndg796ixjshd";
+ sha256 = "0rpabw6a6paavv62f0gzhax9brzcgkly27rhkf0ihw8736gkw8ar";
};
modSha256 = "0w1zg9jc2466srx9pdckw7rzn7ma4pbd0617b1h98v364wjzgj72";
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index bc1aee8a687..21658a273b4 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "EventStore";
- version = "5.0.2";
+ version = "5.0.5";
src = fetchFromGitHub {
owner = "EventStore";
repo = "EventStore";
rev = "oss-v${version}";
- sha256 = "0hjc64lmi9x1sq8zk24iag14k424l72g1n4z7wf7gaygd07kx9k8";
+ sha256 = "0cnpw24fvnj0q644p9jlijcqz6bxi61g0b59g52d3qxfydr0lgs0";
};
buildInputs = [
diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix
deleted file mode 100644
index 1f432c18988..00000000000
--- a/pkgs/servers/samba/3.x.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ stdenv, fetchurl, readline, pam ? null, openldap ? null
-, popt, iniparser, libunwind
-, fam ? null , acl ? null, cups ? null
-, useKerberos ? false, kerberos ? null, winbind ? true
-
-# Eg. smbclient and smbspool require a smb.conf file.
-# If you set configDir to "" an empty configuration file
-# $out/lib/smb.conf is is created for you.
-#
-# configDir defaults to "/etc/samba" so that smbpassword picks up
-# the location of its passwd db files from the system configuration file
-# /etc/samba/smb.conf. That's why nixos touches /etc/samba/smb.conf even if you
-# don't enable the samba upstart service.
-, configDir ? "/etc/samba"
-
-}:
-
-assert useKerberos -> kerberos != null;
-
-stdenv.mkDerivation rec {
- name = "samba-3.6.25";
-
- src = fetchurl {
- url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
- sha256 = "0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g";
- };
-
- patches = [(fetchurl {
- url = "https://download.samba.org/pub/samba/patches/security/"
- + "samba-3.6.25-security-2015-12-16.patch";
- sha256 = "00dcjcn577825mfdwdp76jfy5kcrqw3s4d5c41gqdq5gfcdbmqdb";
- })];
-
- buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
- ++ stdenv.lib.optional useKerberos kerberos;
-
- enableParallelBuilding = true;
-
- postPatch =
- # XXX: Awful hack to allow cross-compilation.
- '' sed -i source3/configure \
- -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g'
- ''; # "
-
- preConfigure =
- '' cd source3
- export samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
- export libreplace_cv_HAVE_GETADDRINFO=yes
- export ac_cv_file__proc_sys_kernel_core_pattern=no # XXX: true on Linux, false elsewhere
- '';
-
- configureFlags =
- stdenv.lib.optionals (pam != null) [ "--with-pam" "--with-pam_smbpass" ]
- ++ [ "--with-aio-support"
- "--disable-swat"
- "--with-configdir=${configDir}"
- "--with-fhs"
- "--localstatedir=/var"
- ]
- ++ (stdenv.lib.optional winbind "--with-winbind")
- ++ (stdenv.lib.optional (stdenv.cc.libc != null) "--with-libiconv=${stdenv.cc.libc}");
-
- # Need to use a DESTDIR because `make install' tries to write in /var and /etc.
- installFlags = "DESTDIR=$(TMPDIR)/inst";
-
- stripAllList = [ "bin" "sbin" ];
-
- postInstall =
- ''
- mkdir -p $out
- mv $TMPDIR/inst/$out/* $out/
-
- mkdir -p "$out/lib/pkgconfig"
- cp pkgconfig/*.pc "$out/lib/pkgconfig"
-
- mkdir -pv $out/lib/cups/backend
- ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
- mkdir -pv $out/etc/openldap/schema
- cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
-
- # For nsswitch. Glibc >= 2.1 looks for libnss_.so.2 (see man
- # nsswitch.conf), so provide that too.
- cp -v ../nsswitch/libnss_wins.so "$out/lib"
- cp -v ../nsswitch/libnss_winbind.so "$out/lib"
- (cd "$out/lib" && ln -s libnss_winbind.so libnss_winbind.so.2)
- (cd "$out/lib" && ln -s libnss_wins.so libnss_wins.so.2)
- '' # */
- + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
-
- meta = with stdenv.lib; {
- homepage = https://www.samba.org/;
- description = "The standard Windows interoperability suite of programs for Linux and Unix";
- platforms = platforms.linux;
- license = licenses.gpl3;
- knownVulnerabilities = [
- "Numerous CVEs and no patches from upstream for 3.x since 2014."
- ];
- };
-}
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 804356e9f6b..54e92b977bc 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pgtap";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "theory";
repo = "pgtap";
rev = "v${version}";
- sha256 = "0ks53lsrpa8yxav8jh0jlvs25y6p7mkcdch8il1kvib9k5zq2wnb";
+ sha256 = "09fvzsl8m18yzpvrz6cqvs1ffzs451iwmb2mw39yq69jgqby5kqy";
};
nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ];
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index e990a16c038..98c532d5ddc 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
- # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed
+ # copy everything to share/, used as webroot folder, and then remove what's known to be not needed
mkdir -p $out/share
cp -ra * $out/share/
# tmp/ is created by matomo in PIWIK_USER_PATH
@@ -66,6 +66,27 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
+ filesToFix = [
+ "misc/composer/build-xhprof.sh"
+ "misc/composer/clean-xhprof.sh"
+ "misc/cron/archive.sh"
+ "plugins/Installation/FormDatabaseSetup.php"
+ "vendor/leafo/lessphp/package.sh"
+ "vendor/pear/archive_tar/sync-php4"
+ "vendor/szymach/c-pchart/coverage.sh"
+ ];
+
+ # This fixes the consistency check in the admin interface
+ postFixup = ''
+ pushd $out/share > /dev/null
+ for f in $filesToFix; do
+ length="$(wc -c "$f" | cut -d' ' -f1)"
+ hash="$(md5sum "$f" | cut -d' ' -f1)"
+ sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
+ done
+ popd > /dev/null
+ '';
+
meta = with stdenv.lib; {
description = "A real-time web analytics application";
license = licenses.gpl3Plus;
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 06f54fd5207..d033f211c3a 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,16 +1,18 @@
-{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
+{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper, egl-wayland }:
with stdenv.lib;
xorgserver.overrideAttrs (oldAttrs: {
name = "xwayland-${xorgserver.version}";
+ buildInputs = oldAttrs.buildInputs ++ [ egl-wayland ];
propagatedBuildInputs = oldAttrs.propagatedBuildInputs
++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];
configureFlags = [
"--disable-docs"
"--disable-devel-docs"
"--enable-xwayland"
+ "--enable-xwayland-eglstream"
"--disable-xorg"
"--disable-xvfb"
"--disable-xnest"
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 91684504774..3b37610eced 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "0_5_0";
- sha256 = "1s60w29c8sv0a4nmpggls9pkqyfrwwxjzd65p68d1xxxsdb36rzj";
+ rev = version;
+ sha256 = "012fhy7ni4kyxypn25ssj6py1zxwk41bj4xb1ni4zaw47fqsj1nw";
};
- cargoSha256 = "0b8alc3si6y4xmn812izknbkfkz64kz7kcnq4xaqws6iqn7pqidp";
+ cargoSha256 = "17r6g80qcy1mb195fl5iwcr83d35q2hs71camhwjbdh8yrs9l1la";
nativeBuildInputs = [ pkg-config ]
++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ];
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ]
++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ];
- cargoBuildFlags = stdenv.lib.optionals withAllFeatures [ "--features" "all" ];
+ cargoBuildFlags = stdenv.lib.optional withAllFeatures "--all-features";
preCheck = ''
export HOME=$TMPDIR
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
description = "A modern shell written in Rust";
homepage = "https://www.nushell.sh/";
license = licenses.mit;
- maintainers = [ maintainers.marsam ];
+ maintainers = with maintainers; [ filalex77 marsam ];
};
passthru = {
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 5327e0f8c8f..1948dd2b9c5 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
- version = "1.193";
+ version = "1.194";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
- sha256 = "107nl6vpy4036km3gr9z5f3mq1i6x169v0z0a0ywavj3zjqy23rp";
+ sha256 = "0fkabv05j5dj10mfrpjyvv7lnxl9qaqkbjhwj72r18i9i4019vgh";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 39ad4626f3e..575517829ff 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "abcm2ps";
- version = "8.14.5";
+ version = "8.14.6";
src = fetchFromGitHub {
owner = "leesavide";
repo = "abcm2ps";
rev = "v${version}";
- sha256 = "1i6db49khqy8bqg21cn90b1fvyw8mh1asdswzssr6dr2g8bhdwmq";
+ sha256 = "1gqjqbd8wj0655vi8gcg2r5jqzafdlnfjzwa9z331ywhrskpm53w";
};
configureFlags = [
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 2c9336802ea..c65b2a63f2d 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
- version = "0.6.2";
+ version = "0.7";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "03gad89jg0dif5wqdl1kh0rpmfc80pnkx8hk0v4hrlirr130dgl2";
+ sha256 = "1nhqy1fdzhkjhqs54nq66zj5bf85n3gr4k6zl0hswdvhg6flkg75";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix
deleted file mode 100644
index ada9445218b..00000000000
--- a/pkgs/tools/filesystems/fusesmb/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, samba, fuse }:
-
-stdenv.mkDerivation rec {
- name = "fusesmb-0.8.7";
-
- src = fetchurl {
- url = "http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/${name}.tar.gz";
- sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1";
- };
-
- buildInputs = [ samba fuse ];
-
- postInstall =
- ''
- mkdir -p $out/lib
- ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
- '';
-
- hardeningDisable = [ "format" ];
-
- meta = with stdenv.lib; {
- description = "Samba mounted via FUSE";
- license = licenses.gpl2;
- platforms = platforms.linux;
- broken = true; # Needs vulnerable Samba, missing source link
- # 2018-08-21
- };
-}
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index cd1e3110a13..5b379414666 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -2,13 +2,13 @@
python2Packages.buildPythonApplication rec {
pname = "gitfs";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "PressLabs";
repo = "gitfs";
rev = version;
- sha256 = "04plfdaai7bvnz39lw0yyda6ahbwx0wkws9fjnxxx43dzm3sjl98";
+ sha256 = "1jzwdwan8ndvp2lw6j7zbvg5k9rgf2d8dcxjrwc6bwyk59xdxn4p";
};
patchPhase = ''
diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix
index aab2e111e85..cb697148d04 100644
--- a/pkgs/tools/graphics/facedetect/default.nix
+++ b/pkgs/tools/graphics/facedetect/default.nix
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
};
buildInputs = [ python2Packages.python python2Packages.wrapPython ];
- pythonPath = [ python2Packages.numpy python2Packages.opencv ];
+ pythonPath = [ python2Packages.numpy python2Packages.opencv4 ];
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
patchPhase = ''
substituteInPlace facedetect \
- --replace /usr/share/opencv "${python2Packages.opencv}/share/OpenCV"
+ --replace /usr/share/opencv "${python2Packages.opencv4}/share/opencv4"
'';
installPhase = ''
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 6309587fd52..defdd9494e5 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
- version = "1.193";
+ version = "1.194";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
- sha256 = "1mykng02fyxshm02kywrk16f27b1jhgn9zcaxcvxd255sn58w68k";
+ sha256 = "10c0rbhqscizfa063m6mms31i0knh25bxr35s008b6mp5pxr33mc";
};
buildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index 567a4eaf230..32fe5cc5868 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geekbench";
- version = "5.0.3";
+ version = "5.0.4";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
- sha256 = "0bdkq36b8rr8xzbhjhxia7ss24bm5i4gz4g63dxckis5qi0pfsii";
+ sha256 = "04d7ixfmzj22w9svjdj0kxsp7ycnzdzx9kd2z1vswnyybdkgyjy7";
};
dontConfigure = true;
diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
new file mode 100644
index 00000000000..be8c4fb9c06
--- /dev/null
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -0,0 +1,26 @@
+{ fetchFromGitHub, rustPlatform, stdenv
+, CoreFoundation, libiconv, libresolv, Security }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "onefetch";
+ version = "2.1.0";
+
+ src = fetchFromGitHub {
+ owner = "o2sh";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "02mdzpzfcxp9na86b4jcqqjd3id5jslgmnq1jc0vykg58xha51jg";
+ };
+
+ cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h";
+
+ buildInputs = with stdenv;
+ lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];
+
+ meta = with stdenv.lib; {
+ description = "Git repository summary on your terminal";
+ homepage = "https://github.com/o2sh/onefetch";
+ license = licenses.mit;
+ maintainers = with maintainers; [ filalex77 ];
+ };
+}
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 0827f2eac7b..d63c63ab1d2 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
# when updating this to >=7, check, see previous reverts:
# nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
pname = "dhcpcd";
- version = "8.0.6";
+ version = "8.1.2";
src = fetchurl {
url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0kxxpb79j564m6bjvjb9gsn0yzs13c0arfgsycm51gw3xnch3db6";
+ sha256 = "1b9mihp1mf2vng92fgks764a6pwf2gx7ccw6knja79c42nmyglyb";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix
new file mode 100644
index 00000000000..fee347dd201
--- /dev/null
+++ b/pkgs/tools/networking/mmsd/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, fetchgit
+, autoreconfHook
+, pkgconfig
+, glib
+, dbus
+}:
+
+stdenv.mkDerivation rec {
+ pname = "mmsd";
+ version = "unstable-2019-07-15";
+
+ src = fetchgit {
+ url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git";
+ rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c";
+ sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkgconfig
+ ];
+
+ buildInputs = [
+ glib
+ dbus
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Multimedia Messaging Service Daemon";
+ homepage = "https://01.org/ofono";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix
index 27f4b9562b3..5cae8a61203 100644
--- a/pkgs/tools/networking/ofono/default.nix
+++ b/pkgs/tools/networking/ofono/default.nix
@@ -12,14 +12,14 @@
stdenv.mkDerivation rec {
pname = "ofono";
- version = "1.30";
+ version = "1.31";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git";
rev = version;
- sha256 = "1qzysmzpgbh6zc3x9xh931wxcazka9wwx727c2k66z9gal2n6n66";
+ sha256 = "033y3vggjxn1c7mw75j452idp7arrdv51axs727f7l3c5lnxqdjy";
};
patches = [
diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix
index 665d988f48e..44daa23cd92 100644
--- a/pkgs/tools/networking/tridactyl-native/default.nix
+++ b/pkgs/tools/networking/tridactyl-native/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
pname = "tridactyl-native";
# this is actually the version of tridactyl itself; the native messenger will
# probably not change with every tridactyl version
- version = "1.17.0";
+ version = "1.17.1";
src = fetchFromGitHub {
owner = "tridactyl";
repo = "tridactyl";
rev = version;
- sha256 = "0dpd4jdym644rqm9h83lb8cwfccnwrnqm1g91nl913pj4k5x4hqr";
+ sha256 = "197vh3k9nh58djl6ph0lznkdb2schqlksxxr93xjkk4xsc7k6j1g";
};
sourceRoot = "source/native";
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index ad449429f99..e25a2d2cd5d 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "wireguard-tools";
- version = "0.0.20191012";
+ version = "0.0.20191127";
src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
- sha256 = "0nwcx7m5cpp4h1bclswiqq1jzj08xzpxmq5s4rcfqmrp59cmwgrs";
+ sha256 = "1n1x5858c32p0a13rrhn9a491174k5z4wd0gsy8qn546k1a8qj99";
};
sourceRoot = "source/src/tools";
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index de275b6c09a..43f56352ceb 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "clamav";
- version = "0.102.0";
+ version = "0.102.1";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
- sha256 = "1qdyj4r39266bmbsd2nwyspm20k9wh3c30awrg8c54y78s61izj8";
+ sha256 = "1mpdgn3isz26hd1j6p8lcb76v8hjs54k1wb655rnil4hv78aig8d";
};
# don't install sample config files into the absolute sysconfdir folder
diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix
index 2c216c0a404..a559039d95a 100644
--- a/pkgs/tools/security/gnome-keysign/default.nix
+++ b/pkgs/tools/security/gnome-keysign/default.nix
@@ -28,6 +28,14 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/216c3677e68960afc517edc00529323e85909323.patch";
sha256 = "1w410gvcridbq26sry7fxn49v59ss2lc0w5ab7csva8rzs1nc990";
})
+
+ # stop requiring lxml (no longer used)
+ # https://gitlab.gnome.org/GNOME/gnome-keysign/merge_requests/23
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/ffc6f40584d7564951e1c8b6d18d4f8a6a3fa09d.patch";
+ sha256 = "1hs6mmhi2f21kvy26llzvp37yf0i0dr69d18r641139nr6qg6kwy";
+ includes = [ "setup.py" ];
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix
new file mode 100644
index 00000000000..40546b6f1c3
--- /dev/null
+++ b/pkgs/tools/security/ipscan/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, jdk, jre, swt, makeWrapper, xorg, dpkg }:
+
+stdenv.mkDerivation rec {
+ pname = "ipscan";
+ version = "3.6.2";
+
+ src = fetchurl {
+ url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb";
+ sha256 = "0wnnnabpj0dsxdijvss5sl9kd4i6rmcq55zbas33xs3c5g305ssk";
+ };
+
+ sourceRoot = ".";
+ unpackCmd = "${dpkg}/bin/dpkg-deb -x $src .";
+
+ buildInputs = [ makeWrapper jdk ];
+
+ installPhase = ''
+ mkdir -p $out/share
+ cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar
+
+ makeWrapper ${jre}/bin/java $out/bin/ipscan \
+ --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt xorg.libXtst ]}" \
+ --add-flags "-Xmx256m -cp $out/share/${pname}-${version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main"
+
+ mkdir -p $out/share/applications
+ cp usr/share/applications/ipscan.desktop $out/share/applications/ipscan.desktop
+ substituteInPlace $out/share/applications/ipscan.desktop --replace "/usr/bin" "$out/bin"
+
+ mkdir -p $out/share/pixmaps
+ cp usr/share/pixmaps/ipscan.png $out/share/pixmaps/ipscan.png
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Fast and friendly network scanner";
+ homepage = https://angryip.org;
+ license = licenses.gpl2;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ kylesferrazza ];
+ };
+}
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 97c8ffb8948..1edf86675c3 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -9,7 +9,7 @@ buildGoPackage rec {
version = "5.0.0";
goPackagePath = "github.com/keybase/client";
- subPackages = [ "go/keybase" ];
+ subPackages = [ "go/kbnm" "go/keybase" ];
dontRenameImports = true;
diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix
new file mode 100644
index 00000000000..ee1282e9a13
--- /dev/null
+++ b/pkgs/tools/security/pbis/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, perl, flex, bison, curl,
+ pam, popt, libiconv, libuuid, openssl_1_0_2, cyrus_sasl, sqlite, tdb, libxml2 }:
+
+stdenv.mkDerivation rec {
+ pname = "pbis-open";
+ version = "9.1.0";
+
+ src = fetchFromGitHub {
+ owner = "BeyondTrust";
+ repo = pname;
+ rev = version;
+ sha256 = "081jm34sf488nwz5wzs55d6rxx3sv566x6p4h1yqcjaw36174m8v";
+ };
+
+ nativeBuildInputs = [
+ autoconf automake libtool perl flex bison
+ ];
+
+ # curl must be placed after openssl_1_0_2, because it pulls openssl 1.1 dependency.
+ buildInputs = [
+ pam popt libiconv libuuid openssl_1_0_2 cyrus_sasl
+ curl sqlite popt tdb libxml2 /*libglade2 for gtk*/
+ ];
+
+ postPatch = ''
+ patchShebangs .
+ sed -i -e 's/legacy//g' lwupgrade/MakeKitBuild # disable /opt/ symlinks
+ sed -i -e 's/tdb.h//g' samba-interop/MakeKitBuild #include fails but it won't affect the build
+ '';
+ preConfigure = ''
+ mkdir release
+ cd release
+ if [ $CC = gcc ]; then
+ NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow"
+ fi
+ NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${stdenv.lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable"
+ '';
+ configureScript = ''../configure'';
+ configureFlags = [
+ "CFLAGS=-O"
+ "--docdir=${placeholder "prefix"}/share/doc"
+ "--mandir=${placeholder "prefix"}/share/doc/man"
+ "--datadir=${placeholder "prefix"}/share"
+ "--lw-initdir=${placeholder "prefix"}/etc/init.d"
+ "--selinux=no" # NixOS does not support SELinux
+ "--build-isas=x86_64" # [lwbase] endianness (host/x86_32): [lwbase] ERROR: could not determine endianness
+ "--fail-on-warn=no"
+ # "--debug=yes"
+ ]; # ^ See https://github.com/BeyondTrust/pbis-open/issues/124
+ configureFlagsArray = [ "--lw-bundled-libs=linenoise-mob tomlc99 opensoap krb5 cyrus-sasl curl openldap ${ if libuuid == null then "libuuid" else "" }" ];
+ # ^ it depends on old krb5 version 1.9 (issue #228)
+ # linenoise-mod, tomlc99, opensoap is not in nixpkgs.
+ # krb5 must be old one, and cyrus-sasl and openldap have dependency to newer libkrb5 that cause runtime error
+ enableParallelBuilding = true;
+ makeFlags = "SHELL=";
+ hardeningDisable = [ "format" ]; # -Werror=format-security
+ installPhase = ''
+ mkdir $sys
+ mv stage/{lib,var} $sys
+ mv stage$out $out
+ '';
+ outputs = [ "out" "sys" ];
+
+ meta = with stdenv.lib; {
+ description = "BeyondTrust AD Bridge Open simplifies the process of joining non-Microsoft hosts to Active Directory domains";
+ homepage = "https://github.com/BeyondTrust/pbis-open";
+ license = with licenses; [ gpl2 lgpl21 ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 87f2e922ff7..6e2ab221c42 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -1,30 +1,30 @@
{ stdenv, fetchurl, unzip }:
let
- version = "1.1.3";
+ version = "1.3.0";
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
- sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0";
+ sha256 = "1crfj4gd1qwwa2xidd0pjffv0n6hf5hbhv6568m6zc1ig0qqm6yq";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
- sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867";
+ sha256 = "0pyf0kyvxpmx3fwfvin1r0x30r9byx9lyi81894q06xrhiwbqc0l";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
- sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea";
+ sha256 = "113vnpz9n6y7z2k9jqpfpxqxqbrmd9bhny79yaxqzkfdqw8vyv3g";
};
i686-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_386.zip";
- sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be";
+ sha256 = "0d191qai0bpl7cyivca26wqgycsj2dz08809z147d1vnrz321v6w";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
- sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f";
+ sha256 = "1bk5y3knc42mh07gnnn6p109qz908014620h1s0348wp4qfdy49w";
};
};
@@ -49,6 +49,6 @@ in stdenv.mkDerivation {
description = "A tool for managing secrets, this binary includes the UI";
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ];
license = licenses.mpl20;
- maintainers = with maintainers; [ offline psyanticy ];
+ maintainers = with maintainers; [ offline psyanticy mkaito ];
};
}
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index ad90a52a5bd..cc9b95d06c6 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "facter";
- version = "3.14.5";
+ version = "3.14.6";
src = fetchFromGitHub {
- sha256 = "0xzzhlsfw8yd3ac4kvr3za0rlkgfw28dzxzi5i1qbhzljivvipm5";
+ sha256 = "1zfff1mpdwnlnm8dmmlvysw2zdsnglgk5nvhhzx8zyk0zyz0nj54";
rev = version;
repo = pname;
owner = "puppetlabs";
diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index b9a4f678207..7437d2765a9 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -2,18 +2,20 @@
stdenv.mkDerivation rec {
pname = "ansifilter";
- version = "2.14";
+ version = "2.15";
src = fetchurl {
url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
- sha256 = "1bwp8zmxykfxr3mz1fgvnwqbyix4qpjlha3y479jdchq4y8y7vp2";
-
+ sha256 = "07x1lha6xkfn5sr2f45ynk1fxmzc3qr4axxm0hip4adqygx2zsky";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost lua ];
- makeFlags = "PREFIX=$(out) conf_dir=/etc/ansifilter";
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ "conf_dir=/etc/ansifilter"
+ ];
meta = with stdenv.lib; {
description = "Tool to convert ANSI to other formats";
@@ -21,10 +23,9 @@ stdenv.mkDerivation rec {
Tool to remove ANSI or convert them to another format
(HTML, TeX, LaTeX, RTF, Pango or BBCode)
'';
-
- license = licenses.gpl1;
+ homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.php";
+ license = licenses.gpl3;
maintainers = [ maintainers.Adjective-Object ];
platforms = platforms.linux;
};
}
-
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index b0d66dfd93e..b01317a532f 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FanFicFare";
- version = "3.12.0";
+ version = "3.13.0";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "1hzb668fga9y422670iw22ggfn8a9jp2jdxs2xhzbqxnfrw08wq0";
+ sha256 = "01mrqqz2rv6abdsk80nxizsm5h68m12bqkdsjyqfzyxl0kn7zs0v";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix
index 5f9ca5212d3..88325c38731 100644
--- a/pkgs/tools/text/par/default.nix
+++ b/pkgs/tools/text/par/default.nix
@@ -1,7 +1,8 @@
{stdenv, fetchurl, fetchpatch}:
stdenv.mkDerivation {
- name = "par-1.52";
+ pname = "par";
+ version = "1.52";
src = fetchurl {
url = http://www.nicemice.net/par/Par152.tar.gz;
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 2513d48796e..787f19d91f4 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, emacs, texlive, ghostscript }:
let auctex = stdenv.mkDerivation ( rec {
- version = "12.1";
+ version = "12.2";
# Make this a valid tex(live-new) package;
# the pkgs attribute is provided with a hack below.
@@ -13,7 +13,7 @@ let auctex = stdenv.mkDerivation ( rec {
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69";
+ sha256 = "14vqs08mkfzc91jg7kabs9sdn74vywj8a29gyrfa3ivnm9c7jrsr";
};
buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e8a02b18b0f..61645c41986 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -117,6 +117,7 @@ mapAliases ({
foomatic_filters = foomatic-filters; # 2016-08
fuse_exfat = exfat; # 2015-09-11
fuseki = apache-jena-fuseki; # added 2018-04-25
+ fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
gdb-multitarget = gdb; # added 2017-11-13
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
@@ -339,6 +340,8 @@ mapAliases ({
s6PortableUtils = s6-portable-utils; # added 2018-07-23
sagemath = sage; # added 2018-10-27
sam = deadpixi-sam; # added 2018-04-25
+ samba3 = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15
+ samba3_light = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15
sambaMaster = throw "removed 2019-09-13: outdated and no longer needed";
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a76ec225752..abd8d1cb775 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2563,7 +2563,8 @@ in
cron = callPackage ../tools/system/cron { };
- inherit (callPackages ../development/compilers/cudatoolkit { })
+ cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {});
+ inherit (cudaPackages)
cudatoolkit_6
cudatoolkit_6_5
cudatoolkit_7
@@ -2579,7 +2580,8 @@ in
cudatoolkit = cudatoolkit_10;
- inherit (callPackages ../development/libraries/science/math/cudnn { })
+ cudnnPackages = callPackages ../development/libraries/science/math/cudnn { };
+ inherit (cudnnPackages)
cudnn_cudatoolkit_7
cudnn_cudatoolkit_7_5
cudnn6_cudatoolkit_8
@@ -4148,6 +4150,8 @@ in
netmask = callPackage ../tools/networking/netmask {};
+ ipscan = callPackage ../tools/security/ipscan { };
+
ipv6calc = callPackage ../tools/networking/ipv6calc {};
ipxe = callPackage ../tools/misc/ipxe { };
@@ -5240,6 +5244,9 @@ in
nnn = callPackage ../applications/misc/nnn { };
+
+ noise-repellent = callPackage ../applications/audio/noise-repellent { };
+
notary = callPackage ../tools/security/notary { };
notify-osd = callPackage ../applications/misc/notify-osd { };
@@ -5329,6 +5336,11 @@ in
omping = callPackage ../applications/networking/omping { };
+ onefetch = callPackage ../tools/misc/onefetch {
+ inherit (darwin) libresolv;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ };
+
onioncircuits = callPackage ../tools/security/onioncircuits { };
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { };
@@ -5452,6 +5464,8 @@ in
otpw = callPackage ../os-specific/linux/otpw { };
+ overcommit = callPackage ../development/tools/overcommit { };
+
overmind = callPackage ../applications/misc/overmind { };
owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { };
@@ -6394,8 +6408,6 @@ in
syntex = callPackage ../tools/graphics/syntex {};
- fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; };
-
sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; };
socat = callPackage ../tools/networking/socat { };
@@ -9513,7 +9525,7 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk8;
buildJdkName = "jdk8";
- runJdk = jdk11;
+ runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
@@ -11025,6 +11037,8 @@ in
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
};
+ egl-wayland = callPackage ../development/libraries/egl-wayland {};
+
elastix = callPackage ../development/libraries/science/biology/elastix { };
enchant1 = callPackage ../development/libraries/enchant/1.x.nix { };
@@ -13481,6 +13495,7 @@ in
protobuf = protobuf3_7;
+ protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { };
protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { };
protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { };
protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { };
@@ -15154,12 +15169,14 @@ in
nginx = nginxStable;
nginxStable = callPackage ../servers/http/nginx/stable.nix {
+ perl = null;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
};
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
+ perl = null;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.dav nginxModules.moreheaders ];
@@ -15517,8 +15534,6 @@ in
deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
- samba3 = callPackage ../servers/samba/3.x.nix { };
-
samba4 = callPackage ../servers/samba/4.x.nix {
rpcgen = netbsd.rpcgen;
python = python3;
@@ -15526,17 +15541,6 @@ in
samba = samba4;
- # A lightweight Samba 3, useful for non-Linux-based OSes.
- samba3_light = lowPrio (samba3.override {
- pam = null;
- fam = null;
- cups = null;
- acl = null;
- openldap = null;
- # libunwind 1.0.1 is not ported to GNU/Hurd.
- libunwind = null;
- });
-
samba4Full = lowPrio (samba4.override {
enableLDAP = true;
enablePrinting = true;
@@ -17223,6 +17227,8 @@ in
fira-mono = callPackage ../data/fonts/fira-mono { };
+ flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { };
+
font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4;
font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5;
font-awesome = font-awesome_5;
@@ -17595,6 +17601,8 @@ in
recursive = callPackage ../data/fonts/recursive { };
+ rhodium-libre = callPackage ../data/fonts/rhodium-libre { };
+
rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { };
roboto = callPackage ../data/fonts/roboto { };
@@ -19962,6 +19970,8 @@ in
wxGTK30 = wxGTK30.override { withWebKit = true ; };
};
+ mmsd = callPackage ../tools/networking/mmsd { };
+
moc = callPackage ../applications/audio/moc { };
mod-distortion = callPackage ../applications/audio/mod-distortion { };
@@ -20169,6 +20179,8 @@ in
partio = callPackage ../development/libraries/partio {};
+ pbis-open = callPackage ../tools/security/pbis { };
+
pcmanfm = callPackage ../applications/misc/pcmanfm { };
pcmanfm-qt = lxqt.pcmanfm-qt;
@@ -20609,7 +20621,7 @@ in
gtksharp = gtk-sharp-2_0;
};
- plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { };
+ plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { };
plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
@@ -22396,9 +22408,7 @@ in
wownero = callPackage ../applications/blockchains/wownero.nix {};
- zcash = callPackage ../applications/blockchains/zcash {
- withGui = false;
- };
+ zcash = callPackage ../applications/blockchains/zcash { };
parity = callPackage ../applications/blockchains/parity { };
parity-beta = callPackage ../applications/blockchains/parity/beta.nix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a3a6dbef322..fd583c54a8a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -167,6 +167,8 @@ in {
ansicolor = callPackage ../development/python-modules/ansicolor { };
+ ansiwrap = callPackage ../development/python-modules/ansiwrap { };
+
ansi2html = callPackage ../development/python-modules/ansi2html { };
anytree = callPackage ../development/python-modules/anytree {
@@ -251,10 +253,6 @@ in {
azure-nspkg = callPackage ../development/python-modules/azure-nspkg { };
- azure-cli-core = callPackage ../development/python-modules/azure-cli-core { };
-
- azure-cli-telemetry = callPackage ../development/python-modules/azure-cli-telemetry { };
-
azure-common = callPackage ../development/python-modules/azure-common { };
azure-cosmos = callPackage ../development/python-modules/azure-cosmos { };
@@ -878,6 +876,8 @@ in {
palettable = callPackage ../development/python-modules/palettable { };
+ papermill = callPackage ../development/python-modules/papermill { };
+
parsley = callPackage ../development/python-modules/parsley { };
pastel = callPackage ../development/python-modules/pastel { };
@@ -5254,7 +5254,9 @@ in {
texttable = callPackage ../development/python-modules/texttable { };
- tiledb = callPackage ../development/python-modules/tiledb {
+ textwrap3 = callPackage ../development/python-modules/textwrap3 { };
+
+ tiledb = callPackage ../development/python-modules/tiledb {
inherit (pkgs) tiledb;
};
@@ -6572,6 +6574,8 @@ in {
managesieve = callPackage ../development/python-modules/managesieve { };
+ pony = callPackage ../development/python-modules/pony { };
+
});
in fix' (extends overrides packages)