diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 500d63b8cb..3762b2eaf8 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -207,7 +207,7 @@ /nixos/tests/podman.nix @NixOS/podman @zowoq # Docker tools -/pkgs/build-support/docker @roberth +/pkgs/build-support/docker @roberth @utdemir /nixos/tests/docker-tools-overlay.nix @roberth /nixos/tests/docker-tools.nix @roberth /doc/builders/images/dockertools.xml @roberth diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 94588050cc..48f847b3d1 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -514,6 +514,12 @@ githubId = 69135; name = "Andrea Bedini"; }; + andreasfelix = { + email = "fandreas@physik.hu-berlin.de"; + github = "andreasfelix"; + githubId = 24651767; + name = "Felix Andreas"; + }; andres = { email = "ksnixos@andres-loeh.de"; github = "kosmikus"; @@ -3487,6 +3493,12 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hjones2199 = { + email = "hjones2199@gmail.com"; + github = "hjones2199"; + githubId = 5525217; + name = "Hunter Jones"; + }; hkjn = { email = "me@hkjn.me"; name = "Henrik Jonsson"; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/configuration.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/configuration.xml index 6eb8f50bac..44ff1f1b57 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/configuration.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/configuration.xml @@ -18,6 +18,7 @@ + diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/wayland.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/wayland.xml new file mode 100644 index 0000000000..231c219cf0 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/wayland.xml @@ -0,0 +1,23 @@ + + Wayland + + + While X11 (see ) is still the primary display + technology on NixOS, Wayland support is steadily improving. + Where X11 separates the X Server and the window manager, on Wayland those + are combined: a Wayland Compositor is like an X11 window manager, but also + embeds the Wayland 'Server' functionality. This means it is sufficient to + install a Wayland Compositor such as sway without + separately enabling a Wayland server: + + = true; + + This installs the sway compositor along with some + essential utilities. Now you can start sway from the TTY + console. + + diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index 01f113198e..75c8adbf45 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -879,12 +879,23 @@ php.override { Nginx web server now starting with additional sandbox/hardening options. By default, write access - to services.nginx.stateDir is allowed. To allow writing to other folders, + to /var/log/nginx and /var/cache/nginx is allowed. To allow writing to other folders, use systemd.services.nginx.serviceConfig.ReadWritePaths systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; + + Nginx is also started with the systemd option ProtectHome = mkDefault true; + which forbids it to read anything from /home, /root + and /run/user (see + ProtectHome docs + for details). + If you require serving files from home directories, you may choose to set e.g. + +systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; + + diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml index 7fd7ff5c2a..8c804ce047 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml @@ -136,6 +136,13 @@ stanchion package removed along with services.stanchion module. + + + mutt has been updated to a new major version (2.x), which comes with + some backward incompatible changes that are described in the + release notes for Mutt 2.0. + + @@ -159,6 +166,11 @@ to nextcloud20. + + + The setting defaults to 127.0.0.1 now, making Redis listen on the loopback interface only, and not all public network interfaces. + + NixOS now emits a deprecation warning if systemd's StartLimitInterval setting is used in a serviceConfig section instead of in a unitConfig; that setting is deprecated and now undocumented for the service section by systemd upstream, but still effective and somewhat buggy there, which can be confusing. See #45785 for details. @@ -167,6 +179,62 @@ All services should use or StartLimitIntervalSec in instead. + + + The Unbound DNS resolver service (services.unbound) has been refactored to allow reloading, control sockets and to fix startup ordering issues. + + + + It is now possible to enable a local UNIX control socket for unbound by setting the + option. + + + + Previously we just applied a very minimal set of restrictions and + trusted unbound to properly drop root privs and capabilities. + + + + As of this we are (for the most part) just using the upstream + example unit file for unbound. The main difference is that we start + unbound as unbound user with the required capabilities instead of + letting unbound do the chroot & uid/gid changes. + + + + The upstream unit configuration this is based on is a lot stricter with + all kinds of permissions then our previous variant. It also came with + the default of having the Type set to notify, therefore we are now also + using the unbound-with-systemd package here. Unbound will start up, + read the configuration files and start listening on the configured ports + before systemd will declare the unit active (running). + This will likely help with startup order and the occasional race condition during system + activation where the DNS service is started but not yet ready to answer + queries. Services depending on nss-lookup.target or unbound.service + are now be able to use unbound when those targets have been reached. + + + + Aditionally to the much stricter runtime environmet the + /dev/urandom mount lines we previously had in the code (that would + randomly failed during the stop-phase) have been removed as systemd will take care of those for us. + + + + The preStart script is now only required if we enabled the trust + anchor updates (which are still enabled by default). + + + + Another benefit of the refactoring is that we can now issue reloads via + either pkill -HUP unbound and systemctl reload unbound to reload the + running configuration without taking the daemon offline. A prerequisite + of this was that unbound configuration is available on a well known path + on the file system. We are using the path /etc/unbound/unbound.conf as that is the + default in the CLI tooling which in turn enables us to use + unbound-control without passing a custom configuration location. + + diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix index f1777854e1..6b8853ae39 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix @@ -87,9 +87,12 @@ in bind = mkOption { type = with types; nullOr str; - default = null; # All interfaces - description = "The IP interface to bind to."; - example = "127.0.0.1"; + default = "127.0.0.1"; + description = '' + The IP interface to bind to. + null means "all interfaces". + ''; + example = "192.0.2.1"; }; unixSocket = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix index a0bbab6498..ee7aa7e22f 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -204,6 +204,11 @@ in }; systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ]; + # Restart on config changes. + systemd.services.phpfpm-roundcube.restartTriggers = [ + config.environment.etc."roundcube/config.inc.php".source + ]; + systemd.services.roundcube-setup = mkMerge [ (mkIf (cfg.database.host == "localhost") { requires = [ "postgresql.service" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix index e2fbd3b401..a69e650730 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix @@ -68,7 +68,7 @@ in plugins = mkOption { default = plugins: []; defaultText = "plugins: []"; - example = literalExample "plugins: with plugins; [ m33-fio stlviewer ]"; + example = literalExample "plugins: with plugins; [ themeify stlviewer ]"; description = "Additional plugins to be used. Available plugins are passed through the plugins input."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix index baed83591e..9a46fa3075 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: with lib; - let - cfg = config.services.unbound; stateDir = "/var/lib/unbound"; @@ -17,12 +15,12 @@ let forward = optionalString (any isLocalAddress cfg.forwardAddresses) '' do-not-query-localhost: no - '' + - optionalString (cfg.forwardAddresses != []) '' + '' + + optionalString (cfg.forwardAddresses != []) '' forward-zone: name: . - '' + - concatMapStringsSep "\n" (x: " forward-addr: ${x}") cfg.forwardAddresses; + '' + + concatMapStringsSep "\n" (x: " forward-addr: ${x}") cfg.forwardAddresses; rootTrustAnchorFile = "${stateDir}/root.key"; @@ -31,19 +29,25 @@ let confFile = pkgs.writeText "unbound.conf" '' server: + ip-freebind: yes directory: "${stateDir}" username: unbound - chroot: "${stateDir}" + chroot: "" pidfile: "" + # when running under systemd there is no need to daemonize + do-daemonize: no ${interfaces} ${access} ${trustAnchor} + ${lib.optionalString (cfg.localControlSocketPath != null) '' + remote-control: + control-enable: yes + control-interface: ${cfg.localControlSocketPath} + ''} ${cfg.extraConfig} ${forward} ''; - in - { ###### interface @@ -55,8 +59,8 @@ in package = mkOption { type = types.package; - default = pkgs.unbound; - defaultText = "pkgs.unbound"; + default = pkgs.unbound-with-systemd; + defaultText = "pkgs.unbound-with-systemd"; description = "The unbound package to use"; }; @@ -69,11 +73,14 @@ in interfaces = mkOption { default = [ "127.0.0.1" ] ++ optional config.networking.enableIPv6 "::1"; type = types.listOf types.str; - description = "What addresses the server should listen on."; + description = '' + What addresses the server should listen on. This supports the interface syntax documented in + unbound.conf8. + ''; }; forwardAddresses = mkOption { - default = [ ]; + default = []; type = types.listOf types.str; description = "What servers to forward queries to."; }; @@ -84,6 +91,28 @@ in description = "Use and update root trust anchor for DNSSEC validation."; }; + localControlSocketPath = mkOption { + default = null; + # FIXME: What is the proper type here so users can specify strings, + # paths and null? + # My guess would be `types.nullOr (types.either types.str types.path)` + # but I haven't verified yet. + type = types.nullOr types.str; + example = "/run/unbound/unbound.ctl"; + description = '' + When not set to null this option defines the path + at which the unbound remote control socket should be created at. The + socket will be owned by the unbound user (unbound) + and group will be nogroup. + + Users that should be permitted to access the socket must be in the + unbound group. + + If this option is null remote control will not be + configured at all. Unbounds default values apply. + ''; + }; + extraConfig = mkOption { default = ""; type = types.lines; @@ -106,43 +135,85 @@ in users.users.unbound = { description = "unbound daemon user"; isSystemUser = true; + group = lib.mkIf (cfg.localControlSocketPath != null) (lib.mkDefault "unbound"); + }; + + # We need a group so that we can give users access to the configured + # control socket. Unbound allows access to the socket only to the unbound + # user and the primary group. + users.groups = lib.mkIf (cfg.localControlSocketPath != null) { + unbound = {}; }; networking.resolvconf.useLocalResolver = mkDefault true; + + environment.etc."unbound/unbound.conf".source = confFile; + systemd.services.unbound = { description = "Unbound recursive Domain Name Server"; after = [ "network.target" ]; before = [ "nss-lookup.target" ]; - wants = [ "nss-lookup.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" "nss-lookup.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir}/dev/ - cp ${confFile} ${stateDir}/unbound.conf - ${optionalString cfg.enableRootTrustAnchor '' - ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" - chown unbound ${stateDir} ${rootTrustAnchorFile} - ''} - touch ${stateDir}/dev/random - ${pkgs.utillinux}/bin/mount --bind -n /dev/urandom ${stateDir}/dev/random + preStart = lib.mkIf cfg.enableRootTrustAnchor '' + ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" ''; - serviceConfig = { - ExecStart = "${cfg.package}/bin/unbound -d -c ${stateDir}/unbound.conf"; - ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random"; + restartTriggers = [ + confFile + ]; - ProtectSystem = true; - ProtectHome = true; + serviceConfig = { + ExecStart = "${cfg.package}/bin/unbound -p -d -c /etc/unbound/unbound.conf"; + ExecReload = "+/run/current-system/sw/bin/kill -HUP $MAINPID"; + + NotifyAccess = "main"; + Type = "notify"; + + # FIXME: Which of these do we actualy need, can we drop the chroot flag? + AmbientCapabilities = [ + "CAP_NET_BIND_SERVICE" + "CAP_NET_RAW" + "CAP_SETGID" + "CAP_SETUID" + "CAP_SYS_CHROOT" + "CAP_SYS_RESOURCE" + ]; + + User = "unbound"; + Group = lib.mkIf (cfg.localControlSocketPath != null) (lib.mkDefault "unbound"); + + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; PrivateDevices = true; - Restart = "always"; - RestartSec = "5s"; + PrivateTmp = true; + ProtectHome = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectSystem = "strict"; + RuntimeDirectory = "unbound"; + ConfigurationDirectory = "unbound"; + StateDirectory = "unbound"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "~@clock" + "@cpu-emulation" + "@debug" + "@keyring" + "@module" + "mount" + "@obsolete" + "@resources" + ]; + RestrictNamespaces = true; + LockPersonality = true; + RestrictSUIDSGID = true; }; }; - # If networkmanager is enabled, ask it to interface with unbound. networking.networkmanager.dns = "unbound"; - }; - } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index 88190e8200..8dd2ea2051 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -404,7 +404,7 @@ let echo "Please move your mouse to create needed randomness." ''} echo "Waiting for your FIDO2 device..." - fido2luks -i open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase + fido2luks open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase if [ $? -ne 0 ]; then echo "No FIDO2 key found, falling back to normal open procedure" open_normally diff --git a/third_party/nixpkgs/nixos/modules/system/boot/pbkdf2-sha512.c b/third_party/nixpkgs/nixos/modules/system/boot/pbkdf2-sha512.c index b40c383ac0..67e989957b 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/pbkdf2-sha512.c +++ b/third_party/nixpkgs/nixos/modules/system/boot/pbkdf2-sha512.c @@ -35,4 +35,4 @@ int main(int argc, char** argv) fwrite(key, 1, key_length, stdout); return 0; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 7d582aa592..f71afdca58 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -368,6 +368,7 @@ in trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; tuptime = handleTest ./tuptime.nix {}; + unbound = handleTest ./unbound.nix {}; udisks2 = handleTest ./udisks2.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/unbound.nix b/third_party/nixpkgs/nixos/tests/unbound.nix new file mode 100644 index 0000000000..dc8e5a9d3e --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/unbound.nix @@ -0,0 +1,278 @@ +/* + Test that our unbound module indeed works as most users would expect. + There are a few settings that we must consider when modifying the test. The + ususal use-cases for unbound are + * running a recursive DNS resolver on the local machine + * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via UDP/53 & TCP/53 + * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via TCP/853 (DoT) + * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/53 & UDP/53 + * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/853 (DoT) + + In the below test setup we are trying to implement all of those use cases. + + Another aspect that we cover is access to the local control UNIX socket. It + can optionally be enabled and users can optionally be in a group to gain + access. Users that are not in the group (except for root) should not have + access to that socket. Also, when there is no socket configured, users + shouldn't be able to access the control socket at all. Not even root. +*/ +import ./make-test-python.nix ({ pkgs, lib, ... }: + let + # common client configuration that we can just use for the multitude of + # clients we are constructing + common = { lib, pkgs, ... }: { + config = { + environment.systemPackages = [ pkgs.knot-dns ]; + + # disable the root anchor update as we do not have internet access during + # the test execution + services.unbound.enableRootTrustAnchor = false; + }; + }; + + cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=dns.example.local' + mkdir -p $out + cp key.pem cert.pem $out + ''; + in + { + name = "unbound"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ andir ]; + }; + + nodes = { + + # The server that actually serves our zones, this tests unbounds authoriative mode + authoritative = { lib, pkgs, config, ... }: { + imports = [ common ]; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "fd21::1"; prefixLength = 64; } + ]; + networking.firewall.allowedTCPPorts = [ 53 ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + + services.unbound = { + enable = true; + interfaces = [ "192.168.0.1" "fd21::1" "::1" "127.0.0.1" ]; + allowedAccess = [ "192.168.0.0/24" "fd21::/64" "::1" "127.0.0.0/8" ]; + extraConfig = '' + server: + local-data: "example.local. IN A 1.2.3.4" + local-data: "example.local. IN AAAA abcd::eeff" + ''; + }; + }; + + # The resolver that knows that fowards (only) to the authoritative server + # and listens on UDP/53, TCP/53 & TCP/853. + resolver = { lib, nodes, ... }: { + imports = [ common ]; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { address = "192.168.0.2"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "fd21::2"; prefixLength = 64; } + ]; + networking.firewall.allowedTCPPorts = [ + 53 # regular DNS + 853 # DNS over TLS + ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + + services.unbound = { + enable = true; + allowedAccess = [ "192.168.0.0/24" "fd21::/64" "::1" "127.0.0.0/8" ]; + interfaces = [ "::1" "127.0.0.1" "192.168.0.2" "fd21::2" "192.168.0.2@853" "fd21::2@853" "::1@853" "127.0.0.1@853" ]; + forwardAddresses = [ + (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv6.addresses).address + (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv4.addresses).address + ]; + extraConfig = '' + server: + tls-service-pem: ${cert}/cert.pem + tls-service-key: ${cert}/key.pem + ''; + }; + }; + + # machine that runs a local unbound that will be reconfigured during test execution + local_resolver = { lib, nodes, config, ... }: { + imports = [ common ]; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { address = "192.168.0.3"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "fd21::3"; prefixLength = 64; } + ]; + networking.firewall.allowedTCPPorts = [ + 53 # regular DNS + ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + + services.unbound = { + enable = true; + allowedAccess = [ "::1" "127.0.0.0/8" ]; + interfaces = [ "::1" "127.0.0.1" ]; + localControlSocketPath = "/run/unbound/unbound.ctl"; + extraConfig = '' + include: "/etc/unbound/extra*.conf" + ''; + }; + + users.users = { + # user that is permitted to access the unix socket + someuser.extraGroups = [ + config.users.users.unbound.group + ]; + + # user that is not permitted to access the unix socket + unauthorizeduser = {}; + }; + + environment.etc = { + "unbound-extra1.conf".text = '' + forward-zone: + name: "example.local." + forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address} + forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address} + ''; + "unbound-extra2.conf".text = '' + auth-zone: + name: something.local. + zonefile: ${pkgs.writeText "zone" '' + something.local. IN A 3.4.5.6 + ''} + ''; + }; + }; + + + # plain node that only has network access and doesn't run any part of the + # resolver software locally + client = { lib, nodes, ... }: { + imports = [ common ]; + networking.nameservers = [ + (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address + (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address + ]; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.10"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = [ + { address = "fd21::10"; prefixLength = 64; } + ]; + }; + }; + + testScript = { nodes, ... }: '' + import typing + import json + + zone = "example.local." + records = [("AAAA", "abcd::eeff"), ("A", "1.2.3.4")] + + + def query( + machine, + host: str, + query_type: str, + query: str, + expected: typing.Optional[str] = None, + args: typing.Optional[typing.List[str]] = None, + ): + """ + Execute a single query and compare the result with expectation + """ + text_args = "" + if args: + text_args = " ".join(args) + + out = machine.succeed( + f"kdig {text_args} {query} {query_type} @{host} +short" + ).strip() + machine.log(f"{host} replied with {out}") + if expected: + assert expected == out, f"Expected `{expected}` but got `{out}`" + + + def test(machine, remotes, /, doh=False, zone=zone, records=records, args=[]): + """ + Run queries for the given remotes on the given machine. + """ + for query_type, expected in records: + for remote in remotes: + query(machine, remote, query_type, zone, expected, args) + query(machine, remote, query_type, zone, expected, ["+tcp"] + args) + if doh: + query( + machine, + remote, + query_type, + zone, + expected, + ["+tcp", "+tls"] + args, + ) + + + client.start() + authoritative.wait_for_unit("unbound.service") + + # verify that we can resolve locally + with subtest("test the authoritative servers local responses"): + test(authoritative, ["::1", "127.0.0.1"]) + + resolver.wait_for_unit("unbound.service") + + with subtest("root is unable to use unbounc-control when the socket is not configured"): + resolver.succeed("which unbound-control") # the binary must exist + resolver.fail("unbound-control list_forwards") # the invocation must fail + + # verify that the resolver is able to resolve on all the local protocols + with subtest("test that the resolver resolves on all protocols and transports"): + test(resolver, ["::1", "127.0.0.1"], doh=True) + + resolver.wait_for_unit("multi-user.target") + + with subtest("client should be able to query the resolver"): + test(client, ["${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True) + + # discard the client we do not need anymore + client.shutdown() + + local_resolver.wait_for_unit("multi-user.target") + + # link a new config file to /etc/unbound/extra.conf + local_resolver.succeed("ln -s /etc/unbound-extra1.conf /etc/unbound/extra1.conf") + + # reload the server & ensure the forwarding works + with subtest("test that the local resolver resolves on all protocols and transports"): + local_resolver.succeed("systemctl reload unbound") + print(local_resolver.succeed("journalctl -u unbound -n 1000")) + test(local_resolver, ["::1", "127.0.0.1"], args=["+timeout=60"]) + + with subtest("test that we can use the unbound control socket"): + out = local_resolver.succeed( + "sudo -u someuser -- unbound-control list_forwards" + ).strip() + + # Thank you black! Can't really break this line into a readable version. + expected = "example.local. IN forward ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}" + assert out == expected, f"Expected `{expected}` but got `{out}` instead." + local_resolver.fail("sudo -u unauthorizeduser -- unbound-control list_forwards") + + + # link a new config file to /etc/unbound/extra.conf + local_resolver.succeed("ln -sf /etc/unbound-extra2.conf /etc/unbound/extra2.conf") + + # reload the server & ensure the new local zone works + with subtest("test that we can query the new local zone"): + local_resolver.succeed("unbound-control reload") + r = [("A", "3.4.5.6")] + test(local_resolver, ["::1", "127.0.0.1"], zone="something.local.", records=r) + ''; + }) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin.nix b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin.nix index 936eaa2505..cbce177310 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ doublec infinisil ]; + maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 3a5bc63e1c..cca7b0b2f4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev - version = "4.2.0.15"; # "Android Studio 4.2 Canary 15" - build = "202.6922807"; - sha256Hash = "sha256-PXFNnPSJbdp9NtkMDR3Vq+vpWqd85Io2FmXPhRLRk/8="; + version = "4.2.0.16"; # "Android Studio 4.2 Canary 16" + build = "202.6939830"; + sha256Hash = "sha256-2Xh0GR4BHZI6ofdyMI2icrztI2BmiHWT+1bEZIZ58IE="; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/qxmledit/qxmledit.json b/third_party/nixpkgs/pkgs/applications/editors/qxmledit/qxmledit.json index 3b50532d6a..88d2e3c4c2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/qxmledit/qxmledit.json +++ b/third_party/nixpkgs/pkgs/applications/editors/qxmledit/qxmledit.json @@ -3,4 +3,4 @@ "repo": "qxmledit", "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1", "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834" -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix index aeef43e3f0..32892c7c26 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix @@ -16,7 +16,7 @@ let pname = "TeXmacs"; - version = "1.99.13"; + version = "1.99.14"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; @@ -26,22 +26,9 @@ mkDerivation { src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "Aq0cS47QqmFQHelxRjANeJlgXCXagnYRykpAq7wHqbQ="; + sha256 = "1zbl1ddhppgnn3j213jl1b9mn8zmwnknxiqswm25p4llj0mqcgna"; }; - patches = [ - # Minor patch for Qt 5.15 support, should be included in next release. - (fetchpatch { - url = "https://github.com/texmacs/texmacs/commit/3cf56af92326b74538f5e943928199ba6e963d0b.patch"; - sha256 = "+OBQmnKgvQZZkLx6ea773Dwq0o7L92Sex/kcVUhmg6Q="; - }) - # Fix returned version, lets hope they remember to bump the version next release. - (fetchpatch { - url = "https://github.com/texmacs/texmacs/commit/da5b67005d2fc31bb32ea1ead882c26af12d8cbb.patch"; - sha256 = "czMgdraQErrdvN83jY76P673L52BpQkDwntmKvF0Ykg="; - }) - ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index da66b0d9d2..13990c3387 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.10"; + version = "3.10.11"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0="; + sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/kde/elisa.nix b/third_party/nixpkgs/pkgs/applications/kde/elisa.nix index bd2cd52947..9a51aa786f 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/elisa.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/elisa.nix @@ -3,6 +3,7 @@ , lib , extra-cmake-modules , kdoctools +, qtbase , qtmultimedia , qtquickcontrols2 , qtwebsockets @@ -42,5 +43,6 @@ mkDerivation rec { description = "A simple media player for KDE"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; + broken = lib.versionOlder qtbase.version "5.14"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kwave.nix b/third_party/nixpkgs/pkgs/applications/kde/kwave.nix index 78a3d9ab4a..1a831c7c8d 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kwave.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kwave.nix @@ -1,14 +1,17 @@ -{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig, kcrash, kiconthemes, kio, audiofile, libsamplerate -, alsaLib, libpulseaudio, flac, id3lib, libogg, libmad, libopus, libvorbis, fftw, librsvg }: +{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig +, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsaLib, libpulseaudio, flac, id3lib +, libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: mkDerivation { name = "kwave"; + meta = with lib; { homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave"; description = "A simple media player"; maintainers = with maintainers; [ freezeboy ]; license = licenses.gpl2Plus; platforms = platforms.linux; + broken = lib.versionOlder qtbase.version "5.14"; }; nativeBuildInputs = [ extra-cmake-modules diff --git a/third_party/nixpkgs/pkgs/applications/kde/minuet.nix b/third_party/nixpkgs/pkgs/applications/kde/minuet.nix index cd98d56b86..2c0f0a5092 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/minuet.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/minuet.nix @@ -1,4 +1,4 @@ -{ mkDerivation +{ mkDerivation, qtbase , lib, extra-cmake-modules, gettext, python , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools @@ -10,6 +10,7 @@ mkDerivation { meta = with lib; { license = with licenses; [ lgpl21 gpl3 ]; maintainers = with maintainers; [ peterhoeg HaoZeke ]; + broken = lib.versionOlder qtbase.version "5.14"; }; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix index d14d4d43e8..77eae10293 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "0r0wj4w3jj3l56z1lx6ypkzz4fsgx4vzqbvs95661l8q362pndzw"; + sha256 = "0flp7mwj1pgcwx3k9pzc8pmqlkhbddj0maimdnvlazk87kzxpfd0"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/third_party/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch deleted file mode 100644 index 24c9c4a80f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Wed, 23 Nov 2016 00:40:48 +0300 -Subject: [PATCH] Build and use one version of preprocessor library - ---- - octoprint_m33fio/__init__.py | 73 ++---------------------------------------- - shared library source/Makefile | 62 +++-------------------------------- - 2 files changed, 6 insertions(+), 129 deletions(-) - -diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index 054870a..4d5ecc1 100755 ---- a/octoprint_m33fio/__init__.py -+++ b/octoprint_m33fio/__init__.py -@@ -1189,78 +1189,9 @@ class M33FioPlugin( - # Check if using shared library or checking if it is usable - if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : - -- # Check if running on Linux -- if platform.uname()[0].startswith("Linux") : -- -- # Check if running on a Raspberry Pi 1 -- if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so") -- -- # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 -- elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so") -- -- # Otherwise check if running on an ARM7 device -- elif platform.uname()[4].startswith("armv7") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so") -- -- # Otherwise check if using an i386 or x86-64 device -- elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so") -- -- # Otherwise check if running on Windows and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -+ # Set shared library -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") - -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll") -- -- # Otherwise check if running on macOS and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") -- -- # Otherwise check if running FreeBSD -- elif platform.uname()[0].startswith("FreeBSD") : -- -- # TODO: Compile FreeBSD shared library pre-processors -- pass -- - # Check if shared library was set - if self.sharedLibrary : - -diff --git a/shared library source/Makefile b/shared library source/Makefile -index 792b4f4..4c74f5c 100755 ---- a/shared library source/Makefile -+++ b/shared library source/Makefile -@@ -1,68 +1,14 @@ --# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64 --LIBRARY_NAME = preprocessor --TARGET_PLATFORM = LINUX64 -+LIBRARY_NAME = libpreprocessor - VER = .1 - --ifeq ($(TARGET_PLATFORM), LINUX32) -- PROG = $(LIBRARY_NAME)_i386.so -- CC = g++ -- CFLAGS = -fPIC -m32 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), LINUX64) -- PROG = $(LIBRARY_NAME)_x86-64.so -- CC = g++ -- CFLAGS = -fPIC -m64 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), WINDOWS32) -- PROG = $(LIBRARY_NAME)_i386.dll -- CC = i686-w64-mingw32-g++ -- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), WINDOWS64) -- PROG = $(LIBRARY_NAME)_x86-64.dll -- CC = x86_64-w64-mingw32-g++ -- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), PI) -- PROG = $(LIBRARY_NAME)_arm1176jzf-s.so -- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), PI2) -- PROG = $(LIBRARY_NAME)_arm_cortex-a7.so -- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), ARM7) -- PROG = $(LIBRARY_NAME)_arm7.so -- CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), MACOS32) -- PROG = $(LIBRARY_NAME)_i386.dylib -- CC = clang++ -- CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) -- --endif -- --ifeq ($(TARGET_PLATFORM), MACOS64) -- PROG = $(LIBRARY_NAME)_x86-64.dylib -- CC = clang++ -- CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) --endif -+PROG = $(LIBRARY_NAME).so -+CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER) - - SRCS = preprocessor.cpp gcode.cpp vector.cpp - CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared - - all: -- $(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) -+ $(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) - - clean: - rm -f ../octoprint_m33fio/static/libraries/$(PROG) --- -2.14.1 - diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix index 366b3866df..421690f29d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix @@ -109,6 +109,25 @@ in { }; }; + marlingcodedocumentation = buildPlugin rec { + pname = "MarlinGcodeDocumentation"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "costas-basdekis"; + repo = pname; + rev = "v${version}"; + sha256 = "0vx06w9hqwy0k4r8g67y8gdckfdx7wl8ghfx6hmxc1s8fgkghfkc"; + }; + + meta = with stdenv.lib; { + description = "Displays GCode documentation for Marlin in the Octoprint terminal command line"; + homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation"; + license = licenses.agpl3; + maintainers = with maintainers; [ lovesegfault ]; + }; + }; + mqtt = buildPlugin rec { pname = "MQTT"; version = "0.8.7"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/plater/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plater/default.nix new file mode 100644 index 0000000000..9d29390870 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/plater/default.nix @@ -0,0 +1,30 @@ +{ mkDerivation +, cmake +, fetchFromGitHub +, lib +, libGLU +, qtbase +}: + +mkDerivation rec { + pname = "plater"; + version = "2020-07-30"; + + src = fetchFromGitHub { + owner = "Rhoban"; + repo = "Plater"; + rev = "f8de6d038f95a9edebfcfe142c8e9783697d5b47"; + sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU qtbase ]; + + meta = with lib; { + description = "3D-printer parts placer and plate generator"; + homepage = "https://github.com/Rhoban/Plater"; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + license = licenses.cc-by-nc-30; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix index ad8e261cf6..ad107b6447 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0dszc3igfvlb6dgf5whyhw72id39lqqmgpd42kyqx5yjf5dw2wg7"; + sha256 = "01zydr1w8byjhxf4xj6z001q4ynq0452cn332ap1l1w0dmx9mxyr"; }; - vendorSha256 = "1wcqk8lfv3jq7dfaj9dj8bzsmq2qislzs1m38gx1hh4jwg1rn2cn"; + vendorSha256 = "1xyai417l8q44b562ssp5qqw04klrhg5397ahr4pc3i30csz8a7a"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix index 4f441d8a9a..f259b28131 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix @@ -1,32 +1,30 @@ -{ stdenv, fetchurl, xorg, pkgconfig -, gtkSupport ? true, gtk2 -, qtSupport ? true, qt4 +{ stdenv, fetchFromGitHub, xorg, pkg-config +, cmake, libevdev +, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook +, fltkSupport ? true, fltk +, qtSupport ? true, qt5 }: -stdenv.mkDerivation { - version = "0.31"; +stdenv.mkDerivation rec { pname = "xautoclick"; - src = fetchurl { - url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; - sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; + version = "0.34"; + + src = fetchFromGitHub { + owner = "qarkai"; + repo = "xautoclick"; + rev = "v${version}"; + sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE="; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext ] - ++ stdenv.lib.optionals gtkSupport [ gtk2 ] - ++ stdenv.lib.optionals qtSupport [ qt4 ]; - patchPhase = '' - substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev} - ''; - preConfigure = stdenv.lib.optional qtSupport '' - mkdir .bin - ln -s ${qt4}/bin/moc .bin/moc-qt4 - addToSearchPath PATH .bin - sed -i -e "s@LD=\$_cc@LD=\$_cxx@" configure - ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libevdev xorg.libXtst ] + ++ stdenv.lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] + ++ stdenv.lib.optionals fltkSupport [ fltk ] + ++ stdenv.lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; meta = with stdenv.lib; { description = "Autoclicker application, which enables you to automatically click the left mousebutton"; - homepage = "http://xautoclick.sourceforge.net"; + homepage = "https://github.com/qarkai/xautoclick"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 76f53dcecc..92403598a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -22,7 +22,7 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport , libva ? null # useVaapi -, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone +, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization , useOzone ? false @@ -146,7 +146,7 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; + ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 842ce9ba9a..f6f6deb738 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -403,7 +403,7 @@ stdenv.mkDerivation rec { homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames srcs; - maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap KarlJoad ]; + maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ]; hydraPlatforms = []; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index de409f8037..fd5a860445 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -22,7 +22,7 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport , libva ? null # useVaapi -, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone +, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization , useOzone ? false @@ -153,7 +153,7 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; + ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index 505de3c080..2f884970fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,24 +2,22 @@ buildGoModule rec { pname = "argocd"; - version = "1.4.2"; - commit = "48cced9d925b5bc94f6aa9fa4a8a19b2a59e128a"; + version = "1.7.8"; + commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj"; + sha256 = "1pwk6mzmlsx43c75wl5lglpxgc2jkgzra4443hwp6n0wfgzajfp4"; }; - vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj"; + vendorSha256 = "0c5gykijwjrq3cx9qg9hm5j7axccngc1kp5qj3429a2ilw80l8pl"; doCheck = false; nativeBuildInputs = [ packr ]; - patches = [ ./use-go-module.patch ]; - buildFlagsArray = '' -ldflags= -X github.com/argoproj/argo-cd/common.version=${version} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/use-go-module.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/use-go-module.patch deleted file mode 100644 index ac597f4187..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/use-go-module.patch +++ /dev/null @@ -1,3058 +0,0 @@ -diff --git a/Gopkg.lock b/Gopkg.lock -deleted file mode 100644 -index 03737a95..00000000 ---- a/Gopkg.lock -+++ /dev/null -@@ -1,2103 +0,0 @@ --# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. -- -- --[[projects]] -- digest = "1:6d5a057da97a9dbdb10e7beedd2f43452b6bf7691001c0c8886e8dacf5610349" -- name = "bou.ke/monkey" -- packages = ["."] -- pruneopts = "" -- revision = "bdf6dea004c6fd1cdf4b25da8ad45a606c09409a" -- version = "v1.0.1" -- --[[projects]] -- digest = "1:9702dc153c9bb6ee7ee0587c248b7024700e89e4a7be284faaeeab9da32e1c6b" -- name = "cloud.google.com/go" -- packages = ["compute/metadata"] -- pruneopts = "" -- revision = "767c40d6a2e058483c25fa193e963a22da17236d" -- version = "v0.18.0" -- --[[projects]] -- digest = "1:8ec1618fc3ee146af104d6c13be250f25e5976e34557d4afbfe4b28035ce6c05" -- name = "github.com/Knetic/govaluate" -- packages = ["."] -- pruneopts = "" -- revision = "d216395917cc49052c7c7094cf57f09657ca08a8" -- version = "v3.0.0" -- --[[projects]] -- digest = "1:63e57618d792cccb87ad7cb8a0602e6205732beb3b01b0ea858fc4a5fd3ce8f1" -- name = "github.com/MakeNowJust/heredoc" -- packages = ["."] -- pruneopts = "" -- revision = "efb6ca8de9d5385c3963279701760e37637cf238" -- version = "v2.0.1" -- --[[projects]] -- digest = "1:b856d8248663c39265a764561c1a1a149783f6cc815feb54a1f3a591b91f6eca" -- name = "github.com/Masterminds/semver" -- packages = ["."] -- pruneopts = "" -- revision = "c7af12943936e8c39859482e61f0574c2fd7fc75" -- version = "v1.4.2" -- --[[projects]] -- digest = "1:71c0dfb843260bfb9b03357cae8eac261b8d82e149ad8f76938b87a23aa47c43" -- name = "github.com/PuerkitoBio/purell" -- packages = ["."] -- pruneopts = "" -- revision = "b938d81255b5473c57635324295cb0fe398c7a58" -- --[[projects]] -- branch = "master" -- digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c" -- name = "github.com/PuerkitoBio/urlesc" -- packages = ["."] -- pruneopts = "" -- revision = "de5bf2ad457846296e2031421a34e2568e304e35" -- --[[projects]] -- branch = "master" -- digest = "1:a1b56af5e69569454f55ef4842485a0da5616e240a610d77c987e17a73b0e265" -- name = "github.com/TomOnTime/utfutil" -- packages = ["."] -- pruneopts = "" -- revision = "09c41003ee1d5015b75f331e52215512e7145b8d" -- --[[projects]] -- branch = "master" -- digest = "1:52905b00a73cda93a2ce8c5fa35185daed673d59e39576e81ad6ab6fb7076b3c" -- name = "github.com/argoproj/pkg" -- packages = [ -- "errors", -- "exec", -- "rand", -- "time", -- ] -- pruneopts = "" -- revision = "02a6aac40ac4cd23de448afe7a1ec0ba4b6d2b96" -- --[[projects]] -- digest = "1:d8a2bb36a048d1571bcc1aee208b61f39dc16c6c53823feffd37449dde162507" -- name = "github.com/asaskevich/govalidator" -- packages = ["."] -- pruneopts = "" -- revision = "ccb8e960c48f04d6935e72476ae4a51028f9e22f" -- version = "v9" -- --[[projects]] -- branch = "master" -- digest = "1:c0bec5f9b98d0bc872ff5e834fac186b807b656683bd29cb82fb207a1513fabb" -- name = "github.com/beorn7/perks" -- packages = ["quantile"] -- pruneopts = "" -- revision = "3a771d992973f24aa725d07868b467d1ddfceafb" -- --[[projects]] -- digest = "1:6e2b0748ea11cffebe87b4a671a44ecfb243141cdd5df54cb44b7e8e93cb7ea3" -- name = "github.com/casbin/casbin" -- packages = [ -- ".", -- "config", -- "effect", -- "errors", -- "log", -- "model", -- "persist", -- "persist/file-adapter", -- "rbac", -- "rbac/default-role-manager", -- "util", -- ] -- pruneopts = "" -- revision = "aaed1b7a7eac65d37ec4e15e308429fdf0bd6a9e" -- version = "v1.9.1" -- --[[projects]] -- branch = "master" -- digest = "1:9c19f8c33e635e0439c8afc167d6d02e3aa6eea5b69d64880244fd354a99edc4" -- name = "github.com/chai2010/gettext-go" -- packages = [ -- "gettext", -- "gettext/mo", -- "gettext/plural", -- "gettext/po", -- ] -- pruneopts = "" -- revision = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb" -- --[[projects]] -- branch = "v2" -- digest = "1:d8ee1b165eb7f4fd9ada718e1e7eeb0bc1fd462592d0bd823df694443f448681" -- name = "github.com/coreos/go-oidc" -- packages = ["."] -- pruneopts = "" -- revision = "1180514eaf4d9f38d0d19eef639a1d695e066e72" -- --[[projects]] -- digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" -- name = "github.com/davecgh/go-spew" -- packages = ["spew"] -- pruneopts = "" -- revision = "346938d642f2ec3594ed81d874461961cd0faa76" -- version = "v1.1.0" -- --[[projects]] -- digest = "1:6098222470fe0172157ce9bbef5d2200df4edde17ee649c5d6e48330e4afa4c6" -- name = "github.com/dgrijalva/jwt-go" -- packages = ["."] -- pruneopts = "" -- revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" -- version = "v3.2.0" -- --[[projects]] -- digest = "1:c05f1899f086e3b4613d94d9e6f7ba6f4b6587498a1aa6037c5c294b22f5a743" -- name = "github.com/docker/distribution" -- packages = [ -- "digestset", -- "reference", -- ] -- pruneopts = "" -- revision = "2461543d988979529609e8cb6fca9ca190dc48da" -- version = "v2.7.1" -- --[[projects]] -- digest = "1:b021ef379356343bdc13ec101e546b756fcef4b1186d08163bef7d3bc8c1e07f" -- name = "github.com/docker/docker" -- packages = [ -- "pkg/term", -- "pkg/term/winconsole", -- ] -- pruneopts = "" -- revision = "fc4825d5ef5e0e1af74904208f9b925c22f0b6f8" -- version = "v1.6.0-rc5" -- --[[projects]] -- branch = "master" -- digest = "1:d6c13a378213e3de60445e49084b8a0a9ce582776dfc77927775dbeb3ff72a35" -- name = "github.com/docker/spdystream" -- packages = [ -- ".", -- "spdy", -- ] -- pruneopts = "" -- revision = "6480d4af844c189cf5dd913db24ddd339d3a4f85" -- --[[projects]] -- branch = "master" -- digest = "1:f1a75a8e00244e5ea77ff274baa9559eb877437b240ee7b278f3fc560d9f08bf" -- name = "github.com/dustin/go-humanize" -- packages = ["."] -- pruneopts = "" -- revision = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e" -- --[[projects]] -- digest = "1:971e9ba63a417c5f1f83ab358677bc59e96ff04285f26c6646ff089fb60b15e8" -- name = "github.com/emicklei/go-restful" -- packages = [ -- ".", -- "log", -- ] -- pruneopts = "" -- revision = "3658237ded108b4134956c1b3050349d93e7b895" -- version = "v2.7.1" -- --[[projects]] -- digest = "1:ba7c75e38d81b9cf3e8601c081567be3b71bccca8c11aee5de98871360aa4d7b" -- name = "github.com/emirpasic/gods" -- packages = [ -- "containers", -- "lists", -- "lists/arraylist", -- "trees", -- "trees/binaryheap", -- "utils", -- ] -- pruneopts = "" -- revision = "f6c17b524822278a87e3b3bd809fec33b51f5b46" -- version = "v1.9.0" -- --[[projects]] -- digest = "1:46ddeb9dd35d875ac7568c4dc1fc96ce424e034bdbb984239d8ffc151398ec01" -- name = "github.com/evanphx/json-patch" -- packages = ["."] -- pruneopts = "" -- revision = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f" -- version = "v4.5.0" -- --[[projects]] -- branch = "master" -- digest = "1:549f95037fea25e00a5341ac6a169a5b3e5306be107f45260440107b779b74f9" -- name = "github.com/exponent-io/jsonpath" -- packages = ["."] -- pruneopts = "" -- revision = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5" -- --[[projects]] -- digest = "1:23a5efa4b272df86a8ebffc942f5e0c1aac4b750836037394cc450b6d91e241a" -- name = "github.com/fatih/camelcase" -- packages = ["."] -- pruneopts = "" -- revision = "44e46d280b43ec1531bb25252440e34f1b800b65" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:b13707423743d41665fd23f0c36b2f37bb49c30e94adb813319c44188a51ba22" -- name = "github.com/ghodss/yaml" -- packages = ["."] -- pruneopts = "" -- revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" -- version = "v1.0.0" -- --[[projects]] -- branch = "master" -- digest = "1:eb77b66abaf9649747230eb973350bd1c311a0d0362213192efbdd222082b072" -- name = "github.com/go-openapi/analysis" -- packages = ["."] -- pruneopts = "" -- revision = "5957818e100395077187fb7ef3b8a28227af06c6" -- --[[projects]] -- branch = "master" -- digest = "1:ee273c95c1414ef11bd4da259b40e83f41c1d5a6bee7d1b54a05ef5f3565fd92" -- name = "github.com/go-openapi/errors" -- packages = ["."] -- pruneopts = "" -- revision = "b2b2befaf267d082d779bcef52d682a47c779517" -- --[[projects]] -- branch = "master" -- digest = "1:1287439f7765209116509fffff2b8f853845e4b35572b41a1aadda42cbcffcc2" -- name = "github.com/go-openapi/jsonpointer" -- packages = ["."] -- pruneopts = "" -- revision = "779f45308c19820f1a69e9a4cd965f496e0da10f" -- --[[projects]] -- branch = "master" -- digest = "1:07ac8ac445f68b0bc063d11845d479fb7e09c906ead7a8c4165b59777df09d74" -- name = "github.com/go-openapi/jsonreference" -- packages = ["."] -- pruneopts = "" -- revision = "36d33bfe519efae5632669801b180bf1a245da3b" -- --[[projects]] -- branch = "master" -- digest = "1:c4a8c916364abeda1c5cf36684320298bbf4d87718b0b2bd9c4ca663157fdc75" -- name = "github.com/go-openapi/loads" -- packages = ["."] -- pruneopts = "" -- revision = "2a2b323bab96e6b1fdee110e57d959322446e9c9" -- --[[projects]] -- branch = "master" -- digest = "1:1d9c762f6695e6e7ed0b4c055fa0eab7d20c2b36c935943282273d37f114e302" -- name = "github.com/go-openapi/runtime" -- packages = [ -- ".", -- "logger", -- "middleware", -- "middleware/denco", -- "middleware/header", -- "middleware/untyped", -- "security", -- ] -- pruneopts = "" -- revision = "cd9d8ed52e4b4665463cbc655500e4faa09c3c16" -- --[[projects]] -- branch = "master" -- digest = "1:fd4008f8283b993180f0626d0c7b2f48880e9dbb6bd92a91cac7ded30dc66777" -- name = "github.com/go-openapi/spec" -- packages = ["."] -- pruneopts = "" -- revision = "1de3e0542de65ad8d75452a595886fdd0befb363" -- --[[projects]] -- branch = "master" -- digest = "1:4ddc424130bcfbf6f782f433192ca2502a02a09e4ac55dcbecf91f22ed4e3138" -- name = "github.com/go-openapi/strfmt" -- packages = ["."] -- pruneopts = "" -- revision = "481808443b00a14745fada967cb5eeff0f9b1df2" -- --[[projects]] -- branch = "master" -- digest = "1:366052ef634d344217d6720719c9f8e95de13a94d211f09785b0ba3c4c181b06" -- name = "github.com/go-openapi/swag" -- packages = ["."] -- pruneopts = "" -- revision = "84f4bee7c0a6db40e3166044c7983c1c32125429" -- --[[projects]] -- branch = "master" -- digest = "1:671e25496d550c80a9d6e7e588d32b380c6b4877f113750724f69acc6ce6790f" -- name = "github.com/go-openapi/validate" -- packages = ["."] -- pruneopts = "" -- revision = "b0a3ed684d0fdd3e1eda00433382188ce8aa7169" -- --[[projects]] -- digest = "1:024c9473f363a12918e87e7efc778091839beab514b01309a6ecd8aa336c8065" -- name = "github.com/go-redis/cache" -- packages = [ -- ".", -- "internal/lrucache", -- "internal/singleflight", -- ] -- pruneopts = "" -- revision = "c58ada1e23a3b66593f81c70572c20a0bb805a90" -- version = "v6.3.5" -- --[[projects]] -- digest = "1:b73fabc1ff8f2417bc5cc51d3f7274d6af5300b5ad9b8606967213134c1700dc" -- name = "github.com/go-redis/redis" -- packages = [ -- ".", -- "internal", -- "internal/consistenthash", -- "internal/hashtag", -- "internal/pool", -- "internal/proto", -- "internal/util", -- ] -- pruneopts = "" -- revision = "22be8a3eaf992c828cecb69dc07348313bf08d2e" -- version = "v6.15.1" -- --[[projects]] -- digest = "1:842c1acbacc80da775cfc0c412c4fe322c2d1b86c260db632987730d0d67a6bd" -- name = "github.com/gobuffalo/packr" -- packages = ["."] -- pruneopts = "" -- revision = "7f4074995d431987caaa35088199f13c44b24440" -- version = "v1.11.0" -- --[[projects]] -- digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c" -- name = "github.com/gobwas/glob" -- packages = [ -- ".", -- "compiler", -- "match", -- "syntax", -- "syntax/ast", -- "syntax/lexer", -- "util/runes", -- "util/strings", -- ] -- pruneopts = "" -- revision = "5ccd90ef52e1e632236f7326478d4faa74f99438" -- version = "v0.2.3" -- --[[projects]] -- branch = "master" -- digest = "1:9a06e7365c6039daf4db9bbf79650e2933a2880982cbab8106cb74a36617f40d" -- name = "github.com/gogits/go-gogs-client" -- packages = ["."] -- pruneopts = "" -- revision = "5a05380e4bc2440e0ec12f54f6f45648dbdd5e55" -- --[[projects]] -- digest = "1:d69d2ba23955582a64e367ff2b0808cdbd048458c178cea48f11ab8c40bd7aea" -- name = "github.com/gogo/protobuf" -- packages = [ -- "gogoproto", -- "plugin/compare", -- "plugin/defaultcheck", -- "plugin/description", -- "plugin/embedcheck", -- "plugin/enumstringer", -- "plugin/equal", -- "plugin/face", -- "plugin/gostring", -- "plugin/marshalto", -- "plugin/oneofcheck", -- "plugin/populate", -- "plugin/size", -- "plugin/stringer", -- "plugin/testgen", -- "plugin/union", -- "plugin/unmarshal", -- "proto", -- "protoc-gen-gofast", -- "protoc-gen-gogo/descriptor", -- "protoc-gen-gogo/generator", -- "protoc-gen-gogo/generator/internal/remap", -- "protoc-gen-gogo/grpc", -- "protoc-gen-gogo/plugin", -- "protoc-gen-gogofast", -- "sortkeys", -- "vanity", -- "vanity/command", -- ] -- pruneopts = "" -- revision = "5628607bb4c51c3157aacc3a50f0ab707582b805" -- version = "v1.3.1" -- --[[projects]] -- branch = "master" -- digest = "1:107b233e45174dbab5b1324201d092ea9448e58243ab9f039e4c0f332e121e3a" -- name = "github.com/golang/glog" -- packages = ["."] -- pruneopts = "" -- revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" -- --[[projects]] -- digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18" -- name = "github.com/golang/protobuf" -- packages = [ -- "jsonpb", -- "proto", -- "protoc-gen-go", -- "protoc-gen-go/descriptor", -- "protoc-gen-go/generator", -- "protoc-gen-go/generator/internal/remap", -- "protoc-gen-go/grpc", -- "protoc-gen-go/plugin", -- "ptypes", -- "ptypes/any", -- "ptypes/duration", -- "ptypes/empty", -- "ptypes/struct", -- "ptypes/timestamp", -- ] -- pruneopts = "" -- revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" -- version = "v1.2.0" -- --[[projects]] -- digest = "1:1e5b1e14524ed08301977b7b8e10c719ed853cbf3f24ecb66fae783a46f207a6" -- name = "github.com/google/btree" -- packages = ["."] -- pruneopts = "" -- revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:9fcb267c272bc5054564b392e3ff7e65e35400fd9914afb1d169f92b95e7dbc9" -- name = "github.com/google/go-cmp" -- packages = [ -- "cmp", -- "cmp/internal/diff", -- "cmp/internal/flags", -- "cmp/internal/function", -- "cmp/internal/value", -- ] -- pruneopts = "" -- revision = "2d0692c2e9617365a95b295612ac0d4415ba4627" -- version = "v0.3.1" -- --[[projects]] -- digest = "1:14d826ee25139b4674e9768ac287a135f4e7c14e1134a5b15e4e152edfd49f41" -- name = "github.com/google/go-jsonnet" -- packages = [ -- ".", -- "ast", -- "parser", -- ] -- pruneopts = "" -- revision = "dfddf2b4e3aec377b0dcdf247ff92e7d078b8179" -- --[[projects]] -- branch = "master" -- digest = "1:754f77e9c839b24778a4b64422236d38515301d2baeb63113aa3edc42e6af692" -- name = "github.com/google/gofuzz" -- packages = ["."] -- pruneopts = "" -- revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" -- --[[projects]] -- branch = "master" -- digest = "1:d0899ec7c2f61fd5e4ccba7dbefe72e366a3ecce23ecdb982c768fa1d38812fb" -- name = "github.com/google/shlex" -- packages = ["."] -- pruneopts = "" -- revision = "c34317bd91bf98fab745d77b03933cf8769299fe" -- --[[projects]] -- digest = "1:2a131706ff80636629ab6373f2944569b8252ecc018cda8040931b05d32e3c16" -- name = "github.com/googleapis/gnostic" -- packages = [ -- "OpenAPIv2", -- "compiler", -- "extensions", -- ] -- pruneopts = "" -- revision = "ee43cbb60db7bd22502942cccbc39059117352ab" -- version = "v0.1.0" -- --[[projects]] -- digest = "1:09aa5dd1332b93c96bde671bafb053249dc813febf7d5ca84e8f382ba255d67d" -- name = "github.com/gorilla/websocket" -- packages = ["."] -- pruneopts = "" -- revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d" -- version = "v1.4.0" -- --[[projects]] -- branch = "master" -- digest = "1:e1fd67b5695fb12f54f979606c5d650a5aa72ef242f8e71072bfd4f7b5a141a0" -- name = "github.com/gregjones/httpcache" -- packages = [ -- ".", -- "diskcache", -- ] -- pruneopts = "" -- revision = "901d90724c7919163f472a9812253fb26761123d" -- --[[projects]] -- branch = "master" -- digest = "1:9dca8c981b8aed7448d94e78bc68a76784867a38b3036d5aabc0b32d92ffd1f4" -- name = "github.com/grpc-ecosystem/go-grpc-middleware" -- packages = [ -- ".", -- "auth", -- "logging", -- "logging/logrus", -- "logging/logrus/ctxlogrus", -- "retry", -- "tags", -- "tags/logrus", -- "util/backoffutils", -- "util/metautils", -- ] -- pruneopts = "" -- revision = "bc372cc64f55abd91995ba3f219b380ffbc59e9d" -- --[[projects]] -- digest = "1:e24dc5ef44694848785de507f439a24e9e6d96d7b43b8cf3d6cfa857aa1e2186" -- name = "github.com/grpc-ecosystem/go-grpc-prometheus" -- packages = ["."] -- pruneopts = "" -- revision = "c225b8c3b01faf2899099b768856a9e916e5087b" -- version = "v1.2.0" -- --[[projects]] -- digest = "1:9feb7485bc57adbcbc1e1037ca05588e9d8b0a3a1875fbf730021fc118859b75" -- name = "github.com/grpc-ecosystem/grpc-gateway" -- packages = [ -- "protoc-gen-grpc-gateway", -- "protoc-gen-grpc-gateway/descriptor", -- "protoc-gen-grpc-gateway/generator", -- "protoc-gen-grpc-gateway/gengateway", -- "protoc-gen-grpc-gateway/httprule", -- "protoc-gen-swagger", -- "protoc-gen-swagger/genswagger", -- "protoc-gen-swagger/options", -- "runtime", -- "runtime/internal", -- "utilities", -- ] -- pruneopts = "" -- revision = "07f5e79768022f9a3265235f0db4ac8c3f675fec" -- version = "v1.3.1" -- --[[projects]] -- branch = "master" -- digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94" -- name = "github.com/hashicorp/golang-lru" -- packages = [ -- ".", -- "simplelru", -- ] -- pruneopts = "" -- revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3" -- --[[projects]] -- digest = "1:23bc0b496ba341c6e3ba24d6358ff4a40a704d9eb5f9a3bd8e8fbd57ad869013" -- name = "github.com/imdario/mergo" -- packages = ["."] -- pruneopts = "" -- revision = "163f41321a19dd09362d4c63cc2489db2015f1f4" -- version = "0.3.2" -- --[[projects]] -- digest = "1:6f7a8f1f3e04174c426eea1c8661ef49a6b4c63bd2e40c0ad74b5ba9051f4812" -- name = "github.com/improbable-eng/grpc-web" -- packages = ["go/grpcweb"] -- pruneopts = "" -- revision = "16092bd1d58ae1b3c2d8be1cb67e65956f945dea" -- version = "0.7.0" -- --[[projects]] -- digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" -- name = "github.com/inconshreveable/mousetrap" -- packages = ["."] -- pruneopts = "" -- revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" -- version = "v1.0" -- --[[projects]] -- branch = "master" -- digest = "1:95abc4eba158a39873bd4fabdee576d0ae13826b550f8b710881d80ae4093a0f" -- name = "github.com/jbenet/go-context" -- packages = ["io"] -- pruneopts = "" -- revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4" -- --[[projects]] -- digest = "1:302ad9379eb146668760df4d779a95379acab43ce5f9a28f27f3273f98232020" -- name = "github.com/jonboulle/clockwork" -- packages = ["."] -- pruneopts = "" -- revision = "2eee05ed794112d45db504eb05aa693efd2b8b09" -- version = "v0.1.0" -- --[[projects]] -- digest = "1:31c6f3c4f1e15fcc24fcfc9f5f24603ff3963c56d6fa162116493b4025fb6acc" -- name = "github.com/json-iterator/go" -- packages = ["."] -- pruneopts = "" -- revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682" -- --[[projects]] -- branch = "master" -- digest = "1:63e7368fcf6b54804076eaec26fd9cf0c4466166b272393db4b93102e1e962df" -- name = "github.com/kballard/go-shellquote" -- packages = ["."] -- pruneopts = "" -- revision = "95032a82bc518f77982ea72343cc1ade730072f0" -- --[[projects]] -- digest = "1:41e0bed5df4f9fd04c418bf9b6b7179b3671e416ad6175332601ca1c8dc74606" -- name = "github.com/kevinburke/ssh_config" -- packages = ["."] -- pruneopts = "" -- revision = "81db2a75821ed34e682567d48be488a1c3121088" -- version = "0.5" -- --[[projects]] -- branch = "master" -- digest = "1:448b4a6e39e46d8740b00dc871f26d58dc39341b160e01267b7917132831a136" -- name = "github.com/konsorten/go-windows-terminal-sequences" -- packages = ["."] -- pruneopts = "" -- revision = "b729f2633dfe35f4d1d8a32385f6685610ce1cb5" -- --[[projects]] -- branch = "master" -- digest = "1:93018a4331df9925058905133cb997aec8f54d5303f4536a23e49b5648632d06" -- name = "github.com/liggitt/tabwriter" -- packages = ["."] -- pruneopts = "" -- revision = "89fcab3d43de07060e4fd4c1547430ed57e87f24" -- --[[projects]] -- branch = "master" -- digest = "1:ccc20cacf54eb16464dad02efa1c14fa7c0b9e124639b0d2a51dcc87b0154e4c" -- name = "github.com/mailru/easyjson" -- packages = [ -- "buffer", -- "jlexer", -- "jwriter", -- ] -- pruneopts = "" -- revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1" -- --[[projects]] -- digest = "1:63722a4b1e1717be7b98fc686e0b30d5e7f734b9e93d7dee86293b6deab7ea28" -- name = "github.com/matttproud/golang_protobuf_extensions" -- packages = ["pbutil"] -- pruneopts = "" -- revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" -- version = "v1.0.1" -- --[[projects]] -- digest = "1:096a8a9182648da3d00ff243b88407838902b6703fc12657f76890e08d1899bf" -- name = "github.com/mitchellh/go-homedir" -- packages = ["."] -- pruneopts = "" -- revision = "ae18d6b8b3205b561c79e8e5f69bff09736185f4" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:713b341855f1480e4baca1e7c5434e1d266441340685ecbde32d59bdc065fb3f" -- name = "github.com/mitchellh/go-wordwrap" -- packages = ["."] -- pruneopts = "" -- revision = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c" -- version = "v1.0.0" -- --[[projects]] -- branch = "master" -- digest = "1:eb9117392ee8e7aa44f78e0db603f70b1050ee0ebda4bd40040befb5b218c546" -- name = "github.com/mitchellh/mapstructure" -- packages = ["."] -- pruneopts = "" -- revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b" -- --[[projects]] -- digest = "1:0c0ff2a89c1bb0d01887e1dac043ad7efbf3ec77482ef058ac423d13497e16fd" -- name = "github.com/modern-go/concurrent" -- packages = ["."] -- pruneopts = "" -- revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" -- version = "1.0.3" -- --[[projects]] -- digest = "1:e32bdbdb7c377a07a9a46378290059822efdce5c8d96fe71940d87cb4f918855" -- name = "github.com/modern-go/reflect2" -- packages = ["."] -- pruneopts = "" -- revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" -- version = "1.0.1" -- --[[projects]] -- digest = "1:5d9b668b0b4581a978f07e7d2e3314af18eb27b3fb5d19b70185b7c575723d11" -- name = "github.com/opencontainers/go-digest" -- packages = ["."] -- pruneopts = "" -- revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf" -- version = "v1.0.0-rc1" -- --[[projects]] -- digest = "1:4c0404dc03d974acd5fcd8b8d3ce687b13bd169db032b89275e8b9d77b98ce8c" -- name = "github.com/patrickmn/go-cache" -- packages = ["."] -- pruneopts = "" -- revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0" -- version = "v2.1.0" -- --[[projects]] -- digest = "1:049b5bee78dfdc9628ee0e557219c41f683e5b06c5a5f20eaba0105ccc586689" -- name = "github.com/pelletier/go-buffruneio" -- packages = ["."] -- pruneopts = "" -- revision = "c37440a7cf42ac63b919c752ca73a85067e05992" -- version = "v0.2.0" -- --[[projects]] -- branch = "master" -- digest = "1:5f0faa008e8ff4221b55a1a5057c8b02cb2fd68da6a65c9e31c82b72cbc836d0" -- name = "github.com/petar/GoLLRB" -- packages = ["llrb"] -- pruneopts = "" -- revision = "33fb24c13b99c46c93183c291836c573ac382536" -- --[[projects]] -- digest = "1:4709c61d984ef9ba99b037b047546d8a576ae984fb49486e48d99658aa750cd5" -- name = "github.com/peterbourgon/diskv" -- packages = ["."] -- pruneopts = "" -- revision = "0be1b92a6df0e4f5cb0a5d15fb7f643d0ad93ce6" -- version = "v3.0.0" -- --[[projects]] -- digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca" -- name = "github.com/pkg/errors" -- packages = ["."] -- pruneopts = "" -- revision = "645ef00459ed84a119197bfb8d8205042c6df63d" -- version = "v0.8.0" -- --[[projects]] -- digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411" -- name = "github.com/pmezard/go-difflib" -- packages = ["difflib"] -- pruneopts = "" -- revision = "792786c7400a136282c1664665ae0a8db921c6c2" -- version = "v1.0.0" -- --[[projects]] -- branch = "master" -- digest = "1:90daff4630a8cf2fa207dbd3ccaed0e860936ead1851a473019674e6b5993a13" -- name = "github.com/pquerna/cachecontrol" -- packages = [ -- ".", -- "cacheobject", -- ] -- pruneopts = "" -- revision = "525d0eb5f91d30e3b1548de401b7ef9ea6898520" -- --[[projects]] -- digest = "1:9d34d575593e3dd27bbd119138ba009ef1535a0df2aad7259e1dd5aed7405eea" -- name = "github.com/prometheus/client_golang" -- packages = [ -- "prometheus", -- "prometheus/internal", -- "prometheus/promhttp", -- ] -- pruneopts = "" -- revision = "7858729281ec582767b20e0d696b6041d995d5e0" -- --[[projects]] -- branch = "master" -- digest = "1:185cf55b1f44a1bf243558901c3f06efa5c64ba62cfdcbb1bf7bbe8c3fb68561" -- name = "github.com/prometheus/client_model" -- packages = ["go"] -- pruneopts = "" -- revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" -- --[[projects]] -- branch = "master" -- digest = "1:f477ef7b65d94fb17574fc6548cef0c99a69c1634ea3b6da248b63a61ebe0498" -- name = "github.com/prometheus/common" -- packages = [ -- "expfmt", -- "internal/bitbucket.org/ww/goautoneg", -- "model", -- ] -- pruneopts = "" -- revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" -- --[[projects]] -- branch = "master" -- digest = "1:e04aaa0e8f8da0ed3d6c0700bd77eda52a47f38510063209d72d62f0ef807d5e" -- name = "github.com/prometheus/procfs" -- packages = [ -- ".", -- "internal/util", -- "nfs", -- "xfs", -- ] -- pruneopts = "" -- revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92" -- --[[projects]] -- digest = "1:6bb048133650d1fb7fbff9fb3c35bd5c7e8653fc95c3bae6df94cd17d1580278" -- name = "github.com/robfig/cron" -- packages = ["."] -- pruneopts = "" -- revision = "45fbe1491cdd47d74d1bf1396286d67faee8b8b5" -- version = "v3.0.0" -- --[[projects]] -- digest = "1:5f47c69f85311c4dc292be6cc995a0a3fe8337a6ce38ef4f71e5b7efd5ad42e0" -- name = "github.com/rs/cors" -- packages = ["."] -- pruneopts = "" -- revision = "9a47f48565a795472d43519dd49aac781f3034fb" -- version = "v1.6.0" -- --[[projects]] -- digest = "1:2761e287c811d0948d47d0252b82281eca3801eb3c9d5f9530956643d5b9f430" -- name = "github.com/russross/blackfriday" -- packages = ["."] -- pruneopts = "" -- revision = "05f3235734ad95d0016f6a23902f06461fcf567a" -- version = "v1.5.2" -- --[[projects]] -- digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8" -- name = "github.com/sergi/go-diff" -- packages = ["diffmatchpatch"] -- pruneopts = "" -- revision = "1744e2970ca51c86172c8190fadad617561ed6e7" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:01d968ff6535945510c944983eee024e81f1c949043e9bbfe5ab206ebc3588a4" -- name = "github.com/sirupsen/logrus" -- packages = [ -- ".", -- "hooks/test", -- ] -- pruneopts = "" -- revision = "a67f783a3814b8729bd2dac5780b5f78f8dbd64d" -- version = "v1.1.0" -- --[[projects]] -- branch = "master" -- digest = "1:50b5be512f924d289f20e8b2aef8951d98b9bd8c44666cf169514906df597a4c" -- name = "github.com/skratchdot/open-golang" -- packages = ["open"] -- pruneopts = "" -- revision = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c" -- --[[projects]] -- digest = "1:022a4e2a8c327eb46a99088a51c0dda5d5be86928ace2afd72145dc1d746a323" -- name = "github.com/soheilhy/cmux" -- packages = ["."] -- pruneopts = "" -- revision = "e09e9389d85d8492d313d73d1469c029e710623f" -- version = "v0.1.4" -- --[[projects]] -- digest = "1:0c63b3c7ad6d825a898f28cb854252a3b29d37700c68a117a977263f5ec94efe" -- name = "github.com/spf13/cobra" -- packages = ["."] -- pruneopts = "" -- revision = "0.0.5" -- --[[projects]] -- digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d" -- name = "github.com/spf13/pflag" -- packages = ["."] -- pruneopts = "" -- revision = "583c0c0531f06d5278b7d917446061adc344b5cd" -- version = "v1.0.1" -- --[[projects]] -- digest = "1:b1861b9a1aa0801b0b62945ed7477c1ab61a4bd03b55dfbc27f6d4f378110c8c" -- name = "github.com/src-d/gcfg" -- packages = [ -- ".", -- "scanner", -- "token", -- "types", -- ] -- pruneopts = "" -- revision = "f187355171c936ac84a82793659ebb4936bc1c23" -- version = "v1.3.0" -- --[[projects]] -- digest = "1:306417ea2f31ea733df356a2b895de63776b6a5107085b33458e5cd6eb1d584d" -- name = "github.com/stretchr/objx" -- packages = ["."] -- pruneopts = "" -- revision = "facf9a85c22f48d2f52f2380e4efce1768749a89" -- version = "v0.1" -- --[[projects]] -- digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75" -- name = "github.com/stretchr/testify" -- packages = [ -- "assert", -- "mock", -- ] -- pruneopts = "" -- revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" -- version = "v1.2.2" -- --[[projects]] -- digest = "1:51cf0fca93f4866709ceaf01b750e51d997c299a7bd2edf7ccd79e3b428754ae" -- name = "github.com/vmihailenco/msgpack" -- packages = [ -- ".", -- "codes", -- ] -- pruneopts = "" -- revision = "a053f3dac71df214bfe8b367f34220f0029c9c02" -- version = "v3.3.1" -- --[[projects]] -- digest = "1:afc0b8068986a01e2d8f449917829753a54f6bd4d1265c2b4ad9cba75560020f" -- name = "github.com/xanzy/ssh-agent" -- packages = ["."] -- pruneopts = "" -- revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c" -- version = "v0.2.0" -- --[[projects]] -- branch = "master" -- digest = "1:3cf699a0df65293cc8fd2339606950d3e2f6d02a435703951d1da411a23f7cef" -- name = "github.com/yudai/gojsondiff" -- packages = [ -- ".", -- "formatter", -- ] -- pruneopts = "" -- revision = "0525c875b75ca60b9e67ddc44496aa16f21066b0" -- --[[projects]] -- branch = "master" -- digest = "1:9857bb2293f372b2181004d8b62179bbdb4ab0982ec6f762abe6cf2bfedaff85" -- name = "github.com/yudai/golcs" -- packages = ["."] -- pruneopts = "" -- revision = "ecda9a501e8220fae3b4b600c3db4b0ba22cfc68" -- --[[projects]] -- branch = "master" -- digest = "1:525776d99293affd2c61dfb573007ff9f22863068c20c220ef3f58620758c341" -- name = "github.com/yuin/gopher-lua" -- packages = [ -- ".", -- "ast", -- "parse", -- "pm", -- ] -- pruneopts = "" -- revision = "732aa6820ec4fb93d60c4057dd574c33db8ad4e7" -- --[[projects]] -- branch = "master" -- digest = "1:2ea6df0f542cc95a5e374e9cdd81eaa599ed0d55366eef92d2f6b9efa2795c07" -- name = "golang.org/x/crypto" -- packages = [ -- "bcrypt", -- "blowfish", -- "cast5", -- "curve25519", -- "ed25519", -- "ed25519/internal/edwards25519", -- "internal/chacha20", -- "openpgp", -- "openpgp/armor", -- "openpgp/elgamal", -- "openpgp/errors", -- "openpgp/packet", -- "openpgp/s2k", -- "poly1305", -- "ssh", -- "ssh/agent", -- "ssh/knownhosts", -- "ssh/terminal", -- ] -- pruneopts = "" -- revision = "432090b8f568c018896cd8a0fb0345872bbac6ce" -- --[[projects]] -- branch = "master" -- digest = "1:b4ba046df563f56fe42b6270b20039107a37e1ab47c97aa47a16f848aa5b6d9a" -- name = "golang.org/x/net" -- packages = [ -- "context", -- "context/ctxhttp", -- "http2", -- "http2/hpack", -- "idna", -- "internal/timeseries", -- "lex/httplex", -- "trace", -- ] -- pruneopts = "" -- revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb" -- --[[projects]] -- digest = "1:8a58c605e58272e3d280181a24749b07499cf98968da6f7c1d19c8d5649c6b1b" -- name = "golang.org/x/oauth2" -- packages = [ -- ".", -- "google", -- "internal", -- "jws", -- "jwt", -- ] -- pruneopts = "" -- revision = "cce311a261e6fcf29de72ca96827bdb0b7d9c9e6" -- --[[projects]] -- branch = "master" -- digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1" -- name = "golang.org/x/sync" -- packages = [ -- "errgroup", -- "semaphore", -- ] -- pruneopts = "" -- revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca" -- --[[projects]] -- branch = "master" -- digest = "1:ed900376500543ca05f2a2383e1f541b4606f19cd22f34acb81b17a0b90c7f3e" -- name = "golang.org/x/sys" -- packages = [ -- "unix", -- "windows", -- ] -- pruneopts = "" -- revision = "d0be0721c37eeb5299f245a996a483160fc36940" -- --[[projects]] -- branch = "master" -- digest = "1:31985a0ed491dba5ba7fe92e18be008acd92ca9435ed9b35b06f3e6c00fd82cb" -- name = "golang.org/x/text" -- packages = [ -- "collate", -- "collate/build", -- "encoding", -- "encoding/internal", -- "encoding/internal/identifier", -- "encoding/unicode", -- "internal/colltab", -- "internal/gen", -- "internal/tag", -- "internal/triegen", -- "internal/ucd", -- "internal/utf8internal", -- "language", -- "runes", -- "secure/bidirule", -- "transform", -- "unicode/bidi", -- "unicode/cldr", -- "unicode/norm", -- "unicode/rangetable", -- "width", -- ] -- pruneopts = "" -- revision = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1" -- --[[projects]] -- branch = "master" -- digest = "1:55a681cb66f28755765fa5fa5104cbd8dc85c55c02d206f9f89566451e3fe1aa" -- name = "golang.org/x/time" -- packages = ["rate"] -- pruneopts = "" -- revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" -- --[[projects]] -- branch = "master" -- digest = "1:77e1d6ed91936b206979806b0aacbf817ec54b840803d8f8cd7a1de5bfbf92a4" -- name = "golang.org/x/tools" -- packages = [ -- "go/ast/astutil", -- "imports", -- ] -- pruneopts = "" -- revision = "5e776fee60db37e560cee3fb46db699d2f095386" -- --[[projects]] -- branch = "master" -- digest = "1:e9e4b928898842a138bc345d42aae33741baa6d64f3ca69b0931f9c7a4fd0437" -- name = "gonum.org/v1/gonum" -- packages = [ -- "blas", -- "blas/blas64", -- "blas/cblas128", -- "blas/gonum", -- "floats", -- "graph", -- "graph/internal/linear", -- "graph/internal/ordered", -- "graph/internal/set", -- "graph/internal/uid", -- "graph/iterator", -- "graph/simple", -- "graph/topo", -- "graph/traverse", -- "internal/asm/c128", -- "internal/asm/c64", -- "internal/asm/f32", -- "internal/asm/f64", -- "internal/cmplx64", -- "internal/math32", -- "lapack", -- "lapack/gonum", -- "lapack/lapack64", -- "mat", -- ] -- pruneopts = "" -- revision = "90b7154515874cee6c33cf56b29e257403a09a69" -- --[[projects]] -- digest = "1:934fb8966f303ede63aa405e2c8d7f0a427a05ea8df335dfdc1833dd4d40756f" -- name = "google.golang.org/appengine" -- packages = [ -- ".", -- "datastore", -- "internal", -- "internal/app_identity", -- "internal/base", -- "internal/datastore", -- "internal/log", -- "internal/modules", -- "internal/remote_api", -- "internal/urlfetch", -- "urlfetch", -- ] -- pruneopts = "" -- revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" -- version = "v1.0.0" -- --[[projects]] -- branch = "master" -- digest = "1:2d833b53e432cd69645da559b822661ebc5c0a13c571dee1c1f80fb1a0241330" -- name = "google.golang.org/genproto" -- packages = [ -- "googleapis/api/annotations", -- "googleapis/rpc/status", -- ] -- pruneopts = "" -- revision = "2b5a72b8730b0b16380010cfe5286c42108d88e7" -- --[[projects]] -- digest = "1:15656947b87a6a240e61dcfae9e71a55a8d5677f240d12ab48f02cdbabf1e309" -- name = "google.golang.org/grpc" -- packages = [ -- ".", -- "balancer", -- "balancer/base", -- "balancer/roundrobin", -- "codes", -- "connectivity", -- "credentials", -- "encoding", -- "encoding/proto", -- "grpclog", -- "internal", -- "internal/backoff", -- "internal/channelz", -- "internal/envconfig", -- "internal/grpcrand", -- "internal/transport", -- "keepalive", -- "metadata", -- "naming", -- "peer", -- "reflection", -- "reflection/grpc_reflection_v1alpha", -- "resolver", -- "resolver/dns", -- "resolver/passthrough", -- "stats", -- "status", -- "tap", -- ] -- pruneopts = "" -- revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1" -- version = "v1.15.0" -- --[[projects]] -- digest = "1:adf5b0ae3467c3182757ecb86fbfe819939473bb870a42789dc1a3e7729397cd" -- name = "gopkg.in/go-playground/webhooks.v5" -- packages = [ -- "bitbucket", -- "bitbucket-server", -- "github", -- "gitlab", -- "gogs", -- ] -- pruneopts = "" -- revision = "175186584584a83966dc9a7b8ec6c3d3a4ce6110" -- version = "v5.11.0" -- --[[projects]] -- digest = "1:e5d1fb981765b6f7513f793a3fcaac7158408cca77f75f7311ac82cc88e9c445" -- name = "gopkg.in/inf.v0" -- packages = ["."] -- pruneopts = "" -- revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" -- version = "v0.9.0" -- --[[projects]] -- branch = "v2" -- digest = "1:c80894778314c7fb90d94a5ab925214900e1341afeddc953cda7398b8cdcd006" -- name = "gopkg.in/mgo.v2" -- packages = [ -- "bson", -- "internal/json", -- ] -- pruneopts = "" -- revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655" -- --[[projects]] -- digest = "1:de0ec5755ee1a5e61f079c8855cf2073b5a5f614ae3b51db65f2c4e1044455fd" -- name = "gopkg.in/square/go-jose.v2" -- packages = [ -- ".", -- "cipher", -- "json", -- ] -- pruneopts = "" -- revision = "76dd09796242edb5b897103a75df2645c028c960" -- version = "v2.1.6" -- --[[projects]] -- digest = "1:c8f3ff1edaf7208bf7633e5952ffb8d697552343f8010aee12427400b434ae63" -- name = "gopkg.in/src-d/go-billy.v4" -- packages = [ -- ".", -- "helper/chroot", -- "helper/polyfill", -- "osfs", -- "util", -- ] -- pruneopts = "" -- revision = "59952543636f55de3f860b477b615093d5c2c3e4" -- version = "v4.2.1" -- --[[projects]] -- digest = "1:a72d911e18578e34367f4b849340501c7e6a2787a3a05651b3d53c6cb96990f4" -- name = "gopkg.in/src-d/go-git.v4" -- packages = [ -- ".", -- "config", -- "internal/revision", -- "plumbing", -- "plumbing/cache", -- "plumbing/filemode", -- "plumbing/format/config", -- "plumbing/format/diff", -- "plumbing/format/gitignore", -- "plumbing/format/idxfile", -- "plumbing/format/index", -- "plumbing/format/objfile", -- "plumbing/format/packfile", -- "plumbing/format/pktline", -- "plumbing/object", -- "plumbing/protocol/packp", -- "plumbing/protocol/packp/capability", -- "plumbing/protocol/packp/sideband", -- "plumbing/revlist", -- "plumbing/storer", -- "plumbing/transport", -- "plumbing/transport/client", -- "plumbing/transport/file", -- "plumbing/transport/git", -- "plumbing/transport/http", -- "plumbing/transport/internal/common", -- "plumbing/transport/server", -- "plumbing/transport/ssh", -- "storage", -- "storage/filesystem", -- "storage/filesystem/dotgit", -- "storage/memory", -- "utils/binary", -- "utils/diff", -- "utils/ioutil", -- "utils/merkletrie", -- "utils/merkletrie/filesystem", -- "utils/merkletrie/index", -- "utils/merkletrie/internal/frame", -- "utils/merkletrie/noder", -- ] -- pruneopts = "" -- revision = "a1f6ef44dfed1253ef7f3bc049f66b15f8fc2ab2" -- version = "v4.9.1" -- --[[projects]] -- digest = "1:ceec7e96590fb8168f36df4795fefe17051d4b0c2acc7ec4e260d8138c4dafac" -- name = "gopkg.in/warnings.v0" -- packages = ["."] -- pruneopts = "" -- revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b" -- version = "v0.1.2" -- --[[projects]] -- digest = "1:cedccf16b71e86db87a24f8d4c70b0a855872eb967cb906a66b95de56aefbd0d" -- name = "gopkg.in/yaml.v2" -- packages = ["."] -- pruneopts = "" -- revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" -- version = "v2.2.2" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:5e5cfbab57ea5444c1eb295a39fdc403f097f5ace592c829db7b3e0e3ea66903" -- name = "k8s.io/api" -- packages = [ -- "admission/v1", -- "admission/v1beta1", -- "admissionregistration/v1", -- "admissionregistration/v1beta1", -- "apps/v1", -- "apps/v1beta1", -- "apps/v1beta2", -- "auditregistration/v1alpha1", -- "authentication/v1", -- "authentication/v1beta1", -- "authorization/v1", -- "authorization/v1beta1", -- "autoscaling/v1", -- "autoscaling/v2beta1", -- "autoscaling/v2beta2", -- "batch/v1", -- "batch/v1beta1", -- "batch/v2alpha1", -- "certificates/v1beta1", -- "coordination/v1", -- "coordination/v1beta1", -- "core/v1", -- "discovery/v1alpha1", -- "events/v1beta1", -- "extensions/v1beta1", -- "imagepolicy/v1alpha1", -- "networking/v1", -- "networking/v1beta1", -- "node/v1alpha1", -- "node/v1beta1", -- "policy/v1beta1", -- "rbac/v1", -- "rbac/v1alpha1", -- "rbac/v1beta1", -- "scheduling/v1", -- "scheduling/v1alpha1", -- "scheduling/v1beta1", -- "settings/v1alpha1", -- "storage/v1", -- "storage/v1alpha1", -- "storage/v1beta1", -- ] -- pruneopts = "" -- revision = "195af9ec35214c6d98662c5791364285bf2e2cf2" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:7f29d62c07c68767171cf2ed8598e0cb862b99584bb8beb93189e2ed00ac520e" -- name = "k8s.io/apiextensions-apiserver" -- packages = [ -- "pkg/apis/apiextensions", -- "pkg/apis/apiextensions/v1", -- "pkg/apis/apiextensions/v1beta1", -- "pkg/client/clientset/clientset", -- "pkg/client/clientset/clientset/scheme", -- "pkg/client/clientset/clientset/typed/apiextensions/v1", -- "pkg/client/clientset/clientset/typed/apiextensions/v1beta1", -- "pkg/features", -- ] -- pruneopts = "" -- revision = "07afe84a85e43cf2503133660c424a0b594b21db" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:36db89a45a8cb3d565f7ebfd67dafd42c9c0bbb80d6bbd4991629b39b02a4c64" -- name = "k8s.io/apimachinery" -- packages = [ -- "pkg/api/equality", -- "pkg/api/errors", -- "pkg/api/meta", -- "pkg/api/resource", -- "pkg/api/validation", -- "pkg/api/validation/path", -- "pkg/apis/meta/internalversion", -- "pkg/apis/meta/v1", -- "pkg/apis/meta/v1/unstructured", -- "pkg/apis/meta/v1/unstructured/unstructuredscheme", -- "pkg/apis/meta/v1/validation", -- "pkg/apis/meta/v1beta1", -- "pkg/conversion", -- "pkg/conversion/queryparams", -- "pkg/fields", -- "pkg/labels", -- "pkg/runtime", -- "pkg/runtime/schema", -- "pkg/runtime/serializer", -- "pkg/runtime/serializer/json", -- "pkg/runtime/serializer/protobuf", -- "pkg/runtime/serializer/recognizer", -- "pkg/runtime/serializer/streaming", -- "pkg/runtime/serializer/versioning", -- "pkg/selection", -- "pkg/types", -- "pkg/util/cache", -- "pkg/util/clock", -- "pkg/util/diff", -- "pkg/util/duration", -- "pkg/util/errors", -- "pkg/util/framer", -- "pkg/util/httpstream", -- "pkg/util/httpstream/spdy", -- "pkg/util/intstr", -- "pkg/util/json", -- "pkg/util/jsonmergepatch", -- "pkg/util/mergepatch", -- "pkg/util/naming", -- "pkg/util/net", -- "pkg/util/remotecommand", -- "pkg/util/runtime", -- "pkg/util/sets", -- "pkg/util/strategicpatch", -- "pkg/util/validation", -- "pkg/util/validation/field", -- "pkg/util/wait", -- "pkg/util/yaml", -- "pkg/version", -- "pkg/watch", -- "third_party/forked/golang/json", -- "third_party/forked/golang/netutil", -- "third_party/forked/golang/reflect", -- ] -- pruneopts = "" -- revision = "72ed19daf4bb788ae595ae4103c404cb0fa09c84" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:4e236f3f94cfc5f005ceb143948ad39a4b2ad10373f394b232838f797bddd6ef" -- name = "k8s.io/apiserver" -- packages = [ -- "pkg/apis/audit", -- "pkg/authentication/serviceaccount", -- "pkg/authentication/user", -- "pkg/endpoints/request", -- "pkg/features", -- "pkg/util/feature", -- ] -- pruneopts = "" -- revision = "ebfe712c1fff40c4800d779470515e6025eda218" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:b46a88b317c3187b6fa7c5351eca48b35aad182eee371168677747430ff955bb" -- name = "k8s.io/cli-runtime" -- packages = [ -- "pkg/genericclioptions", -- "pkg/kustomize", -- "pkg/kustomize/k8sdeps", -- "pkg/kustomize/k8sdeps/configmapandsecret", -- "pkg/kustomize/k8sdeps/kunstruct", -- "pkg/kustomize/k8sdeps/kv", -- "pkg/kustomize/k8sdeps/transformer", -- "pkg/kustomize/k8sdeps/transformer/hash", -- "pkg/kustomize/k8sdeps/transformer/patch", -- "pkg/kustomize/k8sdeps/validator", -- "pkg/printers", -- "pkg/resource", -- ] -- pruneopts = "" -- revision = "6bff60de437070d7e8644b7a930837d5de512240" -- --[[projects]] -- branch = "release-13.0" -- digest = "1:84f90f6a3b5b16f2c57164c5281d302b2647da8f77aa9cb14d5ebeb17fccc25e" -- name = "k8s.io/client-go" -- packages = [ -- "discovery", -- "discovery/cached/disk", -- "discovery/fake", -- "dynamic", -- "dynamic/fake", -- "informers/core/v1", -- "informers/internalinterfaces", -- "kubernetes", -- "kubernetes/fake", -- "kubernetes/scheme", -- "kubernetes/typed/admissionregistration/v1", -- "kubernetes/typed/admissionregistration/v1/fake", -- "kubernetes/typed/admissionregistration/v1beta1", -- "kubernetes/typed/admissionregistration/v1beta1/fake", -- "kubernetes/typed/apps/v1", -- "kubernetes/typed/apps/v1/fake", -- "kubernetes/typed/apps/v1beta1", -- "kubernetes/typed/apps/v1beta1/fake", -- "kubernetes/typed/apps/v1beta2", -- "kubernetes/typed/apps/v1beta2/fake", -- "kubernetes/typed/auditregistration/v1alpha1", -- "kubernetes/typed/auditregistration/v1alpha1/fake", -- "kubernetes/typed/authentication/v1", -- "kubernetes/typed/authentication/v1/fake", -- "kubernetes/typed/authentication/v1beta1", -- "kubernetes/typed/authentication/v1beta1/fake", -- "kubernetes/typed/authorization/v1", -- "kubernetes/typed/authorization/v1/fake", -- "kubernetes/typed/authorization/v1beta1", -- "kubernetes/typed/authorization/v1beta1/fake", -- "kubernetes/typed/autoscaling/v1", -- "kubernetes/typed/autoscaling/v1/fake", -- "kubernetes/typed/autoscaling/v2beta1", -- "kubernetes/typed/autoscaling/v2beta1/fake", -- "kubernetes/typed/autoscaling/v2beta2", -- "kubernetes/typed/autoscaling/v2beta2/fake", -- "kubernetes/typed/batch/v1", -- "kubernetes/typed/batch/v1/fake", -- "kubernetes/typed/batch/v1beta1", -- "kubernetes/typed/batch/v1beta1/fake", -- "kubernetes/typed/batch/v2alpha1", -- "kubernetes/typed/batch/v2alpha1/fake", -- "kubernetes/typed/certificates/v1beta1", -- "kubernetes/typed/certificates/v1beta1/fake", -- "kubernetes/typed/coordination/v1", -- "kubernetes/typed/coordination/v1/fake", -- "kubernetes/typed/coordination/v1beta1", -- "kubernetes/typed/coordination/v1beta1/fake", -- "kubernetes/typed/core/v1", -- "kubernetes/typed/core/v1/fake", -- "kubernetes/typed/discovery/v1alpha1", -- "kubernetes/typed/discovery/v1alpha1/fake", -- "kubernetes/typed/events/v1beta1", -- "kubernetes/typed/events/v1beta1/fake", -- "kubernetes/typed/extensions/v1beta1", -- "kubernetes/typed/extensions/v1beta1/fake", -- "kubernetes/typed/networking/v1", -- "kubernetes/typed/networking/v1/fake", -- "kubernetes/typed/networking/v1beta1", -- "kubernetes/typed/networking/v1beta1/fake", -- "kubernetes/typed/node/v1alpha1", -- "kubernetes/typed/node/v1alpha1/fake", -- "kubernetes/typed/node/v1beta1", -- "kubernetes/typed/node/v1beta1/fake", -- "kubernetes/typed/policy/v1beta1", -- "kubernetes/typed/policy/v1beta1/fake", -- "kubernetes/typed/rbac/v1", -- "kubernetes/typed/rbac/v1/fake", -- "kubernetes/typed/rbac/v1alpha1", -- "kubernetes/typed/rbac/v1alpha1/fake", -- "kubernetes/typed/rbac/v1beta1", -- "kubernetes/typed/rbac/v1beta1/fake", -- "kubernetes/typed/scheduling/v1", -- "kubernetes/typed/scheduling/v1/fake", -- "kubernetes/typed/scheduling/v1alpha1", -- "kubernetes/typed/scheduling/v1alpha1/fake", -- "kubernetes/typed/scheduling/v1beta1", -- "kubernetes/typed/scheduling/v1beta1/fake", -- "kubernetes/typed/settings/v1alpha1", -- "kubernetes/typed/settings/v1alpha1/fake", -- "kubernetes/typed/storage/v1", -- "kubernetes/typed/storage/v1/fake", -- "kubernetes/typed/storage/v1alpha1", -- "kubernetes/typed/storage/v1alpha1/fake", -- "kubernetes/typed/storage/v1beta1", -- "kubernetes/typed/storage/v1beta1/fake", -- "listers/core/v1", -- "pkg/apis/clientauthentication", -- "pkg/apis/clientauthentication/v1alpha1", -- "pkg/apis/clientauthentication/v1beta1", -- "pkg/version", -- "plugin/pkg/client/auth/exec", -- "plugin/pkg/client/auth/gcp", -- "plugin/pkg/client/auth/oidc", -- "rest", -- "rest/watch", -- "restmapper", -- "scale", -- "scale/scheme", -- "scale/scheme/appsint", -- "scale/scheme/appsv1beta1", -- "scale/scheme/appsv1beta2", -- "scale/scheme/autoscalingv1", -- "scale/scheme/extensionsint", -- "scale/scheme/extensionsv1beta1", -- "testing", -- "third_party/forked/golang/template", -- "tools/auth", -- "tools/cache", -- "tools/clientcmd", -- "tools/clientcmd/api", -- "tools/clientcmd/api/latest", -- "tools/clientcmd/api/v1", -- "tools/metrics", -- "tools/pager", -- "tools/portforward", -- "tools/reference", -- "tools/remotecommand", -- "tools/watch", -- "transport", -- "transport/spdy", -- "util/cert", -- "util/connrotation", -- "util/exec", -- "util/flowcontrol", -- "util/homedir", -- "util/jsonpath", -- "util/keyutil", -- "util/retry", -- "util/workqueue", -- ] -- pruneopts = "" -- revision = "85029d69edeae82e97dd1a0de3b24668cee9a15d" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:254da4cb69b3776686b730a206e081e6f8898bb64760619d1895c25c407e718f" -- name = "k8s.io/code-generator" -- packages = [ -- "cmd/go-to-protobuf", -- "cmd/go-to-protobuf/protobuf", -- "pkg/util", -- "third_party/forked/golang/reflect", -- ] -- pruneopts = "" -- revision = "8e001e5d18949be7e823ccb9cfe9b60026e7bda0" -- --[[projects]] -- branch = "master" -- digest = "1:06c18e328063f3612dfda3c4c5e5b8becda1eabceca689335c8d98704dffe70a" -- name = "k8s.io/component-base" -- packages = ["featuregate"] -- pruneopts = "" -- revision = "435ce712a6949916fa293dc4d3d49429962043d8" -- --[[projects]] -- branch = "master" -- digest = "1:6a2a63e09a59caff3fd2d36d69b7b92c2fe7cf783390f0b7349fb330820f9a8e" -- name = "k8s.io/gengo" -- packages = [ -- "args", -- "examples/set-gen/sets", -- "generator", -- "namer", -- "parser", -- "types", -- ] -- pruneopts = "" -- revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985" -- --[[projects]] -- digest = "1:9eaf86f4f6fb4a8f177220d488ef1e3255d06a691cca95f14ef085d4cd1cef3c" -- name = "k8s.io/klog" -- packages = ["."] -- pruneopts = "" -- revision = "d98d8acdac006fb39831f1b25640813fef9c314f" -- version = "v0.3.3" -- --[[projects]] -- branch = "master" -- digest = "1:0d737d598e9db0a38d6ef6cba514c358b9fe7e1bc6b1128d02b2622700c75f2a" -- name = "k8s.io/kube-aggregator" -- packages = [ -- "pkg/apis/apiregistration", -- "pkg/apis/apiregistration/v1", -- "pkg/apis/apiregistration/v1beta1", -- ] -- pruneopts = "" -- revision = "e80910364765199a4baebd4dec54c885fe52b680" -- --[[projects]] -- digest = "1:16a343bd9d820ae320de4d1eaa8acc7a214aac4b38fb21d03255d3a457d861df" -- name = "k8s.io/kube-openapi" -- packages = [ -- "cmd/openapi-gen", -- "cmd/openapi-gen/args", -- "pkg/common", -- "pkg/generators", -- "pkg/generators/rules", -- "pkg/util/proto", -- "pkg/util/proto/validation", -- "pkg/util/sets", -- ] -- pruneopts = "" -- revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:687af22932f9b53ff2e6755b2eefe160f076d522794abb980f0ddb187bcefacd" -- name = "k8s.io/kubectl" -- packages = [ -- "pkg/cmd/apply", -- "pkg/cmd/delete", -- "pkg/cmd/util", -- "pkg/cmd/util/editor", -- "pkg/cmd/util/editor/crlf", -- "pkg/cmd/wait", -- "pkg/describe", -- "pkg/describe/versioned", -- "pkg/generated", -- "pkg/rawhttp", -- "pkg/scheme", -- "pkg/util", -- "pkg/util/certificate", -- "pkg/util/deployment", -- "pkg/util/event", -- "pkg/util/fieldpath", -- "pkg/util/i18n", -- "pkg/util/interrupt", -- "pkg/util/openapi", -- "pkg/util/openapi/validation", -- "pkg/util/printers", -- "pkg/util/qos", -- "pkg/util/rbac", -- "pkg/util/resource", -- "pkg/util/slice", -- "pkg/util/storage", -- "pkg/util/templates", -- "pkg/util/term", -- "pkg/validation", -- "pkg/version", -- ] -- pruneopts = "" -- revision = "14647fd13a8b4cffc5a8f327b0018e037f72e4e8" -- --[[projects]] -- branch = "release-1.16" -- digest = "1:02241e5570c239d31e52955b1a8e6d603a35fd6542d14e98882fb6c3c4ef3d56" -- name = "k8s.io/kubernetes" -- packages = [ -- "pkg/api/legacyscheme", -- "pkg/api/v1/pod", -- "pkg/apis/apps", -- "pkg/apis/apps/install", -- "pkg/apis/apps/v1", -- "pkg/apis/apps/v1beta1", -- "pkg/apis/apps/v1beta2", -- "pkg/apis/authentication", -- "pkg/apis/authentication/install", -- "pkg/apis/authentication/v1", -- "pkg/apis/authentication/v1beta1", -- "pkg/apis/authorization", -- "pkg/apis/authorization/install", -- "pkg/apis/authorization/v1", -- "pkg/apis/authorization/v1beta1", -- "pkg/apis/autoscaling", -- "pkg/apis/autoscaling/install", -- "pkg/apis/autoscaling/v1", -- "pkg/apis/autoscaling/v2beta1", -- "pkg/apis/autoscaling/v2beta2", -- "pkg/apis/batch", -- "pkg/apis/batch/install", -- "pkg/apis/batch/v1", -- "pkg/apis/batch/v1beta1", -- "pkg/apis/batch/v2alpha1", -- "pkg/apis/certificates", -- "pkg/apis/certificates/install", -- "pkg/apis/certificates/v1beta1", -- "pkg/apis/coordination", -- "pkg/apis/coordination/install", -- "pkg/apis/coordination/v1", -- "pkg/apis/coordination/v1beta1", -- "pkg/apis/core", -- "pkg/apis/core/install", -- "pkg/apis/core/v1", -- "pkg/apis/events", -- "pkg/apis/events/install", -- "pkg/apis/events/v1beta1", -- "pkg/apis/extensions", -- "pkg/apis/extensions/install", -- "pkg/apis/extensions/v1beta1", -- "pkg/apis/networking", -- "pkg/apis/policy", -- "pkg/apis/policy/install", -- "pkg/apis/policy/v1beta1", -- "pkg/apis/rbac", -- "pkg/apis/rbac/install", -- "pkg/apis/rbac/v1", -- "pkg/apis/rbac/v1alpha1", -- "pkg/apis/rbac/v1beta1", -- "pkg/apis/scheduling", -- "pkg/apis/scheduling/install", -- "pkg/apis/scheduling/v1", -- "pkg/apis/scheduling/v1alpha1", -- "pkg/apis/scheduling/v1beta1", -- "pkg/apis/settings", -- "pkg/apis/settings/install", -- "pkg/apis/settings/v1alpha1", -- "pkg/apis/storage", -- "pkg/apis/storage/install", -- "pkg/apis/storage/v1", -- "pkg/apis/storage/v1alpha1", -- "pkg/apis/storage/v1beta1", -- "pkg/features", -- "pkg/kubectl/cmd/auth", -- "pkg/registry/rbac/reconciliation", -- "pkg/registry/rbac/validation", -- "pkg/util/node", -- "pkg/util/parsers", -- "pkg/util/slice", -- "pkg/util/workqueue/prometheus", -- ] -- pruneopts = "" -- revision = "bfafae8f1c2fdf3c3cfef04674db028531a7c098" -- --[[projects]] -- branch = "master" -- digest = "1:a8a2e6bbef691323b833d0eb11bb0e570e7eb9619ac76f7b11265530e1cac922" -- name = "k8s.io/utils" -- packages = [ -- "buffer", -- "exec", -- "integer", -- "net", -- "pointer", -- "trace", -- ] -- pruneopts = "" -- revision = "6ca3b61696b65b0e81f1a39b4937fc2d2994ed6a" -- --[[projects]] -- branch = "master" -- digest = "1:9b9f12f4c13ca4a4f4b4554c00ba46cb2910ff4079825d96d520b03c447e6da5" -- name = "layeh.com/gopher-json" -- packages = ["."] -- pruneopts = "" -- revision = "97fed8db84274c421dbfffbb28ec859901556b97" -- --[[projects]] -- digest = "1:0b2daace3dcced8712072529b621360cf520f3c2ead92d755f35a0ec8dca2714" -- name = "sigs.k8s.io/kustomize" -- packages = [ -- "pkg/commands/build", -- "pkg/constants", -- "pkg/expansion", -- "pkg/factory", -- "pkg/fs", -- "pkg/git", -- "pkg/gvk", -- "pkg/ifc", -- "pkg/ifc/transformer", -- "pkg/image", -- "pkg/internal/error", -- "pkg/loader", -- "pkg/patch", -- "pkg/patch/transformer", -- "pkg/resid", -- "pkg/resmap", -- "pkg/resource", -- "pkg/target", -- "pkg/transformers", -- "pkg/transformers/config", -- "pkg/transformers/config/defaultconfig", -- "pkg/types", -- ] -- pruneopts = "" -- revision = "a6f65144121d1955266b0cd836ce954c04122dc8" -- version = "v2.0.3" -- --[[projects]] -- digest = "1:321081b4a44256715f2b68411d8eda9a17f17ebfe6f0cc61d2cc52d11c08acfa" -- name = "sigs.k8s.io/yaml" -- packages = ["."] -- pruneopts = "" -- revision = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480" -- version = "v1.1.0" -- --[solve-meta] -- analyzer-name = "dep" -- analyzer-version = 1 -- input-imports = [ -- "bou.ke/monkey", -- "github.com/Masterminds/semver", -- "github.com/TomOnTime/utfutil", -- "github.com/argoproj/pkg/errors", -- "github.com/argoproj/pkg/exec", -- "github.com/argoproj/pkg/time", -- "github.com/casbin/casbin", -- "github.com/casbin/casbin/model", -- "github.com/coreos/go-oidc", -- "github.com/dgrijalva/jwt-go", -- "github.com/dustin/go-humanize", -- "github.com/evanphx/json-patch", -- "github.com/ghodss/yaml", -- "github.com/go-openapi/loads", -- "github.com/go-openapi/runtime/middleware", -- "github.com/go-openapi/spec", -- "github.com/go-redis/cache", -- "github.com/go-redis/redis", -- "github.com/gobuffalo/packr", -- "github.com/gobwas/glob", -- "github.com/gogits/go-gogs-client", -- "github.com/gogo/protobuf/gogoproto", -- "github.com/gogo/protobuf/proto", -- "github.com/gogo/protobuf/protoc-gen-gofast", -- "github.com/gogo/protobuf/protoc-gen-gogofast", -- "github.com/gogo/protobuf/sortkeys", -- "github.com/golang/protobuf/proto", -- "github.com/golang/protobuf/protoc-gen-go", -- "github.com/golang/protobuf/ptypes/empty", -- "github.com/google/go-jsonnet", -- "github.com/google/shlex", -- "github.com/grpc-ecosystem/go-grpc-middleware", -- "github.com/grpc-ecosystem/go-grpc-middleware/auth", -- "github.com/grpc-ecosystem/go-grpc-middleware/logging", -- "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus", -- "github.com/grpc-ecosystem/go-grpc-middleware/retry", -- "github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus", -- "github.com/grpc-ecosystem/go-grpc-prometheus", -- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway", -- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger", -- "github.com/grpc-ecosystem/grpc-gateway/runtime", -- "github.com/grpc-ecosystem/grpc-gateway/utilities", -- "github.com/improbable-eng/grpc-web/go/grpcweb", -- "github.com/kballard/go-shellquote", -- "github.com/patrickmn/go-cache", -- "github.com/pkg/errors", -- "github.com/prometheus/client_golang/prometheus", -- "github.com/prometheus/client_golang/prometheus/promhttp", -- "github.com/robfig/cron", -- "github.com/sirupsen/logrus", -- "github.com/sirupsen/logrus/hooks/test", -- "github.com/skratchdot/open-golang/open", -- "github.com/soheilhy/cmux", -- "github.com/spf13/cobra", -- "github.com/spf13/pflag", -- "github.com/stretchr/testify/assert", -- "github.com/stretchr/testify/mock", -- "github.com/vmihailenco/msgpack", -- "github.com/yudai/gojsondiff", -- "github.com/yudai/gojsondiff/formatter", -- "github.com/yuin/gopher-lua", -- "golang.org/x/crypto/bcrypt", -- "golang.org/x/crypto/ssh", -- "golang.org/x/crypto/ssh/knownhosts", -- "golang.org/x/crypto/ssh/terminal", -- "golang.org/x/net/context", -- "golang.org/x/oauth2", -- "golang.org/x/sync/errgroup", -- "golang.org/x/sync/semaphore", -- "google.golang.org/genproto/googleapis/api/annotations", -- "google.golang.org/grpc", -- "google.golang.org/grpc/codes", -- "google.golang.org/grpc/credentials", -- "google.golang.org/grpc/grpclog", -- "google.golang.org/grpc/metadata", -- "google.golang.org/grpc/reflection", -- "google.golang.org/grpc/status", -- "gopkg.in/go-playground/webhooks.v5/bitbucket", -- "gopkg.in/go-playground/webhooks.v5/bitbucket-server", -- "gopkg.in/go-playground/webhooks.v5/github", -- "gopkg.in/go-playground/webhooks.v5/gitlab", -- "gopkg.in/go-playground/webhooks.v5/gogs", -- "gopkg.in/src-d/go-git.v4", -- "gopkg.in/src-d/go-git.v4/config", -- "gopkg.in/src-d/go-git.v4/plumbing", -- "gopkg.in/src-d/go-git.v4/plumbing/transport", -- "gopkg.in/src-d/go-git.v4/plumbing/transport/client", -- "gopkg.in/src-d/go-git.v4/plumbing/transport/http", -- "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh", -- "gopkg.in/src-d/go-git.v4/storage/memory", -- "gopkg.in/src-d/go-git.v4/utils/ioutil", -- "gopkg.in/yaml.v2", -- "k8s.io/api/apps/v1", -- "k8s.io/api/batch/v1", -- "k8s.io/api/core/v1", -- "k8s.io/api/extensions/v1beta1", -- "k8s.io/api/networking/v1beta1", -- "k8s.io/api/rbac/v1", -- "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", -- "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset", -- "k8s.io/apimachinery/pkg/api/equality", -- "k8s.io/apimachinery/pkg/api/errors", -- "k8s.io/apimachinery/pkg/apis/meta/v1", -- "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", -- "k8s.io/apimachinery/pkg/fields", -- "k8s.io/apimachinery/pkg/labels", -- "k8s.io/apimachinery/pkg/runtime", -- "k8s.io/apimachinery/pkg/runtime/schema", -- "k8s.io/apimachinery/pkg/runtime/serializer", -- "k8s.io/apimachinery/pkg/selection", -- "k8s.io/apimachinery/pkg/types", -- "k8s.io/apimachinery/pkg/util/intstr", -- "k8s.io/apimachinery/pkg/util/jsonmergepatch", -- "k8s.io/apimachinery/pkg/util/runtime", -- "k8s.io/apimachinery/pkg/util/strategicpatch", -- "k8s.io/apimachinery/pkg/util/wait", -- "k8s.io/apimachinery/pkg/watch", -- "k8s.io/cli-runtime/pkg/genericclioptions", -- "k8s.io/cli-runtime/pkg/printers", -- "k8s.io/client-go/discovery", -- "k8s.io/client-go/discovery/fake", -- "k8s.io/client-go/dynamic", -- "k8s.io/client-go/dynamic/fake", -- "k8s.io/client-go/informers/core/v1", -- "k8s.io/client-go/kubernetes", -- "k8s.io/client-go/kubernetes/fake", -- "k8s.io/client-go/kubernetes/scheme", -- "k8s.io/client-go/listers/core/v1", -- "k8s.io/client-go/plugin/pkg/client/auth/gcp", -- "k8s.io/client-go/plugin/pkg/client/auth/oidc", -- "k8s.io/client-go/rest", -- "k8s.io/client-go/testing", -- "k8s.io/client-go/tools/cache", -- "k8s.io/client-go/tools/clientcmd", -- "k8s.io/client-go/tools/clientcmd/api", -- "k8s.io/client-go/tools/portforward", -- "k8s.io/client-go/transport/spdy", -- "k8s.io/client-go/util/flowcontrol", -- "k8s.io/client-go/util/workqueue", -- "k8s.io/code-generator/cmd/go-to-protobuf", -- "k8s.io/klog", -- "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1", -- "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1", -- "k8s.io/kube-openapi/cmd/openapi-gen", -- "k8s.io/kube-openapi/pkg/common", -- "k8s.io/kubectl/pkg/cmd/apply", -- "k8s.io/kubectl/pkg/cmd/util", -- "k8s.io/kubectl/pkg/scheme", -- "k8s.io/kubectl/pkg/util/term", -- "k8s.io/kubernetes/pkg/api/legacyscheme", -- "k8s.io/kubernetes/pkg/api/v1/pod", -- "k8s.io/kubernetes/pkg/apis/apps/install", -- "k8s.io/kubernetes/pkg/apis/authentication/install", -- "k8s.io/kubernetes/pkg/apis/authorization/install", -- "k8s.io/kubernetes/pkg/apis/autoscaling/install", -- "k8s.io/kubernetes/pkg/apis/batch/install", -- "k8s.io/kubernetes/pkg/apis/certificates/install", -- "k8s.io/kubernetes/pkg/apis/coordination/install", -- "k8s.io/kubernetes/pkg/apis/core", -- "k8s.io/kubernetes/pkg/apis/core/install", -- "k8s.io/kubernetes/pkg/apis/events/install", -- "k8s.io/kubernetes/pkg/apis/extensions/install", -- "k8s.io/kubernetes/pkg/apis/policy/install", -- "k8s.io/kubernetes/pkg/apis/rbac/install", -- "k8s.io/kubernetes/pkg/apis/scheduling/install", -- "k8s.io/kubernetes/pkg/apis/settings/install", -- "k8s.io/kubernetes/pkg/apis/storage/install", -- "k8s.io/kubernetes/pkg/kubectl/cmd/auth", -- "k8s.io/kubernetes/pkg/util/node", -- "k8s.io/kubernetes/pkg/util/slice", -- "k8s.io/kubernetes/pkg/util/workqueue/prometheus", -- "k8s.io/utils/pointer", -- "layeh.com/gopher-json", -- ] -- solver-name = "gps-cdcl" -- solver-version = 1 -diff --git a/Gopkg.toml b/Gopkg.toml -deleted file mode 100644 -index 2fa04ee4..00000000 ---- a/Gopkg.toml -+++ /dev/null -@@ -1,117 +0,0 @@ --# Packages should only be added to the following list when we use them *outside* of our go code. --# (e.g. we want to build the binary to invoke as part of the build process, such as in --# generate-proto.sh). Normal use of golang packages should be added via `dep ensure`, and pinned --# with a [[constraint]] or [[override]] when version is important. --required = [ -- "github.com/golang/protobuf/protoc-gen-go", -- "github.com/gogo/protobuf/protoc-gen-gofast", -- "github.com/gogo/protobuf/protoc-gen-gogofast", -- "k8s.io/code-generator/cmd/go-to-protobuf", -- "k8s.io/kube-openapi/cmd/openapi-gen", -- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway", -- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger", -- "golang.org/x/sync/errgroup", --] -- --[[constraint]] -- name = "google.golang.org/grpc" -- version = "1.15.0" -- --[[constraint]] -- name = "github.com/gogo/protobuf" -- version = "1.3.1" -- --# override github.com/grpc-ecosystem/go-grpc-middleware's constraint on master --[[override]] -- name = "github.com/golang/protobuf" -- version = "1.2.0" -- --[[constraint]] -- name = "github.com/grpc-ecosystem/grpc-gateway" -- version = "v1.3.1" -- --# prometheus does not believe in semversioning yet --[[constraint]] -- name = "github.com/prometheus/client_golang" -- revision = "7858729281ec582767b20e0d696b6041d995d5e0" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/api" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/kubernetes" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/code-generator" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/apimachinery" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/apiextensions-apiserver" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/apiserver" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/kubectl" -- --[[override]] -- branch = "release-1.16" -- name = "k8s.io/cli-runtime" -- --[[override]] -- version = "2.0.3" -- name = "sigs.k8s.io/kustomize" -- --# ASCIIRenderer does not implement blackfriday.Renderer --[[override]] -- name = "github.com/russross/blackfriday" -- version = "1.5.2" -- --[[override]] -- branch = "release-13.0" -- name = "k8s.io/client-go" -- --[[override]] -- name = "github.com/casbin/casbin" -- version = "1.9.1" -- --[[constraint]] -- name = "github.com/stretchr/testify" -- version = "1.2.2" -- --[[constraint]] -- name = "github.com/gobuffalo/packr" -- version = "v1.11.0" -- --[[constraint]] -- branch = "master" -- name = "github.com/argoproj/pkg" -- --[[constraint]] -- branch = "master" -- name = "github.com/yudai/gojsondiff" -- --# Fixes: Could not introduce sigs.k8s.io/kustomize@v2.0.3, as it has a dependency on github.com/spf13/cobra with constraint ^0.0.2, which has no overlap with existing constraint 0.0.5 from (root) --[[override]] -- name = "github.com/spf13/cobra" -- revision = "0.0.5" -- --# TODO: move off of k8s.io/kube-openapi and use controller-tools for CRD spec generation --# (override argoproj/argo contraint on master) --[[override]] -- revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1" -- name = "k8s.io/kube-openapi" -- --# jsonpatch replace operation does not apply: doc is missing key: /metadata/annotations --[[override]] -- name = "github.com/evanphx/json-patch" -- version = "v4.1.0" -diff --git a/go.mod b/go.mod -new file mode 100644 -index 00000000..2e741ab3 ---- /dev/null -+++ b/go.mod -@@ -0,0 +1,114 @@ -+module github.com/argoproj/argo-cd -+ -+go 1.12 -+ -+require ( -+ bou.ke/monkey v1.0.1 -+ github.com/Masterminds/semver v1.4.2 -+ github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d -+ github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4 -+ github.com/casbin/casbin v1.9.1 -+ github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect -+ github.com/coreos/go-oidc v2.1.0+incompatible -+ github.com/dgrijalva/jwt-go v3.2.0+incompatible -+ github.com/docker/docker v1.6.0-rc5 // indirect -+ github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect -+ github.com/dustin/go-humanize v1.0.0 -+ github.com/evanphx/json-patch v4.5.0+incompatible -+ github.com/ghodss/yaml v1.0.0 -+ github.com/go-openapi/loads v0.19.2 -+ github.com/go-openapi/runtime v0.19.0 -+ github.com/go-openapi/spec v0.19.2 -+ github.com/go-redis/cache v6.3.5+incompatible -+ github.com/go-redis/redis v6.15.1+incompatible -+ github.com/gobuffalo/packr v1.11.0 -+ github.com/gobwas/glob v0.2.3 -+ github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 -+ github.com/gogo/protobuf v1.3.1 -+ github.com/golang/protobuf v1.3.1 -+ github.com/google/btree v1.0.0 // indirect -+ github.com/google/go-cmp v0.3.1 // indirect -+ github.com/google/go-jsonnet v0.10.0 -+ github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf -+ github.com/googleapis/gnostic v0.1.0 // indirect -+ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect -+ github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 -+ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 -+ github.com/grpc-ecosystem/grpc-gateway v1.3.1 -+ github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a -+ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect -+ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 -+ github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 // indirect -+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect -+ github.com/patrickmn/go-cache v2.1.0+incompatible -+ github.com/pkg/errors v0.8.1 -+ github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d // indirect -+ github.com/prometheus/client_golang v0.9.2 -+ github.com/robfig/cron v1.1.0 -+ github.com/rs/cors v1.6.0 // indirect -+ github.com/sirupsen/logrus v1.4.2 -+ github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c -+ github.com/soheilhy/cmux v0.1.4 -+ github.com/spf13/cobra v0.0.5 -+ github.com/spf13/pflag v1.0.5 -+ github.com/stretchr/testify v1.3.0 -+ github.com/vmihailenco/msgpack v3.3.1+incompatible -+ github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c -+ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect -+ github.com/yudai/pp v2.0.1+incompatible // indirect -+ github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 -+ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 -+ golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 -+ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 -+ golang.org/x/sync v0.0.0-20190423024810-112230192c58 -+ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 -+ google.golang.org/grpc v1.23.0 -+ gopkg.in/go-playground/webhooks.v5 v5.11.0 -+ gopkg.in/src-d/go-git.v4 v4.9.1 -+ gopkg.in/yaml.v2 v2.2.8 -+ k8s.io/api v0.0.0 -+ k8s.io/apiextensions-apiserver v0.0.0 -+ k8s.io/apimachinery v0.16.5-beta.1 -+ k8s.io/cli-runtime v0.0.0 -+ k8s.io/client-go v0.0.0 -+ k8s.io/klog v1.0.0 -+ k8s.io/kube-aggregator v0.0.0 -+ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a -+ k8s.io/kubectl v0.0.0 -+ k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f -+ k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 -+ layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 -+) -+ -+replace ( -+ k8s.io/api => k8s.io/api v0.0.0-20200131112707-d64dbec685a4 -+ k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e -+ k8s.io/apimachinery => k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9 -+ k8s.io/apiserver => k8s.io/apiserver v0.0.0-20200208192130-2d005a048922 -+ k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442 -+ k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48 -+ k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb -+ k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18 -+ k8s.io/code-generator => k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0 -+ k8s.io/component-base => k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd -+ k8s.io/cri-api => k8s.io/cri-api v0.16.8-beta.0 -+ k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3 -+ k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505 -+ k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 -+ k8s.io/klog => k8s.io/klog v0.4.0 -+ k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007 -+ k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d -+ k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf -+ k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f -+ k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863 -+ k8s.io/kubectl => k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f -+ k8s.io/kubelet => k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4 -+ k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3 -+ k8s.io/metrics => k8s.io/metrics v0.0.0-20200131120008-5c623d74062d -+ k8s.io/node-api => k8s.io/node-api v0.0.0-20200131122255-04077c800298 -+ k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 -+ k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173 -+ k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20200131120425-dca0863cb511 -+ k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20200131115407-2b45fb79af22 -+ k8s.io/utils => k8s.io/utils v0.0.0-20190801114015-581e00157fb1 -+) -diff --git a/go.sum b/go.sum -new file mode 100644 -index 00000000..3d39244f ---- /dev/null -+++ b/go.sum -@@ -0,0 +1,700 @@ -+bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM= -+bou.ke/monkey v1.0.1 h1:zEMLInw9xvNakzUUPjfS4Ds6jYPqCFx3m7bRmG5NH2U= -+bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg= -+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -+cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= -+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -+github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -+github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= -+github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= -+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -+github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -+github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= -+github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= -+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= -+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= -+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= -+github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= -+github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -+github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= -+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= -+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -+github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= -+github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d h1:WtAMR0fPCOfK7TPGZ8ZpLLY18HRvL7XJ3xcs0wnREgo= -+github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d/go.mod h1:WML6KOYjeU8N6YyusMjj2qRvaPNUEvrQvaxuFcMRFJY= -+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= -+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= -+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= -+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= -+github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4 h1:ykGEoo3WuCNoqO+rnaa0j/RdYfXZFp5Aqim+CjzdBaQ= -+github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4/go.mod h1:2EZ44RG/CcgtPTwrRR0apOc7oU6UIw8GjCUJWZ8X3bM= -+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= -+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -+github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM= -+github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -+github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us= -+github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU= -+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= -+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -+github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU= -+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -+github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -+github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E= -+github.com/casbin/casbin v1.9.1 h1:ucjbS5zTrmSLtH4XogqOG920Poe6QatdXtz1FEbApeM= -+github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog= -+github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -+github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY= -+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -+github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U= -+github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -+github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho= -+github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= -+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -+github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= -+github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= -+github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= -+github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4= -+github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -+github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -+github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -+github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -+github.com/coredns/corefile-migration v1.0.2/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E= -+github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -+github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -+github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= -+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -+github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -+github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1hF1U= -+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -+github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= -+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= -+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -+github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= -+github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -+github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -+github.com/docker/docker v1.6.0-rc5 h1:8dnqiCOcZf2QXwR4LNnG7AK9hXeeT6adGmtjicsVswc= -+github.com/docker/docker v1.6.0-rc5/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -+github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -+github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= -+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -+github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s= -+github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= -+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M= -+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -+github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= -+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -+github.com/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo= -+github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -+github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= -+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= -+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -+github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= -+github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -+github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8= -+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= -+github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= -+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -+github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -+github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw= -+github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= -+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -+github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M= -+github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= -+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -+github.com/go-openapi/analysis v0.19.2 h1:ophLETFestFZHk3ji7niPEL4d466QjW+0Tdg5VyDq7E= -+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -+github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY= -+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w= -+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w= -+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -+github.com/go-openapi/loads v0.19.2 h1:rf5ArTHmIJxyV5Oiks+Su0mUens1+AjpkPoWr5xFRcI= -+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -+github.com/go-openapi/runtime v0.19.0 h1:sU6pp4dSV2sGlNKKyHxZzi1m1kG4WnYtWcJ+HYbygjE= -+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -+github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -+github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE= -+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= -+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -+github.com/go-openapi/strfmt v0.19.0 h1:0Dn9qy1G9+UJfRU7TR8bmdGxb4uifB7HNrJjOnV0yPk= -+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= -+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -+github.com/go-openapi/validate v0.19.2 h1:ky5l57HjyVRrsJfd2+Ro5Z9PjGuKbsmftwyMtk8H7js= -+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -+github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= -+github.com/go-redis/cache v6.3.5+incompatible h1:4OUyoXXYRRQ6tKA4ue3TlPUkBzk3occzjtXBZBxCzgs= -+github.com/go-redis/cache v6.3.5+incompatible/go.mod h1:XNnMdvlNjcZvHjsscEozHAeOeSE5riG9Fj54meG4WT4= -+github.com/go-redis/redis v6.15.1+incompatible h1:BZ9s4/vHrIqwOb0OPtTQ5uABxETJ3NRuUNoSUurnkew= -+github.com/go-redis/redis v6.15.1+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -+github.com/gobuffalo/packr v1.11.0 h1:lxysfHcxVCWGNMHzKABP7ZEL3A7iIVYfkev/D7AR0aM= -+github.com/gobuffalo/packr v1.11.0/go.mod h1:rYwMLC6NXbAbkKb+9j3NTKbxSswkKLlelZYccr4HYVw= -+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -+github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -+github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 h1:BbwX8wsMRDZRdNYxAna+4ls3wvMKJyn4PT6Zk1CPxP4= -+github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0= -+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= -+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= -+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= -+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= -+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= -+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= -+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -+github.com/google/cadvisor v0.34.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48= -+github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= -+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -+github.com/google/go-jsonnet v0.10.0 h1:NzmG/5DRTYDjNnsL/OmX6wT+ByeKbSoRoV6VxOy+QdM= -+github.com/google/go-jsonnet v0.10.0/go.mod h1:gVu3UVSfOt5fRFq+dh9duBqXa5905QY8S1QvMNcEIVs= -+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= -+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= -+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -+github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf h1:7+FW5aGwISbqUtkfmIpZJGRgNFg2ioYPvFaUxdqpDsg= -+github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= -+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -+github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI= -+github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= -+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -+github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= -+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -+github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= -+github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 h1:lR9ssWAqp9qL0bALxqEEkuudiP1eweOdv9jsRK3e7lE= -+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= -+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -+github.com/grpc-ecosystem/grpc-gateway v1.3.1 h1:k2neygAEBYavP90THffKBVlkASdxu4XiI8cAWuL3MG0= -+github.com/grpc-ecosystem/grpc-gateway v1.3.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -+github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= -+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -+github.com/heketi/heketi v9.0.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o= -+github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI= -+github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4= -+github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s= -+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -+github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= -+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -+github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a h1:RweVA0vnEyStwtAelyGmnU8ENDnwd1Q7pQr7U3J/rXo= -+github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs= -+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= -+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -+github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8= -+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -+github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= -+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= -+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= -+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -+github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= -+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -+github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8= -+github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= -+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -+github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -+github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= -+github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= -+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= -+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= -+github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= -+github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04= -+github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk= -+github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao= -+github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58= -+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= -+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -+github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 h1:A6SLdFpRzUUF5v9F/7T1fu3DERmOCgTwwP6x54eyFfU= -+github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8/go.mod h1:UtpLyb/EupVKXF/N0b4NRe1DNg+QYJsnsHQ038romhM= -+github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= -+github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= -+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -+github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= -+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -+github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -+github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4= -+github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY= -+github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -+github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= -+github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= -+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -+github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= -+github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= -+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= -+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -+github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -+github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0= -+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -+github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU= -+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= -+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -+github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= -+github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= -+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -+github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= -+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -+github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= -+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -+github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= -+github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -+github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -+github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs= -+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= -+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -+github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= -+github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= -+github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -+github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= -+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -+github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d h1:7gXyC293Lsm2YWgQ+0uaAFFFDO82ruiQSwc3ua+Vtlc= -+github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -+github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= -+github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= -+github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= -+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8= -+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= -+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -+github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= -+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -+github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY= -+github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= -+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -+github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI= -+github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -+github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= -+github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -+github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= -+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -+github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= -+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -+github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -+github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI= -+github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= -+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -+github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= -+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= -+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -+github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= -+github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= -+github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= -+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= -+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -+github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -+github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM= -+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -+github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= -+github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -+github.com/vmihailenco/msgpack v3.3.1+incompatible h1:ibe+d1lqocBmxbJ+gwcDO8LpAHFr3PGDYovoURuTVGk= -+github.com/vmihailenco/msgpack v3.3.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -+github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= -+github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro= -+github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8= -+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -+github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= -+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -+github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c h1:/8Xb/f8s2/ZZpzMzBkFwW2Jvj7Pglk+AW8m8FFqOoIQ= -+github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= -+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -+github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI= -+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= -+github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 h1:1yOVVSFiradDwXpgdkDjlGOcGJqcohH/W49Zn8Ywgco= -+github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4/go.mod h1:fFiAh+CowNFr0NK5VASokuwKwkbacRmHsVA7Yb1Tqac= -+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -+golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -+golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= -+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI= -+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= -+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= -+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20181004145325-8469e314837c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= -+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= -+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -+golang.org/x/tools v0.0.0-20170824195420-5d2fd3ccab98/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -+golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= -+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -+google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= -+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -+google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= -+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg= -+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -+google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= -+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= -+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -+gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -+gopkg.in/go-playground/webhooks.v5 v5.11.0 h1:V3vej+ZXrVvO2EmBTKlhClEbpTqXH44K5OyLUMOkHMg= -+gopkg.in/go-playground/webhooks.v5 v5.11.0/go.mod h1:LZbya/qLVdbqDR1aKrGuWV6qbia2zCYSR5dpom2SInQ= -+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= -+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -+gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U= -+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -+gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA= -+gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -+gopkg.in/src-d/go-billy.v4 v4.2.1 h1:omN5CrMrMcQ+4I8bJ0wEhOBPanIRWzFC953IiXKdYzo= -+gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= -+gopkg.in/src-d/go-git-fixtures.v3 v3.1.1 h1:XWW/s5W18RaJpmo1l0IYGqXKuJITWRFuA45iOf1dKJs= -+gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -+gopkg.in/src-d/go-git.v4 v4.9.1 h1:0oKHJZY8tM7B71378cfTg2c5jmWyNlXvestTT6WfY+4= -+gopkg.in/src-d/go-git.v4 v4.9.1/go.mod h1:Vtut8izDyrM8BUVQnzJ+YvmNcem2J89EmfZYCkLokZk= -+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -+gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= -+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -+gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY= -+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -+honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -+k8s.io/api v0.0.0-20200131112707-d64dbec685a4 h1:7kA/ATNKWB1TVM0pwxzl/JONybbBVROCxqndoCd57fU= -+k8s.io/api v0.0.0-20200131112707-d64dbec685a4/go.mod h1:SGkmWEIoDg63In+t6yMJLEXQSkK5XxTNDcVydoy58dc= -+k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e h1:L/XqOouONrybm+3jyUJZPo5JIMARb5qFNfmmUqy81Eg= -+k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e/go.mod h1:YzEcimsSKeVDDQnLTI9Qf8uws94WpMl4qut8Rbx4dVk= -+k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9 h1:pusQlPC9d40F13jjdYyJDFDwnUjCTDN5P/y5WteLVkA= -+k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9/go.mod h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE= -+k8s.io/apiserver v0.0.0-20200208192130-2d005a048922 h1:kgU/Yr5/GsGK3GAaFgmSp+y0IMLu+FoZK+wnKlgzIrQ= -+k8s.io/apiserver v0.0.0-20200208192130-2d005a048922/go.mod h1:kcWyL8/bV2c1b/FeWrxbO08zraTaYuhR7leZ4l9iOmo= -+k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442 h1:gHF/ZIm6hTWAuN/rKdH1IO/iJfKPjn0d1kdeIMbPiDg= -+k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442/go.mod h1:sL3otDuOz8AlMrzsrBeB/ektmi6qYAE4a9Gid/pxtSo= -+k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU= -+k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU= -+k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb/go.mod h1:hb9XI7OCOFjqueeUaUYHbEuGG/nSq0UZtydmOu83p6M= -+k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18/go.mod h1:2U3dLDmef+EIuACENgQ1f8jQV//Z+aX/bp9DsglDXK0= -+k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ= -+k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd h1:W0AuOSSgValfdhcR68oayHewqFJh/nMA+JDPQbXGrkg= -+k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd/go.mod h1:55xG5ozAlA2bbjfmFYC2LPf4cQqp4nOJT5e4+cXUDnY= -+k8s.io/cri-api v0.16.8-beta.0/go.mod h1:W6aMMPN5fmxcRGaHnb6BEfoTeS82OsJcsUJyKf+EWYc= -+k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3/go.mod h1:2NVc4Xw5CEBgQj3/GtHOKPs5M68nhbszaFFuoB+xGUE= -+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -+k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM= -+k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ= -+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -+k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007 h1:PqWgdqcu7/ZAno0sqGoqo3eC/qhwnz+XTotZfG+84ic= -+k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007/go.mod h1:u6psj4FzpmwlJuQKReXypLOIhIF2UxzZRBThWtnjIDU= -+k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d/go.mod h1:rlvqwtZiupLrqd54U19Th2a0sMf0PNbGA1J3zPTwFAc= -+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ= -+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -+k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f/go.mod h1:3/a8cJm4V50vBnkRwRhpgdIdsTH+4cj/kV66oxybGxc= -+k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863/go.mod h1:1xme9q7fNwDPtgIELmyOFGQErlOzFlQ1XHjTPUz1GYc= -+k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f h1:7764TWFJ+UYY6TX1Vq3jCo/3BkORLtywarY8SEdQh18= -+k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f/go.mod h1:d78MZ7MR2Q5xMwSrGvbJARH13CsOo5mSoDZWfjIe1TQ= -+k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4/go.mod h1:VkwV80jJy9GciSRBPFduby5qJxI5v5lV3D6WMMCveek= -+k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f h1:bGmDtZ96ysKXeBFw0+9cw9twoCQjrPRkkpSQqhxEXVs= -+k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f/go.mod h1:OdJXH1Q9L+NDVj158Zo8f6R3NSaOx1ewLUcaJv8hSRE= -+k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3/go.mod h1:Egd+aHCesdnzDDtUaaWnAhnyt5/dgQIfM4UL5z2WJxg= -+k8s.io/metrics v0.0.0-20200131120008-5c623d74062d/go.mod h1:18pR44uxuhPU05LZpHhJiPPzQvGoFmCf2UlTp2EhSM8= -+k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ= -+k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173/go.mod h1:Bnw1dM0HuYH49aVse0I8cV6KeyOFPBaWxnhsU7uR2UA= -+k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE= -+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -+layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 h1:RZkKxMR3jbQxdCEcglq3j7wY3PRJIopAwBlx1RE71X0= -+layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427/go.mod h1:ivKkcY8Zxw5ba0jldhZCYYQfGdb2K6u9tbYK1AwMIBc= -+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= -+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= -+sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= -+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -+sigs.k8s.io/structured-merge-diff v1.0.2/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= -+sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= -+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -+vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index ae98fbbcc2..8fa288f040 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -222,6 +222,7 @@ let in stdenv.mkDerivation rec { name = "k3s"; + version = k3sVersion; # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 299c1fb523..134d25ae67 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "minikube"; - version = "1.14.1"; + version = "1.14.2"; vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89"; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "000i30qsjx1h2x6b8vb5piq9lhjrz5hj9wza7gxsrzsf2z9rhryg"; + sha256 = "1fidvfm9x3rbqfjn9zm5kx9smk94dmjm4gb98rrdmgsld5fg99xj"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix index ff0d1c69f4..aec421bf1a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.11.4"; - sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; + version = "0.11.6"; + sha256 = "09ym9fd4fp2461ddhrb5nlz8l24iq4hsbqikzc21ainagq2g1azf"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix index 3687b58b5a..863f7cbed2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.12.3"; - sha256 = "100ynhc4nm4mmjxx1jhq2kjbqshxvi5x8y482520j8gsyn40g6zc"; + version = "0.12.7"; + sha256 = "0y1nwmpc4fqgjyb19n1f2w4y5k7fy4p68v2vnnry11nj3im7ia14"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index b7aa2d845b..47a79c7309 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.65.0.78"; + version = "8.66.0.74"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "04qcpz3w2clpa23axh0xx68rm792d2l029r3wy1hfzbxd51z09lh"; + sha256 = "11bpzr3j6fa5x62xrx2q2sr1wxjrn0a37053j4prxjcvdrc5in8f"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index 0b18a579e3..49a4790f8a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.7"; + version = "2.0.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0r58xnjgkw0kmnnzhb32mk5gkkani5kbi5krybpbag156fqhgxg4"; + sha256 = "1bxf8976mrl3vbn3s5i32i1lf908yag5rsf84n76dllmly61794k"; }; patches = optional smimeSupport (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix index 017f059ff6..d50f5a6793 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { description = "Decentralised and censorship-resistant network"; homepage = "https://freenetproject.org/"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.doublec ]; + maintainers = [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index 964752f3b8..9b6a8bd707 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.2.5"; + version = "4.3.0.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "1n613ylg6i9gisgk0dbr2kpfasyizrkdjff1r8smd4vri2qrdksn"; + sha256 = "068sf24mjvc2idimgpzvf7gjk8n9xrr3qqlqfx5j3j598ckm3yfp"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index e9f676eae5..d906b44590 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.7"; + version = "3.4.0"; variant = if withQt then "qt" else "cli"; pcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1nkhglzxj05hwhgzrgan4glv0z67rmasf9djx1dmqicwdnw2z0xy"; + sha256 = "1bm8jj2rviis9j9l6nixvhxcfx362y9iphkxssgmiz2kj6yypr37"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 111e50b7d4..2f961f43da 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -6,11 +6,11 @@ , openssl, gperf, cppunit, poppler, utillinux , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus-glib, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, clucene_core, libcdr, lcms , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf -, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 +, librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] @@ -394,10 +394,10 @@ in (mkDrv rec { libXdmcp libpthreadstubs libGLU libGL mythes glib libmysqlclient neon nspr nss openldap openssl pam perl pkgconfig poppler - python3 sane-backends unzip vigra which zip zlib + python3 sane-backends unzip which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux - librevenge libe-book libmwaw glm glew ncurses epoxy + librevenge libe-book libmwaw glm ncurses epoxy libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/third_party/nixpkgs/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py index 636f36cb38..c4d15927f3 100755 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -53,10 +53,10 @@ def main(): def construct_url(x): if x['brief']: - return 'http://dev-www.libreoffice.org/src/{}{}'.format( + return 'https://dev-www.libreoffice.org/src/{}{}'.format( x.get('subdir', ''), x['tarball']) else: - return 'http://dev-www.libreoffice.org/src/{}{}-{}'.format( + return 'https://dev-www.libreoffice.org/src/{}{}-{}'.format( x.get('subdir', ''), x['md5'], x['tarball']) diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index 16d754a18a..e26081a029 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -1,882 +1,882 @@ [ { name = "libabw-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; md5 = ""; md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { name = "boost_1_71_0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; md5 = ""; md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { name = "breakpad.zip"; - url = "http://dev-www.libreoffice.org/src/breakpad.zip"; + url = "https://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; - url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; md5 = "beeca87be45ec87d241ddd0e1bad80c1"; md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { name = "bzip2-1.0.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { name = "libcdr-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; md5 = ""; md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { name = "dtoa-20180411.tgz"; - url = "http://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; + url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; md5 = ""; md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; } { name = "libcmis-0.5.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; md5 = ""; md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; - url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + url = "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "cppunit-1.15.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"; md5 = ""; md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; - url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + url = "https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { name = "curl-7.71.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; md5 = ""; md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.5.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; md5 = ""; md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; } { name = "epm-3.7.tar.gz"; - url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + url = "https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { name = "libepubgen-0.1.1.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; md5 = ""; md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { name = "libetonyek-0.1.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; md5 = ""; md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { name = "expat-2.2.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; md5 = ""; md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { name = "fontconfig-2.13.91.tar.gz"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; md5 = ""; md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; } { name = "crosextrafonts-20130214.tar.gz"; - url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + url = "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; md5 = "368f114c078f94214a308a74c7e991bc"; md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; } { name = "crosextrafonts-carlito-20130920.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + url = "https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; md5 = "c74b7223abe75949b4af367942d96c7a"; md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; } { name = "dejavu-fonts-ttf-2.37.zip"; - url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; + url = "https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a"; md5 = "33e1e61fab06a547851ed308b4ffef42"; md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; } { name = "GentiumBasic_1102.zip"; - url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; + url = "https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc"; md5 = "1725634df4bb3dcb1b2c91a6175f8789"; md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; md5 = ""; md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; md5 = ""; md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; - url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + url = "https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; md5 = "907d6e99f241876695c19ff3db0b8923"; md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; } { name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; md5 = "edc4d741888bc0d38e32dbaa17149596"; md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { name = "source-serif-pro-3.000R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { name = "noto-fonts-20171024.tar.gz"; - url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; md5 = ""; md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { name = "culmus-0.131.tar.gz"; - url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; md5 = ""; md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; md5 = ""; md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; } { name = "alef-1.001.tar.gz"; - url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + url = "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; md5 = ""; md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { name = "Amiri-0.111.zip"; - url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-0.111.zip"; sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166"; md5 = ""; md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip"; } { name = "ttf-kacst_2.01+mry.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; md5 = ""; md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { name = "ReemKufi-0.7.zip"; - url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f"; md5 = ""; md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip"; } { name = "Scheherazade-2.100.zip"; - url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + url = "https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; md5 = ""; md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; } { name = "libfreehand-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; md5 = ""; md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { name = "freetype-2.9.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.9.7.zip"; - url = "http://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; + url = "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; md5 = ""; md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { name = "gpgme-1.9.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; + url = "https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc"; md5 = ""; md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { name = "harfbuzz-2.6.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; - url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + url = "https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; md5 = "17410483b5b5f267aa18b7e00b65e6e0"; md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { name = "hunspell-1.7.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; md5 = ""; md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { name = "icu4c-67_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; md5 = ""; md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; } { name = "icu4c-67_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; md5 = ""; md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; - url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; md5 = "ba2930200c9f019c2d93a8c88c651a0f"; md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; } { name = "flute-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; } { name = "libbase-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; } { name = "libfonts-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; md5 = "3bdf40c0d199af31923e900d082ca2dd"; md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; } { name = "libformula-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; } { name = "liblayout-0.2.10.zip"; - url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + url = "https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; md5 = "db60e4fde8dd6d6807523deb71ee34dc"; md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; } { name = "libloader-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; md5 = "97b2d4dba862397f446b217e2b623e71"; md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; } { name = "librepository-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; md5 = "8ce2fcd72becf06c41f7201d15373ed9"; md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; } { name = "libserializer-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; md5 = "f94d9870737518e3b597f9265f4e9803"; md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; } { name = "libxml-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; md5 = "ace6ab49184e329db254e454a010f56d"; md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; } { name = "sacjava-1.3.zip"; - url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + url = "https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; md5 = "39bb3fcea1514f1369fcfc87542390fd"; md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { name = "libjpeg-turbo-1.5.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; md5 = ""; md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { name = "language-subtag-registry-2020-04-01.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da"; md5 = ""; md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; md5 = "b63e6340a02ff1cacfeadb2c42286161"; md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { name = "lcms2-2.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { name = "libassuan-2.5.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; md5 = ""; md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; md5 = ""; md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; } { name = "libeot-0.01.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { name = "libexttextcat-3.4.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { name = "libffi-3.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; md5 = ""; md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; } { name = "libgpg-error-1.27.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "libnumbertext-1.0.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; md5 = ""; md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; } { name = "ltm-1.0.zip"; - url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; + url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { name = "xmlsec1-1.2.30.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; md5 = ""; md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { name = "libxml2-2.9.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { name = "libxslt-1.1.34.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; - url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { name = "lxml-4.1.1.tgz"; - url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; + url = "https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; md5 = ""; md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; } { name = "mariadb-connector-c-3.1.8-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b"; md5 = ""; md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { name = "mdds-1.6.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; md5 = ""; md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; md5 = ""; md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; md5 = ""; md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { name = "libmwaw-0.3.16.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; md5 = ""; md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { name = "neon-0.30.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; md5 = ""; md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.47.1-with-nspr-4.23.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; - sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; + name = "nss-3.55-with-nspr-4.27.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz"; + sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45"; md5 = ""; - md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; + md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0"; md5 = ""; md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { name = "officeotron-0.7.4-master.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; md5 = "8249374c274932a21846fa7629c2aa9b"; md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { name = "openldap-2.4.45.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { name = "openssl-1.0.2t.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { name = "liborcus-0.15.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; md5 = ""; md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; md5 = ""; md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { name = "libpagemaker-0.0.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { name = "pdfium-4137.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6"; md5 = ""; md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e"; md5 = "e80ebae4da01e77f68744319f01d52a3"; md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { name = "libpng-1.6.37.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; md5 = ""; md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { name = "poppler-0.82.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; md5 = ""; md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { name = "Python-3.7.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; md5 = ""; md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; md5 = ""; md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; md5 = ""; md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; + url = "https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c"; md5 = "1f5def51ca0026cd192958ef07228b52"; md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; } { name = "redland-1.0.17.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; md5 = "e5be03eda13ef68aabab6e42aa67715e"; md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { name = "librevenge-0.0.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; - url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { name = "serf-1.2.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; - url = "http://dev-www.libreoffice.org/src/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; - sha256 = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0"; + name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; md5 = ""; - md5name = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0-skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; + md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db"; md5 = ""; md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } { name = "swingExSrc.zip"; - url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; md5 = "35c94d2df8893241173de1d16b6034c0"; md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; } { name = "twaindsm_2.4.1.orig.tar.gz"; - url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; md5 = ""; md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { name = "ucpp-1.3.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; md5 = "0168229624cfac409e766913506961a8"; md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { name = "libvisio-0.1.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; md5 = ""; md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { name = "libwpg-0.3.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; md5 = ""; md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { name = "libwps-0.4.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; md5 = ""; md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; } { name = "xsltml_2.1.2.zip"; - url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + url = "https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; md5 = "a7983f859eafb2677d7ff386a023bc40"; md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { name = "zlib-1.2.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 1beb8f1156..dbfd249901 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "0"; - patch = "0"; - tweak = "3"; + patch = "3"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-sl+vgnLGIWtyw8Y/ovVsxThdOMg2Gby4SRaiaqvZVB0="; + sha256 = "0b998k2dxbbj7hn3srn07fgsah236h14ncyyahamdff6h3hvqrk5"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-i3yfD5cmM6D9BctjablIFRqfibjrwLAaxxPIsQdk0sY="; + sha256 = "0s3ic79q0c16hbd6r06mwkyqhw4fdfy9z3xbqvdxp7jl64cjlaj4"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-hYBEEPRmh16zgGZBUN20xfTY6qL07aKMC1lC/0ij9/0="; + sha256 = "14wjkcdmcflfcc7264jx64s6clk5rdsprx7nkbv08z0bp6ff677b"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index 0b53e3e85a..fde8df6104 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -1,27 +1,30 @@ { - mkDerivation, lib, fetchgit, - extra-cmake-modules, + stdenv, extra-cmake-modules, fetchurl, kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, - knewstuff, kplotting, kwidgetsaddons, kxmlgui, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, wrapQtAppsHook, qtx11extras, qtwebsockets, eigen, zlib, - cfitsio, indilib, xplanet + cfitsio, indilib, xplanet, libnova, gsl }: -mkDerivation { - name = "kstars"; - - src = fetchgit { - url = "https://anongit.kde.org/kstars.git"; - rev = "7acc527939280edd22823371dc4e22494c6c626a"; - sha256 = "1n1lgi7p3dj893fdnzjbnrha40p4apl0dy8zppcabxwrb1khb84v"; +stdenv.mkDerivation rec { + pname = "kstars"; + version = "3.4.3"; + + src = fetchurl { + url = "https://mirrors.mit.edu/kde/stable/kstars/kstars-${version}.tar.xz"; + sha256 = "0j5yxg6ay6sic194skz6vjzg6yvrpb3gvypvs0frjrcjbsl1j4f8"; }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + patches = [ + ./indi-fix.patch + ]; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; buildInputs = [ kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio knewstuff kplotting kwidgetsaddons kxmlgui @@ -30,10 +33,14 @@ mkDerivation { eigen zlib - cfitsio indilib xplanet + cfitsio indilib xplanet libnova gsl ]; - meta = with lib; { + cmakeFlags = [ + "-DINDI_NIX_ROOT=${indilib}" + ]; + + meta = with stdenv.lib; { description = "Virtual planetarium astronomy software"; homepage = "https://kde.org/applications/education/org.kde.kstars"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/indi-fix.patch b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/indi-fix.patch new file mode 100644 index 0000000000..9ff9f8a31d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/indi-fix.patch @@ -0,0 +1,50 @@ +--- CMakeLists.txt 2020-11-02 13:58:06.119743710 -0600 ++++ kstars-3.4.3/CMakeLists.txt 2020-11-02 14:05:01.707799274 -0600 +@@ -4,5 +4,7 @@ + set (KStars_VERSION_REVISION 3) + set (CMAKE_CXX_STANDARD 11) + ++add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) ++ + # Build KStars Lite with -DBUILD_KSTARS_LITE=ON + option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) + +--- ksutils.cpp 2020-11-02 13:47:44.883596916 -0600 ++++ kstars-3.4.3/kstars/auxiliary/ksutils.cpp 2020-11-02 17:41:44.961937090 -0600 +@@ -1076,6 +1076,9 @@ + { + QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); + QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); ++#define STR_EXPAND(x) #x ++#define STR(x) STR_EXPAND(x) ++ QString nix = QString(STR(INDI_NIX_ROOT)); + + if (option == "fitsDir") + { +@@ -1089,7 +1091,7 @@ + if (flat.isEmpty() == false) + return flat + "/bin/indiserver"; + else +- return snap + "/usr/bin/indiserver"; ++ return nix + "/bin/indiserver"; + } + else if (option == "INDIHubAgent") + { +@@ -1099,7 +1101,7 @@ + if (flat.isEmpty() == false) + return flat + "/bin/indihub-agent"; + else +- return snap + "/usr/bin/indihub-agent"; ++ return nix + "/bin/indihub-agent"; + } + else if (option == "indiDriversDir") + { +@@ -1109,7 +1111,7 @@ + if (flat.isEmpty() == false) + return flat + "/share/indi"; + else +- return snap + "/usr/share/indi"; ++ return nix + "/share/indi"; + #else + return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); + #endif diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index de01b095e3..494a5cf293 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,15 +1,15 @@ { lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }: -mkDerivation { +mkDerivation rec { pname = "librepcb"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "LibrePCB"; repo = "LibrePCB"; fetchSubmodules = true; - rev = "ae04eef5a71b5ba66ae2cee6b631c1c933ace535"; - sha256 = "0wk5qny1jb6n4mwyyrs7syir3hmwxlwazcd80bpxharmsj7p0rzc"; + rev = version; + sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix index 49ff0d5d5a..1bf7d16f29 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null -, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook +, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: let name = "maxima"; - version = "5.42.2"; + version = "5.44.0"; searchPath = stdenv.lib.makeBinPath @@ -16,14 +16,20 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "0kdncy6137sg3rradirxzj10mkcvafxd892zlclwhr9sa7b12zhn"; + sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = stdenv.lib.filter (x: x != null) [ sbcl ecl texinfo perl python makeWrapper gnuplot # required in the test suite ]; + postPatch = '' + substituteInPlace doc/info/Makefile.am --replace "/usr/bin/env perl" "${perl}/bin/perl" + ''; + postInstall = '' # Make sure that maxima can find its runtime dependencies. for prog in "$out/bin/"*; do @@ -57,13 +63,6 @@ stdenv.mkDerivation ({ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - - # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed) - # introduced in https://trac.sagemath.org/ticket/13364 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d"; - }) ] ++ stdenv.lib.optionals ecl-fasl [ # build fasl, needed for ECL support (fetchpatch { @@ -74,11 +73,13 @@ stdenv.mkDerivation ({ # The test suite is disabled since 5.42.2 because of the following issues: # - # Errors found in /build/maxima-5.42.2/share/linearalgebra/rtest_matrixexp.mac, problems: + # Error(s) found: + # /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems: # (20 21 22) - # Error found in rtest_arag, problem: - # (error break) - # 3 tests failed out of 3,881 total tests. + # Tests that were expected to fail but passed: + # /build/maxima-5.44.0/share/vector/rtest_vect.mac problem: + # (19) + # 3 tests failed out of 16,184 total tests. # # These failures don't look serious. It would be nice to fix them, but I # don't know how and probably won't have the time to find out. diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/convertall/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/convertall/default.nix new file mode 100644 index 0000000000..63ed18c89b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/misc/convertall/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, python3, wrapQtAppsHook }: + +let + inherit (python3.pkgs) wrapPython pyqt5; +in stdenv.mkDerivation rec { + pname = "convertall"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "doug-101"; + repo = "ConvertAll"; + rev = "v${version}"; + sha256 = "02xxasgbjbivsbhyfpn3cpv52lscdx5kc95s6ns1dvnmdg0fpng0"; + }; + + nativeBuildInputs = [ python3 wrapPython wrapQtAppsHook ]; + + propagatedBuildInputs = [ pyqt5 ]; + + installPhase = '' + python3 install.py -p $out -x + ''; + + postFixup = '' + buildPythonPath $out + patchPythonScript $out/share/convertall/convertall.py + makeQtWrapper $out/share/convertall/convertall.py $out/bin/convertall + ''; + + meta = with stdenv.lib; { + homepage = "https://convertall.bellz.org/"; + description = "Graphical unit converter"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = pyqt5.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 151abb099f..bfa4a1f433 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020.3"; + name = "gromacs-2020.4"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.3.tar.gz"; - sha256 = "1acjrhcfzpqy2dncblhj97602jbg9gdha4q1bgji9nrj25lq6cch"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.4.tar.gz"; + sha256 = "1rplvgna60nqyb8nspaz3bfkwb044kv3zxdaa5whql5m441nj6am"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix index 85838b04cb..b2e5284796 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.esclear ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index 7c7906fc84..853fe22f0b 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem +{ stdenv, lib, fetchurl, pkgconfig, autoconf, makeDesktopItem , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding , openssl, libssh2 #build-in ssh , fcitx, ibus, uim #IME , wrapGAppsHook #color picker in mlconfig +, Cocoa #Darwin }: stdenv.mkDerivation rec { @@ -18,9 +19,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; buildInputs = [ - libX11 gdk-pixbuf.dev cairo libXft gtk3 vte - harfbuzz fribidi m17n_lib openssl libssh2 - fcitx ibus uim + libX11 + gdk-pixbuf.dev + cairo + libXft + gtk3 + harfbuzz + fribidi + ] ++ lib.optionals (!stdenv.isDarwin) [ + # need linker magic, not adapted for Darwin yet + openssl + libssh2 + + # Not supported on Darwin + vte + m17n_lib + + fcitx + ibus + uim ]; #bad configure.ac and Makefile.in everywhere @@ -42,34 +59,41 @@ stdenv.mkDerivation rec { --replace "-m 2755 -g utmp" " " \ --replace "-m 4755 -o root" " " ''; - NIX_LDFLAGS = " + NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) " -L${stdenv.cc.cc.lib}/lib -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n - " + stdenv.lib.optionalString (openssl != null) " + " + lib.optionalString (openssl != null) " -lcrypto - " + stdenv.lib.optionalString (libssh2 != null) " + " + lib.optionalString (libssh2 != null) " -lssh2 "; configureFlags = [ - "--with-x=yes" - "--with-gui=xlib,fb" "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice "--with-type-engines=cairo,xft,xcore" "--with-gtk=3.0" "--enable-ind" #indic scripts "--enable-fribidi" #bidi scripts - "--enable-m17nlib" #character encodings "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core #and configuring ~/.mlterm/key correctly. - ] ++ stdenv.lib.optional (libssh2 == null) "--disable-ssh2"; + ] ++ lib.optionals (!stdenv.isDarwin) [ + "--with-x=yes" + "--with-gui=xlib,fb" + "--enable-m17nlib" #character encodings + ] ++ lib.optionals stdenv.isDarwin [ + "--with-gui=quartz" + ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ]; postInstall = '' install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" install -D -t $out/share/applications $desktopItem/share/applications/* + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/ + cp -a cocoa/mlterm.app $out/Applications/ + install $out/bin/mlterm -Dt $out/Applications/mlterm.app/Contents/MacOS/ ''; desktopItem = makeDesktopItem { @@ -80,17 +104,17 @@ stdenv.mkDerivation rec { comment = "Terminal emulator"; desktopName = "mlterm"; genericName = "Terminal emulator"; - categories = stdenv.lib.concatStringsSep ";" [ + categories = lib.concatStringsSep ";" [ "Application" "System" "TerminalEmulator" ]; startupNotify = "false"; }; - meta = with stdenv.lib; { - description = "Multi Lingual TERMinal emulator on X11"; + meta = with lib; { + description = "Multi Lingual TERMinal emulator"; homepage = "http://mlterm.sourceforge.net/"; license = licenses.bsd3; - maintainers = with maintainers; [ vrthra ramkromberg ]; - platforms = with platforms; linux; + maintainers = with maintainers; [ vrthra ramkromberg atemu ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix index fcbb546a1f..a60250ee0f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -45,14 +45,14 @@ assert useWayland -> wayland != null && wayland-protocols != null && waylandpp ! let kodiReleaseDate = "20200728"; - kodiVersion = "18.8"; + kodiVersion = "18.9"; rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "0qpkpz43s207msvv3qkiy6vzqwcgmydxv3py7vc29mv6h30chrva"; + sha256 = "0nnf7823pixj6n2fkjc8rbdjwayvhlbglij2by4rnjzzfgmqmw20"; }; cmakeProto = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix index a0ec55dd89..74370aafa4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,36 +1,30 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig -, libX11, freefont_ttf, nettle, libconfig, wayland, libpthreadstubs, libXdmcp -, libXfixes, libbfd +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol +, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp +, libXi, libXext, wayland, libffi, libGLU, expat, libbfd }: stdenv.mkDerivation rec { pname = "looking-glass-client"; - version = "B1"; + version = "B2"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "0vykv7yjz4fima9d82m83acd8ab72nq4wyzyfs1c499i27wz91ia"; + sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d"; + fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig - libX11 freefont_ttf nettle libconfig wayland libpthreadstubs - libXdmcp libXfixes libbfd cmake + SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle + libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat + libbfd ]; - enableParallelBuilding = true; - sourceRoot = "source/client"; - - installPhase = '' - mkdir -p $out/bin - mv looking-glass-client $out/bin - ''; + NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. meta = with stdenv.lib; { description = "A KVM Frame Relay (KVMFR) implementation"; @@ -41,9 +35,9 @@ stdenv.mkDerivation rec { step required to move away from dual booting with other operating systems for legacy programs that require high performance graphics. ''; - homepage = "https://looking-glass.hostfission.com/"; + homepage = "https://looking-glass.io/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.alexbakker ]; + maintainers = with maintainers; [ alexbakker ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix index 9a00b3a2ef..064e555f3a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "0iwixf3gaichmpvhczxdg5srkb72yh61i5wh7m3fab657h3r7di6"; + sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix index da58d844ee..0af46db0a1 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace meson.build --replace "v1.5" "1.5" + substituteInPlace meson.build \ + --replace "v1.5" "1.5" \ + --replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']" ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix index a6c8d5cd1c..4bb4225d39 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "v1.6-1"; + version = "v1.6-2"; src = fetchFromGitHub { owner = "mortie"; repo = "swaylock-effects"; rev = version; - sha256 = "044fc4makjx8v29fkx5xlil6vr1v4r0k6c8741pl67gzvlm4cx3i"; + sha256 = "0fs3c4liajgkax0a2pdc7117v1g9k73nv87g3kyv9wsnkfbbz534"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix index d0a1de7f60..1bbdb7a460 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix @@ -33,4 +33,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/build-support/docker/detjson.py b/third_party/nixpkgs/pkgs/build-support/docker/detjson.py index 439c213138..fe82cbea11 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/detjson.py +++ b/third_party/nixpkgs/pkgs/build-support/docker/detjson.py @@ -37,4 +37,4 @@ def main(): json.dump(j, sys.stdout, sort_keys=True) if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsvnrevision/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchsvnrevision/default.nix index 288451a225..f2e2a11da8 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchsvnrevision/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchsvnrevision/default.nix @@ -7,4 +7,4 @@ runCommand: subversion: repository: rev=$(echo p | svn ls -v --depth empty ${repository} |awk '{ print $1 }') echo "[ \"$rev\" ]" > $out echo Latest revision is $rev - '') \ No newline at end of file + '') diff --git a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch new file mode 100644 index 0000000000..4382cdcf35 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch @@ -0,0 +1,336 @@ +From 67f62e5a8acd70d30f7067f1f44ac7b15c67011a Mon Sep 17 00:00:00 2001 +From: Peter Howkins +Date: Mon, 2 Nov 2020 05:30:08 +0000 +Subject: [PATCH] all: remove deprecated sys_errlist[] and replace with ANSI C + strerror() + +--- + cde/config/imake/imake.c | 13 ------------- + cde/lib/tt/bin/dbck/spec.C | 8 -------- + cde/lib/tt/lib/tt_options.h | 12 ------------ + cde/programs/dtcm/dtcm/dnd.c | 4 ---- + cde/programs/dtcm/libDtCmP/util.c | 5 +---- + .../dthelp/parser.ccdf/volumegen/Volumegen.c | 1 - + cde/programs/dtimsstart/remote.c | 4 ---- + cde/programs/dtimsstart/start.c | 12 +++--------- + cde/programs/dtinfo/dtinfo/src/external-api/comm.c | 5 +---- + .../dtksh/ksh93/src/lib/libast/string/fmterror.c | 9 +-------- + .../dtksh/ksh93/src/lib/libast/string/strerror.c | 8 +------- + cde/programs/dtlogin/dm.h | 7 +------ + 12 files changed, 8 insertions(+), 80 deletions(-) + +diff --git a/cde/config/imake/imake.c b/cde/config/imake/imake.c +index 574af7c7..83834aa7 100644 +--- a/cde/config/imake/imake.c ++++ b/config/imake/imake.c +@@ -242,19 +242,6 @@ extern int errno; + #include + #include "imakemdep.h" + +-/* +- * This define of strerror is copied from (and should be identical to) +- * Xos.h, which we don't want to include here for bootstrapping reasons. +- */ +-#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) +-# ifndef strerror +-extern char *sys_errlist[]; +-extern int sys_nerr; +-# define strerror(n) \ +- (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error") +-# endif +-#endif +- + #define TRUE 1 + #define FALSE 0 + +diff --git a/cde/lib/tt/bin/dbck/spec.C b/cde/lib/tt/bin/dbck/spec.C +index 18bba3fb..eaf2d6b7 100644 +--- a/cde/lib/tt/bin/dbck/spec.C ++++ b/lib/tt/bin/dbck/spec.C +@@ -44,14 +44,6 @@ + #include "ttdbck.h" + #include "tt_db_server_consts.h" + +-#if !defined(OPT_STRERROR) +-// No strerror(), fake it +-char * +-strerror(int e) +-{ +- return ((e sys_nerr) +- (void) fprintf(stderr, ":Unknown error %d", saveerr); +- else +- (void) fprintf(stderr, ":%s", sys_errlist[saveerr]); ++ (void) fprintf(stderr, ":%s", strerror(saveerr)); + } + #endif + +diff --git a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c b/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c +index d9a42943..08de4809 100644 +--- a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c ++++ b/programs/dthelp/parser.ccdf/volumegen/Volumegen.c +@@ -56,7 +56,6 @@ + typedef int Boolean; + + /* extern int errno; */ +-/* extern char *sys_errlist[]; */ + /* extern int sys_nerr; */ + + static void GenTopicList ( +diff --git a/cde/programs/dtimsstart/remote.c b/cde/programs/dtimsstart/remote.c +index 68773673..71d32977 100644 +--- a/cde/programs/dtimsstart/remote.c ++++ b/programs/dtimsstart/remote.c +@@ -37,10 +37,6 @@ + #include /* for X_ChangeHosts */ + #include /* for XA_STRING */ + +-#if !defined(__linux__) && !defined(CSRG_BASED) +-extern char *sys_errlist[]; +-#endif +- + static char *conf_msg_id = STR_CONFDATA; + + #define CONF_MSG_ID_LEN strlen(conf_msg_id) +diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c +index 78fc2a38..1dafa189 100644 +--- a/cde/programs/dtimsstart/start.c ++++ b/programs/dtimsstart/start.c +@@ -27,14 +27,10 @@ + #include + #include + #include ++#include + + #if (defined(__linux__) || defined(CSRG_BASED)) && !defined(_NFILE) + #define _NFILE FOPEN_MAX +-#endif +- +-#if !defined(__linux__) && !defined(CSRG_BASED) +-extern char *sys_errlist[]; +-extern int sys_nerr; + #endif + + /* local functions */ +@@ -599,8 +595,7 @@ static int invoke_ims(UserSelection *sel) + + pid = fork(); + if (pid == (pid_t) -1) { +- put_xims_log("fork failed [%s]", +- (errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0); ++ put_xims_log("fork failed [%s]", strerror(errno), 0, 0); + #ifdef DEBUG + perror("fork"); + #endif +@@ -617,8 +612,7 @@ static int invoke_ims(UserSelection *sel) + #endif + execl(SH_PATH, "sh", "-c", renv->cmdbuf, NULL); + +- put_xims_log("%s: exec failed [%s]", SH_PATH, +- (errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0); ++ put_xims_log("%s: exec failed [%s]", SH_PATH, strerror(errno) , 0, 0); + /* perror(SH_PATH); */ + sleep(1); + _exit(1); +diff --git a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c +index d61ccb7a..6aa2fc91 100644 +--- a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c ++++ b/programs/dtinfo/dtinfo/src/external-api/comm.c +@@ -53,9 +53,6 @@ + #include + #endif + +-extern char *sys_errlist[]; +- +- + static OliasEvent *current_event; + static int reply_status; + #define NO_REPLY 0 +@@ -332,7 +329,7 @@ wait_for_reply (Widget toplevel) + XtAppWarningMsg (XtWidgetToApplicationContext (toplevel), + "communicationsError", "select", + "Olias API", "Select failed: %s", +- &sys_errlist[errno], &num_params); ++ strerror(errno), &num_params); + continue; + } + continue; +diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c +index 313b67bc..8dd87ab8 100644 +--- a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c ++++ b/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c +@@ -92,14 +92,7 @@ + #endif + #include + +-extern __MANGLE__ int sys_nerr; +-extern __MANGLE__ char* sys_errlist[]; +- + char* + fmterror __PARAM__((int err), (err)) __OTORP__(int err;){ +- static char msg[28]; +- +- if (err > 0 && err <= sys_nerr) return(sys_errlist[err]); +- sfsprintf(msg, sizeof(msg), "Error %d", err); +- return(msg); ++ return strerror(err); + } +diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c +index 7686a54d..a6aa7ce8 100644 +--- a/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c ++++ b/programs/dtksh/ksh93/src/lib/libast/string/strerror.c +@@ -108,18 +108,12 @@ NoN(strerror) + + #include + +-extern __MANGLE__ int sys_nerr; +-extern __MANGLE__ char* sys_errlist[]; + + char* + strerror __PARAM__((int err), (err)) __OTORP__(int err;) + #line 25 + { +- static char msg[28]; +- +- if (err > 0 && err <= sys_nerr) return(sys_errlist[err]); +- sfsprintf(msg, sizeof(msg), "Error %d", err); +- return(msg); ++ return strerror(err); + } + + #endif +diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h +index 3e0f2499..e67edc3c 100644 +--- a/cde/programs/dtlogin/dm.h ++++ b/programs/dtlogin/dm.h +@@ -68,8 +68,7 @@ + # include /* for passwd structure */ + # include + # include /* for exit(), malloc(), abort() */ +-# include /* for string functions, bcopy(), +- sys_errlist */ ++# include /* for string functions, bcopy() */ + # include /* for NGROUPS */ + # include /* for fd_set */ + # include /* for Internet socket stuff */ +@@ -475,10 +474,6 @@ struct verify_info { + * + ***************************************************************************/ + +-#if !defined(__linux__) && !defined(CSRG_BASED) +-extern char *sys_errlist[]; /* system error msgs */ +-extern int sys_nerr; /* system error msgs */ +-#endif + extern XrmDatabase XresourceDB; + + +-- +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix index 7e6b49957b..7454603e7a 100644 --- a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix @@ -2,7 +2,8 @@ , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf , ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk -, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot }: +, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot +, rpcsvc-proto }: let x11ProjectRoot = symlinkJoin { @@ -25,6 +26,7 @@ in stdenv.mkDerivation rec { # remove with next release patches = [ ./2.3.2.patch + ./0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch ]; buildInputs = [ @@ -33,6 +35,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ bison ncompress gawk autoPatchelfHook makeWrapper fakeroot + rpcsvc-proto ]; makeFlags = [ @@ -74,6 +77,5 @@ EOF license = licenses.lgpl2; maintainers = [ maintainers.gnidorah ]; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = true; # not compatible with glibc 2.32 }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix index c6a48bd744..a4b884147d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -35,6 +35,7 @@ gccStdenv.mkDerivation rec { #runtimeDeps = [ gnused gnugrep ]; configureFlags = [ + "--enable-targets=${gambit-params.targets}" "--enable-single-host" "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" @@ -94,6 +95,7 @@ gccStdenv.mkDerivation rec { # Now use the bootstrap compiler to build the real thing! make -j$NIX_BUILD_CORES from-scratch + ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"} ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix index 0e78831f2e..be745367ec 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix @@ -2,12 +2,16 @@ rec { stable-params = { + stable = true; defaultRuntimeOptions = "f8,-8,t8"; buildRuntimeOptions = "f8,-8,t8"; fix-stamp = git-version : ""; + targets = "java,js,php,python,ruby"; + modules = false; }; unstable-params = { + stable = false; defaultRuntimeOptions = "iL,fL,-L,tL"; buildRuntimeOptions = "i8,f8,-8,t8"; fix-stamp = git-version : '' @@ -15,6 +19,8 @@ rec { --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; ''; + targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest + modules = false; }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix index 7284e5b531..a689991a1e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-07-29"; - git-version = "4.9.3-1232-gbba388b8"; + version = "unstable-2020-09-20"; + git-version = "4.9.3-1234-g6acd87df"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "bba388b80ca62a77883a8936d64b03316808696a"; - sha256 = "0iqlp1mvxz8g32kqrqm0phnnp1i5c4jrapqh2wqwa8fh1vgnizg1"; + rev = "6acd87dfa95bfca33082a431e72f023345dc07ee"; + sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r"; }; gambit-params = gambit-support.unstable-params; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index 9b90cc053e..e498818d2e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-ethereum"; - version = "unstable-2020-08-02"; - git-version = "0.0-15-g7cd2dd7"; + version = "unstable-2020-10-18"; + git-version = "0.0-26-gf27ada8"; gerbil-package = "mukn/ethereum"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; @@ -15,8 +15,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-ethereum"; - rev = "7cd2dd7436b11917d0729dbafe087cfa8ec38f86"; - sha256 = "0qq3ch2dg735yrj3l2c9pb9qlvz98x3vjfi2xyr4fwr78smpqgb5"; + rev = "f27ada8e7f4de4f8fbdfede9fe055914b254d8e7"; + sha256 = "1lykjqim6a44whj1r8kkpiz68wghkfqx5vjlrc2ldxlmgd4r9gvd"; }; meta = { description = "Gerbil Ethereum: a Scheme alternative to web3.js"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix new file mode 100644 index 0000000000..336f5af89c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-libp2p"; + version = "unstable-2018-12-27"; + git-version = "2376b3f"; + gerbil-package = "vyzo"; + gerbil = gerbil-unstable; + gerbilInputs = []; + buildInputs = []; # Note: at *runtime*, depends on go-libp2p-daemon + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-libp2p"; + src = fetchFromGitHub { + owner = "vyzo"; + repo = "gerbil-libp2p"; + rev = "2376b3f39cee04dd4ec455c8ea4e5faa93c2bf88"; + sha256 = "0jcy7hfg953078msigyfwp2g4ii44pi6q7vcpmq01cbbvxpxz6zw"; + }; + meta = { + description = "Gerbil libp2p: use libp2p from Gerbil"; + homepage = "https://github.com/vyzo/gerbil-libp2p"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix index 1be6684bf4..74485c19c2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-persist"; - version = "unstable-2020-08-02"; - git-version = "0.0-4-ga3b2bd1"; + version = "unstable-2020-08-31"; + git-version = "0.0-8-gd211390"; gerbil-package = "clan/persist"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo]; @@ -14,8 +14,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-persist"; - rev = "a3b2bd104612db0e4492737f09f72adea6684483"; - sha256 = "0mc01wva26ww1i7n8naa95mfw7i6lj8qg0bwsik7gb3dsj2acjvh"; + rev = "d211390c8a199cf2b8c7400cd98977524e960015"; + sha256 = "13s6ws8ziwalfp23nalss41qnz667z2712lr3y123sypm5n5axk7"; }; meta = { description = "Gerbil Persist: Persistent data and activities"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix index 55673368ee..c6580ea0c7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-ethereum"; - version = "unstable-2020-08-02"; - git-version = "0.0-13-g1014154"; + version = "unstable-2020-10-17"; + git-version = "0.0-35-g44d490d"; gerbil-package = "clan/poo"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto]; @@ -14,8 +14,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-poo"; - rev = "1014154fe4943dfbec7524666c831b601ba88559"; - sha256 = "0g8l5mi007n07qs79m9h3h3am1p7h0kzq7yb49h562b8frh5gp97"; + rev = "44d490d95b9d1b5d54eaedf2602419af8e086837"; + sha256 = "082ndpy281saybcnp3bdidcibkk2ih6glrkbb5fdj1524ban4d0k"; }; meta = { description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix index e3f4bb0e0d..9cb9954544 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -1,14 +1,16 @@ -{ pkgs, gccStdenv, callPackage, fetchFromGitHub }: +{ pkgs, lib, gccStdenv, callPackage, fetchFromGitHub }: # See ../gambit/build.nix regarding gccStdenv rec { # Gerbil libraries gerbilPackages-unstable = { + gerbil-libp2p = callPackage ./gerbil-libp2p.nix { }; gerbil-utils = callPackage ./gerbil-utils.nix { }; gerbil-crypto = callPackage ./gerbil-crypto.nix { }; gerbil-poo = callPackage ./gerbil-poo.nix { }; gerbil-persist = callPackage ./gerbil-persist.nix { }; gerbil-ethereum = callPackage ./gerbil-ethereum.nix { }; + smug-gerbil = callPackage ./smug-gerbil.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. @@ -23,6 +25,7 @@ rec { gambit-params ? pkgs.gambit-support.stable-params, gerbilInputs ? [], buildInputs ? [], + buildScript ? "./build.ss", softwareName ? ""} : let buildInputs_ = buildInputs; in gccStdenv.mkDerivation rec { @@ -33,8 +36,8 @@ rec { set -e ; if [ -n "${version-path}.ss" ] ; then echo -e '(import :clan/versioning${builtins.concatStringsSep "" - (map (x : if x.passthru.version-path != "" - then " :${x.passthru.gerbil-package}/${x.passthru.version-path}" else "") + (map (x : lib.optionalString (x.passthru.version-path != "") + " :${x.passthru.gerbil-package}/${x.passthru.version-path}") gerbilInputs) })\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss" fi @@ -50,7 +53,7 @@ rec { buildPhase = '' runHook preBuild - ./build.ss + ${buildScript} runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix index 7e1a9bf055..6d89e1181f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-utils"; - version = "unstable-2020-08-02"; - git-version = "0.2-21-g7e7d053"; + version = "unstable-2020-10-18"; + git-version = "0.2-36-g8b481b7"; gerbil-package = "clan"; gerbil = gerbil-unstable; gambit-params = gambit-support.unstable-params; @@ -12,8 +12,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-utils"; - rev = "7e7d053ec5e78cc58d38cb03baf554d83b31b0c6"; - sha256 = "078vqdcddfavqq0d9pw430iz1562cgx1ck3fw6dpwxjkyc6m4bms"; + rev = "8b481b787e13e07e14d0718d670aab016131a090"; + sha256 = "0br8k5b2wcv4wcp65r2bfhji3af2qgqjspf41syqslq9awx47f3m"; }; meta = { description = "Gerbil Clan: Community curated Collection of Common Utilities"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix new file mode 100644 index 0000000000..732cdb500b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix @@ -0,0 +1,30 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "smug-gerbil"; + version = "unstable-2019-12-24"; + git-version = "95d60d4"; + gerbil-package = "drewc/smug"; + gerbil = gerbil-unstable; + gerbilInputs = []; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = ""; #"version"; + softwareName = "Smug-Gerbil"; + src = fetchFromGitHub { + owner = "drewc"; + repo = "smug-gerbil"; + rev = "95d60d486c1603743c6d3c525e6d5f5761b984e5"; + sha256 = "0ys07z78gq60z833si2j7xa1scqvbljlx1zb32vdf32f1b27c04j"; + }; + meta = { + description = "Super Monadic Über Go-into : Parsers and Gerbil Scheme"; + homepage = "https://github.com/drewc/smug-gerbil"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; + buildScript = '' + for i in primitive simple tokens smug ; do gxc -O $i.ss ; done + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix index 7b54438b5c..d4ff3ca7a9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2020-08-02"; - git-version = "0.16-120-g3f248e13"; + version = "unstable-2020-11-05"; + git-version = "0.16-152-g808929ae"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "3f248e139dfa11be74284fc812253fbecafbaf31"; - sha256 = "18v192cypj0nbmfcyflm8qnwp27qwy65m0a19ggs47wwbzhgvgqh"; + rev = "808929aeb8823959191f35df53bc0c0150911b4b"; + sha256 = "0d9k2gkrs9qvlnk7xa3gjzs3gln3ydds7yd2313pvbw4q2lcz8iw"; }; inherit gambit-support; gambit = gambit-unstable; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix index b9225cbd79..d702973338 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "20.06"; + version = "20.06.1"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "1gkr9w8lsdzqykqwd3f1a1phsqv090648i14ilhv8jdg85frdimr"; + sha256 = "ef093ae81424c4f3fe696eff9aefb5fb66899e11bb17ae0326adfb70d09c1c1f"; }; buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 566fd7be31..0bfaba914a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; - maintainers = with maintainers; [ doublec kamilchm patternspandemic redvers ]; + maintainers = with maintainers; [ kamilchm patternspandemic redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix index 6a827cff9a..4b1f572beb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix @@ -18,4 +18,8 @@ rec { rustcSrc = callPackage ./rust-src.nix { inherit rustc; }; + + rustLibSrc = callPackage ./rust-lib-src.nix { + inherit rustc; + }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix new file mode 100644 index 0000000000..67a7fa3641 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix @@ -0,0 +1,11 @@ +{ stdenv, rustc }: + +stdenv.mkDerivation { + name = "rust-lib-src"; + src = rustc.src; + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mv library $out + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/TODO.md b/third_party/nixpkgs/pkgs/development/idris-modules/TODO.md index 4dcaa61829..41b0be2b2e 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/TODO.md +++ b/third_party/nixpkgs/pkgs/development/idris-modules/TODO.md @@ -1,3 +1,3 @@ * Build the RTS separately from Idris * idris2nix -* Only require gmp, rts when compiling executables \ No newline at end of file +* Only require gmp, rts when compiling executables diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 39db54babe..bebb5376b8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.645"; + version = "1.10.1.727"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1z6a9an8ls992y4japmzdxay7c5d2z9s2q1xl4g615r23jwpcsf9"; + sha256 = "1mnxvy4n7g72vcwhvrgr0xqri3p9d9w76c8a78kphhmd8lq0m92q"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp clojure-tools-${version}.jar $out/libexec cp example-deps.edn $out cp deps.edn $out - cp clj_exec.clj $out + cp exec.jar $out substituteInPlace clojure --replace PREFIX $out diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix index 7d185edb1d..b9485fdcab 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -77,9 +77,7 @@ stdenv.mkDerivation { mkdir -p $out cp -R * $out/ echo $libPath - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $out/bin/dart + find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; libPath = makeLibraryPath [ stdenv.cc.cc ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix index 3dcd8c19ba..8f9d869abf 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.11.1"; - sha256 = "0czyv98sq9drlvdwv3gw9vnhn8qa3va4xh5vdqpg7m6b93l1r3p1"; + version = "1.11.2"; + sha256 = "0b4nfgxhmi4gwba9h9k103zrkpbxxvk0gmdl0ggrd5xlg6v288ky"; minimumOTPVersion = "21"; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix index e0e2357cc2..3ad55d806a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.1"; - sha256 = "1k74g6m2lidhp04vrcwrg0jszj3zwxyrm4fsma09sfn9rfsra36g"; + version = "23.1.2"; + sha256 = "06dp2sw486khy2lc34cw5dca58ii5jvi26dpchiqxnmyvd6995z0"; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix index 97e997bdd6..d075eb4e3f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "0xdm70b61pdj8z3g08az16y9b6cpz5hv7iwvwfyfyxrjdi47h419"; + sha256 = "1wimpcg4nyxykbkh407d7h0b828vmrf7sv412mgmif57p3aw433f"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix index 762ca2bdd3..81975bc525 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix @@ -9,4 +9,4 @@ runCommand "update-python-libraries" { cp ${./update-python-libraries.py} $out patchShebangs $out substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"' -'' \ No newline at end of file +'' diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL_image/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL_image/default.nix index 8e3078563e..968fc3d38a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL_image/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL_image/default.nix @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = [ + # Disable its dynamic loading or dlopen will fail because of no proper rpath + "--disable-jpg-shared" + "--disable-png-shared" + "--disable-tif-shared" + ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix index f2215b9b98..fb6cc72796 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "0n6y9xarqhj95i4h56klx10gy0fyckxbfwgiissfknpfq6l0m7r6"; + sha256 = "1bcvmxcnl1ig38fxqkx8ydidhxq6a0kn2k9waf0lygh4ap928sgk"; }; buildInputs = [ standard-library ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/third_party/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix index fd5ccf9696..88b1302271 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix @@ -33,4 +33,4 @@ in buildEnv { done popd ''; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix index b6d6b68875..ba7da8f5b7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "10hgjavhvn33y3k5j3l1326x13bxffghg2arxjrh7i7zd3qprfv5"; + sha256 = "1ld2k00500p107jarw379hsd1nlnm33972nv9c3ssfq619bj01c9"; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix index fadd2657b6..212b2f743d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchFromGitHub , cmake , cfitsio , libusb1 @@ -9,14 +9,18 @@ , curl , libjpeg , gsl +, fftw }: -stdenv.mkDerivation { - name = "indilib-1.1.0"; +stdenv.mkDerivation rec { + pname = "indilib"; + version = "1.8.6"; - src = fetchurl { - url = "mirror://sourceforge/indi/libindi_1.1.0.tar.gz"; - sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; + src = fetchFromGitHub { + owner = "indilib"; + repo = "indi"; + rev = "v${version}"; + sha256 = "1yzvcm7lwhwssnvv6gp8f7igmnvs35bpidmzz6z15awm5841yw30"; }; patches = [ @@ -36,12 +40,14 @@ stdenv.mkDerivation { libnova libjpeg gsl + fftw ]; - meta = { + meta = with stdenv.lib; { homepage = "https://www.indilib.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - description = "Implementaion of the INDI protocol for POSIX operating systems"; - platforms = stdenv.lib.platforms.unix; + description = "Implementation of the INDI protocol for POSIX operating systems"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ hjones2199 ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch b/third_party/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch index 0f497419e7..7016800129 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch @@ -1,12 +1,11 @@ -diff -Naur libindi-1.0.0-upstream/CMakeLists.txt libindi-1.0.0/CMakeLists.txt ---- libindi-1.0.0-upstream/CMakeLists.txt 2015-03-28 21:06:49.576863460 -0430 -+++ libindi-1.0.0/CMakeLists.txt 2015-03-28 21:07:48.420677548 -0430 -@@ -28,7 +28,7 @@ - ## the following are directories where stuff will be installed to - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") - set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/") --set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") -+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") - - ################## Includes ################################ - Include (CheckCXXSourceCompiles) +--- indi-1.8.6/CMakeLists.txt 2020-08-21 05:56:59.000000000 -0500 ++++ CMakeLists.txt 2020-11-01 12:50:57.621293870 -0600 +@@ -77,7 +77,7 @@ + ## the following are directories where stuff will be installed to + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") + set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") +-set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") ++set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") + + set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 5e361a09d3..73aaaec4e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.9.2"; + version = "1.9.4"; + + outputs = ["out" "dev"]; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; + sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; /* During darwin bootstrap, we have a cp that doesn't understand the @@ -23,30 +25,17 @@ stdenv.mkDerivation rec { # Hack to be able to run the test, broken because we use # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="`pwd`/src/lib_json''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" '' else '' - export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; nativeBuildInputs = [ cmake python validatePkgConfig ]; - patches = [ - # Fix generation of pkg-config file (https://github.com/open-source-parsers/jsoncpp/pull/1199) - (fetchpatch { - url = "https://github.com/open-source-parsers/jsoncpp/commit/b05a21342a646a986b11c28ba6b19665756d21d2.patch"; - sha256 = "0dn4cvvkcp9mnxbzyaqb49z6bv5yqsx1wlf1lyki1n2rni2hn63p"; - }) - ] ++ stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ - # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 - (fetchpatch { - url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; - sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; - }) - ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix index fd2ed39e34..a0f831e927 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gettext }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: stdenv.mkDerivation rec { pname = "libexif"; @@ -11,6 +11,20 @@ stdenv.mkDerivation rec { sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-0198.patch"; + url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch"; + sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k"; + }) + (fetchpatch { + name = "CVE-2020-0452.patch"; + url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch"; + excludes = [ "NEWS" ]; + sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6"; + }) + ]; + nativeBuildInputs = [ autoreconfHook gettext ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix index e1b9e4f0bd..84bd9b33e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "31"; + version = "33"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "10n2lnfrpsv4vyrirkphr4jwjjhy7i617g6za78dwirfjq63npw4"; + sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; }; nativeBuildInputs = [ flex bison ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix index c8cb7734e9..3fac142189 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, pandoc }: stdenv.mkDerivation rec { pname = "nuspell"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "1jfnwva2i67i9pyh123a5h2zs5p7gw77qh4w7qkx61jigsyxc5v7"; + sha256 = "1p90a3wv4b8m5fdpbnr9cyd1x3a504q9rc4cghq02xff63h5gclf"; }; - nativeBuildInputs = [ cmake pkgconfig ronn ]; + nativeBuildInputs = [ cmake pkgconfig pandoc ]; buildInputs = [ boost icu ]; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix index c8d8be4e8c..32e5c5381b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, flex, libevent, hwloc, munge, zlib +, libtool, flex, libevent, hwloc, munge, zlib, pandoc } : let - version = "3.1.5"; + version = "3.2.0"; in stdenv.mkDerivation { pname = "pmix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "0fvfsig20amcigyn4v3gcdxc0jif44vqg37b8zzh0s8jqqj7jz5w"; + sha256 = "171hpz0m6lpyjd1hkxy7fl06fcgymz8cssqgbxzg92b7x595276b"; }; postPatch = '' @@ -21,7 +21,7 @@ in stdenv.mkDerivation { patchShebangs ./config ''; - nativeBuildInputs = [ perl autoconf automake libtool flex ]; + nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ]; buildInputs = [ libevent hwloc munge zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix index 550d0b1bac..9d7bb38cf3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix @@ -7,4 +7,4 @@ callPackage ./generic.nix (args // rec { url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; }; -}) \ No newline at end of file +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 33229bbefc..6180c14c4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -100,7 +100,7 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - passthru.tests = callPackage ./test { }; + passthru.tests.cmake = callPackage ./test { }; meta = with stdenv.lib; { description = "C++ API of the PyTorch machine learning framework"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix index d661ec28db..e69807871f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -6,16 +6,12 @@ stdenv.mkDerivation { src = ./.; - postPatch = '' - cat CMakeLists.txt - ''; - - makeFlags = [ "VERBOSE=1" ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libtorch-bin ]; + doCheck = true; + installPhase = '' touch $out ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp index 5537724ce5..ca238fba52 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp @@ -1,7 +1,20 @@ -#include +#undef NDEBUG +#include + #include +#include + int main() { torch::Tensor tensor = torch::eye(3); - std::cout << tensor << std::endl; + + float checkData[] = { + 1, 0, 0, + 0, 1, 0, + 0, 0, 1 + }; + + torch::Tensor check = torch::from_blob(checkData, {3, 3}); + + assert(tensor.allclose(check)); } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 2be3baed44..7b91940033 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,5 @@ -{ stdenvNoCC +{ callPackage +, stdenvNoCC , fetchurl , rpmextract , undmg @@ -90,7 +91,8 @@ in stdenvNoCC.mkDerivation { substituteInPlace $f \ --replace "prefix=/mkl" "prefix=$out" \ --replace $\{MKLROOT} "$out" \ - --replace "lib/intel64_lin" "lib" + --replace "lib/intel64_lin" "lib" \ + --replace "lib/intel64" "lib" done for f in $(find opt/intel -name 'mkl*iomp.pc') ; do @@ -156,6 +158,8 @@ in stdenvNoCC.mkDerivation { dontStrip = true; dontPatchELF = true; + passthru.tests.pkg-config = callPackage ./test { }; + meta = with stdenvNoCC.lib; { description = "Intel Math Kernel Library"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix new file mode 100644 index 0000000000..688c0ec7c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkg-config, mkl }: + +stdenv.mkDerivation { + pname = "mkl-test"; + version = mkl.version; + + src = ./.; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ mkl ]; + + doCheck = true; + + buildPhase = '' + # Check regular Nix build. + gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + + # Clear flags to ensure that we are purely relying on options + # provided by pkg-config. + NIX_CFLAGS_COMPILE="" \ + NIX_LDFLAGS="" \ + gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + ''; + + installPhase = '' + touch $out + ''; + + checkPhase = '' + ./test + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/test.c b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/test.c new file mode 100644 index 0000000000..9413ac0c68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/test.c @@ -0,0 +1,12 @@ +#include + +#include + +int main() { + float u[] = {1., 2., 3.}; + float v[] = {4., 5., 6.}; + + float dp = cblas_sdot(3, u, 1, v, 1); + + assert(dp == 32.); +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 67faad8cd7..13132c8cc1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p"; + sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"; }; # $out for the library and $examples for the example programs (in examples): @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libpng ffmpeg ]; - mesonFlags = [ "-Dlogind-provider=systemd" ]; + mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; postFixup = '' # Install ALL example programs to $examples: diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 98963ba412..9c5e10d3a4 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -2,22 +2,22 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (5.2.4.3) + activesupport (5.2.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.3) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.0.beta.2) + cocoapods (1.10.0) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0.beta.2) + cocoapods-core (= 1.10.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,8 +31,8 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.17.0, < 2.0) - cocoapods-core (1.10.0.beta.2) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.0) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -64,19 +64,19 @@ GEM i18n (1.8.5) concurrent-ruby (~> 1.0) json (2.3.1) - minitest (5.14.1) + minitest (5.14.2) molinillo (0.6.6) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) - public_suffix (4.0.5) + public_suffix (4.0.6) ruby-macho (1.4.0) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.18.0) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock index 9e891569d9..d4de7cd698 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,25 +2,26 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.3) - i18n (~> 0.7) + activesupport (5.2.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.3) - activesupport (>= 4.0.2, < 5) + cocoapods (1.10.0) + addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.3) + cocoapods-core (= 1.10.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-stats (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) @@ -30,55 +31,57 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.3) - activesupport (>= 4.0.2, < 6) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.0) + activesupport (> 5.0, < 6) + addressable (~> 2.6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) + public_suffix typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.3.0) + cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.1.0) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.12.2) + ffi (1.13.1) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.8.5) concurrent-ruby (~> 1.0) - json (2.3.0) - minitest (5.14.1) + json (2.3.1) + minitest (5.14.2) molinillo (0.6.6) - nanaimo (0.2.6) + nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) + public_suffix (4.0.6) ruby-macho (1.4.0) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.16.0) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.6) + nanaimo (~> 0.3.0) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index b456f728b4..9067f2cec4 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02fdawr3wyvpzpja3r7mvb8lmn2mm5jdw502bx3ncr2sy2nw1kx6"; + sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; type = "gem"; }; - version = "5.2.4.3"; + version = "5.2.4.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z94dnx0rljsfa3k24i1nc0vf1nfk3bbk89nqc6n1ax25h4fs5sw"; + sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96"; type = "gem"; }; - version = "1.27.3"; + version = "1.27.5"; }; atomos = { groups = ["default"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jf5q75h410b6gymy86j4zy9yhb6n28wa7hrk8p7y2dsafdzbric"; + sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j"; type = "gem"; }; - version = "1.10.0.beta.2"; + version = "1.10.0"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrw6v5fp0m903ghvfwaw3mbxrr68x7hz9bj34rj4icirwp4ifyl"; + sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4"; type = "gem"; }; - version = "1.10.0.beta.2"; + version = "1.10.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -263,10 +263,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; type = "gem"; }; - version = "5.14.1"; + version = "5.14.2"; }; molinillo = { groups = ["default"]; @@ -313,10 +313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.5"; + version = "4.0.6"; }; ruby-macho = { groups = ["default"]; @@ -366,9 +366,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18idiqfbvyrcyflccwy4qw125psckrnqy7ggci33m8f3zs8h7hnm"; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; type = "gem"; }; - version = "1.18.0"; + version = "1.19.0"; }; } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix index 8ff1b2e118..3641186186 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix @@ -1,14 +1,25 @@ { activesupport = { - dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; + sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.4.4"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -16,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0"; + sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96"; type = "gem"; }; - version = "1.27.2"; + version = "1.27.5"; }; atomos = { source = { @@ -50,26 +61,26 @@ version = "1.0.3"; }; cocoapods = { - dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zqj1878izp34cn7552q2djs3zd4a5ylyv0af3yxbz34z0qllk60"; + sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; + dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sn1561sdhq2bh35pmi9nhq1adjcgdkhxybd9pxcjs75zmqzpz13"; + sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -86,10 +97,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08vn0pgcyn6w6fq5xjd7szv2h9s5rzl17kyidnd7fl5qdmzc9c54"; + sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -108,16 +119,6 @@ }; version = "1.0.0"; }; - cocoapods-stats = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; - type = "gem"; - }; - version = "1.1.0"; - }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; groups = ["default"]; @@ -152,10 +153,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; escape = { source = { @@ -181,10 +182,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; fourflusher = { groups = ["default"]; @@ -224,32 +225,34 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; type = "gem"; }; - version = "0.9.5"; + version = "1.8.5"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; type = "gem"; }; - version = "5.14.1"; + version = "5.14.2"; }; molinillo = { source = { @@ -260,12 +263,14 @@ version = "0.6.6"; }; nanaimo = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6"; + sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; type = "gem"; }; - version = "0.2.6"; + version = "0.3.0"; }; nap = { source = { @@ -283,6 +288,16 @@ }; version = "0.11.0"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; ruby-macho = { groups = ["default"]; platforms = []; @@ -329,9 +344,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index dc15488105..0d35f0fbd5 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -31,15 +31,6 @@ let sha512 = "twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w=="; }; }; - "@angular-devkit/core-10.0.7" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "10.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.7.tgz"; - sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; - }; - }; "@angular-devkit/core-10.2.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; @@ -49,15 +40,6 @@ let sha512 = "XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA=="; }; }; - "@angular-devkit/schematics-10.0.7" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "10.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.7.tgz"; - sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; - }; - }; "@angular-devkit/schematics-10.2.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -67,13 +49,13 @@ let sha512 = "TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww=="; }; }; - "@angular-devkit/schematics-cli-0.1000.7" = { + "@angular-devkit/schematics-cli-0.1002.0" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "0.1000.7"; + version = "0.1002.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1000.7.tgz"; - sha512 = "5zXO0WfyRySZudv2/EEC/UVfG75y7TGrdMfVZNc1WP0SB54psA0U3Z3jT+6Y9VjdjmXdxjVfybhuOzZ4I1fs0Q=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1002.0.tgz"; + sha512 = "wV5YPdcolPAXo5oyMu9vM3fm3grb3ZT9amrTMC9oc3OWQUVFySPCIzvguHf8bVGMQ/AHfel2TaYxIQv/LurBrQ=="; }; }; "@antora/asciidoc-loader-2.3.4" = { @@ -184,13 +166,13 @@ let sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apollo/federation-0.20.2" = { + "@apollo/federation-0.20.4" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.20.2"; + version = "0.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.2.tgz"; - sha512 = "SrwUK0dZdlHLDkv/8K/Q5OK1AE/RypNkLmxhBndlOKAb2e5li6dZy6FJGNbErgHBAJQSx2Xp1gCF5CZONbFxpw=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.4.tgz"; + sha512 = "A/2BtgSytrrA2nSuCrKIlXYemfMEzCosIOD4vUjK7Y1LvNuPCBxt6mdZ+hjKrfpY4IXhZdgbtHjI5/Q2Pkqsmg=="; }; }; "@apollo/protobufjs-1.0.5" = { @@ -328,13 +310,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.11.6" = { + "@babel/generator-7.12.1" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.6"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; - sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"; + sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg=="; }; }; "@babel/generator-7.12.5" = { @@ -1372,13 +1354,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.5" = { + "@babel/types-7.12.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.5"; + version = "7.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.5.tgz"; - sha512 = "gyTcvz7JFa4V45C0Zklv//GmFOAal5fL23OWpBLqc4nZ4Yrz67s4kCNwSK1Gu0MXGTU8mRY3zJYtacLdKXlzig=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz"; + sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA=="; }; }; "@bugsnag/browser-7.5.1" = { @@ -1741,13 +1723,13 @@ let sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg=="; }; }; - "@expo/config-3.3.13" = { + "@expo/config-3.3.14" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.13"; + version = "3.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.13.tgz"; - sha512 = "ZFkMQxtk6Zobfc+BPy60rAAuiXFd5ybV7QFF3A7tTy7e6T0/YmuiSMyTM6fqs2c0O47F8/1eoaefXWUl7ppz3w=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.14.tgz"; + sha512 = "nYnnNJRr3UZlBsUk4esbeYS2AfR3EFw4x9bVZQbbWKgDapFj26QIjGYeolZrO0yFhllSC/TU+2YNIyt6sQwRpw=="; }; }; "@expo/config-types-40.0.0-beta.1" = { @@ -1768,22 +1750,22 @@ let sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; }; }; - "@expo/dev-server-0.1.38" = { + "@expo/dev-server-0.1.39" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.38"; + version = "0.1.39"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.38.tgz"; - sha512 = "LOLqo/SpjVfYuSEOicKgCnUzIvbV0oYvXTS9Rr/LBxw3Q/Smy8p8FbYZ/7RTbSnFbCW1oZWERJ+Qe1ghWKbAEw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.39.tgz"; + sha512 = "PTNrPQ7z3yYLijePiqOKTtjTtzpn9HECE0LQKFcf/IVHxxVe/ScRWJAu6xndL51sXWJgE3PXg8r47UMLHb7Y2w=="; }; }; - "@expo/dev-tools-0.13.57" = { + "@expo/dev-tools-0.13.58" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.57"; + version = "0.13.58"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.57.tgz"; - sha512 = "eRP49UYFVytfK7cHA6notnfmCiWvcQ2FOFJABeti2zUa3O55IDP0b/NDqdyLRDpuTxsRZl/K0MBLD5NAUsHMHQ=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.58.tgz"; + sha512 = "CdlCPWEzvA69ZucdeCYFoM0fEBVufcSwOOs2xcEJo2cVHGJkCUFhEwASXHdPOGt773DF1ISF4mKQAUsLtmA7qw=="; }; }; "@expo/eas-build-job-0.1.2" = { @@ -1813,13 +1795,13 @@ let sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w=="; }; }; - "@expo/metro-config-0.1.38" = { + "@expo/metro-config-0.1.39" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.38"; + version = "0.1.39"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.38.tgz"; - sha512 = "t7BW8cgmm7nmxiY20g1ZMKvXFyDr5Kq+9Ppnskvhg+QffXcY3db/kYSOR0QswscqF5/jBPVGjox7m4+SBKHCDg=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.39.tgz"; + sha512 = "oCeBGyLPmo65HeUPKEBMiZCbh2RfEbH8AO7Apwitn1zs8LZf9DvVtpEh7mlYRJlmKCrxaM4NjuFZMcquh72aiQ=="; }; }; "@expo/ngrok-2.4.3" = { @@ -2020,22 +2002,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.42" = { + "@expo/webpack-config-0.12.43" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.42"; + version = "0.12.43"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.42.tgz"; - sha512 = "VqQIzFiQQQLMQISdmIqBgJHeGD9LO8eP9sI5puW6y8oEB7Cd8asU+DOC3xJVS1MrqK2usQhW5EJhi2wV7RVG8g=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.43.tgz"; + sha512 = "2XNqppNrngC4WrJJRnKpST6Xzez6GbUxB+SwhKVef8qf4Uw2vE50p0zpGTcIzs+aAIaKW3cFSIRQnhxkVrGXww=="; }; }; - "@expo/xdl-58.0.18" = { + "@expo/xdl-58.0.19" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "58.0.18"; + version = "58.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.18.tgz"; - sha512 = "CwwLtdEIj857iXwhc10V+gjuepOQ0S21wWM0oKny0TzGSmCz8uVvTCnKK+Geem5hsqyKkCsayirUKTeZ2ToMqA=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.19.tgz"; + sha512 = "+YWCOSJi6CoBLSgktJfy8/ijQGK3WbPUmujndcxY/WPmCe+Wek6kajmxclMMuDVAjg4RFXdH/fuLwOb/abOU5g=="; }; }; "@fluentui/date-time-utilities-7.9.0" = { @@ -2065,22 +2047,22 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.149.3" = { + "@fluentui/react-7.149.4" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.149.3"; + version = "7.149.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.3.tgz"; - sha512 = "CmeTmPcqEy+lHCKsxg2Y0QnvU1dfyh8F/3Bkt48yo+B6/eCEUUCQW+Xl3ktp3tvlijdLaskKV68L9lNh3RZP4Q=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.4.tgz"; + sha512 = "yZqU5EFYDlXZQfFLIm085/A/nYW9SL/YccPT6E+r51vwn4NlfRSQ6K0IFD5cGnMPOhA+mwyT79uFgxb3/I281A=="; }; }; - "@fluentui/react-focus-7.16.16" = { + "@fluentui/react-focus-7.16.17" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.16"; + version = "7.16.17"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.16.tgz"; - sha512 = "1YtdaoFUwQWiVfBnhIcMxb0U6ZH3uyk9asfjluW9d6GsUTWczY+PNKZWukIQT1dtpr4+LcOw+F5oSTnzux/Mpg=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.17.tgz"; + sha512 = "Uioe+9tZoiXxp5aKam6Y+PyU46UDGMCF4xYctgP3tIpPyi7xfka7Aat6IyIFcTxN53UKea2IcCMzbOhpK0VTLg=="; }; }; "@fluentui/react-window-provider-1.0.1" = { @@ -2092,13 +2074,13 @@ let sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w=="; }; }; - "@fluentui/theme-1.5.4" = { + "@fluentui/theme-1.6.0" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.4.tgz"; - sha512 = "f89jKHET6/f4Z+BzKzs1YXA3mAsBBIDSOtc5ZXfNwYcKPJ0ZqKYtplRz668LcvHdz1ysMR0XxtA0Y5eNUXyLxw=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.6.0.tgz"; + sha512 = "X+uJx7+9ChfM0SAq+eDLgL9t65ZA8NAc1Ifrw4eek6cS3c1eY95/tgf1EkX+hOE9+oIuEATujM9THzk+4yd1VQ=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2128,13 +2110,13 @@ let sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/delegate-7.0.3" = { + "@graphql-tools/delegate-7.0.4" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.3.tgz"; - sha512 = "BSRF/Wg9XNllWo3Kdt0QBBaFltexn3vAnTOWH1qLrNcmfQAvUMf17/TsAqH9ZLSKU1NW9XCOsd7YMHhhUuTCEg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.4.tgz"; + sha512 = "6/qL9V31FgECNPwc5As1359hpsAt4ASWsiYBSYWL+Iq9/K0YRcNeEmSseXIyCP4oh8k/9HS/w/m2lkMk/YSUpQ=="; }; }; "@graphql-tools/graphql-file-loader-6.2.5" = { @@ -3343,13 +3325,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.125" = { + "@microsoft/load-themed-styles-1.10.126" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.125"; + version = "1.10.126"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.125.tgz"; - sha512 = "qig3jfhrlwvK0tDQc3mrEbg6hUt432FDK4y3zJH9upT068Qrk40s6J62Kv7YW+lIMfX5h/tTi5Y/RyvqwcM+Nw=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.126.tgz"; + sha512 = "6GoapdGJPmWq6WChTaImAZ6UjuPb2FWHeP/pTEHw6Dz+d4/4TnyWcVR9uDLx+8n6xn3ZpU6OtW0FEGzNNa+TUw=="; }; }; "@mozilla/readability-0.3.0" = { @@ -3478,40 +3460,40 @@ let sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q=="; }; }; - "@netlify/traffic-mesh-agent-0.24.0-pre.23" = { + "@netlify/traffic-mesh-agent-0.24.0" = { name = "_at_netlify_slash_traffic-mesh-agent"; packageName = "@netlify/traffic-mesh-agent"; - version = "0.24.0-pre.23"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0-pre.23.tgz"; - sha512 = "uv5F3grah5C0CPGm8raASIyVDi+lYBR4os+wG0GXkUVCU2r2Pcl8MStLeN3phe1G3AjVkco5WcAKC8XfBvvqEw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0.tgz"; + sha512 = "m3nfdolp8+jwy7sBKz6iuw1MRRZR27onrUtQz3Iwor7CE0+rIWJm+aPc5AFYUlISDM5zTCXgVGDeiPHJv5cOQQ=="; }; }; - "@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23" = { + "@netlify/traffic-mesh-agent-darwin-x64-0.24.0" = { name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; packageName = "@netlify/traffic-mesh-agent-darwin-x64"; - version = "0.24.0-pre.23"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0-pre.23.tgz"; - sha512 = "XDn77F+tx+qQZ9sMwqmwRAOEm56syA7xO1rScDY4JV8oSyvwa6sfUWnFXefyxUt1uLNfIQhiKDnA4sOyCRJxDw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0.tgz"; + sha512 = "aFh/04aTRNI7BAyUbpXvH6AZ+XcJMxwroQWfMYjyVm7F+T4bg0XRcteoVjX/U2NhxkNhCXMqBgrHFsVNZLlJ7w=="; }; }; - "@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23" = { + "@netlify/traffic-mesh-agent-linux-x64-0.24.0" = { name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; packageName = "@netlify/traffic-mesh-agent-linux-x64"; - version = "0.24.0-pre.23"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0-pre.23.tgz"; - sha512 = "9D2sFOcO72IBsqiHgU1Z5tQ6+lvjRBUeOc0iFKgcUPG5eJ46pgrOAD8B8tNd2FscNz2lyrJxZc1kGAOjYikzUQ=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0.tgz"; + sha512 = "cUHUpajpK3WrE78F29fEuOKuRG+mkXoPoe2SL9wO+sCrAw18A9px/tfWWFwC9iJLSr/WLHYAAOJhdm02ypa65A=="; }; }; - "@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23" = { + "@netlify/traffic-mesh-agent-win32-x64-0.24.0" = { name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; packageName = "@netlify/traffic-mesh-agent-win32-x64"; - version = "0.24.0-pre.23"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0-pre.23.tgz"; - sha512 = "kFImydqG6Er+kgG5UFjIWBp7TxFcf/eOoXSOWr6a+3kJu2iwZP2IdflyNK9EsKdW/KA+W43PXleF4VQwLm830w=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0.tgz"; + sha512 = "9K4QA5VcJK9Wrx9BTKSaeOaX9es7lfS97iJMB1micSFuLIK5o/DS9oxaa4tMjzIy0Ck/Pa717XX9TGx9MpCexA=="; }; }; "@netlify/zip-it-and-ship-it-1.4.0" = { @@ -3523,58 +3505,58 @@ let sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ=="; }; }; - "@node-red/editor-api-1.2.2" = { + "@node-red/editor-api-1.2.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.2.tgz"; - sha512 = "5bKIH2lPYiYMYLQIpBplwu4tkuFk4JI24sCOyYsPTkT1EB2zx4qxQndwc+crKjBCMbMvHdh2D3zw9mc1Av9B7g=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.3.tgz"; + sha512 = "7xw02VV69E08jx4cnLkVaOaX+XrQNPlFCRSobAQyj6KKGizMbclWKbsIF6gWSnWEHJdQR/kbAuaK0Qm/F19YuA=="; }; }; - "@node-red/editor-client-1.2.2" = { + "@node-red/editor-client-1.2.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.2.tgz"; - sha512 = "bkNPwzTFhe1AYVydmgqHNfhUsdHfJx261PGLOS9ZJYf9Ww2jVDKXGxHz25qd4lgeRqnUcT7b6T2bOzqVs1zMWA=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.3.tgz"; + sha512 = "nYmt4B2GwZOAQIAeHDj6dj85aJ2KnyXdX4nHqRkpBO3UMqfaZuG2WuhDful/TOUEhgTOXWLzXVPQwzFt3q9fRA=="; }; }; - "@node-red/nodes-1.2.2" = { + "@node-red/nodes-1.2.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.2.tgz"; - sha512 = "cbHfjdV5QGEQtwYpqZh7ylUnI3zbXmfvcIoGRMXVyhHTgok00ltAgJtJ3PGHSSOsd/OWshPKO2OPoM0xenepTw=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.3.tgz"; + sha512 = "HHWRtbronw4OaFGlF58CYSCFHTVzvfzT+mWmqTucP7iD14658hDHUAVPC8eFmP6E2tbo+Vy3+Rdu80djcaRyUQ=="; }; }; - "@node-red/registry-1.2.2" = { + "@node-red/registry-1.2.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.2.tgz"; - sha512 = "HTpv/5OmptMkXYzlGfwQZl8lb+e5ta72z0nexNgbox5nc1Cg65CaFvhwcjC9UVK7ROblwDlVnutBG03eZvyOoA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.3.tgz"; + sha512 = "wGJ1KK1+NycM+Sbmib6FIL4/OwWxB0sx4IHLI5tYdGYLaf7MYSKTcNxpLvUwjsE2k0ngeiqW43oPhyFrK01Ihw=="; }; }; - "@node-red/runtime-1.2.2" = { + "@node-red/runtime-1.2.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.2.tgz"; - sha512 = "a4dGwF4BgAYAFyKGGyeLjashn1hstl1i7g2nwGFfnI2hJvF05fzj2lGy8dWE6wYq6c2FZQv4OetAwBfN1akxsg=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.3.tgz"; + sha512 = "qFEJ8Xgg5lgtlYPW/Zfi2r8HBMzTzwP+ws7f9So28fG76SGcXk8MfNnx2GTSGRnp+a9Mn1/SRlunNQqw9bQ/LA=="; }; }; - "@node-red/util-1.2.2" = { + "@node-red/util-1.2.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.2.tgz"; - sha512 = "7rj3qb/puqcNaHIz12wtLjuJ1pHWsZzPZ+vEubs116SxAas6OVYYLuBGEPhHWeE3zg3t6Erv7wYNaDZeyUm/CQ=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.3.tgz"; + sha512 = "myAbQ35tk/oIJJfwUehpQbobFcAkeLxRKmRE5FOda8S79RHJh3OJVdISSm2lgUh0QlwFl4D8fZvu+2wZ5GoB0Q=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -3685,6 +3667,15 @@ let sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA=="; }; }; + "@oclif/command-1.6.1" = { + name = "_at_oclif_slash_command"; + packageName = "@oclif/command"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/command/-/command-1.6.1.tgz"; + sha512 = "pvmMmfGn+zm4e4RwVw63mg9sIaqKqmVsFbImQoUrCO/43UmWzoSHWNXKdgEGigOezWrkZfFucaeZcSbp149OWg=="; + }; + }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -3694,6 +3685,15 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; + "@oclif/config-1.15.1" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz"; + sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ=="; + }; + }; "@oclif/config-1.17.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; @@ -3703,6 +3703,15 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; + "@oclif/errors-1.2.2" = { + name = "_at_oclif_slash_errors"; + packageName = "@oclif/errors"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.2.2.tgz"; + sha512 = "Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg=="; + }; + }; "@oclif/errors-1.3.3" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -4621,13 +4630,13 @@ let sha512 = "rJRTTTL8CMMFb3ebCvAVHKHxuNzRqy/HtbXhJ82l5Xo/jXcm74eV2Q0RBUrNo1yBKWFIR+FIwiXLJaGcC/R9Pw=="; }; }; - "@schematics/schematics-0.1000.7" = { + "@schematics/schematics-0.1002.0" = { name = "_at_schematics_slash_schematics"; packageName = "@schematics/schematics"; - version = "0.1000.7"; + version = "0.1002.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1000.7.tgz"; - sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; + url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1002.0.tgz"; + sha512 = "A6z0j+GCgj3NPAJ3+OZPgU/8KYLHcVWN+ZELuQTFXZgN6mpgbxCmM3yymfo7+riaF0xx1mXlt8G+tO7xDsLVvQ=="; }; }; "@schematics/update-0.1002.0" = { @@ -4684,13 +4693,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.1.1" = { + "@serverless/enterprise-plugin-4.1.2" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.1.tgz"; - sha512 = "ga9g/bRyA6LCckYPU8jvx63Q9+Po/yZxbdbYb2KiCZ+0S1YcQQsjDJwsOTAAgQ6AEp95TtrQkn3BycYTSGEm7A=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.2.tgz"; + sha512 = "aAHF9ElWr0eaAEVXy6M9DvokiyVV/y5xokiBnAhQisMT2faTVlCX1B8D1nJef0NdJ6pXJVOd3JrXC4rIxjz0zg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -4711,13 +4720,13 @@ let sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q=="; }; }; - "@serverless/platform-client-china-2.0.7" = { + "@serverless/platform-client-china-2.0.8" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.7.tgz"; - sha512 = "SuHCHqwCjZXODdSlgetXFGksz+ksAWy3kbCpFhAC9nkiFSWR01CLX4a6UW+VhOeb6j6F3wbkczzqi38P17+USg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.8.tgz"; + sha512 = "20sceKHkGP56HnwMgrdHwD963bxew63+hE2aNrcu1DtLuUqcRvP5evaWO/CwMDTajJJDhEwi3wQDxPpxtKlJ7A=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -4954,13 +4963,13 @@ let sha512 = "uWKtjh29I/d0mfmfBN7w6RwwNBQxQVKrauF5ND/gqb0PVsKV22GIpkI+viWjI7KNKso6/B0tMmsv7TX2tsNcLQ=="; }; }; - "@sorg/log-2.2.0" = { + "@sorg/log-2.2.1" = { name = "_at_sorg_slash_log"; packageName = "@sorg/log"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.0.tgz"; - sha512 = "w5aH2k4caUWxO3dzJ0+GUJJGSqsg0gT6myhypQumlJXsKzYqzsZGZRWA2s/0zQIx6+B2wDvdweVogiWMAAbaKw=="; + url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.1.tgz"; + sha512 = "GGtgReHuH7M+FS0pGy6tb3QPNVipjUl5+RWvG8yMP3Hb+Lq0AqsFYgBUz+FVECQ9J3otvsAzgOfz+8BIqRUr0Q=="; }; }; "@starptech/expression-parser-0.10.0" = { @@ -5089,13 +5098,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@tencent-sdk/capi-1.1.5" = { + "@tencent-sdk/capi-1.1.6" = { name = "_at_tencent-sdk_slash_capi"; packageName = "@tencent-sdk/capi"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.5.tgz"; - sha512 = "cHkoMY/1L5VxeiKv51uKxbFK8lZ7pZbY3CukzOHro8YKT6dETKYzTGO/F8jDhH7r8vKWxuA+ZcALzxYuVlmwsg=="; + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.6.tgz"; + sha512 = "3Ietq/r8B/CQu94qXr4YrNE79p5emhtMI6szHh/cD9xz1/6OOUwW/agcCO1748v94jjxOFEspAvva6jGVriuGA=="; }; }; "@textlint/ast-node-types-4.3.4" = { @@ -5854,13 +5863,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.164" = { + "@types/lodash-4.14.165" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.164"; + version = "4.14.165"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.164.tgz"; - sha512 = "fXCEmONnrtbYUc5014avwBeMdhHHO8YJCkOBflUL9EoJBSKZ1dei+VO74fA7JkTHZ1GvZack2TyIw5U+1lT8jg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.165.tgz"; + sha512 = "tjSSOTHhI5mCHTy/OOXYIhi2Wt1qcbHmuXD1Ha7q70CgI/I71afO4XtLb/cVexki1oVYchpul/TOuu3Arcdxrg=="; }; }; "@types/long-4.0.1" = { @@ -6340,22 +6349,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.50.0" = { + "@types/vscode-1.51.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.50.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz"; - sha512 = "QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg=="; - }; - }; - "@types/webpack-4.41.21" = { - name = "_at_types_slash_webpack"; - packageName = "@types/webpack"; - version = "4.41.21"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz"; - sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.51.0.tgz"; + sha512 = "C/jZ35OT5k/rsJyAK8mS1kM++vMcm89oSWegkzxRCvHllIq0cToZAkIDs6eCY4SKrvik3nrhELizyLcM0onbQA=="; }; }; "@types/webpack-4.41.24" = { @@ -6511,22 +6511,22 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.18" = { + "@uifabric/foundation-7.9.19" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.18"; + version = "7.9.19"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.18.tgz"; - sha512 = "xDDuKAyYNEppKF7lFqolUTQoIYbv70f2teLudsh0yeRDVoISNT4A87nDc/Xa4bkTwttc9Di+D1HEZWP9Wqpj1w=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.19.tgz"; + sha512 = "F/kKiFL4uSiosnqdv1BT3aQ3w9bQ3l+F3NiMqDbJpnlBAOMOlH2X7xAxZsNYbS66pgTPKsSP/8/SK3A+0wzMXg=="; }; }; - "@uifabric/icons-7.5.15" = { + "@uifabric/icons-7.5.16" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.15"; + version = "7.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.15.tgz"; - sha512 = "jNrPY7lsEs7gPUXokIYFxZs4TuX5Xiivx/KtxtoZKM4cpurLJx3ddCyOMp+kNn1ljzaNKNbcJae/ONB/jMJkQA=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.16.tgz"; + sha512 = "S+KGDZeN9y5sBJfg7Jgi3/598CxE0hvlMtl1XzzftKPdD2Jw8QCQazgYFqG8iZj6R5ILFjezoDr+yXYj6dMXMQ=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6556,13 +6556,13 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.16" = { + "@uifabric/styling-7.16.17" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.16"; + version = "7.16.17"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.16.tgz"; - sha512 = "FFRXMjRPCagj+fN1o8O/FsbO7jHqVKEJyKT5j+zCwl0yBx5XqbQLcX9wzAEdBItB4anlgO7C5ZtFBUholwcCiA=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.17.tgz"; + sha512 = "9TZP5npZopaQUkb7V418bu2OzqjL+4uov9n59Kh/Ll2Bq9WyWg/kngGUMX793gxjOMy9w2IUEd2LN3odM05OlQ=="; }; }; "@uifabric/utilities-7.33.2" = { @@ -7159,22 +7159,22 @@ let sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w=="; }; }; - "@webpack-cli/info-1.0.2" = { + "@webpack-cli/info-1.1.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.0.2.tgz"; - sha512 = "FEfLQwmN4pXZSYSrtp+KC84rFanoCIxXFpS2wUvviDCE2fnajwxw2GXzbj83IlH4Dl8Wq8kJjavVwvxv3YJmnw=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.1.0.tgz"; + sha512 = "uNWSdaYHc+f3LdIZNwhdhkjjLDDl3jP2+XBqAq9H8DjrJUvlOKdP8TNruy1yEaDfgpAIgbSAN7pye4FEHg9tYQ=="; }; }; - "@webpack-cli/serve-1.0.1" = { + "@webpack-cli/serve-1.1.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.0.1.tgz"; - sha512 = "WGMaTMTK6NOe29Hw1WBEok9vGLfKg5C6jWzNOS/6HH1YadR+RL+TRWRcSyc81Dzulljhk/Ree9mrDM4Np9GGOQ=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.1.0.tgz"; + sha512 = "7RfnMXCpJ/NThrhq4gYQYILB18xWyoQcBey81oIyVbmgbc6m5ZHHyFK+DyH7pLHJf0p14MxL4mTsoPAgBSTpIg=="; }; }; "@wry/context-0.4.4" = { @@ -7807,15 +7807,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.12.3" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"; - sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; - }; - }; "ajv-6.12.4" = { name = "ajv"; packageName = "ajv"; @@ -8347,13 +8338,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.31.0" = { + "apollo-2.31.1" = { name = "apollo"; packageName = "apollo"; - version = "2.31.0"; + version = "2.31.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.31.0.tgz"; - sha512 = "galQp/6UAiP+Aa2WtJZPIPPAiQqR6Um/fe0cOC8wu3c1BmXF2fHzjj2NSOv7xqAHZPyBRn/ixIe0aVUy3gcCLw=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.31.1.tgz"; + sha512 = "qx64LGc09GSwpEIUbRJX90zq6ixVsgo6ZPGuCsDTY83Lz5ITMeXIs7+CF/1oAU1IzEI+YRMVsFTkK2aIBZzSYA=="; }; }; "apollo-cache-1.3.5" = { @@ -8392,49 +8383,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.38.0" = { + "apollo-codegen-core-0.38.1" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.38.0"; + version = "0.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.38.0.tgz"; - sha512 = "NZnmS1qWFSlYaraxyi9q4uVFDGktr3IgQmgGI5Jj7iBY5iFTNJIIDXb2ufB8UvLBF3eKqHR9VxpQIAi4wfo8+w=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.38.1.tgz"; + sha512 = "LOeLQdSeKnHJBYxjhrJ/4b8RR9V4f9QhUAB/wYyJ7g8eCT4ZcjdGdwQ/KnijI0GmrWaz+t4Z5zn3wpXaudn7bA=="; }; }; - "apollo-codegen-flow-0.36.0" = { + "apollo-codegen-flow-0.36.1" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.36.0"; + version = "0.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.36.0.tgz"; - sha512 = "OJ3aRqxbI63NnUrUrPaindeXCI9bOCGmIHoENGGXwNrtS229lUJ9b6rTelqyfAwKau8AysJQoMfAclula3Br7A=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.36.1.tgz"; + sha512 = "+986zLn9gA44fKF+7iKrPrtSN0cCtlgXeqBHZFujcyGaWWzra8+/lj23L+toFCT+FI93KYGZLqslrlwoMbcD3g=="; }; }; - "apollo-codegen-scala-0.37.0" = { + "apollo-codegen-scala-0.37.1" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.37.0.tgz"; - sha512 = "Wsvd/eF6XBnzJvl1AceiAXw3pFwGYWyKXWbCzneuNHggf3ONc09V0zPQ2dqcsMnslIn6y+HnZav9rQB/iJNNEQ=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.37.1.tgz"; + sha512 = "+pSDQ4MbGZNbQ1VgfHK0P+w+iDoIHDQ2Bq7WhjX8ZayKTpLb/X9eWYMzrfQRtr0uDrXbbPkM0YGj1kcdGehINw=="; }; }; - "apollo-codegen-swift-0.38.0" = { + "apollo-codegen-swift-0.38.1" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.38.0"; + version = "0.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.38.0.tgz"; - sha512 = "kUoDUOOY3h7fUg4hpNNZrQl+bfPzwxN49pl8lrGoEB8uvgaCBj5C77NbHTISomSk1OzdT8uVlm4l4oJiMsT28g=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.38.1.tgz"; + sha512 = "VJROl4GQzDJn8EnFX6IEP/G1KMeHZblD/Mrbweza+3Kel4wH6SpD533Jc/W4pd4pxdzbhbmfXkJSzkL/xPIvbg=="; }; }; - "apollo-codegen-typescript-0.38.0" = { + "apollo-codegen-typescript-0.38.1" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.38.0"; + version = "0.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.38.0.tgz"; - sha512 = "sEAIoE38ASFtqU7bhj31vtSRLKix5H8ltwvU9MRMbpgWfos/r29krKrNSJi8DeouC1/QSQAOaFzsghCMe5fkrQ=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.38.1.tgz"; + sha512 = "UAHh1HliM8ahraF7csRYrbhrYhDcgqlE0PEu1WwqFISE1r7wRtLZXg+ic25iyRpTIZqkB8mfkym20Z5nZgmNbw=="; }; }; "apollo-datasource-0.7.2" = { @@ -8464,13 +8455,13 @@ let sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg=="; }; }; - "apollo-language-server-1.24.0" = { + "apollo-language-server-1.24.1" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.24.0.tgz"; - sha512 = "n1o1QmQ6hQcl5Rx+K23yO9MrDcF94Xygychn1pxJG5xKEZ8kkKxqNqjUhjFxIN908LJ4yuFjTW6OEtEym4haxg=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.24.1.tgz"; + sha512 = "2LYW/pWWBkG0/BggMedZ3EEHAQIKFc9PxHroxKhXh2Y5SXha4yQmmFILloQFrA6z7fU39IF6Tudgt5yNw2Cw/w=="; }; }; "apollo-link-1.2.1" = { @@ -9877,13 +9868,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.784.0" = { + "aws-sdk-2.786.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.784.0"; + version = "2.786.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz"; - sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.786.0.tgz"; + sha512 = "oL+rDkoBdn0Q3AxiEzSemCE3WqW6kBf0A72SIjDQZJb4/NDvA2mL2rpNQGaxaFX3zMHEwfUGcMu7T3q7I6Q0lw=="; }; }; "aws-sign2-0.6.0" = { @@ -10984,6 +10975,15 @@ let sha512 = "hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg=="; }; }; + "bitfield-4.0.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield/-/bitfield-4.0.0.tgz"; + sha512 = "jtuSG9CQr5yoHFuvhgf50+DH8Aezl3C/mMSfqdG4DqP7Kqe34uBUtCEHPN9oWaldTm96/i7y5e778SnM5ES4rw=="; + }; + }; "bitfield-rle-2.2.1" = { name = "bitfield-rle"; packageName = "bitfield-rle"; @@ -11020,6 +11020,15 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; + "bittorrent-lsd-1.0.0" = { + name = "bittorrent-lsd"; + packageName = "bittorrent-lsd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.0.0.tgz"; + sha512 = "rM3ECQrtEiE1ef5TTdQbWJgbpd4NQur3bxrNs0r5VPcYfnFhXT85m75+whkyV5NIwNsndS7M/D+Uf/Mi/BUrWg=="; + }; + }; "bittorrent-peerid-1.3.3" = { name = "bittorrent-peerid"; packageName = "bittorrent-peerid"; @@ -11029,13 +11038,13 @@ let sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w=="; }; }; - "bittorrent-protocol-3.1.2" = { + "bittorrent-protocol-3.2.0" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.2.tgz"; - sha512 = "vjKcxwQ/rDd3FeqImBZXLKk14eawf8sXVXPJd8LgrTZmpDzCn8kquhNIiYbE7M3SybAQ1r5uILJ7f2V2TlT8bQ=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.2.0.tgz"; + sha512 = "8xgCgK8xUg7MXZBxhqJapZy9hexHwN2TCD+b8m4yWg56/ZFfdkULxhxQkzuhpXyUfvKIKxeRzGmLT43li7FDKg=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -11821,13 +11830,13 @@ let sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; - "buffer-5.7.0" = { + "buffer-5.7.1" = { name = "buffer"; packageName = "buffer"; - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz"; - sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; "buffer-alloc-1.2.0" = { @@ -12550,13 +12559,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001154" = { + "caniuse-lite-1.0.30001156" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001154"; + version = "1.0.30001156"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz"; - sha512 = "y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001156.tgz"; + sha512 = "z7qztybA2eFZTB6Z3yvaQBIoJpQtsewRD74adw2UbRWwsRq3jIPvgrQGawBMbfafekQaD21FWuXNcywtTDGGCw=="; }; }; "canvas-2.6.1" = { @@ -13081,15 +13090,6 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.4.2" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz"; - sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; - }; - }; "chokidar-3.4.3" = { name = "chokidar"; packageName = "chokidar"; @@ -13378,6 +13378,15 @@ let sha512 = "eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q=="; }; }; + "clean-stack-1.3.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; + sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; + }; + }; "clean-stack-2.2.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -13594,6 +13603,15 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; + "cli-ux-5.4.6" = { + name = "cli-ux"; + packageName = "cli-ux"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.6.tgz"; + sha512 = "EeiS2TzEndRVknCqE+8Ri8g0bsP617a1nq6n+3Trwft1JCDzyUNlX2J1fl7fwTgRPWtmBmiF6xIyueL5YGs65g=="; + }; + }; "cli-ux-5.5.0" = { name = "cli-ux"; packageName = "cli-ux"; @@ -15161,13 +15179,13 @@ let sha512 = "jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA=="; }; }; - "conventional-changelog-angular-5.0.11" = { + "conventional-changelog-angular-5.0.12" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "5.0.11"; + version = "5.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz"; - sha512 = "nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw=="; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz"; + sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw=="; }; }; "conventional-changelog-core-3.2.3" = { @@ -15188,31 +15206,31 @@ let sha512 = "GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g=="; }; }; - "conventional-changelog-writer-4.0.17" = { + "conventional-changelog-writer-4.0.18" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.17"; + version = "4.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz"; - sha512 = "IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.18.tgz"; + sha512 = "mAQDCKyB9HsE8Ko5cCM1Jn1AWxXPYV0v8dFPabZRkvsiWUul2YyAqbIaoMKF88Zf2ffnOPSvKhboLf3fnjo5/A=="; }; }; - "conventional-commits-filter-2.0.6" = { + "conventional-commits-filter-2.0.7" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz"; - sha512 = "4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw=="; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz"; + sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA=="; }; }; - "conventional-commits-parser-3.1.0" = { + "conventional-commits-parser-3.2.0" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz"; - sha512 = "RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz"; + sha512 = "XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ=="; }; }; "conventional-recommended-bump-5.0.1" = { @@ -15494,13 +15512,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-compat-3.6.5" = { + "core-js-3.7.0" = { + name = "core-js"; + packageName = "core-js"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz"; + sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA=="; + }; + }; + "core-js-compat-3.7.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.6.5"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; - sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz"; + sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg=="; }; }; "core-util-is-1.0.2" = { @@ -16835,13 +16862,13 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; - "dayjs-1.9.4" = { + "dayjs-1.9.5" = { name = "dayjs"; packageName = "dayjs"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.4.tgz"; - sha512 = "ABSF3alrldf7nM9sQ2U+Ln67NRwmzlLOqG7kK03kck0mw3wlSSEKv/XhKGGxUjQcS57QeiCyNdrFgtj9nWlrng=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.5.tgz"; + sha512 = "WULIw7UpW/E0y6VywewpbXAMH3d5cZijEhoHLwM+OMVbk/NtchKS/W+57H/0P1rqU7gHrAArjiRLHCUhgMQl6w=="; }; }; "deasync-0.1.15" = { @@ -19004,13 +19031,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.587" = { + "electron-to-chromium-1.3.589" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.587"; + version = "1.3.589"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.587.tgz"; - sha512 = "8XFNxzNj0R8HpTQslWAw6UWpGSuOKSP3srhyFHVbGUGb8vTHckZGCyWi+iQlaXJx5DNeTQTQLd6xN11WSckkmA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.589.tgz"; + sha512 = "rQItBTFnol20HaaLm26UgSUduX7iGerwW7pEYX17MB1tI6LzFajiLV7iZ7LVcUcsN/7HrZUoCLrBauChy/IqEg=="; }; }; "elegant-spinner-1.0.1" = { @@ -19320,6 +19347,15 @@ let sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg=="; }; }; + "engine.io-4.0.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.1.tgz"; + sha512 = "6EaSBxasBUwxRdf6B68SEYpD3tcrG80J4YTzHl/D+9Q+vM0AMHZabfYcc2WdnvEaQxZjX/UZsa+UdGoM0qQQkQ=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -19356,6 +19392,15 @@ let sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="; }; }; + "engine.io-parser-4.0.1" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.1.tgz"; + sha512 = "v5aZK1hlckcJDGmHz3W8xvI3NUHYc9t8QtTbqdR5OaH3S9iJZilPubauOm+vLWOMMWzpE3hiq92l9lTAHamRCg=="; + }; + }; "enhanced-resolve-2.3.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -20769,13 +20814,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.48" = { + "expo-pwa-0.0.49" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.48"; + version = "0.0.49"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.48.tgz"; - sha512 = "4KaL0+YhFxS9zrpQG/BNW+fxMldvgx9dM16b6sZ2t7eMkDlUO7Vo6B+zxeg5l/naP27CA02bMUkeEHr61Y5ojA=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.49.tgz"; + sha512 = "HzwUGdnN9g5Ov/3r2uXwyjYP0xNtgOre1Z+Cywxg7GQWoFiklBfvYraIQFfwOjXVnsgo7bF4GFd4QW4v5vi9wA=="; }; }; "express-2.5.11" = { @@ -21831,15 +21876,6 @@ let sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; }; }; - "find-process-1.4.4" = { - name = "find-process"; - packageName = "find-process"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/find-process/-/find-process-1.4.4.tgz"; - sha512 = "rRSuT1LE4b+BFK588D2V8/VG9liW0Ark1XJgroxZXI0LtwmQJOb490DvDYvbm+Hek9ETFzTutGfJ90gumITPhQ=="; - }; - }; "find-requires-1.0.0" = { name = "find-requires"; packageName = "find-requires"; @@ -22434,13 +22470,13 @@ let sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; }; }; - "fork-ts-checker-webpack-plugin-5.1.0" = { + "fork-ts-checker-webpack-plugin-5.2.1" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz"; - sha512 = "vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz"; + sha512 = "SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw=="; }; }; "form-data-1.0.0-rc3" = { @@ -22911,13 +22947,13 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; - "fsevents-2.2.0" = { + "fsevents-2.2.1" = { name = "fsevents"; packageName = "fsevents"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.0.tgz"; - sha512 = "pKnaUh2TNvk+/egJdBw1h46LwyLx8BzEq+MGCf/RMCVfEHHsGOCWG00dqk91kUPPArIIwMBg9T/virxwzP03cA=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz"; + sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; }; }; "fstream-0.1.31" = { @@ -23586,15 +23622,6 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.2.0" = { - name = "git-url-parse"; - packageName = "git-url-parse"; - version = "11.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.2.0.tgz"; - sha512 = "KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g=="; - }; - }; "git-url-parse-11.4.0" = { name = "git-url-parse"; packageName = "git-url-parse"; @@ -26684,15 +26711,6 @@ let sha512 = "Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ=="; }; }; - "inquirer-7.1.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz"; - sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg=="; - }; - }; "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; @@ -27278,13 +27296,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.0.0" = { + "is-core-module-2.1.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz"; - sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz"; + sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA=="; }; }; "is-data-descriptor-0.1.4" = { @@ -29420,13 +29438,13 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "jsonata-1.8.3" = { + "jsonata-1.8.4" = { name = "jsonata"; packageName = "jsonata"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.3.tgz"; - sha512 = "r6ztI6ohbpRo77AxBm6vMs3aHZi2L2PaakW7TCPwSkeGcuAZ/SxXGLWH2Npwqq5+YBM/fg/g0EXg/pI9HvXQ8Q=="; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.4.tgz"; + sha512 = "OqzmM5IICtm/687zckG5BROZzInGCEuKojpYs48H8RnkII8Np+o912ryvhnYwsRrSI24TQRG/qqrSwBuaneDbg=="; }; }; "jsonc-parser-1.0.3" = { @@ -29726,13 +29744,13 @@ let sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; }; }; - "jwt-decode-3.0.0" = { + "jwt-decode-3.1.1" = { name = "jwt-decode"; packageName = "jwt-decode"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.0.0.tgz"; - sha512 = "RBQv2MTm3FNKQkdzhEyQwh5MbdNgMa+FyIJIK5RMWEn6hRgRHr7j55cRxGhRe6vGJDElyi6f6u/yfkP7AoXddA=="; + url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.1.tgz"; + sha512 = "EaH9dTD9ogCmxZRdiTsIUIJslqjoFfk8nEAi+Bq8u/aUjrVuhZ6eZjhWRH6SC9NBA0Lwr3K35H2zDnWvK/n4vQ=="; }; }; "k-bucket-0.6.0" = { @@ -33228,13 +33246,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.2" = { + "marked-1.2.3" = { name = "marked"; packageName = "marked"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz"; - sha512 = "5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.3.tgz"; + sha512 = "RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw=="; }; }; "marked-terminal-4.1.0" = { @@ -33741,15 +33759,6 @@ let sha512 = "qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA=="; }; }; - "memorystore-1.6.2" = { - name = "memorystore"; - packageName = "memorystore"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.2.tgz"; - sha512 = "HQM+cZB/kY1+jj57It22FsptJ3nuZRYxnwh3rWZEvDZO1zuzhIrX9uyFcjP9AhFQvM5WS6vZKtn3veohDH4S7w=="; - }; - }; "memorystore-1.6.4" = { name = "memorystore"; packageName = "memorystore"; @@ -33822,6 +33831,15 @@ let sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; }; }; + "meow-8.0.0" = { + name = "meow"; + packageName = "meow"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-8.0.0.tgz"; + sha512 = "nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg=="; + }; + }; "merge-1.2.1" = { name = "merge"; packageName = "merge"; @@ -34776,15 +34794,6 @@ let sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="; }; }; - "moment-2.28.0" = { - name = "moment"; - packageName = "moment"; - version = "2.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz"; - sha512 = "Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="; - }; - }; "moment-2.29.1" = { name = "moment"; packageName = "moment"; @@ -34902,13 +34911,13 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-4.2.1" = { + "mqtt-4.2.4" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.1"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz"; - sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz"; + sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ=="; }; }; "mqtt-packet-6.6.0" = { @@ -36290,13 +36299,13 @@ let sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; }; }; - "node-html-parser-1.4.6" = { + "node-html-parser-1.4.8" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.6.tgz"; - sha512 = "VgX2Bk8dq59yFeNC46LdA6VzRXffOPVNOMoeZquACZVwbC1VYJ3ssd5/mncTBGBrd3M+t6cMD5KQWdK/l+qPFQ=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.8.tgz"; + sha512 = "goyDL2T1qnepirf64Qu1ttJ2UZmNGp1CPbG3pkh2VYc1yqzgPX0rjKN7vqThFcZmEIzC+ratLIod1O/MNXwgzg=="; }; }; "node-int64-0.4.0" = { @@ -36668,6 +36677,15 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; + "normalize-package-data-3.0.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz"; + sha512 = "6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw=="; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -37560,13 +37578,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.149.3" = { + "office-ui-fabric-react-7.149.4" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.149.3"; + version = "7.149.4"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.3.tgz"; - sha512 = "R0iqyTGX8l+cUB5h8SvhB/i5QexNhlXP8GW3j5NCb8U0ZiEuTVpxCCMDua/0Mmdj6MZmcK/hcL9gmK6ZPUe6qg=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.4.tgz"; + sha512 = "9gfzIGlQr9tijkR10S+chRkNhxtyf2bonPFwTvJh/vrJ3R2/CHanHEWh+k4KUjsz2+4bf/+aRY5mjKCpEG65qA=="; }; }; "omggif-1.0.10" = { @@ -37830,13 +37848,13 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; - "openapi-framework-7.0.2" = { + "openapi-framework-7.1.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.0.2"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.0.2.tgz"; - sha512 = "62gOWK5iq75HJVS0KWKuLXR7CYynjrbvgxLrTc0Tr0fTcI9ZiJV61KDmz9bz37rHhk/uQIVSMMuTjTC8bmyQtA=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.1.0.tgz"; + sha512 = "GB1TUdv51fYKdvzy0Xg3fLtsuHXJY0v0PR6XGjdSKgxLYK8PA1/dQfxtTRftzx7XVI6uMegdG8aCAPwYTsypWQ=="; }; }; "openapi-jsonschema-parameters-1.2.0" = { @@ -37866,13 +37884,13 @@ let sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; }; }; - "openapi-request-coercer-7.0.1" = { + "openapi-request-coercer-7.1.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.0.1.tgz"; - sha512 = "nKSRnLX7KQ3Iu1TTZ+1PdEoz0Ke47vH4EcZIM9EOkdqadCFj2pSG/6oMcyqipCs2X7oMFi9Df/UGDRnTdzmPog=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.1.0.tgz"; + sha512 = "6nvSgvOvLYMkUBu3NbHQU6Lcol1WxDr0DsOe3oYHb2tZhokrNEuOF20QYPV+CGZYyEzc0f+Hdas774n5B0euLg=="; }; }; "openapi-request-validator-4.2.0" = { @@ -38028,13 +38046,13 @@ let sha512 = "xH6qaz/hS55rEX8xURz4HRUO96cpj821WY6UEG9rgcusZ8Jsq54jGWP1EMCjGvgngonw8vgSljM1i2OESv16Gw=="; }; }; - "opentracing-0.14.4" = { + "opentracing-0.14.5" = { name = "opentracing"; packageName = "opentracing"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.4.tgz"; - sha512 = "nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA=="; + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.5.tgz"; + sha512 = "XLKtEfHxqrWyF1fzxznsv78w3csW41ucHnjiKnfzZLD5FN8UBDZZL1i4q0FR29zjxXhm+2Hop+5Vr/b8tKIvEg=="; }; }; "opn-3.0.3" = { @@ -38226,15 +38244,6 @@ let sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; - "ora-4.0.4" = { - name = "ora"; - packageName = "ora"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz"; - sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; - }; - }; "ora-4.1.1" = { name = "ora"; packageName = "ora"; @@ -38343,6 +38352,15 @@ let sha512 = "h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg=="; }; }; + "os-name-4.0.0" = { + name = "os-name"; + packageName = "os-name"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz"; + sha512 = "caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg=="; + }; + }; "os-shim-0.1.3" = { name = "os-shim"; packageName = "os-shim"; @@ -38901,13 +38919,13 @@ let sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA=="; }; }; - "pacote-11.1.12" = { + "pacote-11.1.13" = { name = "pacote"; packageName = "pacote"; - version = "11.1.12"; + version = "11.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.12.tgz"; - sha512 = "suazooYMzefXr3glexAX4+q+qqH3wrzchtj+EivwiCCr/tsaHe9HtdHSx3R8YPjulAhojBZ2JkAVy13QwA8Jpg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.13.tgz"; + sha512 = "oJ7Bg7p3izrIMhZPHCCHmMHQl+xb+pKBXL5ZYeM2oCZrw6sBRSx7f8l7F+95V2qA0BP3c1cNaaBmUNkbo6Hn9w=="; }; }; "pacote-9.5.12" = { @@ -39855,13 +39873,13 @@ let sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; }; }; - "patrisika-0.21.0" = { + "patrisika-0.22.0" = { name = "patrisika"; packageName = "patrisika"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz"; - sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482"; + url = "https://registry.npmjs.org/patrisika/-/patrisika-0.22.0.tgz"; + sha512 = "2ug3pMunBT5js9S6+6cpt7KkfQA+nQ35nZi6aiiS6S0GdqvXhcsaSvOnczJosEZK9Xrar4j8t9J1VpNnVMrHWw=="; }; }; "patrisika-scopes-0.11.1" = { @@ -43024,13 +43042,13 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "query-string-6.13.6" = { + "query-string-6.13.7" = { name = "query-string"; packageName = "query-string"; - version = "6.13.6"; + version = "6.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-6.13.6.tgz"; - sha512 = "/WWZ7d9na6s2wMEGdVCVgKWE9Rt7nYyNIf7k8xmHXcesPMlEzicWo3lbYwHyA4wBktI2KrXxxZeACLbE84hvSQ=="; + url = "https://registry.npmjs.org/query-string/-/query-string-6.13.7.tgz"; + sha512 = "CsGs8ZYb39zu0WLkeOhe0NMePqgYdAuCqxOYKDR5LVCytDZYMGx3Bb+xypvQvPHVPijRXB0HZNFllCzHRe4gEA=="; }; }; "querystring-0.2.0" = { @@ -43816,15 +43834,6 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; - "readdirp-3.4.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; - }; - }; "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; @@ -45643,15 +45652,6 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.5.5" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz"; - sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; - }; - }; "rxjs-6.6.2" = { name = "rxjs"; packageName = "rxjs"; @@ -45670,13 +45670,13 @@ let sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; }; }; - "s.color-0.0.13" = { + "s.color-0.0.15" = { name = "s.color"; packageName = "s.color"; - version = "0.0.13"; + version = "0.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/s.color/-/s.color-0.0.13.tgz"; - sha512 = "56rTWlPg3jQX5n2wv201gUBn8fSgnGwbNjN159FV+JeD4EeqZiVnhDASmivhE4+f9Ivzj59y5AgoFflsf25KwA=="; + url = "https://registry.npmjs.org/s.color/-/s.color-0.0.15.tgz"; + sha512 = "AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA=="; }; }; "s3-stream-upload-2.0.2" = { @@ -45823,13 +45823,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.28.0" = { + "sass-1.29.0" = { name = "sass"; packageName = "sass"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz"; - sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz"; + sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA=="; }; }; "sass-formatter-0.5.1" = { @@ -47569,6 +47569,15 @@ let sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="; }; }; + "socket.io-adapter-2.0.3" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz"; + sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ=="; + }; + }; "socket.io-client-1.0.6" = { name = "socket.io-client"; packageName = "socket.io-client"; @@ -47632,6 +47641,15 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; + "socket.io-parser-4.0.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.1.tgz"; + sha512 = "5JfNykYptCwU2lkOI0ieoePWm+6stEhkZ2UnLDjqnE1YEjUlXXLd1lpxPZ+g+h3rtaytwWkWrLQCaJULlGqjOg=="; + }; + }; "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; @@ -50044,24 +50062,6 @@ let sha512 = "es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA=="; }; }; - "suf-cli-0.1.3" = { - name = "suf-cli"; - packageName = "suf-cli"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.3.tgz"; - sha512 = "dM85t6+egHKKM7ChM1JpkZUeXNczRb7vAQN3Y8UAyRjeW6UvfChPi8YbV73eTUBp6N7VfKqwwrsYsbdEb/u0Rg=="; - }; - }; - "suf-node-1.2.1" = { - name = "suf-node"; - packageName = "suf-node"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/suf-node/-/suf-node-1.2.1.tgz"; - sha512 = "LFLshqEwm1bXd3fEl0STYXZzEHbAz8HwsyItA8vvxhMZrIo+CpB7RrtLvor6mk+7SdfgJhmV3RdIdDIcPAJTTg=="; - }; - }; "suf-regex-0.0.25" = { name = "suf-regex"; packageName = "suf-regex"; @@ -50467,13 +50467,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.11" = { + "systeminformation-4.28.1" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.11"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.11.tgz"; - sha512 = "U7bigXbOnsB8k1vNHS0Y13RCsRz5/UohiUmND+3mMUL6vfzrpbe/h4ZqewowB+B+tJNnmGFDj08Z8xGfYo45dQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.28.1.tgz"; + sha512 = "g9WQy+Igsf0efbbTlXzDkV7iYeUerFJeqI/zh07F9sWHxclejmXn5hrGdgHf2ok+1DuRmC9t4mEh7XS0b8Zk9w=="; }; }; "syswide-cas-5.3.0" = { @@ -51854,13 +51854,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.3.0" = { + "torrent-discovery-9.4.0" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.3.0.tgz"; - sha512 = "rdOfm+o6d+E+nRjeYiCzXGrM9ou7spkZpxu9xhnfKoTJgtWpSYEHXO4BT9hwVF1uoUpm+hOwNnwgkSfBZNMh7g=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.0.tgz"; + sha512 = "+YW9JGbO5bCuDw9YYW//p4iVLV0aP4C+AYrNQjL/+dSNPUtD1ufK1V8UZERt6rIoeNGhutkSVyeO4Fid9Tjxjg=="; }; }; "torrent-piece-1.1.2" = { @@ -52601,6 +52601,15 @@ let sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="; }; }; + "type-fest-0.18.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.0.tgz"; + sha512 = "fbDukFPnJBdn2eZ3RR+5mK2slHLFd6gYHY7jna1KWWy4Yr4XysHuCdXRzy+RiG/HwG4WJat00vdC2UHky5eKiQ=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -52826,13 +52835,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.11.2" = { + "uglify-js-3.11.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.2"; + version = "3.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.2.tgz"; - sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz"; + sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw=="; }; }; "uglify-js-3.11.5" = { @@ -54114,13 +54123,13 @@ let sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489"; }; }; - "ut_metadata-3.5.1" = { + "ut_metadata-3.5.2" = { name = "ut_metadata"; packageName = "ut_metadata"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.1.tgz"; - sha512 = "D98YM9dKGHzNFUuqLHLV1vXqbHNfyvTx/rADtvF9P6D1HYV/0JuArlpnQIHhOuWXQGUVyR5XJGRVLKbeNu0o5A=="; + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.2.tgz"; + sha512 = "3XZZuJSeoIUyMYSuDbTbVtP4KAVGHPfU8nmHFkr8LJc+THCaUXwnu/2AV+LCSLarET/hL9IlbNfYTGrt6fOVuQ=="; }; }; "ut_pex-2.0.1" = { @@ -55392,6 +55401,15 @@ let sha512 = "IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="; }; }; + "vscode-jsonrpc-6.0.0-next.7" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "6.0.0-next.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz"; + sha512 = "1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug=="; + }; + }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -55401,13 +55419,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.0.0-next.9" = { + "vscode-languageclient-7.0.0-next.12" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.0.0-next.9"; + version = "7.0.0-next.12"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz"; - sha512 = "lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.12.tgz"; + sha512 = "OrzvOvhS5o26C0KctTJC7hkwh3avCwkVhllzy42AqwpIUZ3p2aVqkSG2uVxaeodq8ThBb3TLgtg50vxyWs6FEg=="; }; }; "vscode-languageserver-3.5.1" = { @@ -55500,6 +55518,15 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; + "vscode-languageserver-protocol-3.16.0-next.10" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.16.0-next.10"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.10.tgz"; + sha512 = "YRTctHUZvts0Z1xXKNYU0ha0o+Tlgtwr+6O8OmDquM086N8exiSKBMwMC+Ra1QtIE+1mfW43Wxsme2FnMkAS9A=="; + }; + }; "vscode-languageserver-protocol-3.16.0-next.2" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -56022,15 +56049,6 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; - "webpack-4.44.1" = { - name = "webpack"; - packageName = "webpack"; - version = "4.44.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz"; - sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; - }; - }; "webpack-4.44.2" = { name = "webpack"; packageName = "webpack"; @@ -56040,6 +56058,15 @@ let sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; }; + "webpack-5.4.0" = { + name = "webpack"; + packageName = "webpack"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.4.0.tgz"; + sha512 = "udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -56112,13 +56139,13 @@ let sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; }; }; - "webpack-node-externals-2.5.1" = { + "webpack-node-externals-2.5.2" = { name = "webpack-node-externals"; packageName = "webpack-node-externals"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.1.tgz"; - sha512 = "RWxKGibUU5kuJT6JDYmXGa3QsZskqIaiBvZ2wBxHlJzWVJPOyBMnroXf23uxEHnj1rYS8jNdyUfrNAXJ2bANNw=="; + url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.2.tgz"; + sha512 = "aHdl/y2N7PW2Sx7K+r3AxpJO+aDMcYzMQd60Qxefq3+EwhewSbTBqNumOsCE1JsCUNoyfGj5465N0sSf6hc/5w=="; }; }; "webpack-sources-1.4.3" = { @@ -56220,13 +56247,13 @@ let sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; - "whatwg-fetch-3.4.1" = { + "whatwg-fetch-3.5.0" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; - sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; + sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -56499,6 +56526,15 @@ let sha512 = "OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg=="; }; }; + "windows-release-4.0.0" = { + name = "windows-release"; + packageName = "windows-release"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz"; + sha512 = "OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg=="; + }; + }; "winreg-0.0.12" = { name = "winreg"; packageName = "winreg"; @@ -58288,7 +58324,7 @@ in sources."inquirer-7.3.3" sources."ip-1.1.5" sources."is-callable-1.2.2" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -58583,7 +58619,7 @@ in sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - (sources."buffer-5.7.0" // { + (sources."buffer-5.7.1" // { dependencies = [ sources."base64-js-1.3.1" ]; @@ -59034,40 +59070,38 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.5.1"; + version = "7.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.1.tgz"; - sha512 = "18EfBO48ojVm7YzwyPc8PRjas9KcIVjdlD+v7tIImKzrf5THcpAYxvzUvZUspSbLIIIqwTgKj/loqamkwOk/XA=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.2.tgz"; + sha512 = "qxh5aqQbxzQe8Tuc3CF8nLb1KsWCjLabSAZm+hlxrWYSJzbffbn947MPmsIwZdXgAXZ6AprmJV5KeB2U6DoM+w=="; }; dependencies = [ - sources."@angular-devkit/core-10.0.7" - (sources."@angular-devkit/schematics-10.0.7" // { + sources."@angular-devkit/core-10.2.0" + (sources."@angular-devkit/schematics-10.2.0" // { dependencies = [ - sources."ora-4.0.4" - ]; - }) - (sources."@angular-devkit/schematics-cli-0.1000.7" // { - dependencies = [ - sources."inquirer-7.1.0" + sources."chalk-4.1.0" + sources."ora-5.0.0" ]; }) + sources."@angular-devkit/schematics-cli-0.1002.0" sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" (sources."@babel/highlight-7.10.4" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-7.2.1" // { - dependencies = [ - sources."@angular-devkit/core-10.2.0" - sources."@angular-devkit/schematics-10.2.0" - sources."ajv-6.12.4" - sources."rxjs-6.6.2" - ]; - }) - sources."@schematics/schematics-0.1000.7" + sources."@nestjs/schematics-7.2.1" + sources."@schematics/schematics-0.1002.0" sources."@types/anymatch-1.3.1" + sources."@types/eslint-7.2.4" + sources."@types/eslint-scope-3.7.0" + sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" sources."@types/node-14.14.6" @@ -59079,7 +59113,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.21" // { + (sources."@types/webpack-4.41.24" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -59105,177 +59139,50 @@ in sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.4.2" - sources."ajv-6.12.3" - sources."ajv-errors-1.0.1" + sources."acorn-8.0.4" + sources."ajv-6.12.4" sources."ajv-keywords-3.5.2" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."aproba-1.2.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" sources."at-least-node-1.0.0" - sources."atob-2.1.2" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-js-1.3.1" - sources."big.js-5.2.2" sources."binary-extensions-2.1.0" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" - sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - (sources."browserify-rsa-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" - sources."buffer-4.9.2" + sources."browserslist-4.14.6" sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" - (sources."cacache-12.0.4" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) - sources."cache-base-1.0.1" sources."callsites-3.1.0" - (sources."chalk-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."caniuse-lite-1.0.30001156" + sources."chalk-3.0.0" sources."chardet-0.7.0" - sources."chokidar-3.4.2" - sources."chownr-1.1.4" + sources."chokidar-3.4.3" sources."chrome-trace-event-1.0.2" - sources."cipher-base-1.0.4" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."cli-cursor-3.1.0" sources."cli-spinners-2.5.0" - (sources."cli-table3-0.5.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."cli-width-2.2.1" + sources."cli-table3-0.5.1" + sources."cli-width-3.0.0" sources."clone-1.0.4" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-1.4.0" sources."commander-4.1.1" - sources."commondir-1.0.1" - sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cosmiconfig-6.0.0" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."crypto-browserify-3.12.0" - sources."cyclist-1.0.1" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" + sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."define-property-2.0.2" - sources."des.js-1.0.1" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."domain-browser-1.2.0" - sources."duplexify-3.7.1" - (sources."elliptic-6.5.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) + sources."electron-to-chromium-1.3.589" sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" sources."errno-0.1.7" sources."error-ex-1.3.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" + sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.2.0" @@ -59283,134 +59190,55 @@ in }) sources."estraverse-4.3.0" sources."events-3.2.0" - sources."evp_bytestokey-1.0.3" - sources."execa-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."execa-4.1.0" sources."external-editor-3.1.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.2" sources."figures-3.2.0" - sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."flush-write-stream-1.1.1" - sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-5.1.0" // { + sources."find-up-4.1.0" + (sources."fork-ts-checker-webpack-plugin-5.2.1" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" ]; }) - sources."fragment-cache-0.2.1" - sources."from2-2.3.0" sources."fs-extra-9.0.1" sources."fs-monkey-1.0.1" - sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" - sources."get-stream-4.1.0" - sources."get-value-2.0.6" + sources."get-stream-5.2.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" + sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.4" sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - sources."hmac-drbg-1.0.1" - sources."https-browserify-1.0.0" + sources."has-flag-4.0.0" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."iferr-0.1.5" sources."import-fresh-3.2.2" - sources."imurmurhash-0.1.4" - sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."cli-width-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."rxjs-6.6.3" - sources."supports-color-7.2.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" ]; }) sources."interpret-1.4.0" - sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" + sources."is-core-module-2.1.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-number-7.0.0" - sources."is-plain-object-2.0.4" - sources."is-stream-1.1.0" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" + sources."is-stream-2.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."jest-worker-26.6.2" sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" @@ -59421,372 +59249,152 @@ in sources."universalify-2.0.0" ]; }) - sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-3.0.0" + sources."loader-runner-4.1.0" + sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" - (sources."log-symbols-3.0.0" // { + (sources."log-symbols-4.0.0" // { dependencies = [ - sources."chalk-2.4.2" + sources."chalk-4.1.0" ]; }) - sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."magic-string-0.25.7" - (sources."make-dir-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."md5.js-1.3.5" sources."memfs-3.2.0" sources."memory-fs-0.5.0" - (sources."micromatch-3.1.10" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-range-2.1.1" - ]; - }) - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) + sources."merge-stream-2.0.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) - sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.2" - sources."nanomatch-1.2.13" sources."neo-async-2.6.2" - sources."nice-try-1.0.5" sources."node-emoji-1.10.0" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."node-releases-1.1.65" sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" + sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - (sources."ora-5.0.0" // { + (sources."ora-5.1.0" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."log-symbols-4.0.0" - sources."supports-color-7.2.0" ]; }) - sources."os-browserify-0.3.0" - sources."os-name-3.1.0" + sources."os-name-4.0.0" sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."pako-1.0.11" - sources."parallel-transform-1.2.0" sources."parent-module-1.0.1" - sources."parse-asn1-5.1.6" sources."parse-json-5.1.0" - sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."path-type-4.0.0" - sources."pbkdf2-3.1.1" sources."picomatch-2.2.2" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" + sources."pkg-dir-4.2.0" sources."pluralize-8.0.0" - sources."posix-character-classes-0.1.1" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) sources."punycode-2.1.1" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."readable-stream-2.3.7" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."rechoir-0.6.2" - sources."regex-not-1.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" sources."resolve-1.18.1" sources."resolve-from-4.0.0" - sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" - sources."ret-0.1.15" sources."rimraf-3.0.2" - sources."ripemd160-2.0.2" sources."run-async-2.4.1" - sources."run-queue-1.0.3" - sources."rxjs-6.5.5" + sources."rxjs-6.6.2" sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."schema-utils-2.7.0" sources."semver-7.3.2" - sources."serialize-javascript-4.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setimmediate-1.0.5" - sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."serialize-javascript-5.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shelljs-0.8.4" sources."signal-exit-3.0.3" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."source-list-map-2.0.1" sources."source-map-0.7.3" - sources."source-map-resolve-0.5.3" (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" - sources."split-string-3.1.0" - sources."ssri-6.0.1" - (sources."static-extend-0.1.2" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) - sources."stream-browserify-2.0.2" - sources."stream-each-1.2.3" - sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" - sources."string-width-4.2.0" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.0" sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."supports-color-5.5.0" + sources."strip-final-newline-2.0.0" + sources."supports-color-7.2.0" sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."terser-4.8.0" // { + (sources."terser-5.3.8" // { dependencies = [ sources."commander-2.20.3" - sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.5" // { + (sources."terser-webpack-plugin-5.0.3" // { dependencies = [ - sources."schema-utils-1.0.0" + sources."ajv-6.12.6" + sources."p-limit-3.0.2" + sources."schema-utils-3.0.0" sources."source-map-0.6.1" ]; }) sources."through-2.3.8" - sources."through2-2.0.5" - sources."timers-browserify-2.0.12" sources."tmp-0.0.33" - sources."to-arraybuffer-1.0.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."tree-kill-1.2.2" sources."tsconfig-paths-3.9.0" (sources."tsconfig-paths-webpack-plugin-3.3.0" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) sources."tslib-1.14.1" - sources."tty-browserify-0.0.0" sources."type-fest-0.11.0" - sources."typedarray-0.0.6" - sources."typescript-3.9.7" - sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" + sources."typescript-4.0.5" sources."universalify-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."upath-1.2.0" sources."uri-js-4.4.0" - sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) sources."util-deprecate-1.0.2" - sources."vm-browserify-1.1.2" - sources."watchpack-1.7.4" - (sources."watchpack-chokidar2-2.0.0" // { - dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - sources."to-regex-range-2.1.1" - ]; - }) + sources."watchpack-2.0.1" sources."wcwidth-1.0.1" - (sources."webpack-4.44.1" // { + (sources."webpack-5.4.0" // { dependencies = [ - sources."memory-fs-0.4.1" - sources."schema-utils-1.0.0" + sources."ajv-6.12.6" + sources."enhanced-resolve-5.3.1" + sources."schema-utils-3.0.0" + sources."tapable-2.0.0" ]; }) - sources."webpack-node-externals-2.5.1" - (sources."webpack-sources-1.4.3" // { + sources."webpack-node-externals-2.5.2" + (sources."webpack-sources-2.2.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."which-1.3.1" - sources."windows-release-3.3.3" - sources."worker-farm-1.7.0" + sources."which-2.0.2" + sources."windows-release-4.0.0" sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-4.0.0" - sources."yallist-3.1.1" sources."yaml-1.10.0" ]; buildInputs = globalBuildInputs; @@ -59809,7 +59417,7 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.20.2" + sources."@apollo/federation-0.20.4" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ sources."@types/node-10.17.44" @@ -59825,14 +59433,13 @@ in sources."@babel/compat-data-7.12.5" (sources."@babel/core-7.12.3" // { dependencies = [ - sources."@babel/generator-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."semver-5.7.1" ]; }) - (sources."@babel/generator-7.11.6" // { + (sources."@babel/generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" @@ -59846,12 +59453,12 @@ in sources."@babel/helper-create-regexp-features-plugin-7.12.1" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-explode-assignable-expression-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/helper-function-name-7.10.4" @@ -59859,17 +59466,17 @@ in sources."@babel/helper-hoist-variables-7.10.4" (sources."@babel/helper-member-expression-to-functions-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-module-imports-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/helper-optimise-call-expression-7.10.4" @@ -59877,27 +59484,27 @@ in sources."@babel/helper-regex-7.10.5" (sources."@babel/helper-remap-async-to-generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-replace-supers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-simple-access-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/helper-validator-identifier-7.10.4" @@ -59905,7 +59512,7 @@ in sources."@babel/helper-wrap-function-7.12.3" (sources."@babel/helpers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/highlight-7.10.4" @@ -59973,7 +59580,7 @@ in sources."@babel/plugin-transform-unicode-regex-7.12.1" (sources."@babel/preset-env-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."semver-5.7.1" ]; }) @@ -59992,7 +59599,7 @@ in (sources."@babel/traverse-7.12.5" // { dependencies = [ sources."@babel/generator-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" ]; }) sources."@babel/types-7.10.4" @@ -60070,9 +59677,10 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/plugin-plugins-1.9.0" // { + (sources."@oclif/plugin-plugins-1.9.1" // { dependencies = [ - sources."npm-run-path-3.1.0" + sources."fs-extra-9.0.1" + sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."semver-7.3.2" sources."tslib-2.0.3" @@ -60151,14 +59759,14 @@ in sources."@vue/cli-ui-addon-widgets-4.5.8" (sources."@vue/compiler-core-3.0.2" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.2" (sources."@vue/compiler-sfc-3.0.2" // { dependencies = [ - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."source-map-0.6.1" ]; }) @@ -60210,7 +59818,7 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.31.0" // { + (sources."apollo-2.31.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" @@ -60220,21 +59828,21 @@ in sources."apollo-cache-control-0.11.4" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.38.0" // { + (sources."apollo-codegen-core-0.38.1" // { dependencies = [ sources."recast-0.20.4" sources."source-map-0.6.1" sources."tslib-2.0.3" ]; }) - sources."apollo-codegen-flow-0.36.0" - sources."apollo-codegen-scala-0.37.0" - sources."apollo-codegen-swift-0.38.0" - sources."apollo-codegen-typescript-0.38.0" + sources."apollo-codegen-flow-0.36.1" + sources."apollo-codegen-scala-0.37.1" + sources."apollo-codegen-swift-0.38.1" + sources."apollo-codegen-typescript-0.38.1" sources."apollo-datasource-0.7.2" sources."apollo-env-0.6.5" sources."apollo-graphql-0.6.0" - sources."apollo-language-server-1.24.0" + sources."apollo-language-server-1.24.1" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -60342,7 +59950,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserslist-4.14.6" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -60369,7 +59977,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -60485,8 +60093,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" - (sources."core-js-compat-3.6.5" // { + sources."core-js-3.7.0" + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -60577,7 +60185,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -60709,7 +60317,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.2.0" + sources."git-url-parse-11.4.0" sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" @@ -60851,7 +60459,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-1.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -61032,7 +60640,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.28.0" + sources."moment-2.29.1" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-2.14.2" @@ -61783,7 +61391,7 @@ in sources."@babel/highlight-7.10.4" sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@webassemblyjs/ast-1.9.1" sources."@webassemblyjs/floating-point-hex-parser-1.9.1" sources."@webassemblyjs/helper-api-error-1.9.1" @@ -61888,7 +61496,7 @@ in sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -61929,7 +61537,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."is-3.3.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -62219,7 +61827,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -62423,7 +62031,7 @@ in sources."is-arguments-1.0.4" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-date-object-1.0.2" sources."is-generator-function-1.0.7" sources."is-negative-zero-2.0.0" @@ -62704,7 +62312,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -63050,7 +62658,7 @@ in sources."pkginfo-0.4.1" sources."prompt-1.0.0" sources."punycode-2.1.1" - sources."query-string-6.13.6" + sources."query-string-6.13.7" sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -63063,7 +62671,7 @@ in sources."universal-url-2.0.0" sources."utile-0.3.0" sources."webidl-conversions-4.0.2" - sources."whatwg-fetch-3.4.1" + sources."whatwg-fetch-3.5.0" sources."whatwg-url-7.1.0" (sources."winston-2.1.1" // { dependencies = [ @@ -63277,10 +62885,10 @@ in coc-jest = nodeEnv.buildNodePackage { name = "coc-jest"; packageName = "coc-jest"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.1.tgz"; - sha512 = "9Gkw9wznxtYIiPbgORZqwN5sjHQQYe2rZBvYNPMX2AVlF++OuTXUfy4Aidw6hstbzxKR8JEnjez7JiVaUF6M/A=="; + url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.2.tgz"; + sha512 = "vQKfTnF+LMEJEDR/+oTWowOUylr2+3pkOHGUr+OgNMhdjQPy+K1/Kcuqkm4qTpmhQFwg7OzF7GYDfoQojEEmBQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -63612,7 +63220,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -63669,7 +63277,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -63709,7 +63317,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -63916,7 +63524,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -64584,10 +64192,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.2.3"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.3.tgz"; - sha512 = "mK3oTm3gjQzV37Hq9r/bTj2N63p5tzO7IppuksQ7Yk0hURrHUzyx58PdBhfVOsD77FIo37dY1E0gOXv5t7a1dg=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.5.tgz"; + sha512 = "YtWw6yFdKxgIxjoUyEgzmT3YVtp3JX7AZUOYDbbnPbneyck5poZyOpjwL+3Wu2TzohDtg2H4ivTDyttv2wXvRQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -64646,7 +64254,7 @@ in sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -64671,7 +64279,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."ccount-1.1.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -64712,7 +64320,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -64767,7 +64375,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -65006,7 +64614,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."minimatch-3.0.4" @@ -65121,7 +64729,7 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@prettier/plugin-pug-1.10.1" sources."@sindresorhus/is-0.14.0" - sources."@sorg/log-2.2.0" + sources."@sorg/log-2.2.1" sources."@starptech/expression-parser-0.10.0" sources."@starptech/hast-util-from-webparser-0.10.0" (sources."@starptech/prettyhtml-0.10.0" // { @@ -65306,7 +64914,7 @@ in sources."config-chain-1.1.12" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -65316,7 +64924,6 @@ in ]; }) sources."css-parse-2.0.0" - sources."csstype-2.6.13" sources."currently-unhandled-0.4.1" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -65496,7 +65103,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.2.0" + sources."fsevents-2.2.1" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -65583,7 +65190,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -65691,7 +65298,6 @@ in sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.1" sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -65866,7 +65472,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.1.10" sources."rxjs-6.6.3" - sources."s.color-0.0.13" + sources."s.color-0.0.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -65995,8 +65601,6 @@ in ]; }) sources."stylus-supremacy-2.14.5" - sources."suf-cli-0.1.3" - sources."suf-node-1.2.1" sources."suf-regex-0.0.25" sources."supports-color-5.5.0" sources."symbol-0.2.3" @@ -66648,7 +66252,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -66846,7 +66450,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.27.11" + sources."systeminformation-4.28.1" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -67073,7 +66677,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -68418,7 +68022,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.784.0" + sources."aws-sdk-2.786.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.3.1" @@ -68589,7 +68193,7 @@ in sources."@babel/plugin-transform-react-jsx-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -68716,7 +68320,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -68921,10 +68525,10 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.149.3" - sources."@fluentui/react-focus-7.16.16" + sources."@fluentui/react-7.149.4" + sources."@fluentui/react-focus-7.16.17" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.5.4" + sources."@fluentui/theme-1.6.0" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -68935,7 +68539,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.125" + sources."@microsoft/load-themed-styles-1.10.126" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -68980,12 +68584,12 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.18" - sources."@uifabric/icons-7.5.15" + sources."@uifabric/foundation-7.9.19" + sources."@uifabric/icons-7.5.16" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.9" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.16" + sources."@uifabric/styling-7.16.17" sources."@uifabric/utilities-7.33.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -69155,7 +68759,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-equal-1.0.0" sources."buffer-from-1.1.1" sources."buffer-writer-2.0.0" @@ -69661,7 +69265,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -69957,15 +69561,15 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.149.3" + sources."office-ui-fabric-react-7.149.4" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."openapi-default-setter-7.0.1" - sources."openapi-framework-7.0.2" + sources."openapi-framework-7.1.0" sources."openapi-jsonschema-parameters-7.0.2" - sources."openapi-request-coercer-7.0.1" + sources."openapi-request-coercer-7.1.0" sources."openapi-request-validator-7.0.2" sources."openapi-response-validator-7.0.1" sources."openapi-schema-validator-7.0.1" @@ -70151,7 +69755,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.28.0" + sources."sass-1.29.0" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -70859,10 +70463,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "3.28.4"; + version = "3.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.4.tgz"; - sha512 = "nVk7Tc8I3hzhKnZwIOWh08Qq8VDZqYLA81Zrdu7HeIfJYAzppgYPB6tiZFouWwZl9/twf2JSYAUZmLwVhLK61A=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.5.tgz"; + sha512 = "Lam0JkBx57gs1xhlI+rXx3aJqOebIPBPf9sWAvUpTFDSVkyZN86rFXJWud6QnAFBLGqUgGFZJDC1tMq+l7Mgng=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -70997,7 +70601,7 @@ in sources."lodash-4.17.20" ]; }) - (sources."@babel/types-7.12.5" // { + (sources."@babel/types-7.12.6" // { dependencies = [ sources."lodash-4.17.20" ]; @@ -71008,7 +70612,7 @@ in sources."uuid-3.4.0" ]; }) - (sources."@expo/config-3.3.13" // { + (sources."@expo/config-3.3.14" // { dependencies = [ sources."semver-7.3.2" sources."slash-3.0.0" @@ -71023,7 +70627,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.38" // { + (sources."@expo/dev-server-0.1.39" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -71040,7 +70644,7 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.57" + sources."@expo/dev-tools-0.13.58" sources."@expo/eas-build-job-0.1.2" (sources."@expo/image-utils-0.3.7" // { dependencies = [ @@ -71053,7 +70657,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.38" + sources."@expo/metro-config-0.1.39" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -71101,14 +70705,14 @@ in sources."@expo/spawn-async-1.5.0" sources."@expo/traveling-fastlane-darwin-1.15.1" sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.42" // { + (sources."@expo/webpack-config-0.12.43" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-58.0.18" // { + (sources."@expo/xdl-58.0.19" // { dependencies = [ sources."chownr-1.1.4" sources."es6-error-4.1.1" @@ -71283,7 +70887,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.164" + sources."@types/lodash-4.14.165" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" sources."@types/node-9.6.61" @@ -71513,7 +71117,7 @@ in }) sources."browserify-zlib-0.2.0" sources."browserslist-4.14.6" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -71551,7 +71155,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -71674,8 +71278,8 @@ in sources."slash-3.0.0" ]; }) - sources."core-js-3.6.5" - (sources."core-js-compat-3.6.5" // { + sources."core-js-3.7.0" + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -71737,7 +71341,7 @@ in sources."dag-map-1.0.2" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."dayjs-1.9.4" + sources."dayjs-1.9.5" sources."debug-4.3.0" sources."debuglog-1.0.1" sources."decache-4.4.0" @@ -71810,7 +71414,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -71893,7 +71497,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.48" // { + (sources."expo-pwa-0.0.49" // { dependencies = [ sources."commander-2.20.0" ]; @@ -72177,7 +71781,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -72454,7 +72058,7 @@ in sources."which-2.0.2" ]; }) - sources."node-html-parser-1.4.6" + sources."node-html-parser-1.4.8" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" @@ -72583,7 +72187,7 @@ in sources."url-parse-lax-3.0.0" ]; }) - (sources."pacote-11.1.12" // { + (sources."pacote-11.1.13" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -73680,7 +73284,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -74443,7 +74047,7 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -75378,7 +74982,7 @@ in sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" @@ -75567,7 +75171,7 @@ in sources."@graphql-tools/utils-7.0.2" ]; }) - (sources."@graphql-tools/delegate-7.0.3" // { + (sources."@graphql-tools/delegate-7.0.4" // { dependencies = [ sources."@graphql-tools/utils-7.0.2" ]; @@ -75641,7 +75245,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."bufferutil-4.0.2" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -76232,7 +75836,7 @@ in sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -76478,7 +76082,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.11" + sources."systeminformation-4.28.1" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -76712,7 +76316,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -77105,7 +76709,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -78422,7 +78026,7 @@ in sources."inherits-2.0.4" sources."invert-kv-1.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -78503,7 +78107,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."path-type-1.1.0" - sources."patrisika-0.21.0" + sources."patrisika-0.22.0" sources."patrisika-scopes-0.11.1" sources."pegjs-0.10.0" sources."performance-now-2.1.0" @@ -78712,7 +78316,7 @@ in sources."object-assign-4.1.1" sources."object-hash-1.3.1" sources."once-1.4.0" - sources."opentracing-0.14.4" + sources."opentracing-0.14.5" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" sources."process-0.10.1" @@ -78806,7 +78410,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.784.0" // { + (sources."aws-sdk-2.786.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -78827,7 +78431,7 @@ in sources."bcrypt-pbkdf-1.0.2" (sources."bl-4.0.3" // { dependencies = [ - sources."buffer-5.7.0" + sources."buffer-5.7.1" ]; }) sources."brace-expansion-1.1.11" @@ -80936,22 +80540,24 @@ in sources."concat-stream-1.6.2" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-5.0.11" + sources."conventional-changelog-angular-5.0.12" (sources."conventional-changelog-core-3.2.3" // { dependencies = [ sources."through2-3.0.2" ]; }) sources."conventional-changelog-preset-loader-2.3.4" - (sources."conventional-changelog-writer-4.0.17" // { + (sources."conventional-changelog-writer-4.0.18" // { dependencies = [ - sources."through2-3.0.2" + sources."readable-stream-3.6.0" + sources."through2-4.0.2" ]; }) - sources."conventional-commits-filter-2.0.6" - (sources."conventional-commits-parser-3.1.0" // { + sources."conventional-commits-filter-2.0.7" + (sources."conventional-commits-parser-3.2.0" // { dependencies = [ - sources."through2-3.0.2" + sources."readable-stream-3.6.0" + sources."through2-4.0.2" ]; }) (sources."conventional-recommended-bump-5.0.1" // { @@ -81231,7 +80837,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -81299,15 +80905,21 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-7.1.1" // { + (sources."meow-8.0.0" // { dependencies = [ sources."find-up-4.1.0" + sources."hosted-git-info-3.0.7" sources."locate-path-5.0.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.0" sources."p-locate-4.1.0" sources."parse-json-5.1.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" sources."type-fest-0.6.0" ]; }) @@ -81316,8 +80928,10 @@ in sources."type-fest-0.8.1" ]; }) - sources."type-fest-0.13.1" - sources."yargs-parser-18.1.3" + sources."semver-7.3.2" + sources."type-fest-0.18.0" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.3" ]; }) sources."merge2-1.4.1" @@ -82724,7 +82338,7 @@ in sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -82872,7 +82486,7 @@ in sources."bindings-1.5.0" (sources."bl-4.0.3" // { dependencies = [ - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."readable-stream-3.6.0" ]; }) @@ -82923,7 +82537,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -82995,7 +82609,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -83046,7 +82660,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -83145,7 +82759,7 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.2.0" + sources."fsevents-2.2.1" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-assigned-identifiers-1.2.0" @@ -83217,7 +82831,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -83849,7 +83463,7 @@ in sources."link-check-4.5.2" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.2" + sources."marked-1.2.3" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" @@ -84030,7 +83644,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -84247,7 +83861,7 @@ in sources."base64-js-1.3.1" sources."bl-4.0.3" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."chalk-4.1.0" sources."chownr-1.1.4" @@ -84323,19 +83937,19 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.149.3" - sources."@fluentui/react-focus-7.16.16" + sources."@fluentui/react-7.149.4" + sources."@fluentui/react-focus-7.16.17" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.5.4" - sources."@microsoft/load-themed-styles-1.10.125" + sources."@fluentui/theme-1.6.0" + sources."@microsoft/load-themed-styles-1.10.126" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.18" - sources."@uifabric/icons-7.5.15" + sources."@uifabric/foundation-7.9.19" + sources."@uifabric/icons-7.5.16" sources."@uifabric/merge-styles-7.19.1" sources."@uifabric/react-hooks-7.13.9" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.16" + sources."@uifabric/styling-7.16.17" sources."@uifabric/utilities-7.33.2" sources."accepts-1.3.7" sources."ajv-6.12.6" @@ -84356,7 +83970,7 @@ in sources."basic-auth-2.0.1" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."builtin-status-codes-3.0.0" sources."bytes-3.1.0" @@ -84462,7 +84076,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.149.3" + sources."office-ui-fabric-react-7.149.4" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -84848,10 +84462,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.67.2"; + version = "2.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.67.2.tgz"; - sha512 = "tCb/TqAtxrtRTzBayfRmg7Gd809ymXfg6vVrBAAXqi93ijobB6qjopIQYlq5Tgq50m5rI/EgxvLU3BCUSEq/eQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.0.tgz"; + sha512 = "nrdMstEiFYtwLmPF+UsMxnOekeKIayUwRpEMzaLtK+i9Yf/IjCPxKwMF7Z+yc3wjYIjxjlWSBqq0I8bcwxUDnQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -84959,7 +84573,7 @@ in sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@bugsnag/browser-7.5.1" sources."@bugsnag/core-7.3.5" sources."@bugsnag/cuid-3.0.0" @@ -84994,10 +84608,10 @@ in sources."@netlify/open-api-0.18.1" sources."@netlify/plugin-edge-handlers-1.9.0" sources."@netlify/run-utils-1.0.5" - sources."@netlify/traffic-mesh-agent-0.24.0-pre.23" - sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23" - sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23" - sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23" + sources."@netlify/traffic-mesh-agent-0.24.0" + sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0" + sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0" + sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0" (sources."@netlify/zip-it-and-ship-it-1.4.0" // { dependencies = [ sources."resolve-2.0.0-next.2" @@ -85026,39 +84640,37 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/command-1.8.0" // { + (sources."@oclif/command-1.6.1" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."is-fullwidth-code-point-2.0.0" + sources."semver-5.7.1" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."wrap-ansi-4.0.0" ]; }) - (sources."@oclif/config-1.17.0" // { + sources."@oclif/config-1.15.1" + (sources."@oclif/errors-1.2.2" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" - sources."globby-11.0.1" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.2" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" - sources."tslib-2.0.3" - ]; - }) - (sources."@oclif/errors-1.3.3" // { - dependencies = [ - sources."clean-stack-3.0.0" - sources."wrap-ansi-7.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."clean-stack-1.3.0" + sources."indent-string-3.2.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-5.2.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) ]; }) sources."@oclif/linewrap-1.0.0" @@ -85089,20 +84701,16 @@ in dependencies = [ sources."ansi-styles-3.2.1" sources."cli-ux-4.9.3" - sources."fs-extra-7.0.1" sources."has-flag-3.0.0" sources."indent-string-3.2.0" - sources."is-wsl-1.1.0" - sources."jsonfile-4.0.0" sources."semver-5.7.1" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" - sources."universalify-0.1.2" ]; }) - (sources."@oclif/plugin-plugins-1.9.1" // { + (sources."@oclif/plugin-plugins-1.9.0" // { dependencies = [ - sources."npm-run-path-4.0.1" + sources."npm-run-path-3.1.0" sources."path-key-3.1.1" sources."tslib-2.0.3" ]; @@ -85238,10 +84846,9 @@ in sources."ast-module-types-2.7.1" sources."async-3.2.0" sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.784.0" // { + (sources."aws-sdk-2.786.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -85302,7 +84909,7 @@ in }) sources."browserslist-4.14.6" sources."btoa-lite-1.0.0" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -85324,7 +84931,7 @@ in sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -85373,14 +84980,16 @@ in sources."cli-cursor-2.1.0" sources."cli-progress-3.8.2" sources."cli-spinners-2.5.0" - (sources."cli-ux-5.5.0" // { + (sources."cli-ux-5.4.6" // { dependencies = [ sources."ansi-escapes-4.3.1" - sources."chalk-4.1.0" - sources."clean-stack-3.0.0" - sources."extract-stack-2.0.0" - sources."supports-hyperlinks-2.1.0" - sources."tslib-2.0.3" + sources."emoji-regex-7.0.3" + sources."has-flag-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."semver-5.7.1" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" sources."type-fest-0.11.0" ]; }) @@ -85431,7 +85040,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -85573,7 +85182,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -85714,7 +85323,7 @@ in sources."from2-2.3.0" sources."from2-array-0.0.4" sources."fs-constants-1.0.0" - sources."fs-extra-9.0.1" + sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" @@ -85888,7 +85497,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -85922,7 +85531,7 @@ in sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" - sources."is-wsl-2.2.0" + sources."is-wsl-1.1.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isbuffer-0.0.0" @@ -85946,13 +85555,9 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json5-2.1.3" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-4.0.0" sources."junk-3.1.0" - sources."jwt-decode-3.0.0" + sources."jwt-decode-3.1.1" sources."keep-func-props-3.0.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -86191,12 +85796,12 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."open-7.3.0" - (sources."opn-5.5.0" // { + (sources."open-7.3.0" // { dependencies = [ - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" ]; }) + sources."opn-5.5.0" sources."optionator-0.8.3" (sources."ora-4.1.1" // { dependencies = [ @@ -86614,7 +86219,7 @@ in sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" sources."universal-user-agent-4.0.1" - sources."universalify-1.0.0" + sources."universalify-0.1.2" (sources."unixify-1.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -86979,7 +86584,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -87253,16 +86858,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.2.tgz"; - sha512 = "/cGajoUjpCgP1Plqjtvupm8gE+19Vzm/z31M25f50XIuLpy3wieTki+e2oIPPyuzTD7Gz04JMySbcB8tx0voNA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.3.tgz"; + sha512 = "2SnJJ8YPTz0IzbRyEVpMZmDukm5DiAbNS+Nvv4g8dEtHFgOMj2Qid3OgqbSsYyRE5aH5FZ8xVLyFrBMPMRj24g=="; }; dependencies = [ sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.2" - sources."@node-red/editor-client-1.2.2" - (sources."@node-red/nodes-1.2.2" // { + sources."@node-red/editor-api-1.2.3" + sources."@node-red/editor-client-1.2.3" + (sources."@node-red/nodes-1.2.3" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -87276,9 +86881,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.2" - sources."@node-red/runtime-1.2.2" - sources."@node-red/util-1.2.2" + sources."@node-red/registry-1.2.3" + sources."@node-red/runtime-1.2.3" + sources."@node-red/util-1.2.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -87343,7 +86948,7 @@ in sources."body-parser-1.19.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."busboy-0.2.14" sources."bytes-3.1.0" @@ -87381,7 +86986,6 @@ in sources."cron-1.7.2" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."d-1.0.1" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."deep-extend-0.6.0" @@ -87409,19 +87013,9 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" - sources."es5-ext-0.10.53" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" - (sources."es6-set-0.1.5" // { - dependencies = [ - sources."es6-symbol-3.1.1" - ]; - }) - sources."es6-symbol-3.1.3" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."event-emitter-0.3.5" (sources."express-4.17.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -87432,11 +87026,6 @@ in sources."depd-2.0.0" ]; }) - (sources."ext-1.4.0" // { - dependencies = [ - sources."type-2.1.0" - ]; - }) sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -87513,7 +87102,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.3" + sources."jsonata-1.8.4" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."leven-2.1.0" @@ -87532,9 +87121,10 @@ in sources."lodash.some-4.6.0" sources."lru-cache-4.1.5" sources."media-typer-0.3.0" - (sources."memorystore-1.6.2" // { + (sources."memorystore-1.6.4" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.3.0" + sources."ms-2.1.2" ]; }) sources."merge-descriptors-1.0.1" @@ -87557,14 +87147,13 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moment-timezone-0.5.31" - (sources."mqtt-4.2.1" // { + (sources."mqtt-4.2.4" // { dependencies = [ + sources."concat-stream-2.0.0" sources."debug-4.3.0" - sources."isarray-1.0.0" sources."ms-2.1.2" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" sources."ws-7.3.1" ]; }) @@ -87586,7 +87175,6 @@ in ]; }) sources."negotiator-0.6.2" - sources."next-tick-1.0.0" (sources."node-pre-gyp-0.14.0" // { dependencies = [ sources."chownr-1.1.4" @@ -87723,10 +87311,9 @@ in sources."tslib-2.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.2.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.4" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."unc-path-regex-0.1.2" @@ -87831,7 +87418,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -88363,7 +87950,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.12" + sources."pacote-11.1.13" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -88792,7 +88379,7 @@ in sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -88911,7 +88498,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -88937,7 +88524,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -89049,7 +88636,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89188,7 +88775,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -90357,7 +89944,7 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-callable-1.2.2" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -90601,7 +90188,7 @@ in sources."bncode-0.5.3" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -91093,7 +90680,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -91180,7 +90767,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.27.11" + sources."systeminformation-4.28.1" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -91542,7 +91129,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -92090,7 +91677,7 @@ in sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.5" + sources."@babel/types-7.12.6" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -92159,7 +91746,7 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -92459,7 +92046,7 @@ in sources."@types/node-12.7.12" sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.50.0" + sources."@types/vscode-1.51.0" (sources."@typescript-eslint/eslint-plugin-3.10.1" // { dependencies = [ sources."semver-7.3.2" @@ -92613,7 +92200,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -92747,10 +92334,10 @@ in sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-6.0.0-next.5" - sources."vscode-languageclient-7.0.0-next.9" - sources."vscode-languageserver-protocol-3.16.0-next.7" - sources."vscode-languageserver-types-3.16.0-next.3" + sources."vscode-jsonrpc-6.0.0-next.7" + sources."vscode-languageclient-7.0.0-next.12" + sources."vscode-languageserver-protocol-3.16.0-next.10" + sources."vscode-languageserver-types-3.16.0-next.4" sources."vscode-test-1.4.1" sources."which-2.0.2" sources."which-module-2.0.0" @@ -92934,10 +92521,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz"; - sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz"; + sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA=="; }; dependencies = [ sources."anymatch-3.1.1" @@ -93093,10 +92680,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.10.0.tgz"; - sha512 = "5q/8gJvOh3ssqskIw/UNLyXWWLEfJtvRiPK7qnOS71uvjz19mtL+a3XrowMNe/KINRXzzMWBGpGNwzcLEAhcZQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.11.0.tgz"; + sha512 = "xR6ntWPdLA2gMauiuXAXUImUEFEVe8vmPbIZ4pbc34VwbztyeAnhUf4JyOL9wfDHStdJC2vqZ/zDngTJbM0DxQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -93141,10 +92728,10 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/enterprise-plugin-4.1.1" + sources."@serverless/enterprise-plugin-4.1.2" sources."@serverless/event-mocks-1.1.1" sources."@serverless/platform-client-3.1.2" - sources."@serverless/platform-client-china-2.0.7" + sources."@serverless/platform-client-china-2.0.8" (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" @@ -93166,12 +92753,12 @@ in sources."@serverless/utils-china-1.0.10" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tencent-sdk/capi-1.1.5" + sources."@tencent-sdk/capi-1.1.6" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.164" + sources."@types/lodash-4.14.165" sources."@types/long-4.0.1" sources."@types/node-14.14.6" sources."@types/request-2.48.5" @@ -93230,7 +92817,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.784.0" // { + (sources."aws-sdk-2.786.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93281,7 +92868,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -93363,7 +92950,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.9.4" + sources."dayjs-1.9.5" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" sources."decompress-4.2.1" @@ -93471,13 +93058,6 @@ in sources."filenamify-3.0.0" sources."filesize-6.1.0" sources."fill-range-7.0.1" - (sources."find-process-1.4.4" // { - dependencies = [ - sources."commander-5.1.0" - sources."debug-4.3.0" - sources."ms-2.1.2" - ]; - }) sources."find-requires-1.0.0" sources."flat-5.0.2" sources."follow-redirects-1.5.10" @@ -94593,10 +94173,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.424.1"; + version = "1.424.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.424.1.tgz"; - sha512 = "jPfGpI/cCPc1xn335GP7fVVHkqw/ss3W8ie9p+KM748QgZkc5JMuUJKc9lB1y+5+H7wpCnt4wuO1jKkFBpwSUQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.424.4.tgz"; + sha512 = "l+p0PgYx7+xmAYNGy4hvd8hXtDIcQzYM1SrI7uM4CtlxR0Hjze93p0TcE3GYxSuia3IUDub95DIVtWmxLCeCMw=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -94678,7 +94258,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserify-zlib-0.1.4" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.3" @@ -95218,68 +94798,29 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "2.3.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz"; - sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.0.tgz"; + sha512 = "arLQtd+UoJ08NXBRBGUJDyQ9B+cc9WwD67hc5s1WQcs2DyAkYzI5HWg4U0CrFtK00kjyAWxBGhLwVbfOeMqz1A=="; }; dependencies = [ sources."accepts-1.3.7" - sources."after-0.8.2" - sources."arraybuffer.slice-0.0.7" - sources."async-limiter-1.0.1" - sources."backo2-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" - sources."better-assert-1.0.2" - sources."blob-0.0.5" - sources."callsite-1.0.0" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" - sources."cookie-0.3.1" + sources."component-emitter-1.3.0" + sources."cookie-0.4.1" + sources."cors-2.8.5" sources."debug-4.1.1" - sources."engine.io-3.4.2" - (sources."engine.io-client-3.4.4" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" - ]; - }) - sources."engine.io-parser-2.2.1" - sources."has-binary2-1.0.3" - sources."has-cors-1.1.0" - sources."indexof-0.0.1" - sources."isarray-2.0.1" + sources."engine.io-4.0.1" + sources."engine.io-parser-4.0.1" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" sources."negotiator-0.6.2" - sources."object-component-0.0.3" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { - dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."ms-2.0.0" - (sources."socket.io-parser-3.3.1" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - ]; - }) - ]; - }) - sources."socket.io-parser-3.4.1" - sources."to-array-0.1.4" + sources."object-assign-4.1.1" + sources."socket.io-adapter-2.0.3" + sources."socket.io-parser-4.0.1" + sources."vary-1.1.2" sources."ws-7.3.1" - sources."xmlhttprequest-ssl-1.5.5" - sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -95358,7 +94899,7 @@ in sources."ini-1.3.5" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -95520,7 +95061,7 @@ in sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" (sources."cache-base-1.0.1" // { dependencies = [ @@ -96392,7 +95933,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.784.0" // { + (sources."aws-sdk-2.786.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -96647,7 +96188,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -98145,7 +97686,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -98518,7 +98059,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -99258,7 +98799,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -100524,7 +100065,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."mimic-response-2.1.0" @@ -100826,7 +100367,7 @@ in sources."@types/json5-0.0.30" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.50.0" + sources."@types/vscode-1.51.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -101681,7 +101222,7 @@ in sources."bl-1.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -102235,7 +101776,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.2.0" + sources."fsevents-2.2.1" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -102311,7 +101852,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -103000,7 +102541,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" @@ -103898,10 +103439,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.14.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001156" sources."chrome-trace-event-1.0.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.587" + sources."electron-to-chromium-1.3.589" sources."enhanced-resolve-5.3.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -103971,16 +103512,15 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.1.0.tgz"; - sha512 = "NdhxXMZmoik62Y05t0h1y65LjBM7BwFPq311ihXuMM3RY6dlc4KkCTyHLzTuBEc+bqq6d3xh+CWmU0xRexNJBA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.2.0.tgz"; + sha512 = "EIl3k88vaF4fSxWSgtAQR+VwicfLMTZ9amQtqS4o+TDPW9HGaEpbFBbAZ4A3ZOT5SOnMxNOzROsSTPiE8tBJPA=="; }; dependencies = [ - sources."@webpack-cli/info-1.0.2" - sources."@webpack-cli/serve-1.0.1" + sources."@webpack-cli/info-1.1.0" + sources."@webpack-cli/serve-1.1.0" sources."ansi-colors-4.1.1" - sources."ansi-escapes-4.3.1" sources."ansi-styles-3.2.1" sources."array-back-4.0.1" sources."chalk-2.4.2" @@ -104004,9 +103544,10 @@ in sources."human-signals-1.1.1" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" + sources."leven-3.1.0" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."merge-stream-2.0.0" @@ -104033,7 +103574,6 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" sources."table-layout-1.0.1" - sources."type-fest-0.11.0" sources."typical-5.2.0" sources."v8-compile-cache-2.2.0" sources."webpack-merge-4.2.2" @@ -104793,13 +104333,20 @@ in sources."ms-2.1.2" ]; }) - sources."bittorrent-peerid-1.3.3" - (sources."bittorrent-protocol-3.1.2" // { + (sources."bittorrent-lsd-1.0.0" // { dependencies = [ sources."debug-4.3.0" sources."ms-2.1.2" ]; }) + sources."bittorrent-peerid-1.3.3" + (sources."bittorrent-protocol-3.2.0" // { + dependencies = [ + sources."bitfield-4.0.0" + sources."debug-4.3.0" + sources."ms-2.1.2" + ]; + }) (sources."bittorrent-tracker-9.15.0" // { dependencies = [ sources."debug-4.3.0" @@ -105011,7 +104558,7 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.3.0" // { + (sources."torrent-discovery-9.4.0" // { dependencies = [ sources."debug-4.3.0" sources."ms-2.1.2" @@ -105026,8 +104573,9 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.4.0" sources."url-join-4.0.1" - (sources."ut_metadata-3.5.1" // { + (sources."ut_metadata-3.5.2" // { dependencies = [ + sources."bitfield-4.0.0" sources."debug-4.3.0" sources."ms-2.1.2" ]; @@ -105322,7 +104870,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" + sources."core-js-3.7.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -105515,7 +105063,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix new file mode 100644 index 0000000000..0db0164589 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -0,0 +1,66 @@ +{ buildDunePackage +, stdlib-shims +, ppx_yojson_conv_lib +, ocaml-syntax-shims +, omd +, octavius +, dune-build-info +, uutf +, csexp +, cmdliner +, fetchzip +, lib +}: +let + version = "1.1.0"; + src = fetchzip { + url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/ocaml-lsp-server-${version}.tbz"; + sha256 = "0al89waw43jl80k9z06kh44byhjhwb5hmzx07sddwi1kr1vc6jrb"; + }; + + # unvendor some (not all) dependencies. + # They are vendored by upstream only because it is then easier to install + # ocaml-lsp without messing with your opam switch, but nix should prevent + # this type of problems without resorting to vendoring. + preBuild = '' + rm -r vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} + ''; + + buildInputs = [ + stdlib-shims + ppx_yojson_conv_lib + ocaml-syntax-shims + octavius + uutf + csexp + dune-build-info + omd + cmdliner + ]; + + lsp = buildDunePackage { + pname = "lsp"; + inherit version src; + useDune2 = true; + minimumOCamlVersion = "4.06"; + + inherit buildInputs preBuild; + }; + +in +buildDunePackage { + pname = "ocaml-lsp-server"; + inherit version src; + useDune2 = true; + + inherit preBuild; + + buildInputs = buildInputs ++ [ lsp ]; + + meta = with lib; { + description = "OCaml Language Server Protocol implementation"; + license = lib.licenses.isc; + platforms = platforms.unix; + maintainers = [ maintainers.symphorien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix new file mode 100644 index 0000000000..0fd2870181 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, smbus-cffi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bme680"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "pimoroni"; + repo = "bme680-python"; + rev = "v${version}"; + sha256 = "sha256-oIXh1JnGTI/Cj4MQFpWq+sWR2X+ioCsK0Q+T7wPITCQ="; + }; + + propagatedBuildInputs = [ smbus-cffi ]; + + preBuild = '' + cd library + ''; + checkInputs = [ pytestCheckHook ]; + + # next release will have tests, but not the current one + doCheck = false; + + pythonImportsCheck = [ "bme680" ]; + + meta = with lib; { + description = "Python library for driving the Pimoroni BME680 Breakout"; + homepage = "https://github.com/pimoroni/bme680-python"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix new file mode 100644 index 0000000000..ac1cab90d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchPypi, buildPythonPackage +, click, pytest +}: + +buildPythonPackage rec { + pname = "click-help-colors"; + version = "0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "EZ5fr2nPyRnJlcWWIyasj9h/EeVqNxr1lOPf2EWPTG4="; + }; + + propagatedBuildInputs = [ click ]; + + # tries to use /homeless-shelter to mimic container usage, etc + #doCheck = false; + checkInputs = [ pytest ]; + + pythonImportsCheck = [ "click_help_colors" ]; + + meta = with stdenv.lib; { + description = "Colorization of help messages in Click"; + homepage = "https://github.com/r-m-n/click-help-colors"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix index 1cdf0449c6..dd6059da97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "deepmerge"; - version = "0.1.0"; + version = "0.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0d1ab9lxwymqxxd58j50id1wib48xym3ss5xw172i2jfwwwzfdrx"; + sha256 = "07rcz699fr0jgx6i6fvh8dxa72j7745inix760nw3g46jwk487gs"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix index f0cf96d136..0d618e2b55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.5.4"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "60079a1c4c600cb4d4a9f7c386ea357b5ee02355ae6d6e8b41f769ae3f7af3ad"; + sha256 = "949b93d0535d1223b91ac0048586bd878aaebf4044c54c1dc3068acc9bdf441f"; }; propagatedBuildInputs = [ flask ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix new file mode 100644 index 0000000000..7e13aedec4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, requests +, responses, pytestCheckHook, pytest, pytestcov, isPy27 +}: + +buildPythonPackage rec { + pname = "googlemaps"; + version = "4.4.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "googlemaps"; + repo = "google-maps-services-python"; + rev = "v${version}"; + sha256 = "DYhW1OGce/0gY7Jmwq6iM45PxLyXIYo4Cfg2u6Xuyg4="; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytestCheckHook responses pytestcov ]; + + disabledTests = [ + # touches network + "test_elevation_along_path_single" + "test_transit_without_time" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/googlemaps/google-maps-services-python"; + description = "Python client library for Google Maps API Web Services"; + license = licenses.asl20; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix new file mode 100644 index 0000000000..3ee66a1c52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchPypi, buildPythonPackage +, hyperopt +}: + +buildPythonPackage rec { + pname = "gradient_sdk"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "Q9oeYjjgJf2lhxW1ypsweQAPpMglmW9PxgzMsgTqJkY="; + }; + + propagatedBuildInputs = [ hyperopt ]; + + pythonImportsCheck = [ "gradient_sdk" ]; + + meta = with stdenv.lib; { + description = "Gradient ML SDK"; + homepage = "https://github.com/Paperspace/gradient-sdk"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix new file mode 100644 index 0000000000..0521b4a57d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchPypi, buildPythonPackage +, boto3, requests, datadog, configparser, python +}: + +buildPythonPackage rec { + pname = "gradient_statsd"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; + }; + + propagatedBuildInputs = [ requests datadog ] + ++ lib.optional python.isPy2 configparser; + + pythonImportsCheck = [ "gradient_statsd" ]; + + meta = with stdenv.lib; { + description = "Wrapper around the DogStatsd client"; + homepage = "https://paperspace.com"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix index b00e3a88d3..76ae571802 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { @@ -12,7 +12,9 @@ buildPythonPackage rec { sha256 = "1n9c8yj11npiq9qxivwmfhib1qkjpcyw42a7q0w641bdrz3x6r37"; }; - propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; + propagatedBuildInputs = [ + transitions websockets passlib docopt pyyaml setuptools + ]; postPatch = '' # test tries to bind same port multiple times and fails diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix new file mode 100644 index 0000000000..7a90722499 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchPypi, buildPythonPackage +, cloudpickle, numpy, future, networkx +, six, tqdm, scipy, pymongo +}: + +buildPythonPackage rec { + pname = "hyperopt"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "34xIpivBYUvcN/XMVwBkqTpLgaFlWWIduazuP2U2tlg="; + }; + + propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ]; + + # tries to use /homeless-shelter to mimic container usage, etc + doCheck = false; + + pythonImportsCheck = [ "hyperopt" ]; + + meta = with stdenv.lib; { + description = "Distributed Asynchronous Hyperparameter Optimization"; + homepage = "http://hyperopt.github.com/hyperopt/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix new file mode 100644 index 0000000000..158f1161cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, arrow +, six +, hypothesis +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "inform"; + version = "1.23"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "inform"; + rev = "v${version}"; + sha256 = "02zlprvidkz51aypss4knhv7dbr0sbpz3caqjzf9am2n1jx2viyy"; + }; + + propagatedBuildInputs = [ arrow six ]; + + checkInputs = [ pytest hypothesis ]; + checkPhase = "./test.doctests.py && ./test.inform.py && pytest"; + + meta = with lib; { + description = "Print and logging utilities"; + longDescription = '' + Inform is designed to display messages from programs that are typically + run from a console. It provides a collection of ‘print’ functions that + allow you to simply and cleanly print different types of messages. + ''; + homepage = "https://inform.readthedocs.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix index f6383e46d2..90761f76f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "iniconfig"; - version = "1.0.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0s9z9n4603fdpv2vzh6ddzfgsjmb09n6qalkjl2xwrss6n4jzyg5"; + sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"; }; doCheck = false; # avoid circular import with pytest @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "brain-dead simple parsing of ini files"; - homepage = "https://github.com/CHANGE/iniconfig/"; + homepage = "https://github.com/RonnyPfannschmidt/iniconfig"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 0bcf216fa4..2e751c6f48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.782"; + version = "0.790"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "030kn709515452n6gy2i1d9fg6fyrkmdz228lfpmbslybsld9xzg"; + sha256 = "sha256-KyG6Ra2e8uLriM5K6t0BEtD1AmQYMkF2/UlKaCS3SXU="; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix index 8f26324689..b7ddf35cae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "06as8vh17m0nkp3fpkp42m990a5zjfl2iaa17da99ksh7886mjpc"; + sha256 = "2400d7878e97714e822ab200a71fc71ede487e671f42b4b411745dba95f9cb32"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix new file mode 100644 index 0000000000..1fbfde7b26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, inform +, pytestCheckHook +, docopt +, natsort +, voluptuous +}: + +buildPythonPackage rec { + pname = "nestedtext"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "nestedtext"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1dwks5apghg29aj90nc4qm0chk195jh881297zr1wk7mqd2n159y"; + }; + + propagatedBuildInputs = [ inform ]; + + checkInputs = [ pytestCheckHook docopt natsort voluptuous ]; + pytestFlagsArray = [ "--ignore=build" ]; # Avoids an ImportMismatchError. + + meta = with lib; { + description = "A human friendly data format"; + longDescription = '' + NestedText is a file format for holding data that is to be entered, + edited, or viewed by people. It allows data to be organized into a nested + collection of dictionaries, lists, and strings. In this way it is similar + to JSON, YAML and TOML, but without the complexity and risk of YAML and + without the syntactic clutter of JSON and TOML. NestedText is both simple + and natural. Only a small number of concepts and rules must be kept in + mind when creating it. It is easily created, modified, or viewed with a + text editor and easily understood and used by both programmers and + non-programmers. + ''; + homepage = "https://nestedtext.org"; + license = licenses.mit; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix index d4307c6598..152ceddb91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "4.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-STUyMUCWAHfDA6dkpiOqSRBL3/tubedUbWa94Kp/764="; + sha256 = "asfRohjOgYxMV/wprKvxUD328GVJQkAYnuAkE09kKgs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix new file mode 100644 index 0000000000..c35405f417 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, responses, pytestCheckHook }: + +buildPythonPackage rec { + pname = "openrouteservice"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "GIScience"; + repo = "${pname}-py"; + rev = "v${version}"; + sha256 = "ySXzOQI9NcF1W/otbL7i3AY628/74ZkJjDMQ9ywVEPc="; + }; + + checkInputs = [ pytestCheckHook responses ]; + + disabledTests = [ + # touches network + "test_optimized_waypoints" + "test_invalid_api_key" + "test_raise_timeout_retriable_requests" + ]; + + meta = with lib; { + homepage = "https://github.com/GIScience/openrouteservice-py"; + description = "The Python API to consume openrouteservice(s) painlessly"; + license = licenses.asl20; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paperspace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paperspace/default.nix index c439b4099a..fad394a533 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paperspace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paperspace/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchPypi, buildPythonPackage -, boto3, requests +, boto3, requests, gradient_statsd, terminaltables +, click-completion , click-didyoumean, click-help-colors +, colorama, requests_toolbelt, gradient_sdk, progressbar2 }: buildPythonPackage rec { @@ -11,7 +13,10 @@ buildPythonPackage rec { sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191"; }; - propagatedBuildInputs = [ boto3 requests ]; + propagatedBuildInputs = [ boto3 requests gradient_statsd terminaltables + click-completion click-didyoumean click-help-colors requests_toolbelt + colorama gradient_sdk progressbar2 + ]; # tries to use /homeless-shelter to mimic container usage, etc doCheck = false; @@ -22,6 +27,5 @@ buildPythonPackage rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix index b439c05f0b..fb9237c893 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "psautohint"; - version = "2.1.1"; + version = "2.1.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "adobe-type-tools"; repo = pname; - sha256 = "00n9bycjmvx1fb4332bdj53f01q86ajndrvid9idpiyzybmd5vp4"; + sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n"; rev = "v${version}"; fetchSubmodules = true; # data dir for tests }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix index e63fd00bb5..ffcd3569e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix @@ -1,16 +1,18 @@ { lib, buildPythonPackage, fetchFromGitHub, cmake, python , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, nose, shapely, mock, isPy3k }: +, nose, shapely, pythonOlder, isPyPy }: buildPythonPackage rec { pname = "pyosmium"; - version = "2.15.3"; + version = "3.0.1"; + + disabled = pythonOlder "3.4" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "1523ym9i4rnwi5kcp7n2lm67kxlhar8xlv91s394ixzwax9bgg7w"; + sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +20,7 @@ buildPythonPackage rec { preBuild = "cd .."; - checkInputs = [ nose shapely ] ++ lib.optionals (!isPy3k) [ mock ]; + checkInputs = [ nose shapely ]; checkPhase = "(cd test && ${python.interpreter} run_tests.py)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix index d563a62a46..fefeaf7ebb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix @@ -9,12 +9,12 @@ let in buildPythonPackage rec { - version = "1.9.9"; + version = "2.0.0"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6"; + sha256 = "0yap0p8mp6dx58n3nina6ryhc2cysaj75sq98wf3qybf33cxjr5k"; }; postPatch = if withApplePCSC then '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix new file mode 100644 index 0000000000..b762730914 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, pytestCheckHook +, pyserial +, fetchpatch +}: + +buildPythonPackage rec { + pname = "smbus-cffi"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "fb4195aaabfc01586863f60d3190b5cb1bf8f12622fd597e23e48768dad6bde8"; + }; + + patches = [ + # https://github.com/bivab/smbus-cffi/pull/24 + (fetchpatch { + url = "https://github.com/bivab/smbus-cffi/commit/ba79ae174a9d84e767d95f165c43ee212b1bbb92.patch"; + sha256 = "sha256-WtRuK5y6fWDEhm0Xy5XqS5yCkn7vXXYtjlOjS90gla4="; + }) + ]; + + propagatedBuildInputs = [ cffi ]; + + installCheckPhase = '' + # we want to import the installed module that also contains the compiled library + rm -rf smbus + runHook pytestCheckPhase + ''; + + # requires hardware access + pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ]; + + checkInputs = [ pytestCheckHook pyserial ]; + + meta = with lib; { + description = "Python module for SMBus access through Linux I2C /dev interface"; + homepage = "https://github.com/bivab/smbus-cffi"; + license = licenses.gpl2; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix index 179a74c56d..4638427b3e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, writeText , autoconf, ncurses, graphviz, doxygen -, ocamlPackages, ltl2ba, coq, why3, +, ocamlPackages, ltl2ba, coq, why3 +, gdk-pixbuf, wrapGAppsHook }: let @@ -33,36 +34,34 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; - nativeBuildInputs = [ autoconf makeWrapper ]; + nativeBuildInputs = [ autoconf wrapGAppsHook ]; buildInputs = with ocamlPackages; [ ncurses ocaml findlib ltl2ba ocamlgraph yojson menhir camlzip lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen + gdk-pixbuf ]; enableParallelBuilding = true; - fixupPhase = '' - for p in $out/bin/frama-c{,-gui}; - do - wrapProgram $p --prefix OCAMLPATH ':' ${ocamlpath} - done + preFixup = '' + gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlpath}) ''; # Allow loading of external Frama-C plugins setupHook = writeText "setupHook.sh" '' addFramaCPath () { if test -d "''$1/lib/frama-c/plugins"; then - export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins" - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins" + export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN-}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins" + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins" fi if test -d "''$1/lib/frama-c"; then - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c" + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c" fi if test -d "''$1/share/frama-c/"; then - export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c" + export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE-}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c" fi } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix index 62de8bdfda..138933ebb5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , fixplate , tasty , tasty-hunit @@ -36,6 +37,14 @@ mkDerivation rec { executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; + patches = [ + # raise upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46 + (fetchpatch { + url = "https://github.com/Synthetica9/nix-linter/commit/b406024e525977b3c69d78d6a94a683e2ded121f.patch"; + sha256 = "0viwbprslcmy70bxy3v27did79nqhlc0jcx4kp0lycswaccvnp1j"; + }) + ]; + description = "Linter for Nix(pkgs), based on hnix"; homepage = "https://github.com/Synthetica9/nix-linter"; license = lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/cmakepaths.patch deleted file mode 100644 index d237267078..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/cmakepaths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04c5c58..429ca47 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue") - - set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear") --set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") -+set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") - - add_subdirectory(libear) - add_subdirectory(bear) diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index bc7bb46cd5..cd5e508fbd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -1,22 +1,49 @@ -{ stdenv, fetchFromGitHub, cmake, python3 }: +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, grpc +, protobuf +, openssl +, nlohmann_json +, gtest +, fmt +, spdlog +, c-ares +, abseil-cpp +, zlib +}: stdenv.mkDerivation rec { pname = "bear"; - version = "2.4.2"; + version = "3.0.1"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1"; + sha256 = "02vzlm48ywf6s3fly19j94k11dqx94x8pgmkq1ylx3z3d1y3b5zb"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ python3 ]; # just for shebang of bin/bear + nativeBuildInputs = [ cmake pkg-config ]; - doCheck = false; # all fail + buildInputs = [ + grpc + protobuf + openssl + nlohmann_json + gtest + fmt + spdlog + c-ares + abseil-cpp + zlib + ]; - patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ]; + patches = [ + # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/... + ./no-double-relative.patch + ]; meta = with stdenv.lib; { description = "Tool that generates a compilation database for clang tooling"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch deleted file mode 100644 index 8effc723bb..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/bear/main.py.in -+++ b/bear/main.py.in -@@ -49,6 +49,7 @@ import tempfile - import shutil - import contextlib - import logging -+from distutils.spawn import find_executable - - # Map of ignored compiler option for the creation of a compilation database. - # This map is used in _split_command method, which classifies the parameters -@@ -569,7 +570,15 @@ class Compilation: - (compiler, language, rest of the command) otherwise """ - - if command: # not empty list will allow to index '0' and '1:' -- executable = os.path.basename(command[0]) # type: str -+ executable_file = find_executable(command[0]) -+ if executable_file: -+ absolute_executable = os.path.realpath(executable_file) -+ # Ignore Nix wrappers. -+ if 'wrapper' in absolute_executable: -+ return None -+ executable = os.path.basename(absolute_executable) -+ else: -+ executable = os.path.basename(command[0]) - parameters = command[1:] # type: List[str] - # 'wrapper' 'parameters' and - # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch new file mode 100644 index 0000000000..0184bdfd6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -0,0 +1,14 @@ +diff --git a/source/config.h.in b/source/config.h.in +index 2ca8853..2564c63 100644 +--- a/source/config.h.in ++++ b/source/config.h.in +@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; + + constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; + constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; +-constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; +-constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er"; +-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; ++constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++constexpr char EXECUTOR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/er"; ++constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 92596a068f..702e593568 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -1,23 +1,23 @@ -{ stdenv, lib, graalvm8-ce, fetchurl }: +{ stdenv, lib, graalvm11-ce, fetchurl }: stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2020.04.05"; + version = "2020.11.07"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json"; - sha256 = "1m6kja38p6aypawbynkyq8bdh8wpdjmyqrhslinqid9r8cl25rcq"; + sha256 = "0mwclqjh38alkddr5r7bfqn5lplx06h9gladi89kp06qdxc1hp7a"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "0k9samcqkpkdgzbzr2bpixf75987lsabh97101v1fg12qvjhf187"; + sha256 = "1xqryfcn82bp8wasqnllfgvhl5w9zm63yw8c2kgxz18dayhq4i31"; }; dontUnpack = true; - buildInputs = [ graalvm8-ce ]; + buildInputs = [ graalvm11-ce ]; buildPhase = '' native-image \ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; - platforms = graalvm8-ce.meta.platforms; + platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix index fce25903ac..b26c328dba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -1,38 +1,31 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.37.2"; + version = "0.39.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "1hhycvvp21gy6g71hwf3pk2jnccpnhcf2z7c85shzffhddy1wc0v"; + sha256 = "0lvi4d731ypdjcskj0hdfd37wa3ldspibs2dgaahg7d7zhp1l76g"; }; nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jre ]; - - unpackCmd = '' - mkdir -p ${pname}-${version} - cp $curSrc ${pname}-${version}/ktlint - ''; + dontUnpack = true; installPhase = '' - mkdir -p $out/bin - mv ktlint $out/bin/ktlint - chmod +x $out/bin/ktlint + install -Dm755 $src $out/bin/ktlint ''; postFixup = '' - wrapProgram $out/bin/ktlint --prefix PATH : "${jre}/bin" + wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin" ''; meta = with stdenv.lib; { description = "An anti-bikeshedding Kotlin linter with built-in formatter"; homepage = "https://ktlint.github.io/"; license = licenses.mit; - platforms = platforms.all; + platforms = jre_headless.meta.platforms; maintainers = with maintainers; [ tadfisher ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index 65c3a19489..f92eaf3ebf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.23.6"; + version = "0.23.7"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0afs3h8npbzmcrzm6kzfdva5id3zyifhhsh7zgyrxkmw60qhl498"; + sha256 = "05s0rj785dm9dqr30ak5hi26qy0z2w71zljyln5is4frckxkcvng"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix index 6fb2569511..a121cc6709 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ hh sb0 ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 2e6db32966..a398b7e504 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-10-19"; + rev = "2020-11-09"; version = "unstable-${rev}"; - sha256 = "1xvyk1d26zn1d9i42h78qsm6bg57nhn1rgr46jwa46gsb31nabjh"; - cargoSha256 = "18s5yrc9fdj2ndylwyf07l0kmwxka7mnbj254xmq3g7ragw71xjw"; + sha256 = "sha256-SX9dvx2JtYZBxA3+dHQKX/jrjbAMy37/SAybDjlYcSs="; + cargoSha256 = "sha256-+td+wMmI+MyGz9oPC+SPO2TmAV0+3lOORNY7xf6s3vI="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index ca72f91953..1bab5b9518 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -16,11 +16,6 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - # FIXME: Temporary fixes for our rust 1.46.0 - patches = [ - ./no-track_env_var.patch # Requires rustc 1.47.0 - ]; - buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; @@ -34,7 +29,7 @@ rustPlatform.buildRustPackage { inherit doCheck; preCheck = lib.optionalString doCheck '' - export RUST_SRC_PATH=${rustPlatform.rustcSrc} + export RUST_SRC_PATH=${rustPlatform.rustLibSrc} ''; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch deleted file mode 100644 index f5173c4bac..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch +++ /dev/null @@ -1,120 +0,0 @@ -This patch revert 3d169bd3f4cdc2dc3dd09eadbbc17c19214d69f3 (Add track_env_var to the proc macro server). - -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -index 55d6330cc..cb4b3bdb0 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -@@ -160,7 +160,6 @@ macro_rules! define_handles { - } - define_handles! { - 'owned: -- FreeFunctions, - TokenStream, - TokenStreamBuilder, - TokenStreamIter, -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -index b97886eb9..aeb05aad4 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -@@ -57,10 +57,6 @@ use std::thread; - macro_rules! with_api { - ($S:ident, $self:ident, $m:ident) => { - $m! { -- FreeFunctions { -- fn drop($self: $S::FreeFunctions); -- fn track_env_var(var: &str, value: Option<&str>); -- }, - TokenStream { - fn drop($self: $S::TokenStream); - fn clone($self: &$S::TokenStream) -> $S::TokenStream; -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -index 3acb239af..45d41ac02 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -@@ -11,8 +11,6 @@ use super::client::HandleStore; - /// Declare an associated item of one of the traits below, optionally - /// adjusting it (i.e., adding bounds to types and default bodies to methods). - macro_rules! associated_item { -- (type FreeFunctions) => -- (type FreeFunctions: 'static;); - (type TokenStream) => - (type TokenStream: 'static + Clone;); - (type TokenStreamBuilder) => -diff --git a/crates/proc_macro_srv/src/proc_macro/mod.rs b/crates/proc_macro_srv/src/proc_macro/mod.rs -index fc6e7344f..ee0dc9722 100644 ---- a/crates/proc_macro_srv/src/proc_macro/mod.rs -+++ b/crates/proc_macro_srv/src/proc_macro/mod.rs -@@ -924,25 +924,3 @@ impl fmt::Debug for Literal { - self.0.fmt(f) - } - } -- --pub mod tracked_env { -- use std::env::{self, VarError}; -- use std::ffi::OsStr; -- -- /// Retrieve an environment variable and add it to build dependency info. -- /// Build system executing the compiler will know that the variable was accessed during -- /// compilation, and will be able to rerun the build when the value of that variable changes. -- /// Besides the dependency tracking this function should be equivalent to `env::var` from the -- /// standard library, except that the argument must be UTF-8. -- pub fn var + AsRef>(key: K) -> Result { -- use std::ops::Deref; -- -- let key: &str = key.as_ref(); -- let value = env::var(key); -- super::bridge::client::FreeFunctions::track_env_var( -- key, -- value.as_ref().map(|t| t.deref()).ok(), -- ); -- value -- } --} -diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs -index c5fe3591e..7d1695c86 100644 ---- a/crates/proc_macro_srv/src/rustc_server.rs -+++ b/crates/proc_macro_srv/src/rustc_server.rs -@@ -242,8 +242,6 @@ impl TokenStreamBuilder { - } - } - --pub struct FreeFunctions; -- - #[derive(Clone)] - pub struct TokenStreamIter { - trees: IntoIter, -@@ -256,7 +254,6 @@ pub struct Rustc { - } - - impl server::Types for Rustc { -- type FreeFunctions = FreeFunctions; - type TokenStream = TokenStream; - type TokenStreamBuilder = TokenStreamBuilder; - type TokenStreamIter = TokenStreamIter; -@@ -270,13 +267,6 @@ impl server::Types for Rustc { - type MultiSpan = Vec; - } - --impl server::FreeFunctions for Rustc { -- fn track_env_var(&mut self, _var: &str, _value: Option<&str>) { -- // FIXME: track env var accesses -- // https://github.com/rust-lang/rust/pull/71858 -- } --} -- - impl server::TokenStream for Rustc { - fn new(&mut self) -> Self::TokenStream { - Self::TokenStream::new() -diff --git a/xtask/src/install.rs b/xtask/src/install.rs -index fcc4f05e4..d829790d7 100644 ---- a/xtask/src/install.rs -+++ b/xtask/src/install.rs -@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; - use crate::not_bash::{pushd, run}; - - // Latest stable, feel free to send a PR if this lags behind. --const REQUIRED_RUST_VERSION: u32 = 47; -+const REQUIRED_RUST_VERSION: u32 = 46; - - pub struct InstallCmd { - pub client: Option, diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh index b0435be720..f08ea67cf2 100755 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -24,24 +24,24 @@ echo "$old_rev -> $rev" sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev") # Clear cargoSha256 to avoid inconsistency. -sed -e "s/rev = \".*\"/rev = \"$rev\"/" \ - -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ - -e "s/cargoSha256 = \".*\"/cargoSha256 = \"\"/" \ +sed -e "s#rev = \".*\"#rev = \"$rev\"#" \ + -e "s#sha256 = \".*\"#sha256 = \"$sha256\"#" \ + -e "s#cargoSha256 = \".*\"#cargoSha256 = \"\"#" \ --in-place ./default.nix node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code" # Check vscode compatibility req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)" req_vscode_ver="${req_vscode_ver#^}" -cur_vscode_ver="$(nix eval --raw -f "$nixpkgs" vscode.version)" -if [[ "$(nix eval "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then +cur_vscode_ver="$(nix-instantiate --eval --strict "$nixpkgs" -A vscode.version | tr -d '"')" +if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver" exit 1 fi echo "Prebuilding for cargoSha256" cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \ +sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \ --in-place ./default.nix # Update vscode extension diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/wrapper.nix index 8ca3ff1a6d..bed2062818 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/wrapper.nix @@ -4,7 +4,8 @@ lib.makeOverridable ({ unwrapped, pname ? "rust-analyzer", version ? unwrapped.version, - rustcSrc ? rustPlatform.rustcSrc, + # Use name from `RUST_SRC_PATH` + rustSrc ? rustPlatform.rustLibSrc, }: runCommandNoCC "${pname}-${version}" { inherit pname version; inherit (unwrapped) src meta; @@ -12,5 +13,5 @@ lib.makeOverridable ({ } '' mkdir -p $out/bin makeWrapper ${unwrapped}/bin/rust-analyzer $out/bin/rust-analyzer \ - --set-default RUST_SRC_PATH "${rustcSrc}" + --set-default RUST_SRC_PATH "${rustSrc}" '') diff --git a/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix new file mode 100644 index 0000000000..f26615e26b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, pkg-config +, scdoc +, gnome-builder +, gnused +, glib +, libgee +, json-glib +, jsonrpc-glib +, vala +}: + +stdenv.mkDerivation rec { + pname = "vala-language-server"; + version = "0.48.1"; + + src = fetchFromGitHub { + owner = "benwaffle"; + repo = pname; + rev = version; + sha256 = "12k095052jkvbiyz8gzkj6w7r7p16d5m18fyikl48yvh5nln8fw0"; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + # GNOME Builder Plugin + gnused + gnome-builder + ]; + + buildInputs = [ + glib + libgee + json-glib + jsonrpc-glib + vala + ]; + + meta = with stdenv.lib; { + description = "Code Intelligence for Vala & Genie"; + homepage = "https://github.com/benwaffle/vala-language-server"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ andreasfelix worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix index 880703383d..d48787ea01 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix @@ -1,41 +1,39 @@ -{ stdenv -, lib -, buildGoPackage -, go +{ lib +, fetchFromGitHub +, buildGoModule , makeWrapper , nix-prefetch-git -, fetchFromGitHub +, go }: -buildGoPackage { +buildGoModule { pname = "vgo2nix"; - version = "unstable-2020-05-05"; - goPackagePath = "github.com/adisbladis/vgo2nix"; - - nativeBuildInputs = [ makeWrapper ]; + version = "unstable-2020-11-07"; src = fetchFromGitHub { owner = "nix-community"; repo = "vgo2nix"; - rev = "71e59bf268d5257a0f89b2f59cd20fd468c8c6ac"; - sha256 = "1pcdkknq2v7nrs0siqcvvq2x0qqz5snwdz2lpjnad8i33rwhmayh"; + rev = "4546d8056ab09ece3d2489594627c0541b15a397"; + sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh"; }; - goDeps = ./deps.nix; + vendorSha256 = "1lzhhg9wimn8nfzrrla5bshgk1ghnlsdfmq6iask0zqz311g96bv"; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; allowGoReference = true; - postInstall = with stdenv; let - binPath = lib.makeBinPath [ nix-prefetch-git go ]; - in '' - wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath} + postInstall = '' + wrapProgram $out/bin/vgo2nix --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git go ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; - maintainers = with maintainers; [ adisbladis ]; + maintainers = with maintainers; [ adisbladis SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/deps.nix b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/deps.nix deleted file mode 100644 index 2d9a130e43..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/deps.nix +++ /dev/null @@ -1,210 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/assert"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/assert"; - rev = "405dbfeb8e38"; - sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; - }; - } - { - goPackagePath = "github.com/alecthomas/colour"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/colour"; - rev = "60882d9e2721"; - sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; - }; - } - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "github.com/alecthomas/repr"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/repr"; - rev = "117648cd9897"; - sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/orivej/e"; - fetch = { - type = "git"; - url = "https://github.com/orivej/e"; - rev = "ac3492690fda"; - sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr"; - }; - } - { - goPackagePath = "github.com/orivej/go-nix"; - fetch = { - type = "git"; - url = "https://github.com/orivej/go-nix"; - rev = "dae45d921a44"; - sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy"; - }; - } - { - goPackagePath = "github.com/pkg/profile"; - fetch = { - type = "git"; - url = "https://github.com/pkg/profile"; - rev = "v1.2.1"; - sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.0.0"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/yuin/goldmark"; - fetch = { - type = "git"; - url = "https://github.com/yuin/goldmark"; - rev = "v1.1.27"; - sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0de0cce0169b"; - sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "97732733099d"; - sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "0c9eba77bc32"; - sha256 = "1xz0jyxdmibkams6vd61va5cw963l25jjf3i9r33m0i739qwg4lj"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix index fd84afb161..8844ed2558 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }: rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.10.3"; + version = "1.12.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0703zlrmv0if575rj1mrgfg1a5qbf98sqjhhj09hab69i96wbrk9"; + sha256 = "1w0j6if1fnih1036hlb9a3c6wgjw4p057llhjf0f3d568ah1244a"; }; - cargoSha256 = "0znzyqzvbqcl4mmxpsvaf592xrs968x57czj45jibmafq033dbfa"; + cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config perl ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index 1495b811d0..c12e0260fb 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.32.0"; + version = "7.34.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0dn9awzhaafsdsiwwj6870zyqw4spsmc08zgcc5dhnpcnjcyldf3"; + sha256 = "13d3wc49wp8rh8kxrn1krsyh24g5m6wl0mfhvbjylv0q6kp5jlan"; name = "${pname}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/games/katago/default.nix b/third_party/nixpkgs/pkgs/games/katago/default.nix index 20ad47d3e0..0f9e4b8d67 100644 --- a/third_party/nixpkgs/pkgs/games/katago/default.nix +++ b/third_party/nixpkgs/pkgs/games/katago/default.nix @@ -9,7 +9,7 @@ , fetchpatch , cudnn ? null , cudatoolkit ? null -, libGL_driver ? null +, mesa ? null , opencl-headers ? null , ocl-icd ? null , gperftools ? null @@ -25,7 +25,7 @@ assert !enableGPU -> ( !enableCuda); assert enableCuda -> ( - libGL_driver != null && + mesa != null && cudatoolkit != null && cudnn != null); @@ -65,7 +65,7 @@ in env.mkDerivation rec { eigen ] ++ lib.optionals (enableGPU && enableCuda) [ cudnn - libGL_driver + mesa.drivers ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers ocl-icd diff --git a/third_party/nixpkgs/pkgs/games/keen4/builder.sh b/third_party/nixpkgs/pkgs/games/keen4/builder.sh index 50d261db86..b5864b8392 100644 --- a/third_party/nixpkgs/pkgs/games/keen4/builder.sh +++ b/third_party/nixpkgs/pkgs/games/keen4/builder.sh @@ -28,4 +28,4 @@ for i in *; do fi done EOF -chmod +x $out/bin/keen4 \ No newline at end of file +chmod +x $out/bin/keen4 diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 87ce6f2dad..41a1e6c90c 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-10-15"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "557a1ed5da70cb443a8650766f4e8ea95e8c0da3"; - sha256 = "105rp35mp6nr79vyz93v36x48yjja38n9n4ngxnpsnm7qf9q8x5n"; + rev = "1ec573bf0df6cbc5eef8b593f93081e4c1837c1b"; + sha256 = "0h4aa3bd0wc9hz8af66biv9gcxw1m3bvp87jnc1jp3m3qxk93knl"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -137,12 +137,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-10-21"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "2107094f83e58818ec9b8ca033a75eeeb49db163"; - sha256 = "0bxxl1jj1bigwnvd07wb0ypsp5rn0b5c864m4k44llw7v1r3nrms"; + rev = "ed75b1c92fb144bbe236bfb4d60a98dccf637c58"; + sha256 = "1szxam9hq3s1s542i5fk5pkr5kdpdlz5849yq68i2nnkkh8xwrar"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -317,12 +317,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-10-09"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "26279f70cdfe5da2226cd15d7dd832ef6242ed26"; - sha256 = "0sdkcbh0rxx9wf5qa7wwvm8zjk57vvclvss4cadll54zi6q8xq1s"; + rev = "41be34ca231c97d6be6c05e7ecb5b020f79cd37f"; + sha256 = "0da1v913nlf9kddyk1hqx4h6n95r67b0lxa71hkp8lhqzy9z0gw0"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; @@ -473,12 +473,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-11-02"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "0cbd225b922c3702e4828608bab1c6bf699a3eeb"; - sha256 = "05r8nfbf702bsrzpps2gj04d62kjaa9h6h116c0ql0iwi2zi0kmi"; + rev = "815d105fe9bada4fda9c85f98557005b70a9e667"; + sha256 = "0hxrja25hwcnw31bwcrs8krvjdxwvb6wxjrrx9zwbplj4x7xbkyp"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1040,12 +1040,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-10-29"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "3c94074f71faac00a7d8f4eef2c4bdea96212cd5"; - sha256 = "1g5bll38gw1bpmhss398s1lj9jhvszv1xzbi5qc698y2zi5cm87z"; + rev = "9aacded51b323f338859f01fcdca30a4acaf7dcc"; + sha256 = "07gmj9cljbn4h7naxayq05p38930ffby97zg3x2c98x3hxldqsq8"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1112,12 +1112,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2020-11-02"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "261765405c07bfbf808c69cb6126e0e5a7c6ea4f"; - sha256 = "03abvp7fhssgynm5405bx6qdnbv4j4hrwwz6npqnb5ajqwl6y4cm"; + rev = "8242b8f5aaa07fb3102d8ef649797454039b261b"; + sha256 = "15sjrn8ajagbymxswa5qmaqbw517s2j9xavzhfxmfffv9h10rs3c"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1956,12 +1956,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-10-20"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "8769bbb84cd22b475275cc4f9f06a25445357a49"; - sha256 = "1q1pmfvzvdsknw67zi00b3bn8y10mx7wjfc1nxfy1h33vzhl2g2r"; + rev = "53176a0b75d6389d775d7bce0d494e58fc654f38"; + sha256 = "0wg0nrjbr8my98ivaawj3khyx1fkkgbafwhmq6mlb8j8aj47pigx"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -1980,12 +1980,12 @@ let lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions-nvim"; - version = "2020-10-30"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp_extensions.nvim"; - rev = "8740c4b52dd6f9c2a564209db466ae72a3412dcc"; - sha256 = "0sakmg4fkzji3rl9qmfx2rphz3ma5b6sysf7h7sag4n4lykinayj"; + rev = "eaa389f8a80d9700cc2c3bce787b00b61761a0f0"; + sha256 = "0zndlyn3xgzxwshjk79yfva5914xchzg9v8qimfgn7jlmn5ljhwm"; }; meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; @@ -2604,12 +2604,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-11-03"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f999dc41131c3c69f2411af13597932c042e8e5a"; - sha256 = "0zn8lf290cm2pwjd4iawjrlbpcxqrgqj2agarvsqrlmdxhgq7a77"; + rev = "6e80f426bf9dc44c14b73d3589c6e19cbe9aa682"; + sha256 = "14nprh59sif0kvkdxqw8ij7wnnm4d5zcv4cfgah4y7mj5a99na53"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3313,12 +3313,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-09-27"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "dd226673063b189683b98133d7a2243c1316e71e"; - sha256 = "1kk7xavirj9lh77nsci5ws7p8a1bm3wz5la7sj7y82sr426rmlix"; + rev = "5788b1c6df63bc31ae93d6c1a3523e0602c60901"; + sha256 = "1a6mr5ffwx7f7yclp9i2hvkq2lf3zm1j4761vqmc8nq73w4sbd2z"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3902,12 +3902,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-10-30"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "44b7b729381738cef0fc28a35fbe78fc2abe4d48"; - sha256 = "09kvdm8yakqg0pjv1zbq5yy2wzzl3ax639mykk833b7g8hi6115q"; + rev = "d64e5f8dd7ac0b094f0caacc63453a0418b37fdb"; + sha256 = "0kspf0m00slrscld6qg5rj3i4lr9pwv25xvqqldyk8h884b182g7"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -3926,24 +3926,24 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-10-29"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "5307367693f770a6b06d1a498c9bc9bf4cf9a884"; - sha256 = "14iyfihlirp5adih8v117nz02wskaap4qlbrkgb7w0x87gfa3yqp"; + rev = "3dafdfc0424716bae21f5340314f7d90a9ddf4f2"; + sha256 = "1j18anw9202cplfzgmsy8y6pl8zrxwnrhyn9djy580slakrk1s8k"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2020-04-25"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "1e5ee4f2a3281201aeb71766d45800e192c103f2"; - sha256 = "1d187w74y0viv502gqxfqi0kyak0lyi0dbpcfkjd9c0fjbqrydd6"; + rev = "5007343968e21bba30d85af982689d1c1f9145e1"; + sha256 = "17c3yhnn016k03f2g3cjfwnazg2525pgwy4zqcv0vrgq2g4dil82"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -4130,12 +4130,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-11-03"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "d7bbe7529680662025f633954501a537ba226942"; - sha256 = "042qzd3dg3y5m1sggsxhzhz2i4mnlv8sii817xx6vfif49pg7b0r"; + rev = "992c2d43318ba096eedac0592a0c2d6f90fed236"; + sha256 = "1nl29l1zb9prsm5iz0psiav846fv2ybwxd06rmf2mcigg96502vr"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4382,12 +4382,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-09-26"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "929dbd023f0de84d1abb502b7d77eddad33419a6"; - sha256 = "15qj771nss9jxfrqnfgvk0d5zrna3g064lqbwrfxmc816k1j56w0"; + rev = "383159d338024f09e4d56585a9301958b6fefad6"; + sha256 = "1mzr45pxjm3xfc0x92clybxzj67akwmfjwwbmdd1wxjw37qdjvpw"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5451,16 +5451,28 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-10-29"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "eba0839b79b7f036f492b2b8c4a62269f72b3dab"; - sha256 = "0fbz5yfjcjslpwkw81x1x2i6gd3p5rbssfqw13rbvj6ivf5qgglh"; + rev = "594751093da71a662c0ef371ee60c05c1c96b63b"; + sha256 = "0wanchva7g455v2bic6sfsh9wdcn0x644k9bfsbr14s8kfwpyair"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; + vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { + pname = "vim-lsp-cxx-highlight"; + version = "2020-08-12"; + src = fetchFromGitHub { + owner = "jackguo380"; + repo = "vim-lsp-cxx-highlight"; + rev = "7c47d39d808118f0ef030b15db28ff3995d91cb6"; + sha256 = "0yiyxfhicqhhpp83ilknngr8l9r8z9bchkn3xd2ri8bx0bm7i4l7"; + }; + meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; version = "2020-09-23"; @@ -6003,12 +6015,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-11-02"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "cd768124020d3c565f1d400ea0537949351b26a2"; - sha256 = "1wa8wk60vs9d3qflq4m49h15bwv86gwl2hqbcbfbqdq57y3l3r87"; + rev = "4af1321588c7dcb718022226cb27ec325973c2f0"; + sha256 = "1dghqg23c47qmicmlrhjh6i1fan5bj5s21yinpf58ki7l68rf881"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6157,6 +6169,18 @@ let meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; + vim-racket = buildVimPluginFrom2Nix { + pname = "vim-racket"; + version = "2020-07-24"; + src = fetchFromGitHub { + owner = "wlangstroth"; + repo = "vim-racket"; + rev = "bca2643c3d8bd0fcd46ab73bee69023a5da1964b"; + sha256 = "059a79d66yxhhwq127sjl84ky1153im7mm5ixjcsgg9glgvd39jy"; + }; + meta.homepage = "https://github.com/wlangstroth/vim-racket/"; + }; + vim-ragtag = buildVimPluginFrom2Nix { pname = "vim-ragtag"; version = "2020-01-26"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 4a50581cec..2cc00b630f 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -169,6 +169,7 @@ itchyny/thumbnail.vim itchyny/vim-cursorword itchyny/vim-gitbranch ivanov/vim-ipython +jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim jaredgorski/SpaceCamp jaxbot/semantic-highlight.vim @@ -610,6 +611,7 @@ whonore/Coqtail will133/vim-dirdiff wincent/command-t wincent/ferret +wlangstroth/vim-racket wsdjeg/vim-fetch xavierd/clang_complete xolox/vim-easytags diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 4af15f4619..ea91b6d647 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -3,7 +3,7 @@ "version": "0.4.0-dev", "dependencies": { "node-fetch": "^2.6.1", - "vscode-languageclient": "7.0.0-next.9", + "vscode-languageclient": "7.0.0-next.12", "@rollup/plugin-commonjs": "^13.0.2", "@rollup/plugin-node-resolve": "^8.4.0", "@types/glob": "^7.1.3", diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix index 272b8612d7..497314a6d4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.62"; + version="0.9.64"; name="${baseName}-${version}"; url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz"; - sha256="1q2silgy882fl61p5qa9f9jqkxcqnwa71jig3c729iahx4f0hs05"; + sha256="1zgjwy2k57nx0r63fzr15gijah098ig0bll66jd615vc9q3snfz5"; }; buildInputs = [ which @@ -20,19 +20,6 @@ stdenv.mkDerivation { name = "${s.name}.tar.bz2"; }; - patches = [ - (fetchpatch { - name = "CVE-2020-17367.patch"; - url = "https://github.com/netblue30/firejail/commit/2c734d6350ad321fccbefc5ef0382199ac331b37.patch"; - sha256 = "1gxz4jxp80gxnn46195qxcpmikwqab9d0ylj9zkm62lycp84ij6n"; - }) - (fetchpatch { - name = "CVE-2020-17368.patch"; - url = "https://github.com/netblue30/firejail/commit/34193604fed04cad2b7b6b0f1a3a0428afd9ed5b.patch"; - sha256 = "0n4ch3qykxx870201l8lz81f7h84vk93pzz77f5cjbd30cxnbddl"; - }) - ]; - prePatch = '' # Allow whitelisting ~/.nix-profile substituteInPlace etc/firejail.config --replace \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 76ea5230be..fcebea126f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2020-09-18"; + version = "2020-10-22"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "06k2x6y9dhzs6nnbs1ws7rxbz0xijzmyn24sa223n0bmbb96n4f0"; + sha256 = "15l32993pfm0albx7ky64c5i60vph150hrdkg87md15919a6naia"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1avpf2x1g7dlpva76pcnldxngkjabsyaknkkjbrhg1mj6z9g1mx7"; + outputHash = "0y2dpp3gklzym2gr0w9wddf6cn6p0sv9n2xh401j1299sjsr57m9"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index 9ee6dad768..cfeaa6d1ec 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.9.3"; + version = "5.9.6"; in buildLinux (args // { @@ -13,7 +13,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "0004fp3qnz2dpahnxkbc02yyijyqiavqmacyng1fi5wrw5kl2aj3"; + sha256 = "0v8nc2zy75ij4hn8js23998spadbiid8qc9cib5d0apmzkhilqwq"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix index 3c49e53d80..3e9a8d41b3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202008"; + version = "202009"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "1paxwq0p39vp2ma0rg7dkalc3r28wzj77sm3alavvk2vxgvxi0ig"; + sha256 = "1phkdmbgvrmv5w0xa4i2j9v7lcxkxjdhzi5x6l52z9y9as30dzbd"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index 59a7125aad..13f48405cd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "31.0"; + version = "31.1"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0qr8a25ylmkwfgyj519zvl74q16bhf4895xjich2r98rl2yg0qdl"; + sha256 = "1xkmdix6mgv6kjjj6wi844bfddhl0ybalrp5g8pf5izasc43brg7"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix index 5f10189692..e0e2bcc21d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, kernel, bluez }: +{ lib, stdenv, fetchFromGitHub, kernel, bluez }: stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "atar-axis"; repo = pname; rev = "v${version}"; - sha256 = "1g3ml7vq0dzwl9815c3l0i0qz3a7v8c376c6dqbfkbj2f1d43vqs"; + sha256 = "113xa2mxs2hc4fpjdk3jhhchy81kli6jxdd6vib7zz61n10cjb85"; }; setSourceRoot = '' @@ -34,10 +34,11 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced Linux driver for Xbox One wireless controllers"; homepage = "https://atar-axis.github.io/xpadneo"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/default.nix b/third_party/nixpkgs/pkgs/servers/asterisk/default.nix index 2cf40f3d02..c5c2f6d513 100644 --- a/third_party/nixpkgs/pkgs/servers/asterisk/default.nix +++ b/third_party/nixpkgs/pkgs/servers/asterisk/default.nix @@ -91,17 +91,18 @@ let }; in rec { - # Supported releases (as of 2020-10-07). + # Supported releases (as of 2020-10-26). # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/ # # Series Type Rel. Date Sec. Fixes EOL # 13.x LTS 2014-10-24 2020-10-24 2021-10-24 # 16.x LTS 2018-10-09 2022-10-09 2023-10-09 - asterisk-lts = asterisk_16; + # 18.x LTS 2020-10-20 2024-10-20 2025-10-20 + asterisk-lts = asterisk_18; # 17.x Standard 2019-10-28 2020-10-28 2021-10-28 - asterisk-stable = asterisk_17; - asterisk = asterisk_17; + asterisk-stable = asterisk_18; + asterisk = asterisk_18; asterisk_13 = common { version = "13.37.0"; @@ -129,4 +130,13 @@ in rec { "addons/mp3" = mp3-202; }; }; + + asterisk_18 = common { + version = "18.0.0"; + sha256 = "174zasx8d7ragy2fz4vwc4pbra9wl471mnisz1z0a3b2qsbh4y4v"; + externals = { + "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; + "addons/mp3" = mp3-202; + }; + }; } diff --git a/third_party/nixpkgs/pkgs/servers/go-libp2p-daemon/default.nix b/third_party/nixpkgs/pkgs/servers/go-libp2p-daemon/default.nix new file mode 100644 index 0000000000..995cfe2d26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/go-libp2p-daemon/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "go-libp2p-daemon"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "libp2p"; + repo = "go-libp2p-daemon"; + rev = "bfa207ed34c27947f0828a4ae8d10bda62aa49a9"; + sha256 = "1f3gjkmpqngajjpijpjdmkmsjfm9bdgakb5r28fnc6w9dmfyj51x"; + }; + + vendorSha256 = "0g25r7wd1hvnwxxq18mpx1r1wig6dnlnvzkpvgw79q6nymxlppmv"; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/libp2p/go-libp2p-daemon"; + license = licenses.mit; + maintainers = with maintainers; [ fare ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 8f6f555474..add9dcebde 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.117.4"; + version = "0.117.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -74,7 +74,7 @@ "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO "bbox" = ps: with ps; [ ]; # missing inputs: pybbox "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim - "bh1750" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi + "bh1750" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus @@ -88,8 +88,8 @@ "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez - "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi - "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi + "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense + "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bond" = ps: with ps; [ ]; # missing inputs: bond-api @@ -222,7 +222,7 @@ "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient "environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada - "envirophat" = ps: with ps; [ ]; # missing inputs: envirophat smbus-cffi + "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat "envisalink" = ps: with ps; [ ]; # missing inputs: pyenvisalink "ephember" = ps: with ps; [ ]; # missing inputs: pyephember "epson" = ps: with ps; [ ]; # missing inputs: epson-projector @@ -358,7 +358,7 @@ "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; - "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi + "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; @@ -657,7 +657,7 @@ "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle "rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine "random" = ps: with ps; [ ]; - "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi + "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste "recorder" = ps: with ps; [ sqlalchemy ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 995d0bd0ed..d0d88f73bc 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.117.4"; + hassVersion = "0.117.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0f5a5y6d9wxdfd5l526dz34xz2n1a6ia7vdcr7sqf2qp51brpw52"; + sha256 = "1al2pwj2xrhqyaz2pal4a1bdh4sm63ijfaw8pajghz5z23gf62r0"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix b/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix index eb99fffeb1..45dd6dd43a 100644 --- a/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix @@ -3,7 +3,7 @@ let py = python3.pkgs; in -py.toPythonApplication +py.toPythonApplication (py.mlflow.overridePythonAttrs(old: rec { pname = "mlflow-server"; @@ -34,4 +34,4 @@ py.toPythonApplication cp ${gunicornScript} $gpath chmod 555 $gpath ''; -})) \ No newline at end of file +})) diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index b0ae2ebc2d..d24fe89cc4 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.1.7"; + version = "2.1.9"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "08wqaqar964p9adc0ma8dqg0rf88rylk1m2mddlbbqmd6l4h6m27"; + sha256 = "0y92isca1dlvprik0lbiz8ny1w84svy4zn73brqhzrkxnqppcxi2"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 0199880934..af2a412026 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.5.1"; + version = "5.5.3"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "15cjp48q23fw8ryy39mlxi4rd3rha2yqyrnk5mhx0h72ygawx8k6"; + sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/mrsh/default.nix b/third_party/nixpkgs/pkgs/shells/mrsh/default.nix index cc7e3e27be..c72f23c143 100644 --- a/third_party/nixpkgs/pkgs/shells/mrsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/mrsh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mrsh"; - version = "2020-07-27"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "emersion"; repo = "mrsh"; - rev = "0da902c0ee6f443fe703498e60f266af7f12537e"; - sha256 = "1yr09ln5p1s48aj8xv2d6dy0pahqvd86fkiwyc6zrjfq80igxf05"; + rev = "1738e41b2a35e5f99b9a1300a5f687478458226a"; + sha256 = "08gak5261d4sd6b2w2kscmdwa4gwcp5drgfyb3swyrj9cl0nlcbn"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index d025ed1ddc..20624293e8 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "19bpxx9pi3cl5y7h5qg4a2pmvwqavm1vciyvsq96kxkc7rq2xwvl"; + sha256 = "1nj8cjj5db5r4wnxbcsd5z9n5kqf2p1j54l5z0m650370z41df1f"; }; - cargoSha256 = "1ghbzahz8lbk11sjy2kis12w22rjr92aaw451rmc86pk2lsxn0dx"; + cargoSha256 = "0sh6z8dclla3lrjzwfjb7avsbkagaq9d9q3d8ll8y0mahv1a135w"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix index 6839b47a5f..3317ada541 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "restic"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "0nrh52cjymzcf093sqqa3kfw2nimnx6qwn8aw0wsci2v2r84yzzx"; + sha256 = "13zmx9wzv29z0np3agx4rsz1j9pgrvlnngjsb971i1dnzwv5l3hf"; }; - vendorSha256 = "1pfixq3mbfn12gyablc4g0j8r00md3887q0l8xgxy76z0d8w924s"; + vendorSha256 = "09sa5jpdj73w595c063mib14132zacswh54nmjqp2n440cflmwjh"; subPackages = [ "cmd/restic" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix index 45a4df74b1..9f2a52d64d 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix @@ -1,25 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "restic-rest-server"; - version = "0.9.7"; - - goPackagePath = "github.com/restic/rest-server"; + version = "0.10.0"; src = fetchFromGitHub { owner = "restic"; repo = "rest-server"; rev = "v${version}"; - sha256 = "1g47ly1pxwn0znbj3v5j6kqhn66d4wf0d5gjqzig75pzknapv8qj"; + sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7"; }; - buildPhase = '' - cd go/src/${goPackagePath} - go run build.go - ''; + vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg"; - installPhase = '' - install -Dt $out/bin rest-server + preCheck = '' + substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix index fd4872cf84..f4f0ac4156 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; patches = stdenv.lib.optional staticOnly (fetchpatch { - # from https://github.com/google/brotli/pull/655 - url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; - sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg"; + # context from https://github.com/google/brotli/pull/655 + # updated patch from https://github.com/google/brotli/pull/655 + url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch"; + sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); cmakeFlags = [] @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 67afac2cdc..6b8c6870a6 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -1,24 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchurl +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch , autoreconfHook, bison, glm, yacc, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3Packages -, zlib, perl +, zlib, perl, curl , texLive, texinfo , darwin }: stdenv.mkDerivation rec { - version = "2.66"; + version = "2.67"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - sha256 = "0c445j950n6nxgr1zxj7a26daa5d9f3i91506b7r7627s943b1kd"; + sha256 = "sha256:1lawj2gf0985clzbyym26s5mxxp2syl1dqqxfzk0sq9s30l2rj3l"; }; + patches = + (stdenv.lib.optional (stdenv.lib.versionOlder version "2.68") + (fetchpatch { + url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch"; + sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm"; + })) + ; + nativeBuildInputs = [ autoreconfHook bison @@ -30,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv - zlib perl + zlib perl curl texLive ] ++ (with python3Packages; [ python diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream deleted file mode 100644 index e86d81ba44..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/asymptote/files/ -SF_version_dir -version_link 'src[.]tgz/download$' -SF_redirect diff --git a/third_party/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix index a12e5dbb8b..24e4304469 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix @@ -2,7 +2,7 @@ If user need access to more haskell package for building his diagrams, he simply has to pass these package through the extra packages function as follow in `config.nix`: - + ~~~ diagrams-builder.override { extraPackages = self : [myHaskellPackage]; @@ -15,7 +15,7 @@ let # Used same technique as for the yiCustom package. - wrappedGhc = ghcWithPackages + wrappedGhc = ghcWithPackages (self: [ diagrams-builder ] ++ extraPackages self); ghcVersion = wrappedGhc.version; @@ -25,7 +25,7 @@ let --set NIX_GHC ${wrappedGhc}/bin/ghc \ --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} ''; - + backends = ["svg" "cairo" "ps"]; in @@ -35,10 +35,10 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; - buildCommand = with stdenv.lib; + buildCommand = with stdenv.lib; concatStrings (intersperse "\n" (map exeWrapper backends)); # Will be faster to build the wrapper locally then to fetch it from a binary cache. preferLocalBuild = true; meta = diagrams-builder.meta; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index 51b58a8102..0f67ab84d4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison ]; + patches = [ ./fix-luajit-darwin.patch ]; + postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace /lib/systemd $out/lib/systemd diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch new file mode 100644 index 0000000000..21d9c21f5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch @@ -0,0 +1,14 @@ +diff -Naur fluent-bit.old/cmake/luajit.cmake fluent-bit.new/cmake/luajit.cmake +--- fluent-bit.old/cmake/luajit.cmake ++++ fluent-bit.new/cmake/luajit.cmake +@@ -11,10 +11,6 @@ + set(LUAJIT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${FLB_PATH_LIB_LUAJIT}) + set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR}) + +-if (CMAKE_SYSTEM_NAME MATCHES "Darwin") +- set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT}") +-endif() +- + # luajit (UNIX) + # ============= + ExternalProject_Add(luajit diff --git a/third_party/nixpkgs/pkgs/tools/misc/fortune/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fortune/default.nix index 74c21d21fc..0804d8b063 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fortune/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fortune/default.nix @@ -2,11 +2,13 @@ stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "2.10.0"; + version = "3.2.0"; + # We use fetchurl instead of fetchFromGitHub because the release pack has some + # special files. src = fetchurl { - url = "https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-${version}.tar.xz"; - sha256 = "07g50hij87jb7m40pkvgd47qfvv4s805lwiz79jbqcxzd7zdyax7"; + url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; + sha256 = "0j554ja4min5rbqni8qn5gzk4xiyd643b8r50jyi32pcs88dwp7n"; }; nativeBuildInputs = [ cmake perl ]; @@ -31,12 +33,13 @@ stdenv.mkDerivation rec { ) my_exe( - -- + -- '') ]; meta = with stdenv.lib; { description = "A program that displays a pseudorandom message from a database of quotations"; license = licenses.bsdOriginal; platforms = platforms.unix; + maintainers = with maintainers; [ vonfry ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index fd9cea21a9..de9e582511 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "1s9ynpd158cddzppphqksml5v1csyi55ji0az8kz2p10iz89v1ry"; + sha256 = "04ycjgy40if0licc883lp7i6jpndvcndw24xp7lilskmaacpm5if"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix index 32c45b31a1..1b5f11440f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ wnklmnn ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index a0fe350a27..3e3c62fd09 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -8,18 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "01nsviw5nc5lb6z3j2yiymiwhiq719nwqpvqbyb5p65s98sph7yh"; + sha256 = "17m0h0ib7fl0kijagcwdcnvrdcb6z3knix9dl17abg5ivbvkwz8q"; }; - cargoSha256 = "098p4645air5402shqignc57zdm6755shahhby17nqv1s27gfinc"; - - RUSTC_BOOTSTRAP = 1; + cargoSha256 = "0ddc8b9wph4r1qcy24p8yiaq9s2knii0d7dh0w0qnzrn6cmm17dg"; nativeBuildInputs = [ pkg-config zlib ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 61f6fdde5d..ba210ca363 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KdPr/6wGyoHhEwfPektL+B1khyoRfxDHI4aFcKNU0TM="; + sha256 = "sha256-9HZLr/dwr5T1m6H/SHy9ULfKMkyrLNb2Z8W3RlSWzGM="; }; - cargoSha256 = "sha256-MLlGz7Sid0G52//XekqkZgzLqFL7xoUwT6OvpaF4jm0="; + cargoSha256 = "sha256-cyffVX1XEF5zaNbk/VeZEtKG/Npwv5Yzz9OU5G9UyGc="; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix index 6a613869e1..996e6b4490 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.9.2"; + version = "0.9.3"; src = fetchCrate { inherit pname version; - sha256 = "0k101ymr6shi8hivf7kv52vwgcad2dwhyma0yg2pnp9q3ll0iszb"; + sha256 = "026mgqcp9sg6wwikghrc3rgh5p6wdbnvav5pb3xvs79lj85d5ga7"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0b4pj30w07p67zvpn5af23ddkvknmfp5a33sy6ai8argfi73bf4c"; + cargoSha256 = "07bs23x2vxzlrca5swwq8khmd9fbdhlhm0avwp9y231df6xdi2ys"; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim diff --git a/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix new file mode 100644 index 0000000000..71e065e5d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, Security +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "dogdns"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ogham"; + repo = "dog"; + rev = "v${version}"; + sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; + }; + + nativeBuildInputs = [ installShellFiles ] + ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; + + postInstall = '' + installShellCompletion completions/dog.{bash,fish,zsh} + ''; + + meta = with stdenv.lib; { + description = "Command-line DNS client"; + homepage = "https://dns.lookup.dog"; + license = licenses.eupl12; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix index d2fa0deca0..b6d9eb3448 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -1,4 +1,24 @@ -{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }: +{ stdenv +, lib +, fetchurl +, openssl +, nettle +, expat +, libevent +, dns-root-data +, pkg-config + # + # By default unbound will not be built with systemd support. Unbound is a very + # commmon dependency. The transitive dependency closure of systemd also + # contains unbound. + # Since most (all?) (lib)unbound users outside of the unbound daemon usage do + # not need the systemd integration it is likely best to just default to no + # systemd integration. + # For the daemon use-case, that needs to notify systemd, use `unbound-with-systemd`. + # +, withSystemd ? false +, systemd ? null +}: stdenv.mkDerivation rec { pname = "unbound"; @@ -11,7 +31,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - buildInputs = [ openssl nettle expat libevent ]; + buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ]; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -25,6 +45,8 @@ stdenv.mkDerivation rec { "--enable-relro-now" ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [ "--disable-flto" + ] ++ lib.optionals withSystemd [ + "--enable-systemd" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; @@ -33,7 +55,7 @@ stdenv.mkDerivation rec { make unbound-event-install ''; - preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit + preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. # There was some problem with this on Darwin; let's not complicate non-Linux. @@ -43,17 +65,17 @@ stdenv.mkDerivation rec { buildPhase installPhase '' - # get rid of runtime dependencies on $dev outputs + # get rid of runtime dependencies on $dev outputs + ''substituteInPlace "$lib/lib/libunbound.la" '' - + stdenv.lib.concatMapStrings - (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") - buildInputs; + + lib.concatMapStrings + (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") + (builtins.filter (p: p != null) buildInputs); - meta = with stdenv.lib; { + meta = with lib; { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; homepage = "https://www.unbound.net"; maintainers = with maintainers; [ ehmry fpletz globin ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix b/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix index 729a3f7297..d2a5d91467 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix @@ -3,23 +3,29 @@ , fetchFromGitHub , cryptsetup , pkg-config +, clang +, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.3"; + version = "0.2.15"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "0340xp7q6f0clb7wmqpgllllwsixmsy37k1f5kj3hwvb730rz93x"; + sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9"; }; buildInputs = [ cryptsetup ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config clang ]; - cargoSha256 = "0rp4f6xnwmvf3pv6h0qwsg01jrndf77yn67675ac39kxzmrzfy2f"; + configurePhase = '' + export LIBCLANG_PATH="${llvmPackages.libclang}/lib" + ''; + + cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k"; meta = with stdenv.lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index a3a76dd7b8..791ba80288 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; - [ phreedom doublec thoughtpolice joachifm ]; + [ phreedom thoughtpolice joachifm ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 41024876d5..f8228f4570 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -261,7 +261,7 @@ mapAliases ({ libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 - libGL_driver = mesa.drivers; + libGL_driver = mesa.drivers; # added 2019-05-28 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index a0c9b4641b..8cb08bce06 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -724,6 +724,7 @@ in mlterm = callPackage ../applications/terminal-emulators/mlterm { libssh2 = null; openssl = null; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; @@ -3354,6 +3355,10 @@ in dog = callPackage ../tools/system/dog { }; + dogdns = callPackage ../tools/networking/dogdns { + inherit (darwin.apple_sdk.frameworks) Security; + }; + dosfstools = callPackage ../tools/filesystems/dosfstools { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; @@ -5900,7 +5905,8 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = nomad_0_11; + nomad = nomad_0_12; + # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. @@ -8093,7 +8099,11 @@ in unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { }; - unbound = callPackage ../tools/networking/unbound { }; + unbound = callPackage ../tools/networking/unbound {}; + + unbound-with-systemd = unbound.override { + withSystemd = true; + }; unicorn = callPackage ../development/libraries/unicorn { }; @@ -11953,6 +11963,8 @@ in vagrant = callPackage ../development/tools/vagrant {}; + vala-language-server = callPackage ../development/tools/vala-language-server {}; + bashdb = callPackage ../development/tools/misc/bashdb { }; gdb = callPackage ../development/tools/misc/gdb { @@ -16606,7 +16618,7 @@ in inherit (callPackages ../servers/asterisk { }) asterisk asterisk-stable asterisk-lts - asterisk_13 asterisk_16 asterisk_17; + asterisk_13 asterisk_16 asterisk_17 asterisk_18; asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; @@ -20749,6 +20761,8 @@ in exercism = callPackage ../applications/misc/exercism { }; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; + go-motion = callPackage ../development/tools/go-motion { }; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; @@ -23017,6 +23031,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + plater = libsForQt5.callPackage ../applications/misc/plater { }; + plexamp = callPackage ../applications/audio/plexamp { }; plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; @@ -26880,6 +26896,8 @@ in inherit (pkgs.gnome2) gtkglext; }; + convertall = qt5.callPackage ../applications/science/misc/convertall { }; + cytoscape = callPackage ../applications/science/misc/cytoscape { jre = openjdk11; }; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 1cdcb31c97..757a77f040 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -654,6 +654,8 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; + ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 81f5767df7..e803e50c84 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -913,6 +913,8 @@ in { bluepy = callPackage ../development/python-modules/bluepy { }; + bme680 = callPackage ../development/python-modules/bme680 { }; + bokeh = callPackage ../development/python-modules/bokeh { }; boltons = callPackage ../development/python-modules/boltons { }; @@ -1200,6 +1202,8 @@ in { click-didyoumean = callPackage ../development/python-modules/click-didyoumean { }; + click-help-colors = callPackage ../development/python-modules/click-help-colors { }; + click-log = callPackage ../development/python-modules/click-log { }; click-plugins = callPackage ../development/python-modules/click-plugins { }; @@ -2526,6 +2530,8 @@ in { google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; + googlemaps = callPackage ../development/python-modules/googlemaps { }; + google-music = callPackage ../development/python-modules/google-music { }; google-music-proto = callPackage ../development/python-modules/google-music-proto { }; @@ -2560,6 +2566,10 @@ in { gpyopt = callPackage ../development/python-modules/gpyopt { }; + gradient_sdk = callPackage ../development/python-modules/gradient_sdk { }; + + gradient_statsd = callPackage ../development/python-modules/gradient_statsd { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; grandalf = callPackage ../development/python-modules/grandalf { }; @@ -2826,6 +2836,8 @@ in { hyperlink = callPackage ../development/python-modules/hyperlink { }; + hyperopt = callPackage ../development/python-modules/hyperopt { }; + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; # File name is called 2.nix because this one will need to remain for Python 2. @@ -2925,6 +2937,8 @@ in { infoqscraper = callPackage ../development/python-modules/infoqscraper { }; + inform = callPackage ../development/python-modules/inform { }; + iniconfig = callPackage ../development/python-modules/iniconfig { }; inifile = callPackage ../development/python-modules/inifile { }; @@ -4000,6 +4014,8 @@ in { nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; + nestedtext = callPackage ../development/python-modules/nestedtext { }; + netaddr = callPackage ../development/python-modules/netaddr { }; netcdf4 = callPackage ../development/python-modules/netcdf4 { }; @@ -4231,6 +4247,8 @@ in { openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; @@ -6652,6 +6670,8 @@ in { smartypants = callPackage ../development/python-modules/smartypants { }; + smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smmap = callPackage ../development/python-modules/smmap { };