diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1027ccc9cba..51cca15632d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -107,8 +107,8 @@ # Eclipse /pkgs/applications/editors/eclipse @rycee -# https://github.com/NixOS/nixpkgs/issues/31401 -/lib/licenses.nix @ghost +# Licenses +/lib/licenses.nix @alyssais # Qt / KDE /pkgs/applications/kde @ttuegel diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 466d8d2c359..d7463385ae5 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -8,5 +8,4 @@ ## Technical details -Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the -results. +Please run `nix run nixpkgs.nix-info -c nix-info -m` and paste the result. diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000000..8cc9a80758d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,37 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '0.kind: bug' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. ... +2. ... +3. ... + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Additional context** +Add any other context about the problem here. + +**Metadata** +Please run `nix run nixpkgs.nix-info -c nix-info -m` and paste the result. + +Maintainer information: +```yaml +# a list of nixpkgs attributes affected by the problem +attribute: +# a list of nixos modules affected by the problem +module: +``` diff --git a/.github/ISSUE_TEMPLATE/packaging_request.md b/.github/ISSUE_TEMPLATE/packaging_request.md new file mode 100644 index 00000000000..1ddcd983f31 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/packaging_request.md @@ -0,0 +1,18 @@ +--- +name: Packaging requests +about: For packages that are missing +title: '' +labels: '0.kind: packaging request' +assignees: '' + +--- + +**Project description** +_describe the project a little_ + +**Metadata** + +* homepage URL: +* source URL: +* license: mit, bsd, gpl2+ , ... +* platforms: unix, linux, darwin, ... diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md new file mode 100644 index 00000000000..59e7b64cc66 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/security.md @@ -0,0 +1,27 @@ +--- +name: Security report +about: Report security issues +title: '' +labels: '1.severity: security' +assignees: '' + +--- + +To privately report a security issue with NixOS, Nix, and its ecosystem, +please email a member of the NixOS Security Team and we will ensure the issue +is handled. Our responses will be signed with our GPG keys: +https://nixos.org/nixos/security.html + +**Report** + +CVE: + +**Metadata** + +Maintainer information: +```yaml +# a list of nixpkgs attributes affected by the problem +attribute: +# a list of nixos modules affected by the problem +module: +``` diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 287f63e685c..68a1a097984 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "..."; src = fetchurl { ... }; - buildInputs = [ jdk ant ]; + nativeBuildInputs = [ jdk ant ]; buildPhase = "ant"; } @@ -30,7 +30,8 @@ stdenv.mkDerivation { foo.jar in its share/java directory, and another package declares the attribute -buildInputs = [ jdk libfoo ]; +buildInputs = [ libfoo ]; +nativeBuildInputs = [ jdk ]; then CLASSPATH will be set to /nix/store/...-libfoo/share/java/foo.jar. @@ -46,7 +47,7 @@ buildInputs = [ jdk libfoo ]; script to run it using the OpenJRE. You can use makeWrapper for this: -buildInputs = [ makeWrapper ]; +nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -76,7 +77,7 @@ installPhase = It is possible to use a different Java compiler than javac from the OpenJDK. For instance, to use the GNU Java Compiler: -buildInputs = [ gcj ant ]; +nativeBuildInputs = [ gcj ant ]; Here, Ant will automatically use gij (the GNU Java Runtime) instead of the OpenJRE. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 426113b7918..339524f703d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -542,6 +542,15 @@ github = "averelld"; name = "averelld"; }; + avitex = { + email = "theavitex@gmail.com"; + github = "avitex"; + name = "avitex"; + keys = [{ + longkeyid = "rsa4096/0x8B366C443CABE942"; + fingerprint = "271E 136C 178E 06FA EA4E B854 8B36 6C44 3CAB E942"; + }]; + }; avnik = { email = "avn@avnik.info"; github = "avnik"; @@ -1228,6 +1237,11 @@ github = "deepfire"; name = "Kosyrev Serge"; }; + delan = { + name = "Delan Azabani"; + email = "delan@azabani.com"; + github = "delan"; + }; delroth = { email = "delroth@gmail.com"; github = "delroth"; @@ -3272,6 +3286,11 @@ email = "softs@metabarcoding.org"; name = "Celine Mercier"; }; + metadark = { + email = "kira.bruneau@gmail.com"; + name = "Kira Bruneau"; + github = "metadark"; + }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; @@ -4142,6 +4161,11 @@ github = "proglodyte"; name = "Proglodyte"; }; + protoben = { + email = "protob3n@gmail.com"; + github = "protoben"; + name = "Ben Hamlin"; + }; prusnak = { email = "stick@gk2.sk"; github = "prusnak"; @@ -4640,6 +4664,11 @@ github = "scriptkiddi"; name = "Fritz Otlinghaus"; }; + scubed2 = { + email = "scubed2@gmail.com"; + github = "scubed2"; + name = "Sterling Stein"; + }; sdll = { email = "sasha.delly@gmail.com"; github = "sdll"; @@ -5362,6 +5391,15 @@ github = "twey"; name = "James ‘Twey’ Kay"; }; + twhitehead = { + name = "Tyson Whitehead"; + email = "twhitehead@gmail.com"; + github = "twhitehead"; + keys = [{ + longkeyid = "rsa2048/0x594258F0389D2802"; + fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; + }]; + }; typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 30570a279ec..c8739d04638 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -342,6 +342,11 @@ from nixpkgs due to lack of maintainer. + + + The tomcat-connector httpd.extraSubservice has been removed from nixpkgs. + + diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 5e4c14e749f..4d3d63cd2db 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -31,12 +31,17 @@ sub new { if (!$startCommand) { # !!! merge with qemu-vm.nix. - my $netArgs = ""; - $netArgs .= ",romfile=$args->{netRomFile}" - if defined $args->{netRomFile}; + my $netBackend = "-netdev user,id=net0"; + my $netFrontend = "-device virtio-net-pci,netdev=net0"; + + $netBackend .= "," . $args->{netBackendArgs} + if defined $args->{netBackendArgs}; + + $netFrontend .= "," . $args->{netFrontendArgs} + if defined $args->{netFrontendArgs}; + $startCommand = - "qemu-kvm -m 384 " . - "-device virtio-net-pci,netdev=net0${netArgs} \$QEMU_OPTS "; + "qemu-kvm -m 384 $netBackend $netFrontend \$QEMU_OPTS "; if (defined $args->{hda}) { if ($args->{hdaInterface} eq "scsi") { diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 76ca435d434..4e85bf794da 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -4,7 +4,7 @@ with lib; options.xdg.portal = { enable = mkEnableOption "xdg desktop integration"//{ - default = true; + default = config.services.xserver.enable; }; extraPortals = mkOption { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e07fabb348c..1b944199a66 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -473,6 +473,7 @@ ./services/misc/synergy.nix ./services/misc/sysprof.nix ./services/misc/taskserver + ./services/misc/tiddlywiki.nix ./services/misc/tzupdate.nix ./services/misc/uhub.nix ./services/misc/weechat.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 97279a78a57..29c3f2f8bbf 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -26,7 +26,7 @@ with lib; security.allowSimultaneousMultithreading = mkDefault false; - security.virtualization.flushL1DataCache = mkDefault "always"; + security.virtualisation.flushL1DataCache = mkDefault "always"; security.apparmor.enable = mkDefault true; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index f611a3992ed..4ae64222274 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -63,6 +63,8 @@ with lib; (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") + (mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ]) + # PAM (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ]) diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix index bf474ac0a54..2a7f07ef6db 100644 --- a/nixos/modules/security/misc.nix +++ b/nixos/modules/security/misc.nix @@ -48,13 +48,13 @@ with lib; e.g., shared caches). This attack vector is unproven. Disabling SMT is a supplement to the L1 data cache flushing mitigation - (see ) + (see ) versus malicious VM guests (SMT could "bring back" previously flushed data). ''; }; - security.virtualization.flushL1DataCache = mkOption { + security.virtualisation.flushL1DataCache = mkOption { type = types.nullOr (types.enum [ "never" "cond" "always" ]); default = null; description = '' @@ -114,8 +114,8 @@ with lib; boot.kernelParams = [ "nosmt" ]; }) - (mkIf (config.security.virtualization.flushL1DataCache != null) { - boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualization.flushL1DataCache}" ]; + (mkIf (config.security.virtualisation.flushL1DataCache != null) { + boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualisation.flushL1DataCache}" ]; }) ]; } diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index bc47e7e1e0d..37d44e30fbe 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -6,26 +6,10 @@ let cfg = config.services.postgresql; - # see description of extraPlugins - postgresqlAndPlugins = pg: - if cfg.extraPlugins == [] then pg - else pkgs.buildEnv { - name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}"; - paths = [ pg pg.lib ] ++ cfg.extraPlugins; - # We include /bin to ensure the $out/bin directory is created which is - # needed because we'll be removing files from that directory in postBuild - # below. See #22653 - pathsToLink = [ "/" "/bin" ]; - buildInputs = [ pkgs.makeWrapper ]; - postBuild = - '' - rm $out/bin/{pg_config,postgres,pg_ctl} - cp --target-directory=$out/bin ${pg}/bin/{postgres,pg_config,pg_ctl} - wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib - ''; - }; - - postgresql = postgresqlAndPlugins cfg.package; + postgresql = + if cfg.extraPlugins == [] + then cfg.package + else cfg.package.withPackages (_: cfg.extraPlugins); # The main PostgreSQL configuration file. configFile = pkgs.writeText "postgresql.conf" @@ -58,7 +42,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.postgresql_9_6"; + example = literalExample "pkgs.postgresql_11"; description = '' PostgreSQL package to use. ''; @@ -74,7 +58,7 @@ in dataDir = mkOption { type = types.path; - example = "/var/lib/postgresql/9.6"; + example = "/var/lib/postgresql/11"; description = '' Data directory for PostgreSQL. ''; @@ -195,17 +179,11 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_4; }) ]"; + example = literalExample "with pkgs.postgresql_11.pkgs; [ postgis pg_repack ]"; description = '' - When this list contains elements a new store path is created. - PostgreSQL and the elements are symlinked into it. Then pg_config, - postgres and pg_ctl are copied to make them use the new - $out/lib directory as pkglibdir. This makes it possible to use postgis - without patching the .sql files which reference $libdir/postgis-1.5. + List of PostgreSQL plugins. PostgreSQL version for each plugin should + match version for services.postgresql.package value. ''; - # Note: the duplication of executables is about 4MB size. - # So a nicer solution was patching postgresql to allow setting the - # libdir explicitely. }; extraConfig = mkOption { diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 00bb02dcc5b..02db47568d3 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -27,10 +27,10 @@ configuration.nix: = true; - = pkgs.postgresql_9_4; + = pkgs.postgresql_11; Note that you are required to specify the desired version of PostgreSQL - (e.g. pkgs.postgresql_9_4). Since upgrading your + (e.g. pkgs.postgresql_11). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for such as the most recent @@ -74,4 +74,70 @@ Type "help" for help. here. +
+ Plugins + + + Plugins collection for each PostgreSQL version can be accessed with + .pkgs. For example, for + pkgs.postgresql_11 package, its plugin collection is + accessed by pkgs.postgresql_11.pkgs: + +$ nix repl '<nixpkgs>' + +Loading '<nixpkgs>'... +Added 10574 variables. + +nix-repl> postgresql_11.pkgs.<TAB><TAB> +postgresql_11.pkgs.cstore_fdw postgresql_11.pkgs.pg_repack +postgresql_11.pkgs.pg_auto_failover postgresql_11.pkgs.pg_safeupdate +postgresql_11.pkgs.pg_bigm postgresql_11.pkgs.pg_similarity +postgresql_11.pkgs.pg_cron postgresql_11.pkgs.pg_topn +postgresql_11.pkgs.pg_hll postgresql_11.pkgs.pgjwt +postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga +... + + + + To add plugins via NixOS configuration, set services.postgresql.extraPlugins: + + = pkgs.postgresql_11; + = with pkgs.postgresql_11.pkgs; [ + pg_repack + postgis +]; + + + + You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using + function .withPackages. For example, creating a custom + PostgreSQL package in an overlay can look like: + +self: super: { + postgresql_custom = self.postgresql_11.withPackages (ps: [ + ps.pg_repack + ps.postgis + ]); +} + + + + Here's a recipe on how to override a particular plugin through an overlay: + +self: super: { + postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { + pkgs = super.postgresql_11.pkgs // { + pg_repack = super.postgresql_11.pkgs.pg_repack.overrideAttrs (_: { + name = "pg_repack-v20181024"; + src = self.fetchzip { + url = "https://github.com/reorg/pg_repack/archive/923fa2f3c709a506e111cc963034bf2fd127aa00.tar.gz"; + sha256 = "17k6hq9xaax87yz79j773qyigm4fwk8z4zh5cyp6z0sxnwfqxxw5"; + }; + }); + }; + }; +} + + +
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index c8c4a9ff06d..a889a44d4b2 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -150,6 +150,9 @@ in rm -rf /var/lib/graylog/plugins || true mkdir -p /var/lib/graylog/plugins -m 755 + mkdir -p "$(dirname ${cfg.nodeIdFile})" + chown -R ${cfg.user} "$(dirname ${cfg.nodeIdFile})" + for declarativeplugin in `ls ${glPlugins}/bin/`; do ln -sf ${glPlugins}/bin/$declarativeplugin /var/lib/graylog/plugins/$declarativeplugin done diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 5a964e672ed..59c1c104b9b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -55,6 +55,11 @@ let [service] DISABLE_REGISTRATION = ${boolToString cfg.disableRegistration} + ${optionalString (cfg.mailerPasswordFile != null) '' + [mailer] + PASSWD = #mailerpass# + ''} + ${cfg.extraConfig} ''; in @@ -255,6 +260,13 @@ in description = "Upper level of template and static files path."; }; + mailerPasswordFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/secrets/gitea/mailpw"; + description = "Path to a file containing the SMTP password."; + }; + disableRegistration = mkEnableOption "the registration lock" // { description = '' By default any user can create an account on this gitea instance. @@ -344,9 +356,15 @@ in KEY="$(head -n1 ${secretKey})" DBPASS="$(head -n1 ${cfg.database.passwordFile})" JWTSECRET="$(head -n1 ${jwtSecret})" + ${if (cfg.mailerPasswordFile == null) then '' + MAILERPASSWORD="#mailerpass#" + '' else '' + MAILERPASSWORD="$(head -n1 ${cfg.mailerPasswordFile} || :)" + ''} sed -e "s,#secretkey#,$KEY,g" \ -e "s,#dbpass#,$DBPASS,g" \ -e "s,#jwtsecet#,$JWTSECET,g" \ + -e "s,#mailerpass#,$MAILERPASSWORD,g" \ -i ${runConfig} chmod 640 ${runConfig} ${secretKey} ${jwtSecret} ''} diff --git a/nixos/modules/services/misc/tiddlywiki.nix b/nixos/modules/services/misc/tiddlywiki.nix new file mode 100644 index 00000000000..2adc08f6cfe --- /dev/null +++ b/nixos/modules/services/misc/tiddlywiki.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.tiddlywiki; + listenParams = concatStrings (mapAttrsToList (n: v: " '${n}=${toString v}' ") cfg.listenOptions); + exe = "${pkgs.nodePackages.tiddlywiki}/lib/node_modules/.bin/tiddlywiki"; + name = "tiddlywiki"; + dataDir = "/var/lib/" + name; + +in { + + options.services.tiddlywiki = { + + enable = mkEnableOption "TiddlyWiki nodejs server"; + + listenOptions = mkOption { + type = types.attrs; + default = {}; + example = { + credentials = "../credentials.csv"; + readers="(authenticated)"; + port = 3456; + }; + description = '' + Parameters passed to --listen command. + Refer to + for details on supported values. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd = { + services.tiddlywiki = { + description = "TiddlyWiki nodejs server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + DynamicUser = true; + StateDirectory = name; + ExecStartPre = "-${exe} ${dataDir} --init server"; + ExecStart = "${exe} ${dataDir} --listen ${listenParams}"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix index c5b84e574b8..eae7a61297d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -23,12 +23,24 @@ in { to set the peers up. ''; }; + + singleSubnetPerField = mkOption { + type = types.bool; + default = false; + description = '' + By default, all allowed IPs and subnets are comma-separated in the + allowed_ips field. With this option enabled, + a single IP and subnet will be listed in fields like allowed_ip_0, + allowed_ip_1 and so on. + ''; + }; }; serviceOpts = { script = '' ${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \ -p ${toString cfg.port} \ ${optionalString cfg.verbose "-v"} \ + ${optionalString cfg.singleSubnetPerField "-s"} \ ${optionalString (cfg.wireguardConfig != null) "-n ${cfg.wireguardConfig}"} ''; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b882f6c2ae7..1bd9de93735 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -16,6 +16,9 @@ let poolName = "tt-rss"; + mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; + pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; + tt-rss-config = pkgs.writeText "config.php" '' 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -628,18 +631,18 @@ let serviceConfig = { User = "${cfg.user}"; + Group = "tt_rss"; ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon"; StandardOutput = "syslog"; StandardError = "syslog"; - PermissionsStartOnly = true; }; wantedBy = [ "multi-user.target" ]; - requires = ["${dbService}"]; - after = ["network.target" "${dbService}"]; + requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; + after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; }; - services.mysql = optionalAttrs (cfg.database.type == "mysql") { + services.mysql = mkIf mysqlLocal { enable = true; package = mkDefault pkgs.mysql; ensureDatabases = [ cfg.database.name ]; @@ -653,17 +656,22 @@ let ]; }; - services.postgresql = optionalAttrs (cfg.database.type == "pgsql") { + services.postgresql = mkIf pgsqlLocal { enable = mkDefault true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.user; + ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + } + ]; }; - users = optionalAttrs (cfg.user == "tt_rss") { - users.tt_rss = { - description = "tt-rss service user"; - isSystemUser = true; - group = "tt_rss"; - }; - groups.tt_rss = {}; + users.users.tt_rss = optionalAttrs (cfg.user == "tt_rss") { + description = "tt-rss service user"; + isSystemUser = true; + group = "tt_rss"; }; + + users.groups.tt_rss = {}; }; } diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix deleted file mode 100644 index a883bb2b343..00000000000 --- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ config, pkgs, serverInfo, lib, ... }: - -let - extraWorkersProperties = lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties; - - workersProperties = pkgs.writeText "workers.properties" '' -# Define list of workers that will be used -# for mapping requests -# The configuration directives are valid -# for the mod_jk version 1.2.18 and later -# -worker.list=loadbalancer,status - -# Define Node1 -# modify the host as your host IP or DNS name. -worker.node1.port=8009 -worker.node1.host=localhost -worker.node1.type=ajp13 -worker.node1.lbfactor=1 - -# Load-balancing behaviour -worker.loadbalancer.type=lb -worker.loadbalancer.balance_workers=node1 - -# Status worker for managing load balancer -worker.status.type=status - -${extraWorkersProperties} - ''; -in -{ - - options = { - extraWorkersProperties = lib.mkOption { - default = ""; - description = "Additional configuration for the workers.properties file."; - }; - }; - - extraModules = [ - { name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; } - ]; - - extraConfig = '' -# Where to find workers.properties -JkWorkersFile ${workersProperties} - -# Where to put jk logs -JkLogFile ${serverInfo.serverConfig.logDir}/mod_jk.log - -# Set the jk log level [debug/error/info] -JkLogLevel info - -# Select the log format -JkLogStampFormat "[%a %b %d %H:%M:%S %Y]" - -# JkOptions indicates to send SSK KEY SIZE -# Note: Changed from +ForwardURICompat. -# See http://tomcat.apache.org/security-jk.html -JkOptions +ForwardKeySize +ForwardURICompatUnparsed -ForwardDirectories - -# JkRequestLogFormat -JkRequestLogFormat "%w %V %T" - -# Mount your applications -JkMount /__application__/* loadbalancer - -# You can use external file for mount points. -# It will be checked for updates each 60 seconds. -# The format of the file is: /url=worker -# /examples/*=loadbalancer -#JkMountFile uriworkermap.properties - -# Add shared memory. -# This directive is present with 1.2.10 and -# later versions of mod_jk, and is needed for -# for load balancing to work properly -# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225452 -JkShmFile ${serverInfo.serverConfig.stateDir}/jk.shm - -# Static files in all Tomcat webapp context directories are served by apache -JkAutoAlias /var/tomcat/webapps - -# All requests go to worker by default -JkMount /* loadbalancer -# Serve some static files using httpd -#JkUnMount /*.html loadbalancer -#JkUnMount /*.jpg loadbalancer -#JkUnMount /*.gif loadbalancer -#JkUnMount /*.css loadbalancer -#JkUnMount /*.png loadbalancer -#JkUnMount /*.js loadbalancer - -# Add jkstatus for managing runtime data - -JkMount status -Order deny,allow -Deny from all -Allow from 127.0.0.1 - - ''; -} diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 14304e00dae..98c9ae86cee 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -21,6 +21,13 @@ in description = "Enable the Plasma 5 (KDE 5) desktop environment."; }; + phononBackend = mkOption { + type = types.enum [ "gstreamer" "vlc" ]; + default = "gstreamer"; + example = "vlc"; + description = "Phonon audio backend to install."; + }; + enableQt4Support = mkOption { type = types.bool; default = true; @@ -161,12 +168,14 @@ in qtvirtualkeyboard - libsForQt5.phonon-backend-gstreamer - xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ] - - ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ] + + # Phonon audio backend + ++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer + ++ lib.optional (cfg.phononBackend == "gstreamer" && cfg.enableQt4Support) pkgs.phonon-backend-gstreamer + ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc + ++ lib.optional (cfg.phononBackend == "vlc" && cfg.enableQt4Support) pkgs.phonon-backend-vlc # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable bluedevil diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 665a75e47da..bc5f18d22bc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -100,6 +100,7 @@ in graphene = handleTest ./graphene.nix {}; grafana = handleTest ./grafana.nix {}; graphite = handleTest ./graphite.nix {}; + graylog = handleTest ./graylog.nix {}; hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {}; handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {}; @@ -247,8 +248,8 @@ in pdns-recursor = handleTest ./pdns-recursor.nix {}; taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; + tiddlywiki = handleTest ./tiddlywiki.nix {}; tinydns = handleTest ./tinydns.nix {}; - tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; transmission = handleTest ./transmission.nix {}; udisks2 = handleTest ./udisks2.nix {}; diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 12a34d4401f..57d8006d7ac 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -17,7 +17,7 @@ let ]; }).config.system.build.isoImage; - perlAttrs = params: "{ ${concatStringsSep "," (mapAttrsToList (name: param: "${name} => '${toString param}'") params)} }"; + perlAttrs = params: "{ ${concatStringsSep ", " (mapAttrsToList (name: param: "${name} => ${builtins.toJSON param}") params)} }"; makeBootTest = name: extraConfig: let @@ -61,7 +61,8 @@ let ]; }; machineConfig = perlAttrs ({ - qemuFlags = "-boot order=n -netdev user,id=net0,tftp=${ipxeBootDir}/,bootfile=netboot.ipxe -m 2000"; + qemuFlags = "-boot order=n -m 2000"; + netBackendArgs = "tftp=${ipxeBootDir},bootfile=netboot.ipxe"; } // extraConfig); in makeTest { @@ -78,28 +79,28 @@ let in { biosCdrom = makeBootTest "bios-cdrom" { - cdrom = ''glob("${iso}/iso/*.iso")''; + cdrom = "${iso}/iso/${iso.isoName}"; }; biosUsb = makeBootTest "bios-usb" { - usb = ''glob("${iso}/iso/*.iso")''; + usb = "${iso}/iso/${iso.isoName}"; }; uefiCdrom = makeBootTest "uefi-cdrom" { - cdrom = ''glob("${iso}/iso/*.iso"''; - bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"''; + cdrom = "${iso}/iso/${iso.isoName}"; + bios = "${pkgs.OVMF.fd}/FV/OVMF.fd"; }; uefiUsb = makeBootTest "uefi-usb" { - usb = ''glob("${iso}/iso/*.iso")''; - bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"''; + usb = "${iso}/iso/${iso.isoName}"; + bios = "${pkgs.OVMF.fd}/FV/OVMF.fd"; }; biosNetboot = makeNetbootTest "bios" {}; uefiNetboot = makeNetbootTest "uefi" { - bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"''; + bios = "${pkgs.OVMF.fd}/FV/OVMF.fd"; # Custom ROM is needed for EFI PXE boot. I failed to understand exactly why, because QEMU should still use iPXE for EFI. - netRomFile = ''"${pkgs.ipxe}/ipxe.efirom"''; + netFrontendArgs = "romfile=${pkgs.ipxe}/ipxe.efirom"; }; } diff --git a/nixos/tests/graylog.nix b/nixos/tests/graylog.nix new file mode 100644 index 00000000000..dc54afd1d26 --- /dev/null +++ b/nixos/tests/graylog.nix @@ -0,0 +1,111 @@ +import ./make-test.nix ({ pkgs, lib, ... }: { + name = "graylog"; + meta.maintainers = with lib.maintainers; [ ma27 ]; + + machine = { pkgs, ... }: { + virtualisation.memorySize = 4096; + virtualisation.diskSize = 4096; + + services.mongodb.enable = true; + services.elasticsearch.enable = true; + services.elasticsearch.package = pkgs.elasticsearch-oss; + services.elasticsearch.extraConf = '' + network.publish_host: 127.0.0.1 + network.bind_host: 127.0.0.1 + ''; + + services.graylog = { + enable = true; + passwordSecret = "YGhZ59wXMrYOojx5xdgEpBpDw2N6FbhM4lTtaJ1KPxxmKrUvSlDbtWArwAWMQ5LKx1ojHEVrQrBMVRdXbRyZLqffoUzHfssc"; + elasticsearchHosts = [ "http://localhost:9200" ]; + + # `echo -n "nixos" | shasum -a 256` + rootPasswordSha2 = "6ed332bcfa615381511d4d5ba44a293bb476f368f7e9e304f0dff50230d1a85b"; + }; + + environment.systemPackages = [ pkgs.jq ]; + + systemd.services.graylog.path = [ pkgs.netcat ]; + systemd.services.graylog.preStart = '' + until nc -z localhost 9200; do + sleep 2 + done + ''; + }; + + testScript = let + payloads.login = pkgs.writeText "login.json" (builtins.toJSON { + host = "127.0.0.1:9000"; + username = "admin"; + password = "nixos"; + }); + + payloads.input = pkgs.writeText "input.json" (builtins.toJSON { + title = "Demo"; + global = false; + type = "org.graylog2.inputs.gelf.udp.GELFUDPInput"; + node = "@node@"; + configuration = { + bind_address = "0.0.0.0"; + decompress_size_limit = 8388608; + number_worker_threads = 1; + override_source = null; + port = 12201; + recv_buffer_size = 262144; + }; + }); + + payloads.gelf_message = pkgs.writeText "gelf.json" (builtins.toJSON { + host = "example.org"; + short_message = "A short message"; + full_message = "A long message"; + version = "1.1"; + level = 5; + facility = "Test"; + }); + in '' + $machine->start; + $machine->waitForUnit("graylog.service"); + $machine->waitForOpenPort(9000); + $machine->succeed("curl -sSfL http://127.0.0.1:9000/"); + + my $session = $machine->succeed("curl -X POST " + . "-sSfL http://127.0.0.1:9000/api/system/sessions " + . "-d \$(cat ${payloads.login}) " + . "-H 'Content-Type: application/json' " + . "-H 'Accept: application/json' " + . "-H 'x-requested-by: cli' " + . "| jq .session_id | xargs echo" + ); + + chomp($session); + + $machine->succeed("curl -X POST " + . "-sSfL http://127.0.0.1:9000/api/system/inputs -u $session:session " + . "-d \$(cat ${payloads.input} | sed -e \"s,\@node\@,\$(cat /var/lib/graylog/server/node-id),\") " + . "-H 'Accept: application/json' " + . "-H 'Content-Type: application/json' " + . "-H 'x-requested-by: cli' " + ); + + $machine->waitUntilSucceeds("test \"\$(curl -sSfL 'http://127.0.0.1:9000/api/cluster/inputstates' " + . "-u $session:session " + . "-H 'Accept: application/json' " + . "-H 'Content-Type: application/json' " + . "-H 'x-requested-by: cli'" + . "| jq 'to_entries[]|.value|.[0]|.state' | xargs echo" + . ")\" = \"RUNNING\"" + ); + + $machine->succeed("echo -n \$(cat ${payloads.gelf_message}) | nc -w10 -u 127.0.0.1 12201"); + + $machine->succeed("test \"\$(curl -X GET " + . "-sSfL 'http://127.0.0.1:9000/api/search/universal/relative?query=*' " + . "-u $session:session " + . "-H 'Accept: application/json' " + . "-H 'Content-Type: application/json' " + . "-H 'x-requested-by: cli'" + . " | jq '.total_results' | xargs echo)\" = \"1\"" + ); + ''; +}) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 90c7c9701f6..9a85501d15f 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -331,11 +331,12 @@ let inherit (snakeoil.peer1) publicKey; }; }; + systemd.services.prometheus-wireguard-exporter.after = [ "wireguard-wg0.service" ]; }; exporterTest = '' waitForUnit("prometheus-wireguard-exporter.service"); waitForOpenPort(9586); - succeed("curl -sSf http://localhost:9586/metrics | grep '${snakeoil.peer1.publicKey}'"); + waitUntilSucceeds("curl -sSf http://localhost:9586/metrics | grep '${snakeoil.peer1.publicKey}'"); ''; }; }; diff --git a/nixos/tests/tiddlywiki.nix b/nixos/tests/tiddlywiki.nix new file mode 100644 index 00000000000..4a2014a4ec9 --- /dev/null +++ b/nixos/tests/tiddlywiki.nix @@ -0,0 +1,67 @@ +import ./make-test.nix ({ ... }: { + name = "tiddlywiki"; + nodes = { + default = { + services.tiddlywiki.enable = true; + }; + configured = { + boot.postBootCommands = '' + echo "username,password + somelogin,somesecret" > /var/lib/wikiusers.csv + ''; + services.tiddlywiki = { + enable = true; + listenOptions = { + port = 3000; + credentials="../wikiusers.csv"; + readers="(authenticated)"; + }; + }; + }; + }; + + testScript = '' + startAll; + + subtest "by default works without configuration", sub { + $default->waitForUnit("tiddlywiki.service"); + }; + + subtest "by default available on port 8080 without auth", sub { + $default->waitForUnit("tiddlywiki.service"); + $default->waitForOpenPort(8080); + $default->succeed("curl --fail 127.0.0.1:8080"); + }; + + subtest "by default creates empty wiki", sub { + $default->succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info"); + }; + + subtest "configured on port 3000 with basic auth", sub { + $configured->waitForUnit("tiddlywiki.service"); + $configured->waitForOpenPort(3000); + $configured->fail("curl --fail 127.0.0.1:3000"); + $configured->succeed("curl --fail 127.0.0.1:3000 --user somelogin:somesecret"); + }; + + subtest "configured with different wikifolder", sub { + $configured->succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info"); + }; + + subtest "restart preserves changes", sub { + # given running wiki + $default->waitForUnit("tiddlywiki.service"); + # with some changes + $default->succeed("curl --fail --request PUT --header 'X-Requested-With:TiddlyWiki' --data '{ \"title\": \"title\", \"text\": \"content\" }' --url 127.0.0.1:8080/recipes/default/tiddlers/somepage "); + $default->succeed("sleep 2"); # server syncs to filesystem on timer + + # when wiki is cycled + $default->systemctl("restart tiddlywiki.service"); + $default->waitForUnit("tiddlywiki.service"); + $default->waitForOpenPort(8080); + + # the change is preserved + $default->succeed("curl --fail 127.0.0.1:8080/recipes/default/tiddlers/somepage"); + }; + ''; +}) diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix deleted file mode 100644 index 8e7b886dd30..00000000000 --- a/nixos/tests/tomcat.nix +++ /dev/null @@ -1,30 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "tomcat"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco ]; - }; - - nodes = { - server = - { ... }: - - { services.tomcat.enable = true; - services.httpd.enable = true; - services.httpd.adminAddr = "foo@bar.com"; - services.httpd.extraSubservices = - [ { serviceType = "tomcat-connector"; } ]; - networking.firewall.allowedTCPPorts = [ 80 ]; - }; - - client = { }; - }; - - testScript = '' - startAll; - - $server->waitForUnit("tomcat"); - $client->waitForUnit("network.target"); - $client->waitUntilSucceeds("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); - $client->waitUntilSucceeds("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); - ''; -}) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 492a221c3f8..23eb9033ed1 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -84,9 +84,7 @@ rec { sumokoin = callPackage ./sumokoin.nix { boost = boost165; }; - wownero = callPackage ./wownero.nix { - inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - }; + wownero = callPackage ./wownero.nix {}; zcash = callPackage ./zcash { withGui = false; diff --git a/pkgs/applications/altcoins/wownero.nix b/pkgs/applications/altcoins/wownero.nix index 6de12b09934..7aed3297832 100644 --- a/pkgs/applications/altcoins/wownero.nix +++ b/pkgs/applications/altcoins/wownero.nix @@ -1,22 +1,20 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, git , boost, miniupnpc_2, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium, rapidjson -, CoreData, IOKit, PCSC }: -assert stdenv.isDarwin -> IOKit != null; - with stdenv.lib; stdenv.mkDerivation rec { name = "wownero-${version}"; - version = "0.5.0.2"; + version = "0.6.1.2"; src = fetchFromGitHub { owner = "wownero"; repo = "wownero"; rev = "v${version}"; - sha256 = "120cfkl2q8qgl3ajxfkkri9bxlnvmr1mhb1wvcigch1lqyflff1w"; + sha256 = "03q3pviyhrldpa3f4ly4d97jr39hvrz37chl102bap0790d9lk09"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkgconfig git ]; @@ -24,14 +22,12 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc_2 openssl unbound rapidjson cppzmq zeromq pcsclite readline libsodium - ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; + ]; cmakeFlags = [ "-DReadline_ROOT_DIR=${readline.dev}" "-DMANUAL_SUBMODULES=ON" - ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; - - hardeningDisable = [ "fortify" ]; + ]; meta = { description = "Wownero is a fork of the cryptocurrency Monero with primary alterations"; @@ -44,7 +40,7 @@ stdenv.mkDerivation rec { ''; homepage = http://wownero.org/; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ fuwa ]; }; } diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix index 75b6d8e2758..c49470b76e2 100644 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ b/pkgs/applications/audio/avldrums-lv2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "avldrums.lv2"; - version = "0.3.1"; + version = "0.3.5"; src = fetchFromGitHub { owner = "x42"; repo = pname; rev = "v${version}"; - sha256 = "0yhq3n5bahhqpj40mvlkxcjsdsw63jsbz20pl77bx2qj30w25i2j"; + sha256 = "00n2varc7iwp0xbfi45hpq4vlpxxb2kbrdzvrc20qp2265994bqf"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index d4e2fba0cf4..7d7d25ea88a 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "calf-${version}"; - version = "0.90.2"; + version = "0.90.3"; src = fetchurl { url = "https://calf-studio-gear.org/files/${name}.tar.gz"; - sha256 = "0bn4j1klw2yfxz8clbmasaydifq25rdfsv0n6iisxrzcj1lx7sgh"; + sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index b11f525e9d2..cb968ee9e00 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.12.2"; + version = "6.13.0"; enableParallelBuilding = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2"; + sha256 = "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 494f512752b..da915f3fc3e 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "1.1.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "060g4ddh1z222n39wqj8jxj0zgmpjrgraw76qgyg6xkn15cn9q9y"; + sha256 = "1qrbv4kk5v6ynx424h1i54qj0w8v6vpw81b759jawxvzzprpgq72"; fetchSubmodules = true; }; @@ -26,9 +26,11 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/lv2/ mkdir -p $out/lib/vst/ cd bin - cp -a DragonflyReverb $out/bin/ - cp -a DragonflyReverb-vst.so $out/lib/vst/ - cp -a DragonflyReverb.lv2/ $out/lib/lv2/ + for bin in DragonflyHallReverb DragonflyRoomReverb; do + cp -a $bin $out/bin/ + cp -a $bin-vst.so $out/lib/vst/ + cp -a $bin.lv2/ $out/lib/lv2/ ; + done ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index d798a2bed53..c80485734ca 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.5"; + version = "1.1.9"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sadko4u"; repo = "${pname}"; rev = "${name}"; - sha256 = "0xcxm47j7mz5vprjqqhi95gz62syp4y737h7cssxd3flqkgar7xr"; + sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2"; }; nativeBuildInputs = [ pkgconfig php expat ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 93aacae47ae..e503793ab39 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "1jd4bf6a1ipvg4yhb3xf3maqg68bx97ic9l57djmkirlrkh2a3wp"; + sha256 = "1k4p2ir12qjcs62knvw2s6qyvb46203yx22fnwp341cjk171cxji"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index cf429bf98d4..f9b1fe6afe0 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "138kd9szgn3b97s7crhsyj8pgwb0bn4l9knd4zliqjgj2f1bs9x0"; + sha256 = "1y61wb0bzm1cz7y8xxv6hp8mrkfb9zm9irg6zs4g6aanw539r6l8"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 63bb966e388..00a22ac711e 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.10.2"; + version = "1.5.11.3"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1rr99qkq80s8l2iv3x4ccxan07m15dvmd5s9b10386bfjbwbya01"; + sha256 = "00w0ll94dpss9f1rnaxjmw6mgjx5q2dz8w4mc3wyrk4s4gbd7154"; }; buildInputs = [ diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 210d0f7e989..69906b81438 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zam-plugins-${version}"; - version = "3.10"; + version = "3.11"; src = fetchgit { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; - rev = "a3321af1892a6994d64fb705e48ae8adf8d7df20"; - sha256 = "0yqrs21ph2lx00p0jlc70qkmzfrnf9ihg1r3i9j5n2r903ljdg5p"; + rev = "af338057e42dd5d07cba1889bfc74eda517c6147"; + sha256 = "1qbskhcvy2k2xv0f32lw13smz5g72v0yy47zv6vnhnaiaqf3f2d5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 52888c5f85d..efece505ab9 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.1.7"; + version = "2.1.9"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "014c8xvb7shy00vjx0b1k8zr7iknxskqab1aqvz9md3bn5rwkxm5"; + sha256 = "1im7jq7vi2sbdrh95kbydbbfwdll6z9zh1w1vzh7ny1sigfphkpm"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index c3dffee3aa8..385f9825e46 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, ruby, makeWrapper, +{ lib, bundlerApp, bundlerUpdateScript, makeWrapper, withPngcrush ? true, pngcrush ? null, withPngout ? true, pngout ? null, withAdvpng ? true, advancecomp ? null, @@ -45,8 +45,6 @@ bundlerApp { pname = "image_optim"; gemdir = ./.; - inherit ruby; - exes = [ "image_optim" ]; buildInputs = [ makeWrapper ]; @@ -56,11 +54,13 @@ bundlerApp { --prefix PATH : ${makeBinPath optionalDepsPath} ''; + passthru.updateScript = bundlerUpdateScript "image_optim"; + meta = with lib; { description = "Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)"; homepage = https://github.com/toy/image_optim; license = licenses.mit; - maintainers = with maintainers; [ srghma ]; + maintainers = with maintainers; [ srghma nicknovitski ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/graphics/image_optim/update.sh b/pkgs/applications/graphics/image_optim/update.sh deleted file mode 100755 index 8afd7f90436..00000000000 --- a/pkgs/applications/graphics/image_optim/update.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bundix bundler - -SCRIPT_DIR=$(dirname "$(readlink -f "$BASH_SOURCE")") - -cd $SCRIPT_DIR - -bundle lock --update -bundix diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index ada55f0351e..4f86e573689 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "18.02"; + version = "19.07.1"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "0rb4kjyrr9ry85cfpbk52l19vvwn7lrh2kmj2lwq531smnygn5m3"; + sha256 = "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix index 9ae2ea41d83..20c802a1cbd 100644 --- a/pkgs/applications/misc/doing/default.nix +++ b/pkgs/applications/misc/doing/default.nix @@ -1,8 +1,6 @@ -{ lib, bundlerEnv, ruby +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: -# Bundix: -# nix-shell -p bundix zlib bundlerEnv rec { pname = "doing"; version = (import ./gemset.nix).doing.version; @@ -10,6 +8,8 @@ bundlerEnv rec { inherit ruby; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "doing"; + meta = with lib; { description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done."; longDescription = '' @@ -19,7 +19,7 @@ bundlerEnv rec { ''; homepage = https://brettterpstra.com/projects/doing/; license = licenses.mit; - maintainers = with maintainers; [ ktf ]; + maintainers = with maintainers; [ ktf nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 4a0a4e38a61..62f2d7a069d 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, makeWrapper +{ stdenv, bundlerEnv, ruby, makeWrapper, bundlerUpdateScript , git }: stdenv.mkDerivation rec { @@ -23,11 +23,13 @@ stdenv.mkDerivation rec { --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} ''; + passthru.updateScript = bundlerUpdateScript "gollum"; + meta = with stdenv.lib; { description = "A simple, Git-powered wiki"; homepage = https://github.com/gollum/gollum; license = licenses.mit; - maintainers = with maintainers; [ jgillich primeos ]; + maintainers = with maintainers; [ jgillich primeos nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index b92a7ac476c..d3905c8d3ea 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; postInstall = '' - wrapProgram $out/lib/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]} + wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]} ''; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 3a734253848..85dfda405b0 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { checkPhase = '' export LC_ALL="en_US.UTF-8" export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" make test ARGS+="-E testgui --output-on-failure" ''; diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index a02639e1668..ab40dfc8131 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -9,7 +9,6 @@ let xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite - xrandr ]; in buildFHSUserEnv { @@ -20,15 +19,6 @@ in buildFHSUserEnv { targetPkgs = pkgs: with pkgs; [ lutris-unwrapped - # Common - libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio - libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l - libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio - libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib - alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils - readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite - # Adventure Game Studio allegro dumb @@ -70,8 +60,6 @@ in buildFHSUserEnv { # Osmose qt4 - # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" - # PPSSPP glew snappy @@ -93,16 +81,31 @@ in buildFHSUserEnv { bison flex # WINE - perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC - samba4 sane-backends openldap opencl-headers ocl-icd utillinux + xorg.xrandr perl which p7zip gnused gnugrep psmisc opencl-headers # ZDOOM soundfont-fluid bzip2 game-music-emu ] ++ qt5Deps pkgs ++ gnome3Deps pkgs - ++ xorgDeps pkgs ++ lib.optional steamSupport pkgs.steam; + multiPkgs = pkgs: with pkgs; [ + # Common + libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio + libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l + libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio + libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib + alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils + readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd + vulkan-loader xdg_utils sqlite + + # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" + + # WINE + cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap + ocl-icd utillinux + ] ++ xorgDeps pkgs; + extraInstallCommands = '' mkdir -p $out/share ln -sf ${lutris-unwrapped}/share/applications $out/share diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index 6f9078bb50a..f5504721987 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "pt"; gemdir = ./.; exes = [ "pt" ]; + passthru.updateScript = bundlerUpdateScript "pt"; + meta = with lib; { description = "Minimalist command-line Pivotal Tracker client"; homepage = http://www.github.com/raul/pt; license = licenses.mit; - maintainers = with maintainers; [ ebzzry manveru ]; + maintainers = with maintainers; [ ebzzry manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix new file mode 100644 index 00000000000..0f4e743aba4 --- /dev/null +++ b/pkgs/applications/misc/pyditz/default.nix @@ -0,0 +1,25 @@ +{ stdenv, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + pname = "pyditz"; + version = "0.10.3"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf"; + }; + nativeBuildInputs = [ pythonPackages.setuptools_scm ]; + propagatedBuildInputs = with pythonPackages; [ pyyaml six jinja2 cerberus11 ]; + + checkPhase = '' + ${pythonPackages.python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + homepage = https://pythonhosted.org/pyditz/; + description = "Drop-in replacement for the Ditz distributed issue tracker"; + maintainers = [ maintainers.ilikeavocadoes ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 1b3bacf71df..838cc199a6c 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "taskjuggler"; @@ -9,11 +9,13 @@ bundlerApp { "tj3ts_receiver" "tj3ts_sender" "tj3ts_summary" "tj3webd" ]; + passthru.updateScript = bundlerUpdateScript "taskjuggler"; + meta = with lib; { description = "A modern and powerful project management tool"; homepage = http://taskjuggler.org/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; }; } diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index c70503cbff2..63bb7f4bb4a 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "16.6.1"; + version = "16.7"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "1h5bn4vi7gffwi4mpwpn0s6vxvl44rn3m9b23w8q9zyz9v24flz7"; + sha256 = "1937z0kixb6r82izj12jy4x8z4n96dfq1hx05vcsvsg1sx3wxgb0"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 987b676034f..4086c0e094a 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "xastir"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Release-${version}"; - sha256 = "1xfzd2m4l0zbb96ak2pniffxdrs9lax0amkxfgdsnyg8x5j0xcxm"; + sha256 = "14f908jy5jzvgm1h1sr47hjqjq3q2nq91byhimk84kj044fn21w9"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 0d863ae9131..c4182785e82 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchFromGitHub, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus-glib, file, fontconfig, freetype -, gstreamer, gst-plugins-base, gst_all_1 -, gtk2, hunspell, icu, libevent, libjpeg, libnotify -, libstartup_notification, libvpx, makeWrapper, libGLU_combined -, nspr, nss, pango, perl, python, libpulseaudio, sqlite -, unzip, xorg, which, yasm, zip, zlib +, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype +, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg +, libnotify, libstartup_notification, makeWrapper +, libGLU_combined, perl, python, libpulseaudio +, unzip, xorg, wget, which, yasm, zip, zlib }: -stdenv.mkDerivation rec { - name = "palemoon-${version}"; - version = "27.9.4"; +let + + libPath = stdenv.lib.makeLibraryPath [ ffmpeg ]; + +in stdenv.mkDerivation rec { + pname = "palemoon"; + version = "28.6.0.1"; src = fetchFromGitHub { - name = "palemoon-src"; + name = "${pname}-${version}"; owner = "MoonchildProductions"; - repo = "Pale-Moon"; - rev = version + "_Release"; - sha256 = "0ir5gzhw98gfn15x58g1fwi11jd7gysvacqxg1v0jdjhgdl4m5sx"; + repo = "UXP"; + rev = "PM${version}_Release"; + sha256 = "1adgajy5vsghvjlv2nqyrbp6mnv3k6slqxxi8r949xlb5h6d210b"; }; desktopItem = makeDesktopItem { @@ -39,11 +42,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype - gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 - hunspell icu libevent libjpeg libnotify libstartup_notification - libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python - libpulseaudio sqlite unzip which yasm zip zlib + alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype + gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify + libstartup_notification makeWrapper libGLU_combined perl + pkgconfig python libpulseaudio unzip wget which yasm zip zlib ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver libXt pixman xorgproto @@ -52,57 +54,68 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - export AUTOCONF=${autoconf213}/bin/autoconf - export MOZBUILD_STATE_PATH=$(pwd)/.mozbuild - export MOZ_CONFIG=$(pwd)/.mozconfig - export builddir=$(pwd)/build - mkdir -p $MOZBUILD_STATE_PATH $builddir - echo > $MOZ_CONFIG " - . $src/build/mozconfig.common - ac_add_options --prefix=$out - ac_add_options --with-pthreads - ac_add_options --enable-application=browser + export MOZBUILD_STATE_PATH=$(pwd)/mozbuild + export MOZCONFIG=$(pwd)/mozconfig + export builddir=$(pwd)/pmbuild + + echo > $MOZCONFIG " + mk_add_options AUTOCLOBBER=1 + mk_add_options MOZ_OBJDIR=$builddir + ac_add_options --enable-application=palemoon + + ac_add_options --enable-optimize='-O2' + + # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. ac_add_options --enable-official-branding - ac_add_options --enable-optimize="-O2" - ac_add_options --enable-release - ac_add_options --enable-devtools + export MOZILLA_OFFICIAL=1 + + ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-jemalloc - ac_add_options --enable-shared-js ac_add_options --enable-strip + ac_add_options --with-pthreads + ac_add_options --disable-tests - ac_add_options --disable-installer - ac_add_options --disable-updaters + ac_add_options --disable-eme + ac_add_options --disable-parental-controls + ac_add_options --disable-accessibility + ac_add_options --disable-webrtc + ac_add_options --disable-gamepad + ac_add_options --disable-necko-wifi + ac_add_options --disable-updater + + ac_add_options --x-libraries=${xorg.libX11.out}/lib + + ac_add_options --prefix=$out + mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES' + mk_add_options AUTOCONF=${autoconf213}/bin/autoconf " ''; - patchPhase = '' - chmod u+w . - ''; - hardeningDisable = [ "format" ]; - + buildPhase = '' - cd $builddir $src/mach build ''; installPhase = '' + $src/mach install + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications for n in 16 22 24 32 48 256; do size=$n"x"$n mkdir -p $out/share/icons/hicolor/$size/apps - cp $src/browser/branding/official/default$n.png \ + cp $src/application/palemoon/branding/official/default$n.png \ $out/share/icons/hicolor/$size/apps/palemoon.png done - cd $builddir - $src/mach install + wrapProgram $out/lib/palemoon-${version}/palemoon \ + --prefix LD_LIBRARY_PATH : "${libPath}" ''; meta = with stdenv.lib; { - description = "A web browser"; + description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on efficiency and customization. @@ -114,9 +127,9 @@ stdenv.mkDerivation rec { experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own. ''; - homepage = https://www.palemoon.org/; + homepage = "https://www.palemoon.org/"; license = licenses.mpl20; - maintainers = with maintainers; [ rnhmjoj AndersonTorres ]; - platforms = platforms.linux; + maintainers = with maintainers; [ rnhmjoj AndersonTorres OPNA2608 ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ee477af8d49..4b0071bfabc 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.6.1566.44-1"; + version = "2.6.1566.49-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0bqx78bikcgrpg7qg10jylxa582fcxiwah7g2151hadvy8xl15ab"; + sha256 = "1hl7aqq3i6mkkg7sdcax26kn08p8mqwlq4xpg4v05ivdvyh5ac9d"; }; unpackPhase = '' @@ -69,6 +69,8 @@ in stdenv.mkDerivation rec { cp -r usr/share/{applications,xfce4} "$out"/share substituteInPlace "$out"/share/applications/*.desktop \ --replace /usr/bin/${vivaldiName} "$out"/bin/vivaldi + substituteInPlace "$out"/share/applications/*.desktop \ + --replace vivaldi-stable vivaldi local d for d in 16 22 24 32 48 64 128 256; do mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index e5f437a89ad..424b2ddca91 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -8,8 +8,8 @@ let sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z"; }; "1.6" = { - flinkVersion = "1.6.2"; - sha256 = "17fsr6yv1ayr7fw0r4pjlbpkn9ypzjs4brqndzr3gbzwrdc44arw"; + flinkVersion = "1.8.1"; + sha256 = "1ynxlkdxvrgww9hh7rlkhybrp5vl2slj3pqg2qzc8khpcgqx1h2g"; }; }; in diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index c03af2e9683..c116e46684c 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - version = "2.11.0"; + version = "2.14.2"; name = "helm-${version}"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1z810a6mxyrrw4i908dip8aqsj95c0kmv6xpb1wwhskg1zmf85wk"; + sha256 = "0hxfyfpmhgr5jilp2xm9d5vxiq5fcgqm2hh4g4izcgiz9bz7b6k0"; }; goPackagePath = "k8s.io/helm"; @@ -18,7 +18,7 @@ buildGoPackage rec { # Thsese are the original flags from the helm makefile buildFlagsArray = '' - -ldflags=-X k8s.io/helm/pkg/version.Version=v${version} + -ldflags=-X k8s.io/helm/pkg/version.Version=v${version} -X k8s.io/helm/pkg/version.GitTreeState=clean -X k8s.io/helm/pkg/version.BuildMetadata= -w -s ''; diff --git a/pkgs/applications/networking/cluster/helm/deps.nix b/pkgs/applications/networking/cluster/helm/deps.nix index 36bd3406f5b..2fdda0ca280 100644 --- a/pkgs/applications/networking/cluster/helm/deps.nix +++ b/pkgs/applications/networking/cluster/helm/deps.nix @@ -1,839 +1,1181 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "cloud.google.com/go"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "3b1ae45394a234c385be014e9a488f2bb6eef821"; - sha256 = "0alb495ql6s02kb6lxcbnlkdcmhixyl8zv11sgrkhsk1bckzh119"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; }; } { - goPackagePath = "github.com/Azure/go-ansiterm"; + goPackagePath = "github.com/Azure/go-ansiterm"; fetch = { type = "git"; url = "https://github.com/Azure/go-ansiterm"; - rev = "19f72df4d05d31cbe1c56bfc8045c96babff6c7e"; - sha256 = "0663w5m5qlidpj17s5pqp6rhl0phw7vypf104n04dvdy5nd418ix"; + rev = "d6e3b3328b78"; + sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; }; } { - goPackagePath = "github.com/Azure/go-autorest"; + goPackagePath = "github.com/Azure/go-autorest"; fetch = { type = "git"; url = "https://github.com/Azure/go-autorest"; - rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; - sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; + rev = "v11.1.0"; + sha256 = "1jmr04qkl9fgmj56czn2979ng0f6ygfbk2khv2xyx368686xc1d6"; }; } { - goPackagePath = "github.com/BurntSushi/toml"; + goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "b26d9c308763d68093482582cea63d69be07a0f0"; - sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } { - goPackagePath = "github.com/MakeNowJust/heredoc"; + goPackagePath = "github.com/MakeNowJust/heredoc"; fetch = { type = "git"; url = "https://github.com/MakeNowJust/heredoc"; - rev = "bb23615498cded5e105af4ce27de75b089cbe851"; + rev = "bb23615498cd"; sha256 = "17m780i9afj3sbmcrgwgzarfly4x9376w56qblkqnzdkv6vps22i"; }; } { - goPackagePath = "github.com/Masterminds/semver"; + goPackagePath = "github.com/Masterminds/goutils"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/goutils"; + rev = "v1.1.0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; fetch = { type = "git"; url = "https://github.com/Masterminds/semver"; - rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"; - sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6"; + rev = "v1.4.2"; + sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; }; } { - goPackagePath = "github.com/Masterminds/sprig"; + goPackagePath = "github.com/Masterminds/sprig"; fetch = { type = "git"; url = "https://github.com/Masterminds/sprig"; - rev = "15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"; - sha256 = "1k5pfx9hxzb70kh73a009ikr3vqlq0jvzvbyvxz9x7a7yc4r5b14"; + rev = "9f8fceff796f"; + sha256 = "0m6h88xcs8zc2b1g6zaksfn9kyqhr8q9508h57jb6papx7w54yl2"; }; } { - goPackagePath = "github.com/Masterminds/vcs"; + goPackagePath = "github.com/Masterminds/vcs"; fetch = { type = "git"; url = "https://github.com/Masterminds/vcs"; - rev = "3084677c2c188840777bff30054f2b553729d329"; + rev = "v1.11.1"; sha256 = "1062m73h0pp5d0574lf6px4jsjgywnsbkw50inxx3zal5r185ydm"; }; } { - goPackagePath = "github.com/PuerkitoBio/purell"; + goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "8a290539e2e8629dbc4e6bad948158f790ec31f4"; - sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + rev = "v1.1.0"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; }; } { - goPackagePath = "github.com/PuerkitoBio/urlesc"; + goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/urlesc"; - rev = "5bd2802263f21d8788851d5305584c82a5c75d7e"; - sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + rev = "de5bf2ad4578"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; }; } { - goPackagePath = "github.com/aokoli/goutils"; + goPackagePath = "github.com/adisbladis/vgo2nix"; fetch = { type = "git"; - url = "https://github.com/aokoli/goutils"; - rev = "9c37978a95bd5c709a15883b6242714ea6709e64"; - sha256 = "1c51qgk4pjc8c776h7589c3d14791h86f1yj3ykg4q7vlcf9xrnr"; + url = "https://github.com/adisbladis/vgo2nix"; + rev = "56ac56bb0d96"; + sha256 = "1jbxbgcqkal8cdhj2nfbw92fn1fs9ng1df9sf92vgf0m1xzq2mc3"; }; } { - goPackagePath = "github.com/asaskevich/govalidator"; + 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/asaskevich/govalidator"; fetch = { type = "git"; url = "https://github.com/asaskevich/govalidator"; - rev = "7664702784775e51966f0885f5cd27435916517b"; + rev = "766470278477"; sha256 = "1lmynw9vkgrxv7nh60wdywv0nx4gjlkiar433wydhpc2h3m5q968"; }; } { - goPackagePath = "github.com/beorn7/perks"; + goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; - sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; }; } { - goPackagePath = "github.com/chai2010/gettext-go"; + goPackagePath = "github.com/chai2010/gettext-go"; fetch = { type = "git"; url = "https://github.com/chai2010/gettext-go"; - rev = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb"; - sha256 = "0bwjwvjl7zqm7kxram1rzz0ri3h897kiin13ljy9hx3fzz1i9lml"; + rev = "c6fed771bfd5"; + sha256 = "1p9gzj39x4gyhc552n3dmi3kc224gwilawa5kcg8rla31qkwlsky"; }; } { - goPackagePath = "github.com/cpuguy83/go-md2man"; + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "71acacd42f85e5e82f70a55327789582a5200a90"; + rev = "v1.0.4"; sha256 = "0hmkrq4gdzb6mwllmh4p1y7vrz7hyr8xqagpk9nyr5dhygvnnq2v"; }; } { - goPackagePath = "github.com/cyphar/filepath-securejoin"; + goPackagePath = "github.com/cyphar/filepath-securejoin"; fetch = { type = "git"; url = "https://github.com/cyphar/filepath-securejoin"; - rev = "a261ee33d7a517f054effbf451841abaafe3e0fd"; + rev = "v0.2.2"; sha256 = "0id32zjb92wm569m29nfrzz5mw9z1glr3klayr6j134pp4h1sgq4"; }; } { - goPackagePath = "github.com/davecgh/go-spew"; + goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "782f4967f2dc4564575ca782fe2d04090b5faca8"; - sha256 = "1ypijjawqc0xgmgim42260ibcyclfgfizicz5cbvndw4plqfsswk"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } { - goPackagePath = "github.com/dgrijalva/jwt-go"; + goPackagePath = "github.com/dgrijalva/jwt-go"; fetch = { type = "git"; url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + rev = "01aeca54ebda"; + sha256 = "10dmb5xxn5wijn299h483z0klprprkq7n1azakm3ysp50sr11ywg"; }; } { - goPackagePath = "github.com/docker/distribution"; + goPackagePath = "github.com/docker/distribution"; fetch = { type = "git"; url = "https://github.com/docker/distribution"; - rev = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"; + rev = "edc3ab29cdff"; sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m"; }; } { - goPackagePath = "github.com/docker/docker"; + goPackagePath = "github.com/docker/docker"; fetch = { type = "git"; url = "https://github.com/docker/docker"; - rev = "4f3616fb1c112e206b88cb7a9922bf49067a7756"; - sha256 = "0zmsqm1lkwggfqgy2rw34g4g2jlvr6mvcsh65fmpdb30l65iaqzf"; + rev = "a9fbbdc8dd87"; + sha256 = "0vkr9fs8qv3ydpm4f4b3jsx1f3cxpws78f2kwpyn00y1gb3lpnpc"; }; } { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; - sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"; - sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; + goPackagePath = "github.com/docker/spdystream"; fetch = { type = "git"; url = "https://github.com/docker/spdystream"; - rev = "449fdfce4d962303d702fec724ef0ad181c92528"; + rev = "449fdfce4d96"; sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; }; } { - goPackagePath = "github.com/evanphx/json-patch"; + goPackagePath = "github.com/emicklei/go-restful"; fetch = { type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"; - sha256 = "1c9gzc3gb76lm5famc0345y90is1lyffn39bmdr0xk19462f8av5"; + url = "https://github.com/emicklei/go-restful"; + rev = "ff4f55a20633"; + sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; }; } { - goPackagePath = "github.com/exponent-io/jsonpath"; + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "v4.2.0"; + sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; + }; + } + { + goPackagePath = "github.com/exponent-io/jsonpath"; fetch = { type = "git"; url = "https://github.com/exponent-io/jsonpath"; - rev = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5"; + rev = "d6023ce2651d"; sha256 = "1qkzaxsjs7yg1672sk67nr119j7jc4751yzgii0j3nbipjv321kc"; }; } { - goPackagePath = "github.com/fatih/camelcase"; + goPackagePath = "github.com/fatih/camelcase"; fetch = { type = "git"; url = "https://github.com/fatih/camelcase"; - rev = "f6a740d52f961c60348ebb109adde9f4635d7540"; + rev = "f6a740d52f96"; sha256 = "15vb86adns1izvbzjw0lmmzrwlarhbxw5qalhx10vzzdx73wh4ai"; }; } { - goPackagePath = "github.com/ghodss/yaml"; + goPackagePath = "github.com/ghodss/yaml"; fetch = { type = "git"; url = "https://github.com/ghodss/yaml"; - rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee"; - sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; + rev = "c7ce16629ff4"; + sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; }; } { - goPackagePath = "github.com/go-openapi/jsonpointer"; + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; fetch = { type = "git"; url = "https://github.com/go-openapi/jsonpointer"; - rev = "46af16f9f7b149af66e5d1bd010e3574dc06de98"; - sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + rev = "v0.19.0"; + sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2"; }; } { - goPackagePath = "github.com/go-openapi/jsonreference"; + goPackagePath = "github.com/go-openapi/jsonreference"; fetch = { type = "git"; url = "https://github.com/go-openapi/jsonreference"; - rev = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"; - sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; + rev = "v0.19.0"; + sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj"; }; } { - goPackagePath = "github.com/go-openapi/spec"; + goPackagePath = "github.com/go-openapi/spec"; fetch = { type = "git"; url = "https://github.com/go-openapi/spec"; - rev = "1de3e0542de65ad8d75452a595886fdd0befb363"; - sha256 = "13i9y71fk9vr2abvpsk04k55il32ly3fjinvl1zlamh9mi2mdzf4"; + rev = "v0.17.2"; + sha256 = "14n5x2nxlj2x62v3km96yw7rncxk2b9v94k3j0c22r43c60m38mx"; }; } { - goPackagePath = "github.com/go-openapi/swag"; + goPackagePath = "github.com/go-openapi/swag"; fetch = { type = "git"; url = "https://github.com/go-openapi/swag"; - rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; - sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; + rev = "v0.17.2"; + sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv"; }; } { - goPackagePath = "github.com/gobwas/glob"; + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.4.0"; + sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; fetch = { type = "git"; url = "https://github.com/gobwas/glob"; - rev = "5ccd90ef52e1e632236f7326478d4faa74f99438"; + rev = "v0.2.3"; sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; }; } { - goPackagePath = "github.com/gogo/protobuf"; + goPackagePath = "github.com/gogo/protobuf"; fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "c0656edd0d9eab7c66d1eb0c568f9039345796f7"; - sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; }; } { - goPackagePath = "github.com/golang/glog"; + goPackagePath = "github.com/golang/glog"; fetch = { type = "git"; url = "https://github.com/golang/glog"; - rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; - sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; }; } { - goPackagePath = "github.com/golang/groupcache"; + goPackagePath = "github.com/golang/groupcache"; fetch = { type = "git"; url = "https://github.com/golang/groupcache"; - rev = "02826c3e79038b59d737d3b1c0a1d937f71a4433"; + rev = "02826c3e7903"; sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x"; }; } { - goPackagePath = "github.com/golang/protobuf"; + goPackagePath = "github.com/golang/mock"; fetch = { type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"; - sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; }; } { - goPackagePath = "github.com/google/btree"; + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/btree"; fetch = { type = "git"; url = "https://github.com/google/btree"; - rev = "7d79101e329e5a3adf994758c578dab82b90c017"; + rev = "7d79101e329e"; sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; }; } { - goPackagePath = "github.com/google/gofuzz"; + goPackagePath = "github.com/google/gofuzz"; fetch = { type = "git"; url = "https://github.com/google/gofuzz"; - rev = "44d81051d367757e1c7c6a5a86423ece9afcf63c"; - sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i"; + rev = "24818f796faf"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; }; } { - goPackagePath = "github.com/google/uuid"; + goPackagePath = "github.com/google/uuid"; fetch = { type = "git"; url = "https://github.com/google/uuid"; - rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + rev = "064e2069ce9c"; sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; }; } { - goPackagePath = "github.com/googleapis/gnostic"; + goPackagePath = "github.com/googleapis/gnostic"; fetch = { type = "git"; url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2debce0d731cf0287ddf7242066aba"; + rev = "0c5108395e2d"; sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; }; } { - goPackagePath = "github.com/gophercloud/gophercloud"; + goPackagePath = "github.com/gophercloud/gophercloud"; fetch = { type = "git"; url = "https://github.com/gophercloud/gophercloud"; - rev = "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"; - sha256 = "0xvapk94p1259k8arvwyvhwvcnzma9vdg12g750cgz2ghkzvfhff"; + rev = "c818fa66e4c8"; + sha256 = "0igz47lpdxgpfb4ckrrs64vr4wkkiqaamk4wf5d3il4dc2g06azw"; }; } { - goPackagePath = "github.com/gosuri/uitable"; + goPackagePath = "github.com/gosuri/uitable"; fetch = { type = "git"; url = "https://github.com/gosuri/uitable"; - rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"; + rev = "v0.0.1"; sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; }; } { - goPackagePath = "github.com/gregjones/httpcache"; + goPackagePath = "github.com/gregjones/httpcache"; fetch = { type = "git"; url = "https://github.com/gregjones/httpcache"; - rev = "787624de3eb7bd915c329cba748687a3b22666a6"; + rev = "787624de3eb7"; sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5"; }; } { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; fetch = { type = "git"; url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"; + rev = "0c1b191dbfe5"; sha256 = "0d7vybd4yy9a9clk03578xdpyhifxsy3qv6iiglrrnblbmpgksjc"; }; } { - goPackagePath = "github.com/hashicorp/golang-lru"; + goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { type = "git"; url = "https://github.com/hashicorp/golang-lru"; - rev = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"; - sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp"; + rev = "v0.5.0"; + sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; }; } { - goPackagePath = "github.com/huandu/xstrings"; + goPackagePath = "github.com/huandu/xstrings"; fetch = { type = "git"; url = "https://github.com/huandu/xstrings"; - rev = "3959339b333561bf62a38b424fd41517c2c90f40"; - sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1"; + rev = "v1.2.0"; + sha256 = "0bn1kac5vcspxdpx4bygr4gngdbk67pnbqc04b0f7a4ny25n10iq"; }; } { - goPackagePath = "github.com/imdario/mergo"; + goPackagePath = "github.com/imdario/mergo"; fetch = { type = "git"; url = "https://github.com/imdario/mergo"; - rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc"; - sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g"; + rev = "v0.3.5"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; }; } { - goPackagePath = "github.com/inconshreveable/mousetrap"; + goPackagePath = "github.com/inconshreveable/mousetrap"; fetch = { type = "git"; url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + rev = "v1.0.0"; sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } { - goPackagePath = "github.com/json-iterator/go"; + goPackagePath = "github.com/jmoiron/sqlx"; + fetch = { + type = "git"; + url = "https://github.com/jmoiron/sqlx"; + rev = "v1.2.0"; + sha256 = "0pmi2asx157f5738g19fzyxb9g8yyfbpjyh2a2ykr9mafvp60rfd"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; fetch = { type = "git"; url = "https://github.com/json-iterator/go"; - rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; - sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; + rev = "ab8a2e0c74be"; + sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; }; } { - goPackagePath = "github.com/mailru/easyjson"; + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.0.0"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + }; + } + { + goPackagePath = "github.com/liggitt/tabwriter"; + fetch = { + type = "git"; + url = "https://github.com/liggitt/tabwriter"; + rev = "89fcab3d43de"; + sha256 = "04q8d0jk1ymvy7pv1dgfbqzk8gcjfa77psg1lk30ghlisf54pakg"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"; - sha256 = "0d9m8kyhbawa452vnwn255xxnh6pkp3im0d2310rw1k14nh3yh1p"; + rev = "60711f1a8329"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; }; } { - goPackagePath = "github.com/mattn/go-runewidth"; + 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/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + rev = "v0.0.1"; sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; }; } { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + goPackagePath = "github.com/mattn/go-sqlite3"; fetch = { type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.9.0"; + sha256 = "14vw8bwyaz9lrd1rqhfri5cwpimiimhp75pkbqxxsjsr5jz89s7m"; }; } { - goPackagePath = "github.com/mitchellh/go-wordwrap"; + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-wordwrap"; - rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; + rev = "ad45545899c7"; sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; }; } { - goPackagePath = "github.com/modern-go/concurrent"; + goPackagePath = "github.com/modern-go/concurrent"; fetch = { type = "git"; url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + rev = "bacd9c7ef1dd"; sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; }; } { - goPackagePath = "github.com/modern-go/reflect2"; + goPackagePath = "github.com/modern-go/reflect2"; fetch = { type = "git"; url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; }; } { - goPackagePath = "github.com/opencontainers/go-digest"; + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; fetch = { type = "git"; url = "https://github.com/opencontainers/go-digest"; - rev = "a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"; + rev = "a6d0ee40d420"; sha256 = "1paz3na2xkhi10p5bk7f7gbh5yykfgr9f9i2gcc13rb461yq6fmg"; }; } { - goPackagePath = "github.com/opencontainers/image-spec"; + goPackagePath = "github.com/orivej/e"; fetch = { type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "372ad780f63454fbbbbcc7cf80e5b90245c13e13"; - sha256 = "0wajddbm49bfybkab9midilg18zvdvvsffwhkq7bpp7inj4jnsvs"; + url = "https://github.com/orivej/e"; + rev = "ac3492690fda"; + sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr"; }; } { - goPackagePath = "github.com/petar/GoLLRB"; + goPackagePath = "github.com/orivej/go-nix"; fetch = { type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + url = "https://github.com/orivej/go-nix"; + rev = "dae45d921a44"; + sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy"; }; } { - goPackagePath = "github.com/peterbourgon/diskv"; + goPackagePath = "github.com/peterbourgon/diskv"; fetch = { type = "git"; url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; + rev = "v2.0.1"; sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; }; } { - goPackagePath = "github.com/pkg/errors"; + goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + rev = "v0.8.0"; sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } { - goPackagePath = "github.com/pmezard/go-difflib"; + 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 = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; - sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } { - goPackagePath = "github.com/prometheus/client_golang"; + goPackagePath = "github.com/prometheus/client_golang"; fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + rev = "v0.9.2"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; }; } { - goPackagePath = "github.com/prometheus/client_model"; + goPackagePath = "github.com/prometheus/client_model"; fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; }; } { - goPackagePath = "github.com/prometheus/common"; + goPackagePath = "github.com/prometheus/common"; fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"; - sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8"; + rev = "v0.2.0"; + sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp"; }; } { - goPackagePath = "github.com/prometheus/procfs"; + goPackagePath = "github.com/prometheus/procfs"; fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "65c1f6f8f0fc1e2185eb9863a3bc751496404259"; - sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq"; + rev = "1dc9a6cbc91a"; + sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; }; } { - goPackagePath = "github.com/russross/blackfriday"; + goPackagePath = "github.com/rubenv/sql-migrate"; + fetch = { + type = "git"; + url = "https://github.com/rubenv/sql-migrate"; + rev = "1007f53448d7"; + sha256 = "1cd7wpgym7yzzv4n7bsmg9gh1g7mqlljih3881arqlq11083d3mc"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "300106c228d52c8941d4b3de6054a6062a86dda3"; + rev = "300106c228d5"; sha256 = "1bcqwb9lk2sijn5q3kqp7sadhh0ysbxlj5bxjspk9yp5bp733cbh"; }; } { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + rev = "10ef21a441db"; sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; }; } { - goPackagePath = "github.com/sirupsen/logrus"; + goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "89742aefa4b206dcf400792f3bd35b542998eb3b"; - sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; }; } { - goPackagePath = "github.com/spf13/cobra"; + goPackagePath = "github.com/spf13/cobra"; fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "c439c4fa093711d42e1b01acb1235b52004753c1"; - sha256 = "14v5vhb180yzaknxnm8j4n9jai58b0y2nzrqzpdq7bj9slsga1vd"; + rev = "fe5e611709b0"; + sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; }; } { - goPackagePath = "github.com/spf13/pflag"; + goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "e3a8ff8ce36581f87a15341206f205b1da467059"; - sha256 = "179k26lcgafkbjylbhgj2f5pnh52bmv19rr1w95gca944blw8yga"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; }; } { - goPackagePath = "github.com/technosophos/moniker"; + goPackagePath = "github.com/technosophos/moniker"; fetch = { type = "git"; url = "https://github.com/technosophos/moniker"; - rev = "a5dbd03a2245d554160e3ae6bfdcf969fe58b431"; + rev = "a5dbd03a2245"; sha256 = "1z273gvbwr09lcxwd10wyvxmxjln93r952sr1w9hqxcgc1f8l3vl"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "49796115aa4b964c318aad4f3084fdb41e9aa067"; - sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59"; + rev = "0709b304e793"; + sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "c67002cb31c3"; + sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + }; + } + { + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; + rev = "65e2d4e15006"; + sha256 = "0aqcmh0sp723d6hwgrv7pnrs4crns2ngr4x43jd4v985cbn455x7"; }; } { - goPackagePath = "golang.org/x/oauth2"; + goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4"; - sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "43eea11bc92608addb41b8a406b0407495c106f6"; - sha256 = "0k9wy278f5753d130p8asva2g573vi6wviwkxwwnpxni118knq1l"; + rev = "b90733256f2e"; + sha256 = "1dsqa48ai4rrqf0sxypnmjg5c6sbp63mj5ljr7qadam06r5m2q98"; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "golang.org/x/text"; fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; - sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } { - goPackagePath = "golang.org/x/time"; + goPackagePath = "golang.org/x/time"; fetch = { type = "git"; url = "https://go.googlesource.com/time"; - rev = "f51c12702a4d776e4c1fa9b0fabab841babae631"; + rev = "f51c12702a4d"; sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy"; }; } { - goPackagePath = "google.golang.org/appengine"; + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6cd1fcedba52"; + sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "12d5545dc1cfa6047a286d5e853841b6471f4c19"; - sha256 = "1bv6cjakhi6j3s1bqb3n45qrmvf20qkhwxllvi94jag4i7hd91w8"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; }; } { - goPackagePath = "google.golang.org/genproto"; + goPackagePath = "google.golang.org/genproto"; fetch = { type = "git"; url = "https://github.com/google/go-genproto"; - rev = "09f6ed296fc66555a25fe4ce95173148778dfa85"; - sha256 = "06x5wr7vjsnvv35rpv7jaklilksqbzsbqk8bxababw8vr6avfwki"; + rev = "c66870c02cf8"; + sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn"; }; } { - goPackagePath = "google.golang.org/grpc"; + goPackagePath = "google.golang.org/grpc"; fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "5ffe3083946d5603a0578721101dc8165b1d5b5f"; - sha256 = "1ij3sy49xfihwpcpiwd68mlfkrk375kdh6r6jlqka18zalxgpaan"; + rev = "v1.18.0"; + sha256 = "17drwyj3fi5sdz5ndlj7888b3gin6brs3jnh7gh6i15k97l6gf4n"; }; } { - goPackagePath = "gopkg.in/inf.v0"; + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; fetch = { type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/gorp.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/gorp.v1"; + rev = "v1.7.2"; + sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.0"; sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; }; } { - goPackagePath = "gopkg.in/square/go-jose.v2"; + goPackagePath = "gopkg.in/square/go-jose.v2"; fetch = { type = "git"; - url = "https://github.com/square/go-jose"; - rev = "f8f38de21b4dcd69d0413faf231983f5fd6634b1"; - sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa"; + url = "https://gopkg.in/square/go-jose.v2"; + rev = "89060dee6a84"; + sha256 = "04ak01zs9qibr6qvc6l0zdjj9pgccpbvxz6rdwrqv698i1q3qfpd"; }; } { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "670d4cfef0544295bc27a114dbac37980d83185a"; - sha256 = "182x97q4826cpzybkrl8icyx1n6l1z0kspmbz33fh901v10b6322"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } { - goPackagePath = "k8s.io/api"; + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "88497007e858"; + sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + }; + } + { + goPackagePath = "k8s.io/api"; fetch = { type = "git"; url = "https://github.com/kubernetes/api"; - rev = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"; - sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx"; + rev = "6e4e0e4f393b"; + sha256 = "0y7nxxywq2qx74a5vsg0h2jkfj879wbv6bjran12401fv0vsdlp1"; }; } { - goPackagePath = "k8s.io/apiextensions-apiserver"; + goPackagePath = "k8s.io/apiextensions-apiserver"; fetch = { type = "git"; url = "https://github.com/kubernetes/apiextensions-apiserver"; - rev = "898b0eda132e1aeac43a459785144ee4bf9b0a2e"; - sha256 = "1zn4i4wfmk3y36n6mqcidgsp4aqzwy5w9749zjl2bfbwzpk81bcp"; + rev = "727a075fdec8"; + sha256 = "1p8bdl299hrmkq2hfh7sqhsv7c3ig1i0jy8mcgq0hqjix94a87cj"; }; } { - goPackagePath = "k8s.io/apimachinery"; + goPackagePath = "k8s.io/apimachinery"; fetch = { type = "git"; url = "https://github.com/kubernetes/apimachinery"; - rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; - sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; + rev = "6a84e37a896d"; + sha256 = "1ys06ixidvpcj9sgk0c2i5vsz11gg3h8xcpc9kqxfsik36cw1akk"; }; } { - goPackagePath = "k8s.io/apiserver"; + goPackagePath = "k8s.io/apiserver"; fetch = { type = "git"; url = "https://github.com/kubernetes/apiserver"; - rev = "8b122ec9e3bbab91a262d17a39325e69349dc44d"; - sha256 = "0qfxjypa10s16sll2a75kn2ddjddr2xsa5rsiaxar3gs5pqvq1h5"; + rev = "1ec86e4da56c"; + sha256 = "0my2r4ynbxgpbbrjgcrdrqazhhn2jwk8jkk8ymjks28gzs2i510s"; }; } { - goPackagePath = "k8s.io/client-go"; + goPackagePath = "k8s.io/cli-runtime"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/cli-runtime"; + rev = "d644b00f3b79"; + sha256 = "1zcmfpyp6m9xl8dia56yb00ixra3ag5d43v2f5zlnrwphq967a8p"; + }; + } + { + goPackagePath = "k8s.io/client-go"; fetch = { type = "git"; url = "https://github.com/kubernetes/client-go"; - rev = "59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82"; - sha256 = "0f069d1msdb2x4yvwv0wa3hzanl97csg4hsp1pycxpnqck6qx6qh"; + rev = "1a26190bd76a"; + sha256 = "1b77zf0sip2cilkr40b2jm1kk71212s4clmbs2xl57b4n945yy1d"; }; } { - goPackagePath = "k8s.io/kube-openapi"; + goPackagePath = "k8s.io/cloud-provider"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/cloud-provider"; + rev = "9c9d72d1bf90"; + sha256 = "15iwal7nn1b7jwrvrhlzvdnf0381lccpw3jrlww8sfmxqsp860in"; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "8e90cee79f82"; + sha256 = "1hzy767dj0ya111al54k3g9xa40bsy7j81fi0sh7gyl1azw0h8dk"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; fetch = { type = "git"; url = "https://github.com/kubernetes/kube-openapi"; - rev = "91cfa479c814065e420cee7ed227db0f63a5854e"; - sha256 = "0l9yvc7gfa8i4snpv1d13vy03dplzp2jh47rqr3fhiihcz2wx4s7"; + rev = "b3a7cee44a30"; + sha256 = "1ald0jjliln5ipdniwfcrm4yal9aa4jr07d3ljrhhh2fj72c6dsp"; }; } { - goPackagePath = "k8s.io/kubernetes"; + goPackagePath = "k8s.io/kubernetes"; fetch = { type = "git"; url = "https://github.com/kubernetes/kubernetes"; - rev = "2e809eed16445fff9dcbfc56e9936cf76ccbdadc"; - sha256 = "13fzcbjfc5c35gy66nbn1ms63b8bj3g8z7wja0p8dd3yj9lcj68h"; + rev = "v1.14.1"; + sha256 = "0s06x9jk9b6r0i39nl0bmvwjgdp3qikgfbw5cnzi5mv03hc2li8s"; }; } { - goPackagePath = "k8s.io/utils"; + goPackagePath = "k8s.io/utils"; fetch = { type = "git"; url = "https://github.com/kubernetes/utils"; - rev = "258e2a2fa64568210fbd6267cf1d8fd87c3cb86e"; - sha256 = "1mbw3q03sflrdgj6l7q3frqzb5f78n0m0gzjm228sy1wnm4c3760"; + rev = "c2654d5206da"; + sha256 = "1849p8xhiyk53mpg3mwpsmsm5ps5sa2p54bv7b38m415qxsn2d1x"; }; } { - goPackagePath = "vbom.ml/util"; + goPackagePath = "sigs.k8s.io/kustomize"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/kustomize"; + rev = "v2.0.3"; + sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb"; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "v1.1.0"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; + }; + } + { + goPackagePath = "vbom.ml/util"; fetch = { type = "git"; url = "https://github.com/fvbommel/util"; - rev = "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394"; + rev = "db5cfe13f5cc"; sha256 = "1k9c3ihhkrcmhd26pwd62mp2ll7icr2q65i5pkymnfnhhv40p682"; }; } diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index d1e24c56f8a..171ce3d3a54 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kubetail-${version}"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = "${version}"; - sha256 = "15f97bzw0vha4nrl9207l7w9mlnx58xlcnmpfjvbpm7x0ivb5l0q"; + sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr"; }; installPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix index 1380005a1c1..6973938b60d 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/default.nix +++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix @@ -1,17 +1,18 @@ -{ lib, bundlerApp, ruby }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "terraform_landscape"; - inherit ruby; gemdir = ./.; exes = [ "landscape" ]; + passthru.updateScript = bundlerUpdateScript "terraform-landscape"; + meta = with lib; { description = "Improve Terraform's plan output to be easier to read and understand"; homepage = https://github.com/coinbase/terraform-landscape; license = with licenses; apsl20; - maintainers = with maintainers; [ mbode manveru ]; + maintainers = with maintainers; [ mbode manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f416daf4f88..cb192bddcaf 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.4"; - sha256 = "0hbrdnryfla6d3mjn2sf6qbi79slhd92s2xgcqk3bgvr1n6k0k7n"; + version = "0.12.5"; + sha256 = "0p064rhaanwx4szs8hv6mdqad8d2bgfd94h2la11j58xbsxc7hap"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 55932c5c198..fea062805d0 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "feedreader"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "jangernert"; repo = pname; rev = "v${version}"; - sha256 = "1468kl1gip7h2k5l9x3shp3vxdnx08mr1n4845zinaqz4dpa70jv"; + sha256 = "154lzvd8acs4dyc91nlabpr284yrij8jkhgm0h18hp3cy0a11rv8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 7c348b88c8a..edf10ed2cb4 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.2.2", + "version": "1.3.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index d6dcd0ee2ef..7400393d92b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.2.2"; + version = "1.3.0"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "0ak1icl3apqn1b210jqj9ysnn40808lzrdwibdmv47c30hhq10fb"; + sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1"; }; in mkYarnPackage rec { @@ -81,7 +81,7 @@ in mkYarnPackage rec { description = "A feature-rich client for Matrix.org"; homepage = https://about.riot.im/; license = licenses.asl20; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ pacien worldofpeace ]; inherit (electron.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2d6c0df412a..9a2e2df80f2 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x"; + sha256 = "1rppxcc4m00bf73ghgli967wwrri2jdj865623pn8nk4kny4wxyq"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index 76987d08ff4..4e602862197 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: let - rev = "56d2007b5ba9f1628a44af6edf5dbdf74cf92278"; - sha256 = "1v264mpf9ddiz8zb7fcyjwy1a2yr5f4xs520gf63kl9378v721da"; - version = "2019-03-15"; + rev = "5cdbb97898d727d2b35c25a3117e9a79e474d97b"; + sha256 = "14qikp91l2aj8j9i0nh0nf9ibz65b8bpd3lbyarqshhrpvb5jp79"; + version = "2019-06-04"; in stdenv.mkDerivation { inherit version; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 6ce33d4f047..309b09f10c4 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -94,16 +94,14 @@ in stdenv.mkDerivation { --replace /usr/share/ $out/share/ '' + stdenv.lib.optionalString (theme != null) '' cat <> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js + var fs = require('fs'); document.addEventListener('DOMContentLoaded', function() { let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}" - $.ajax({ - url: '${theme}/theme.css', - success: function(css) { + fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { \$("").appendTo('head').html(css + tt__customCss); \$("").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}'); \$("").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}'); \$("").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}'); - } }); }); EOF diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index fe1903af588..40d23112369 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchurl, makeWrapper, autoPatchelfHook }: let version = "3.8.0"; @@ -16,47 +16,23 @@ stdenv.mkDerivation { ]; sha256 = if stdenv.is64bit then "1bzmqqqpwn6q2pvkrkkxq0ggs8crxbkwaxlggcdxjlyg95cyq8k1" - else "0s835dnaw662sb2v5ahqiwry0qjcpl7ff9krnhbw2iblsbqis3fj"; + else "0p5rqwdsvbria5dzjjm5mj8vfy0zpfs669wpbwxd4g3n4vh03kyw"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - buildPhase = - '' - echo "patching ts3server" - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ - --force-rpath \ - ts3server - cp tsdns/tsdnsserver tsdnsserver - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ - --force-rpath \ - tsdnsserver - ''; + buildInputs = [ stdenv.cc.cc ]; - installPhase = - '' - # Delete unecessary libraries - these are provided by nixos. - #rm *.so* + installPhase = '' + # Install files. + mkdir -p $out/lib/teamspeak + mv * $out/lib/teamspeak/ - # Install files. - mkdir -p $out/lib/teamspeak - mv * $out/lib/teamspeak/ - - # Make symlinks to the binaries from bin. - mkdir -p $out/bin/ - ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server - ln -s $out/lib/teamspeak/tsdnsserver $out/bin/tsdnsserver - - wrapProgram $out/lib/teamspeak/ts3server --prefix LD_LIBRARY_PATH : $out/lib/teamspeak - wrapProgram $out/lib/teamspeak/tsdnsserver --prefix LD_LIBRARY_PATH : $out/lib/tsdnsserver - ''; - - dontStrip = true; - dontPatchELF = true; + # Make symlinks to the binaries from bin. + mkdir -p $out/bin/ + ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server + ln -s $out/lib/teamspeak/tsdnsserver $out/bin/tsdnsserver + ''; meta = { description = "TeamSpeak voice communication server"; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 58797800deb..23bed01907e 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - name = "astroid-${version}"; - version = "0.14"; + pname = "astroid"; + version = "0.15"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "1wkv1icsx3g3gq485dnvcdhr9srrjgz4ws1i1krcw9n61bj7gxh8"; + sha256 = "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3"; }; nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index f7b7d6e8c3d..ccd092ba63c 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,8 +1,4 @@ -{ lib, bundlerApp }: - -# Updated with: -# rm gemset.nix Gemfile.lock -# nix-shell -p bundler bundix --run 'bundle lock && bundix' +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "sup"; @@ -20,11 +16,13 @@ bundlerApp { "sup-tweak-labels" ]; + passthru.updateScript = bundlerUpdateScript "sup"; + meta = with lib; { description = "A curses threads-with-tags style email client"; homepage = http://sup-heliotrope.github.io; license = licenses.gpl2; - maintainers = with maintainers; [ cstrahan lovek323 manveru ]; + maintainers = with maintainers; [ cstrahan lovek323 manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index ac9fa8f4ce8..643e421625f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.0.2"; + version = "3.0.3"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0fz5lbyiw4a27fqc4ndi1w20bpcb6wi9k7vjv29l9fhd99kca7ky"; + sha256 = "0711jilp9sbgi46d105m3galw8n4wk5yncawi08031qxg2f754mg"; }; cmakeFlags = [ diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 13c559cfac1..df8298579e8 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp +{ lib, bundlerApp, bundlerUpdateScript , withPostgresql ? true, postgresql , withSqlite ? false, sqlite }: @@ -11,11 +11,13 @@ bundlerApp rec { buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; + passthru.updateScript = bundlerUpdateScript "ledger-web"; + meta = with lib; { description = "A web frontend to the Ledger CLI tool"; homepage = https://github.com/peterkeen/ledger-web; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg manveru ]; + maintainers = with maintainers; [ peterhoeg manveru nicknovitski ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index efeb23b3e83..6d094ecb5dc 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "timetrap"; gemdir = ./.; exes = [ "t" "timetrap" ]; + passthru.updateScript = bundlerUpdateScript "timetrap"; + meta = with lib; { description = "A simple command line time tracker written in ruby"; homepage = https://github.com/samg/timetrap; license = licenses.mit; - maintainers = with maintainers; [ jerith666 manveru ]; + maintainers = with maintainers; [ jerith666 manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 3540fce9173..86eb0ab4c38 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { name = "zotero-${version}"; - version = "5.0.67"; + version = "5.0.71"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "1b06875qr8dy2lhf4h9z7gcc5pcqdyq92c11b3brsbgbq2n48g40"; + sha256 = "070b1ak870jv8h702a9g930p01jsmly93c44igw48ylbgqjyhlwq"; }; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index 87674e6084b..ae602b752e0 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.8.04"; + version = "4.0.10"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "09wazaa18zfsl4pscpzjqzj9wi4kdi6325rhaf5rl3668nlig4sm"; + sha256 = "1vprax1w5wm3v2i4d0mbakrxp7v53m2bm8icsvaji06ixskq7cxf"; }; buildInputs = [ diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 58a0b8048b5..48c20ecca47 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "14027dcq0ag2qjpxcmsb9n1c64ypmi4rycwxzm2hajj7hk2736hv"; + sha256 = "1jrrj9c4ddm37m8j0g693xjimpnlvx7lan5kxish5p14xpwdak35"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index 406f42e9ad7..2cdd7fda38e 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchFromGitHub, zlib, python}: +{stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}: stdenv.mkDerivation rec { name = "bedtools-${version}"; - version = "2.27.1"; + version = "2.28.0"; src = fetchFromGitHub { owner = "arq5x"; repo = "bedtools2"; rev = "v${version}"; - sha256 = "1pk68y052rm2m24yfmy82ms8p6kd6xcqxxgi7n0a1sbh89wllm6s"; + sha256 = "1266bcn5hgbvysfi6nr4cqxlbxcx7vn7ng8kb0v3gz37qh2zxxw9"; }; - buildInputs = [ zlib python ]; + buildInputs = [ zlib python bzip2 lzma ]; cc = if stdenv.cc.isClang then "clang++" else "g++"; buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} -j $NIX_BUILD_CORES"; installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} install"; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 3367fa87422..153ebaa441f 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { cmakeFlags = # It's important that caffe is passed the major and minor version only because that's what # boost_python expects - [ (if pythonSupport then "-Dpython_version=3${python.pythonVersion}" else "-DBUILD_python=OFF") + [ (if pythonSupport then "-Dpython_version=${python.pythonVersion}" else "-DBUILD_python=OFF") "-DBLAS=open" ] ++ (if cudaSupport then [ "-DCUDA_ARCH_NAME=All" @@ -73,9 +73,17 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ] ; - propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; + propagatedBuildInputs = lib.optionals pythonSupport ( + # requirements.txt + let pp = python.pkgs; in ([ + pp.numpy pp.scipy pp.scikitimage pp.h5py + pp.matplotlib pp.ipython pp.networkx pp.nose + pp.pandas pp.dateutil pp.protobuf pp.gflags + pp.pyyaml pp.pillow pp.six + ] ++ lib.optional leveldbSupport pp.leveldb) + ); - outputs = [ "bin" "out"]; + outputs = [ "bin" "out" ]; propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle patches = [ diff --git a/pkgs/applications/science/math/caffe/python.patch b/pkgs/applications/science/math/caffe/python.patch index b1bed6c174b..dac5071aa08 100644 --- a/pkgs/applications/science/math/caffe/python.patch +++ b/pkgs/applications/science/math/caffe/python.patch @@ -64,7 +64,7 @@ index 4a5bac47..be026d43 100644 - if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON_FOUND) + find_package(NumPy 1.7.1) + find_package(Boost 1.46 REQUIRED COMPONENTS python@major@@minor@) -+ if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND BOOST_PYTHON@major@@minor@_FOUND) ++ if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON@major@@minor@_FOUND) set(HAVE_PYTHON TRUE) if(BUILD_python_layer) list(APPEND Caffe_DEFINITIONS PRIVATE -DWITH_PYTHON_LAYER) diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix index 341b50f0ef2..fda89e33180 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv rec { name = "bitbucket-server-cli-${version}"; @@ -9,11 +9,13 @@ bundlerEnv rec { pname = "atlassian-stash"; + passthru.updateScript = bundlerUpdateScript "gitAndTools.bitbucket-server-cli"; + meta = with lib; { description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)"; homepage = https://bitbucket.org/atlassian/bitbucket-server-cli; license = licenses.mit; - maintainers = with maintainers; [ jgertm ]; + maintainers = with maintainers; [ jgertm nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 9ca7a67a53e..2d6de24167b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby }: +{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv rec { inherit ruby; @@ -7,13 +7,15 @@ bundlerEnv rec { gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "gitAndTools.git-fame"; + meta = with stdenv.lib; { description = '' A command-line tool that helps you summarize and pretty-print collaborators based on contributions ''; homepage = http://oleander.io/git-fame-rb; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = with maintainers; [ expipiplus1 nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 82d98b95966..8733863196d 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.12.2"; + version = "2.12.3"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0sxfmjg26s86m5xa9nbj8287kg12kygxw6gggahal6v7zjhwcvaz"; + sha256 = "13l4nc3k6vl9x1x0153mwi351j3z266wx0fp7xw2851avrgkk9zg"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index f69fdbefe18..c095aa49eaf 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -2,7 +2,7 @@ { fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook , pkexecPath ? "/run/wrappers/bin/pkexec" -, writeScript, common-updater-scripts, curl, gnugrep +, writeScript, common-updater-scripts, curl, gnugrep, coreutils }: let @@ -18,7 +18,7 @@ let arch = "x64"; libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation { pname = "${pname}-bin"; diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index da973b0a7ee..2734028866e 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "1107"; - sha256 = "70edbb16529d638ea41a694dbc5b1408c76fcc3a7d663ef0e48b4e89e1f19c71"; + buildVersion = "1116"; + sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6"; } {}; sublime-merge-dev = common { - buildVersion = "1111"; - sha256 = "d287b77b36febe52623db4546bef978dceb0654257b9a70c798d9cd394305c0d"; + buildVersion = "1115"; + sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl"; dev = true; } {}; } diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index f73c5277d05..76db1cd9e64 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { name = "dvdstyler-${version}"; srcName = "DVDStyler-${version}"; - version = "3.0.4"; + version = "3.1"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2"; - sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"; + sha256 = "1rz69vrfqz9sma9cm1mnvkd11zq3is53lc3m3hcphr02vs69s53m"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 27a0fa3388e..a683e192f11 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "19.02.28"; + version = "19.07.15"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "14l0cm81jy7syi08d8dg4nzp7s9zji9cycnf2mvh7zc7x069d1jr"; + sha256 = "0drl0x8x45kysalzx1pbg0gkvlxaykg9zka1fdkrl4iqfs4s7vv2"; }; enableParallelBuilding = true; diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index a36caa26810..fc4c7bfbaf9 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -25,7 +25,7 @@ _doStrip() { stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} if [ -n "$stripDebugList" ]; then - stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:---strip-unneeded}" + stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:--S}" fi stripAllList=${stripAllList:-} diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index 4986101584e..17303e682b9 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "docbook5-5.0"; +stdenv.mkDerivation rec { + pname = "docbook5"; + version = "5.0.1"; src = fetchurl { - url = http://www.docbook.org/xml/5.0/docbook-5.0.zip; - sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x"; + url = "http://www.docbook.org/xml/${version}/docbook-${version}.zip"; + sha256 = "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index df0201af3b8..0d87cd848f8 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel -, sassc, inkscape, libxml2, gnome2, gdk_pixbuf, librsvg, gtk-engine-murrine +, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true , openboxSupport ? true , xfceSupport ? true +, mateSupport ? true, gtk3, marco , gtkNextSupport ? false , plankSupport ? false , steamSupport ? false -, telegramSupport ? false, zip ? null +, telegramSupport ? false, zip , tweetdeckSupport ? false , selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500) , accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300) @@ -16,17 +17,15 @@ , destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500) }: -assert telegramSupport -> zip != null; - stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.8.3"; + version = "0.8.7"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "0ibgymdrw91lnng76lb0x55zg6nm9f2vap19wk7qsq3bcw6ny2zi"; + sha256 = "1rn51yj7f7bclvrwwqwid4z9cpap4yd0zw0xs08c36zcjmr28426"; }; preferLocalBuild = true; @@ -38,8 +37,9 @@ stdenv.mkDerivation rec { sassc inkscape libxml2 - gnome2.glib.dev + glib.dev ] + ++ stdenv.lib.optionals mateSupport [ gtk3 marco ] ++ stdenv.lib.optional telegramSupport zip; buildInputs = [ @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { (enableFeature gnomeShellSupport "gnome") (enableFeature openboxSupport "openbox") (enableFeature xfceSupport "xfce") + (enableFeature mateSupport "mate") (enableFeature gtkNextSupport "gtk_next") (enableFeature plankSupport "plank") (enableFeature steamSupport "airforsteam") diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 4a5366a72e7..e301305d405 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.32.3"; + version = "3.32.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1r24q2c0i5xwp7dahw4wzycrhijix0nl7bxq1x0za57qm62ysfl9"; + sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 4f436b54ce4..7e1f696c58d 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0075-backends-Update-to-new-output-setting-for-tablets-to.patch"; sha256 = "141p3an83s042f67fw2fqmr79i5g634ndrbpd8cs47fd4wwiwpj5"; }) + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/670 + # Needed for gala redorder workspace + (fetchpatch { + url = "https://github.com/elementary/os-patches/commit/d636a44885c5be662997f8e19f7dcd26670b3219.patch"; + sha256 = "12pbxk6f39a09jxjam5a5hxl4whp3cifzpck2m7fpp0n98nc63qh"; + }) ]; configureFlags = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 2c146169f42..2479d999e8f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "terminal"; - version = "5.3.5"; + version = "5.3.6"; name = "elementary-${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1gd5m24digmx3sgs21ggfiqiwhgym6s1dlg1sv9mdqh5wgsa6b8f"; + sha256 = "0jp21sy8k3jq3ycvng9yy2hbhcvfgiknxxa8vcg3c06vqhadmnc3"; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 9117a7b8f74..440426c00df 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "unstable-2019-07-01"; # Is tracking https://github.com/elementary/gala/commits/stable/juno + version = "unstable-2019-07-21"; # Is tracking https://github.com/elementary/gala/commits/stable/juno src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "5f1dbf15a7571bd16779d964b0cb3bd54232a928"; - sha256 = "1mbxqqfl54pydgs9pvvgfdbbck91vwyg770gd3vgzc6kmf6c34d5"; + rev = "50694796d4c8f0ca92517d5a628b0efdf748279c"; + sha256 = "17d0hd2145mrf8y5ws3xypdbwj72qv7hrrp6p6lm4k16xd96yznr"; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index b6607d54a7e..61572f07e2e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1x2p2sjal42bspmqcg9lzixv6rnihvgmwk92gfcccrmvk8j4bx6s"; + sha256 = "0lqh9g6qq09m744gncspm79lbwx1vjl1d6j2szwcq9f0jdm01pm5"; }; passthru = { diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix index 4b3ff844977..f415fa8c012 100644 --- a/pkgs/development/compilers/matter-compiler/default.nix +++ b/pkgs/development/compilers/matter-compiler/default.nix @@ -1,10 +1,12 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "matter_compiler"; gemdir = ./.; exes = [ "matter_compiler" ]; + passthru.updateScript = bundlerUpdateScript "matter-compiler"; + meta = with lib; { description = '' Matter Compiler is a API Blueprint AST Media Types to API Blueprint conversion tool. @@ -12,7 +14,7 @@ bundlerApp { ''; homepage = https://github.com/apiaryio/matter_compiler/; license = licenses.mit; - maintainers = with maintainers; [ rvlander manveru ]; + maintainers = with maintainers; [ rvlander manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 0fa17e292fa..82802b8f30e 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "coq${coq.coq-version}-math-classes-${version}"; - version = "8.8.1"; + version = "8.9.1"; src = fetchFromGitHub { owner = "coq-community"; repo = "math-classes"; rev = version; - sha256 = "05vlrrwnlfhd7l3xwn4zwpnkwvziw84zpd9775c6ffb83z48ri1r"; + sha256 = "1lw89js07m1wcaycpnyd85sf0snil2rrsfmry9lna2x66ah1mzn5"; }; buildInputs = [ coq bignums ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" ]; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c975b1e2a2c..5cddf2f3672 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -386,6 +386,7 @@ self: super: { xsd = dontCheck super.xsd; snap-core = dontCheck super.snap-core; sourcemap = dontCheck super.sourcemap; + zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57 # These test suites run for ages, even on a fast machine. This is nuts. Random123 = dontCheck super.Random123; diff --git a/pkgs/development/interpreters/evcxr/cargo-lock.patch b/pkgs/development/interpreters/evcxr/cargo-lock.patch new file mode 100644 index 00000000000..6feaf12844c --- /dev/null +++ b/pkgs/development/interpreters/evcxr/cargo-lock.patch @@ -0,0 +1,684 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..edf585d +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,661 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "approx" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "argon2rs" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2-rfc" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cc" ++version = "1.0.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cgmath" ++version = "0.16.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "colored" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "evcxr" ++version = "0.3.3" ++dependencies = [ ++ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sig 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "evcxr_repl" ++version = "0.3.3" ++dependencies = [ ++ "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "evcxr 0.3.3", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustyline 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "evcxr_runtime" ++version = "1.1.0" ++dependencies = [ ++ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "json" ++version = "0.11.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libloading" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nix" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num-traits" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rgb" ++version = "0.8.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustyline" ++version = "3.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scoped_threadpool" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "sig" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8parse" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winconsole" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rgb 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" ++"checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" ++"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" ++"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" ++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637" ++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" ++"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++"checksum bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bd1fa8ad26490b0a5cfec99089952250301b6716cdeaa7c9ab229598fb82ab66" ++"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" ++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a0c56216487bb80eec9c4516337b2588a4f2a2290d72a1416d930e4dcdb0c90d" ++"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64a4b57c8f4e3a2e9ac07e0f6abc9c24b6fc9e1b54c3478cfb598f3d0023e51c" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cdb90b60f2927f8d76139c72dbde7e10c3a2bc47c8594c9c7a66529f2687c03" ++"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" ++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be" ++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" ++"checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6" ++"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" ++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" ++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" ++"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" ++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" ++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" ++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" ++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" ++"checksum regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53ee8cfdddb2e0291adfb9f13d31d3bbe0a03c9a402c01b1e24188d86c35b24f" ++"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" ++"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" ++"checksum rgb 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4f089652ca87f5a82a62935ec6172a534066c7b97be003cc8f702ee9a7a59c92" ++"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" ++"checksum rustyline 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb02ba7748691403057542ee60a1e7688fdfb46bd3bee752b8977537ee003ae2" ++"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" ++"checksum sig 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6567e29578f9bfade6a5d94a32b9a4256348358d2a3f448cab0021f9a02614a2" ++"checksum syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)" = "525bd55255f03c816e5d7f615587bd13030c7103354fadb104993dcee6a788ec" ++"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" ++"checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" ++"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" ++"checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" ++"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef84b96d10db72dd980056666d7f1e7663ce93d82fa33b63e71c966f4cf5032" +diff --git a/Cargo.toml b/Cargo.toml +index d09a342..5377ed0 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -2,10 +2,9 @@ + members = [ + "evcxr", + "evcxr_repl", +- "evcxr_jupyter", + "evcxr_runtime", + ] + + exclude = [ + "runtimes" +-] +\ No newline at end of file ++] diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix new file mode 100644 index 00000000000..2c30c0ca385 --- /dev/null +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -0,0 +1,31 @@ +{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security }: + +rustPlatform.buildRustPackage rec { + name = "evcxr-${version}"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "google"; + repo = "evcxr"; + rev = "ae07ccf08723b7aec0de57d540822b89088ca036"; + sha256 = "1apc93z9vvf6qks5x2pad45rnrj9kjl812rj78w5zmmizccp2fhf"; + }; + + cargoSha256 = "153pxqj4jhlbacr7607q9yfw6h96ns5igbvssis8j3gn0xp6ssg6"; + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ cargo ] ++ stdenv.lib.optional stdenv.isDarwin Security; + postInstall = '' + wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} + rm $out/bin/testing_runtime + ''; + + meta = { + description = "An evaluation context for Rust"; + homepage = "https://github.com/google/evcxr"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.protoben ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index d9350d135eb..b6208eeeb51 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "1.0"; + version = "1.0.1"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "19qrdfi0vig3msqg76k1zf5j3vav0jz44cvj6i4dyfbscdwf2l9c"; + sha256 = "0ia7mgxs5g9849r26yrx07lrx65vhlrxqqh5b6d69gfi1pykb4j2"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 0e47398b346..124984f0d53 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1r21sfs1ik6cb8bz17w6gp6y2xa9rbjxjka0p6airb3qds094iv5"; + sha256 = "1s6zwf97rkkvnf3p7vlaykwa4pxpvj78pmxvvjf5jk29f93b49xp"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index f0f31ae1ffc..04ecadadefa 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -5,7 +5,7 @@ , icu , gobject-introspection , dbus-glib -, vala +, vala_0_40 , python3 , autoreconfHook }: @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - vala + # https://gitlab.gnome.org/GNOME/vala/issues/803 + vala_0_40 autoreconfHook gobject-introspection python3 diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix new file mode 100644 index 00000000000..aadc6986f5a --- /dev/null +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake +, zlib, libGL, libGLU, libpng, freeglut }: + +stdenv.mkDerivation rec { + version = "1.4.0"; + name = "gl2ps-${version}"; + + src = fetchurl { + url = "http://geuz.org/gl2ps/src/${name}.tgz"; + sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"; + }; + + buildInputs = [ + cmake + zlib + libGL + libGLU + libpng + freeglut + ]; + + meta = with stdenv.lib; { + homepage = http://geuz.org/gl2ps; + description = "An OpenGL to PostScript printing library"; + platforms = platforms.all; + license = licenses.lgpl2; + maintainers = with maintainers; [raskin twhitehead]; + }; +} diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index a6281156afa..e476bc22eca 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: +{stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: stdenv.mkDerivation { name = "imlib-1.9.15"; @@ -7,6 +7,14 @@ stdenv.mkDerivation { sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; + patches = [ + (fetchpatch { + name = "CVE-2007-3568.patch"; + url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch; + sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; + }) + ]; + configureFlags = [ "--disable-shm" "--x-includes=${libX11.dev}/include" diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index 3943e5d6d49..e06d9547de0 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -11,10 +11,5 @@ mkDerivation { propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; outputs = [ "out" "dev" ]; - preConfigure = '' - outputBin=dev - ''; - postInstall = '' - moveToOutput share/man $dev - ''; + outputBin = "dev"; } diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 8896447590b..e10dffa96c1 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -2,11 +2,11 @@ , IOKit ? null }: stdenv.mkDerivation rec { - name = "libstatgrab-0.91"; + name = "libstatgrab-0.92"; src = fetchurl { url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; - sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; + sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav"; }; buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index ec4c904795f..44530b38150 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { "-Dx-locale-root=${libX11.out}/share/X11/locale" ]; - # Remove example program which fail on Darwin - postPatch = if stdenv.isDarwin then '' - substituteInPlace meson.build \ - --replace "executable('rmlvo-to-keymap', 'test/rmlvo-to-keymap.c', dependencies: test_dep)" "" - '' else null; + patches = stdenv.lib.optionals stdenv.isDarwin [ + # Fix build on darwin + (fetchpatch { + url = "https://github.com/xkbcommon/libxkbcommon/commit/32d178b50fe0da05e51e4fe8903c84371d133331.patch"; + sha256 = "1wqdjla8hmgdqr8xc2manw363sxrqqsn3s8bd397h3cd7fj3hh1v"; + }) + ]; doCheck = false; # fails, needs unicode locale diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 83f62e4ec2b..e7d7d132617 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -64,10 +64,6 @@ qtOwnPathsHook() { preFixupPhases+=" qtOwnPathsHook" -isQtApp () { - readelf -d "$1" 2>/dev/null | grep -q -F 'libQt5Core' -} - # Note: $qtWrapperArgs still gets defined even if $dontWrapQtApps is set. wrapQtAppsHook() { # skip this hook when requested @@ -77,7 +73,7 @@ wrapQtAppsHook() { [ -z "$wrapQtAppsHookHasRun" ] || return 0 wrapQtAppsHookHasRun=1 - local targetDirs=( "$prefix/bin" ) + local targetDirs=( "$prefix/bin" "$prefix/libexec" ) echo "wrapping Qt applications in ${targetDirs[@]}" for targetDir in "${targetDirs[@]}" @@ -86,7 +82,7 @@ wrapQtAppsHook() { find "$targetDir" -executable -print0 | while IFS= read -r -d '' file do - isQtApp "$file" || continue + isELF "$file" || continue if [ -f "$file" ] then diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2c881a5c45a..2e42e8bd23c 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.4) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.4) + cocoapods-core (= 1.7.5) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.4) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 758383455e0..b8ce7131b9f 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.4) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.4) + cocoapods-core (= 1.7.5) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.4) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index bd89b448eac..7ae6e50de99 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; + sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; + sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-deintegrate = { groups = ["default"]; diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index bb4ea396c09..003c3a1bc13 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; + sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,10 +51,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; + sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-deintegrate = { groups = ["default"]; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 49ab6ec9841..26599311625 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -1,6 +1,7 @@ [ "@angular/cli" , "asar" +, "@antora/cli" , "aws-azure-login" , "azure-functions-core-tools" , "bash-language-server" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 6f3e3d2ce6a..cac338aa815 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,31 +13,40 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.801.1" = { + "@angular-devkit/architect-0.801.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.801.1"; + version = "0.801.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.801.1.tgz"; - sha512 = "Y+4kDpZeh+uIr179gbkpRcyeLizd94sC608TM8XQLM2+sgUB9PoW/KBotuED9Rjlvui4yURQm4UU8LnCsNqWSQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.801.2.tgz"; + sha512 = "gdPdT6y3TDA3hzTAlI3Ym8QB8Zj8kqAMzDwP1JSXxekF6md0qc+NK7WCu6Y+pj1Bbo5mXpxHBov4Xwv1l4STQA=="; }; }; - "@angular-devkit/core-8.1.1" = { + "@angular-devkit/core-8.1.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.1.1.tgz"; - sha512 = "Wq/6HOkT3gSOQRiSmHijzy/bzEqzI44Ho4S/NIZ192M/m28f46Neu2LV9juniQKnAAZ8RmHnXecxq3KjvCRkNg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.1.2.tgz"; + sha512 = "sNkqXbkHE9+ObtLOYmDKJL1bOf1zY0AwGVKemgDqCmu1mRUNqhb7CmF13DRscfU3MEcuiJYDjXqBQDjIszrFiw=="; }; }; - "@angular-devkit/schematics-8.1.1" = { + "@angular-devkit/schematics-8.1.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.1.1.tgz"; - sha512 = "Hzq3eFo33XsWe5q4tFq7kxDAE4ZbTeBySLsgqRd6m3gjGOjYUpAa5dlXdsPtZlOI5/LfR/1j1ALutf/6RG3ugw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.1.2.tgz"; + sha512 = "Di/3vPR4jwdYcMAk13t19sAF0qQUH8KSkFcmO/5E/gECTL1tXNvV690K1Vhn6zpeE17Z1MLB5HwRNcb6nJkD+Q=="; + }; + }; + "@antora/playbook-builder-2.0.0" = { + name = "_at_antora_slash_playbook-builder"; + packageName = "@antora/playbook-builder"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.0.0.tgz"; + sha512 = "uLU4+rpIRZiMit8s1lkbiz5L5V8cPL40RJMRHFb4B7k2PXbvNiZZAMHZBeFgVwfJIKmKAIeUCDgOHgiBIlFc+A=="; }; }; "@apollographql/apollo-tools-0.3.7" = { @@ -85,6 +94,15 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; + "@babel/code-frame-7.5.5" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; + }; + }; "@babel/core-7.3.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; @@ -94,13 +112,13 @@ let sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; }; }; - "@babel/core-7.5.4" = { + "@babel/core-7.5.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.5.4.tgz"; - sha512 = "+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz"; + sha512 = "i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -121,13 +139,13 @@ let sha512 = "8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg=="; }; }; - "@babel/generator-7.5.0" = { + "@babel/generator-7.5.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.5.0.tgz"; - sha512 = "1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz"; + sha512 = "ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ=="; }; }; "@babel/helper-annotate-as-pure-7.0.0" = { @@ -166,22 +184,22 @@ let sha512 = "l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.5.0" = { + "@babel/helper-create-class-features-plugin-7.5.5" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.0.tgz"; - sha512 = "EAoMc3hE5vE5LNhMqDOwB1usHvmRjCDAnH8CD4PVkX9/Yr3W/tcz8xE8QvdZxfsFBDICwZnF2UTHIqslRpvxmA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; + sha512 = "ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg=="; }; }; - "@babel/helper-define-map-7.4.4" = { + "@babel/helper-define-map-7.5.5" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.4.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz"; - sha512 = "IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz"; + sha512 = "fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg=="; }; }; "@babel/helper-explode-assignable-expression-7.1.0" = { @@ -220,13 +238,13 @@ let sha512 = "VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w=="; }; }; - "@babel/helper-member-expression-to-functions-7.0.0" = { + "@babel/helper-member-expression-to-functions-7.5.5" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.0.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz"; - sha512 = "avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz"; + sha512 = "5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA=="; }; }; "@babel/helper-module-imports-7.0.0" = { @@ -238,13 +256,13 @@ let sha512 = "aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A=="; }; }; - "@babel/helper-module-transforms-7.4.4" = { + "@babel/helper-module-transforms-7.5.5" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.4.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz"; - sha512 = "3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz"; + sha512 = "jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw=="; }; }; "@babel/helper-optimise-call-expression-7.0.0" = { @@ -265,13 +283,13 @@ let sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="; }; }; - "@babel/helper-regex-7.4.4" = { + "@babel/helper-regex-7.5.5" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.4.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz"; - sha512 = "Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q=="; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz"; + sha512 = "CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw=="; }; }; "@babel/helper-remap-async-to-generator-7.1.0" = { @@ -283,13 +301,13 @@ let sha512 = "3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg=="; }; }; - "@babel/helper-replace-supers-7.4.4" = { + "@babel/helper-replace-supers-7.5.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.4.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz"; - sha512 = "04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz"; + sha512 = "XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg=="; }; }; "@babel/helper-simple-access-7.1.0" = { @@ -319,13 +337,13 @@ let sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; }; }; - "@babel/helpers-7.5.4" = { + "@babel/helpers-7.5.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.4.tgz"; - sha512 = "6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz"; + sha512 = "nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g=="; }; }; "@babel/highlight-7.5.0" = { @@ -346,13 +364,13 @@ let sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; }; }; - "@babel/parser-7.5.0" = { + "@babel/parser-7.5.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.5.0.tgz"; - sha512 = "I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz"; + sha512 = "E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -373,13 +391,13 @@ let sha512 = "+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.5.0" = { + "@babel/plugin-proposal-class-properties-7.5.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.0.tgz"; - sha512 = "9L/JfPCT+kShiiTTzcnBJ8cOwdKVmlC1RcCf9F0F9tERVrM4iWtWnXtjWCRqNm2la2BxO1MPArWNsU9zsSJWSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz"; + sha512 = "AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A=="; }; }; "@babel/plugin-proposal-dynamic-import-7.5.0" = { @@ -400,13 +418,13 @@ let sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.5.4" = { + "@babel/plugin-proposal-object-rest-spread-7.5.5" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.4.tgz"; - sha512 = "KCx0z3y7y8ipZUMAEEJOyNi11lMb/FOPUjjB113tfowgw0c16EGYos7worCKBcUAh2oG+OBnoUhsnTSoLpV9uA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; + sha512 = "F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.2.0" = { @@ -526,22 +544,22 @@ let sha512 = "ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w=="; }; }; - "@babel/plugin-transform-block-scoping-7.4.4" = { + "@babel/plugin-transform-block-scoping-7.5.5" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.4.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz"; - sha512 = "jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; + sha512 = "82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg=="; }; }; - "@babel/plugin-transform-classes-7.4.4" = { + "@babel/plugin-transform-classes-7.5.5" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.4.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz"; - sha512 = "/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz"; + sha512 = "U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg=="; }; }; "@babel/plugin-transform-computed-properties-7.2.0" = { @@ -706,13 +724,13 @@ let sha512 = "r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA=="; }; }; - "@babel/plugin-transform-object-super-7.2.0" = { + "@babel/plugin-transform-object-super-7.5.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.2.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz"; - sha512 = "VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz"; + sha512 = "un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ=="; }; }; "@babel/plugin-transform-parameters-7.4.4" = { @@ -760,13 +778,13 @@ let sha512 = "fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw=="; }; }; - "@babel/plugin-transform-runtime-7.5.0" = { + "@babel/plugin-transform-runtime-7.5.5" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.0.tgz"; - sha512 = "LmPIZOAgTLl+86gR9KjLXex6P/lRz1fWEjTz6V6QZMmKie51ja3tvzdwORqhHc4RWR8TcZ5pClpRWs0mlaA2ng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz"; + sha512 = "6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w=="; }; }; "@babel/plugin-transform-shorthand-properties-7.2.0" = { @@ -814,13 +832,13 @@ let sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw=="; }; }; - "@babel/plugin-transform-typescript-7.5.2" = { + "@babel/plugin-transform-typescript-7.5.5" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.5.2"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.2.tgz"; - sha512 = "r4zJOMbKY5puETm8+cIpaa0RQZG/sSASW1u0pj8qYklcERgVIbxVbP2wyJA7zI1//h7lEagQmXi9IL9iI5rfsA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz"; + sha512 = "pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w=="; }; }; "@babel/plugin-transform-unicode-regex-7.4.4" = { @@ -850,13 +868,13 @@ let sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; }; }; - "@babel/preset-env-7.5.4" = { + "@babel/preset-env-7.5.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.4.tgz"; - sha512 = "hFnFnouyRNiH1rL8YkX1ANCNAUVC8Djwdqfev8i1415tnAG+7hlA5zhZ0Q/3Q5gkop4HioIPbCEWAalqcbxRoQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz"; + sha512 = "GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A=="; }; }; "@babel/preset-flow-7.0.0" = { @@ -886,13 +904,13 @@ let sha512 = "mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg=="; }; }; - "@babel/register-7.4.4" = { + "@babel/register-7.5.5" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.4.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.4.4.tgz"; - sha512 = "sn51H88GRa00+ZoMqCVgOphmswG4b7mhf9VOB0LUBAieykq2GnRFerlN+JQkO/ntT7wz4jaHNSRPg9IdMPEUkA=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.5.5.tgz"; + sha512 = "pdd5nNR+g2qDkXZlW1yRCWFlNrAn2PPdnZUB72zjX4l1Vv4fMRRLwyf+n/idFCLI1UgVGboUU8oVziwTBiyNKQ=="; }; }; "@babel/runtime-7.3.4" = { @@ -913,22 +931,22 @@ let sha512 = "TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ=="; }; }; - "@babel/runtime-7.5.4" = { + "@babel/runtime-7.5.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.4.tgz"; - sha512 = "Na84uwyImZZc3FKf4aUF1tysApzwf3p2yuFBIyBfbzT5glzKTdvYI4KVW4kcgjrzoGUjC7w3YyCHcJKaRxsr2Q=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz"; + sha512 = "28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ=="; }; }; - "@babel/runtime-corejs2-7.5.4" = { + "@babel/runtime-corejs2-7.5.5" = { name = "_at_babel_slash_runtime-corejs2"; packageName = "@babel/runtime-corejs2"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.5.4.tgz"; - sha512 = "sHv74OzyZ18d6tjHU0HmlVES3+l+lydkOMTiKsJSTGWcTBpIMfXLEgduahlJrQjknW9RCQAqLIEdLOHjBmq/hg=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.5.5.tgz"; + sha512 = "FYATQVR00NSNi7mUfpPDp7E8RYMXDuO8gaix7u/w3GekfUinKgX1AcTxs7SoiEmoEW9mbpjrwqWSW6zCmw5h8A=="; }; }; "@babel/template-7.2.2" = { @@ -958,13 +976,13 @@ let sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; }; }; - "@babel/traverse-7.5.0" = { + "@babel/traverse-7.5.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.0.tgz"; - sha512 = "SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz"; + sha512 = "MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -985,13 +1003,13 @@ let sha512 = "WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ=="; }; }; - "@babel/types-7.5.0" = { + "@babel/types-7.5.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.5.0.tgz"; - sha512 = "UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz"; + sha512 = "s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw=="; }; }; "@calebboyd/semaphore-1.3.1" = { @@ -1102,40 +1120,40 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; - "@evocateur/libnpmaccess-3.1.0" = { + "@evocateur/libnpmaccess-3.1.2" = { name = "_at_evocateur_slash_libnpmaccess"; packageName = "@evocateur/libnpmaccess"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@evocateur/libnpmaccess/-/libnpmaccess-3.1.0.tgz"; - sha512 = "bfrqZ0v+Il5TJBsgF2oyepeJg34K2pBItapzP+UT1QMIGpUh/Zc1pQql4jrafamZTqP3ZvdJxaElat8B5K3ICA=="; + url = "https://registry.npmjs.org/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz"; + sha512 = "KSCAHwNWro0CF2ukxufCitT9K5LjL/KuMmNzSu8wuwN2rjyKHD8+cmOsiybK+W5hdnwc5M1SmRlVCaMHQo+3rg=="; }; }; - "@evocateur/libnpmpublish-1.2.0" = { + "@evocateur/libnpmpublish-1.2.2" = { name = "_at_evocateur_slash_libnpmpublish"; packageName = "@evocateur/libnpmpublish"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@evocateur/libnpmpublish/-/libnpmpublish-1.2.0.tgz"; - sha512 = "sezhX9FSnPIyrBBvxVocVJVO1uIWPczf6rOmUZSntCWfQMraO8pWTFlDJbroFqPbEqFFHf3eyw8NQ0Eb7OLd1g=="; + url = "https://registry.npmjs.org/@evocateur/libnpmpublish/-/libnpmpublish-1.2.2.tgz"; + sha512 = "MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg=="; }; }; - "@evocateur/npm-registry-fetch-3.9.1" = { + "@evocateur/npm-registry-fetch-4.0.0" = { name = "_at_evocateur_slash_npm-registry-fetch"; packageName = "@evocateur/npm-registry-fetch"; - version = "3.9.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@evocateur/npm-registry-fetch/-/npm-registry-fetch-3.9.1.tgz"; - sha512 = "6v1bHbcAypQ+te/1RGSNL4JkK6mcMtcZrUusqo5iKRtYSAig9UJXlOaCcBR+eLywt2DQMNpEwAj24jwWDX5G/w=="; + url = "https://registry.npmjs.org/@evocateur/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz"; + sha512 = "k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g=="; }; }; - "@evocateur/pacote-9.6.0" = { + "@evocateur/pacote-9.6.3" = { name = "_at_evocateur_slash_pacote"; packageName = "@evocateur/pacote"; - version = "9.6.0"; + version = "9.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.0.tgz"; - sha512 = "nKx8EPxXhzqNfePbqC6603z7Kkf6GBS2q+SNGtBS/bCgS5Q+p3OVR6MXKOkpvC3WHse98W2WLu8QaV9axtfxyw=="; + url = "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.3.tgz"; + sha512 = "ExqNqcbdHQprEgKnY/uQz7WRtyHRbQxRl4JnVkSkmtF8qffRrF9K+piZKNLNSkRMOT/3H0e3IP44QVCHaXMWOQ=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -1318,40 +1336,40 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.15.0" = { + "@lerna/add-3.16.1" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.15.0.tgz"; - sha512 = "+KrG4GFy/6FISZ+DwWf5Fj5YB4ESa4VTnSn/ujf3VEda6dxngHPN629j+TcPbsdOxUYVah+HuZbC/B8NnkrKpQ=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.16.1.tgz"; + sha512 = "zk1ldthrXPl+Xuj0vVD3JYqTQzU+qKv8sOvvQrBXimuf/d+r+LJc10DXPGaCE9LwPeLgkrpPbIOQ7tTtkh0xGg=="; }; }; - "@lerna/batch-packages-3.14.0" = { + "@lerna/batch-packages-3.16.0" = { name = "_at_lerna_slash_batch-packages"; packageName = "@lerna/batch-packages"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.14.0.tgz"; - sha512 = "RlBkQVNTqk1qvn6PFWiWNiskllUHh6tXbTVm43mZRNd+vhAyvrQC8RWJxH0ECVvnFAt9rSNGRIVbEJ31WnNQLg=="; + url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.16.0.tgz"; + sha512 = "7AdMkANpubY/FKFI01im01tlx6ygOBJ/0JcixMUWoWP/7Ds3SWQF22ID6fbBr38jUWptYLDs2fagtTDL7YUPuA=="; }; }; - "@lerna/bootstrap-3.15.0" = { + "@lerna/bootstrap-3.16.1" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.15.0.tgz"; - sha512 = "4AxsPKKbgj2Ju03qDddQTpOHvpqnwd0yaiEU/aCcWv/4tDTe79NqUne2Z3+P2WZY0Zzb8+nUKcskwYBMTeq+Mw=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.16.1.tgz"; + sha512 = "flHK3PRNEzGjK5u94ARlTmvraNUDgtG3TpO4dOLgiG4DDqk/7JjRq/vNXhBqgrtoKzm+zp4tH/6+uCAqF6la5w=="; }; }; - "@lerna/changed-3.15.0" = { + "@lerna/changed-3.16.1" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.15.0.tgz"; - sha512 = "Hns1ssI9T9xOTGVc7PT2jUaqzsSkxV3hV/Y7iFO0uKTk+fduyTwGTHU9A/ybQ/xi/9iaJbvaXyjxKiGoEnzmhg=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.16.1.tgz"; + sha512 = "qXm0psRXo2U0EOmnt4PY8i525FbYIkEjaI+I92VzFN9vIlxd40pXJpiPCYMJzVEMr3gInDz5LHAINzoQ+7YAeQ=="; }; }; "@lerna/check-working-tree-3.14.2" = { @@ -1372,13 +1390,13 @@ let sha512 = "xnq+W5yQb6RkwI0p16ZQnrn6HkloH/MWTw4lGE1nKsBLAUbmSU5oTE93W1nrG0X3IMF/xWc9UYvNdUGMWvZZ4w=="; }; }; - "@lerna/clean-3.15.0" = { + "@lerna/clean-3.16.0" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.15.0.tgz"; - sha512 = "D1BN7BnJk6YjrSR7E7RiCmWiFVWDo3L+OSe6zDq6rNNYexPBtSi2JOCeF/Dibi3jd2luVu0zkVpUtuEEdPiD+A=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.16.0.tgz"; + sha512 = "5P9U5Y19WmYZr7UAMGXBpY7xCRdlR7zhHy8MAPDKVx70rFIBS6nWXn5n7Kntv74g7Lm1gJ2rsiH5tj1OPcRJgg=="; }; }; "@lerna/cli-3.13.0" = { @@ -1399,49 +1417,49 @@ let sha512 = "4EkQu4jIOdNL2BMzy/N0ydHB8+Z6syu6xiiKXOoFl0WoWU9H1jEJCX4TH7CmVxXL1+jcs8FIS2pfQz4oew99Eg=="; }; }; - "@lerna/collect-updates-3.14.2" = { + "@lerna/collect-updates-3.16.0" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.14.2.tgz"; - sha512 = "+zSQ2ZovH8Uc0do5dR+sk8VvRJc6Xl+ZnJJGESIl17KSpEw/lVjcOyt6f3BP+WHn+iSOjMWcGvUVA601FIEdZw=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.16.0.tgz"; + sha512 = "HwAIl815X2TNlmcp28zCrSdXfoZWNP7GJPEqNWYk7xDJTYLqQ+SrmKUePjb3AMGBwYAraZSEJLbHdBpJ5+cHmQ=="; }; }; - "@lerna/command-3.15.0" = { + "@lerna/command-3.16.0" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.15.0.tgz"; - sha512 = "dZqr4rKFN+veuXakIQ1DcGUpzBgcWKaYFNN4O6/skOdVQaEfGefzo1sZET+q7k/BkypxkhXHXpv5UqqSuL/EHQ=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.16.0.tgz"; + sha512 = "u7tE4GC4/gfbPA9eQg+0ulnoJ+PMoMqomx033r/IxqZrHtmJR9+pF/37S0fsxJ2hX/RMFPC7c9Q/i8NEufSpdQ=="; }; }; - "@lerna/conventional-commits-3.14.0" = { + "@lerna/conventional-commits-3.16.0" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.14.0.tgz"; - sha512 = "hGZ2qQZ9uEGf2eeIiIpEodSs9Qkkf/2uYEtNT7QN1RYISPUh6/lKGBssc5dpbCF64aEuxmemWLdlDf1ogG6++w=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.16.0.tgz"; + sha512 = "zdvhU+aI7galRyLBFDhvC8T7NbGORJiZbIw/Qgp/TzkSaJfOAE3R7J8J1OZKDgxvhOoVhzMphNycaV3DiUlERQ=="; }; }; - "@lerna/create-3.15.0" = { + "@lerna/create-3.16.0" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.15.0.tgz"; - sha512 = "doXGt0HTwTQl8GkC2tOrraA/5OWbz35hJqi7Dsl3Fl0bAxiv9XmF3LykHFJ+YTDHfGpdoJ8tKu66f/VKP16G0w=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.16.0.tgz"; + sha512 = "OZApR1Iz7awutbmj4sAArwhqCyKgcrnw9rH0aWAUrkYWrD1w4TwkvAcYAsfx5GpQGbLQwoXhoyyPwPfZRRWz3Q=="; }; }; - "@lerna/create-symlink-3.14.0" = { + "@lerna/create-symlink-3.16.0" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.14.0.tgz"; - sha512 = "Kw51HYOOi6UfCKncqkgEU1k/SYueSBXgkNL91FR8HAZH7EPSRTEtp9mnJo568g0+Hog5C+3cOaWySwhHpRG29A=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.0.tgz"; + sha512 = "MiQga30ZYB5mioUA37qkiIMb6X9JtyYhkzgDZFz7iZVdOF0NxkRQJZy+osGnXWij9s1DFfl70pOdVBPMl7LzRA=="; }; }; "@lerna/describe-ref-3.14.2" = { @@ -1453,40 +1471,40 @@ let sha512 = "qa5pzDRK2oBQXNjyRmRnN7E8a78NMYfQjjlRFB0KNHMsT6mCiL9+8kIS39sSE2NqT8p7xVNo2r2KAS8R/m3CoQ=="; }; }; - "@lerna/diff-3.15.0" = { + "@lerna/diff-3.16.0" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.15.0.tgz"; - sha512 = "N1Pr0M554Bt+DlVoD+DXWGh92gcq6G9icn8sH5GSqfwi0XCpPNJ2i1BNEZpUQ6ulLWOMa1YHR4PypPxecRGBjA=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.16.0.tgz"; + sha512 = "QUpVs5TPl8vBIne10/vyjUxanQBQQp7Lk3iaB8MnCysKr0O+oy7trWeFVDPEkBTCD177By7yPGyW5Yey1nCBbA=="; }; }; - "@lerna/exec-3.15.0" = { + "@lerna/exec-3.16.0" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.15.0.tgz"; - sha512 = "YuXPd64TNG9wbb3lRvyMARQbdlbMZ1bJZ+GCm0enivnIWUyg0qtBDcfPY2dWpIgOif04zx+K/gmOX4lCaGM4UQ=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.16.0.tgz"; + sha512 = "mH3O5NXf/O88jBaBBTUf+d56CUkxpg782s3Jxy7HWbVuSUULt3iMRPTh+zEXO5/555etsIVVDDyUR76meklrJA=="; }; }; - "@lerna/filter-options-3.14.2" = { + "@lerna/filter-options-3.16.0" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.14.2.tgz"; - sha512 = "Ct8oYvRttbYB9JalngHhirb8o9ZVyLm5a9MpXNevXoHiu6j0vNhI19BQCwNnrL6wZvEHJnzPuUl/jO23tWxemg=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.16.0.tgz"; + sha512 = "InIi1fF8+PxpCwir9bIy+pGxrdE6hvN0enIs1eNGCVS1TTE8osNgiZXa838bMQ1yaEccdcnVX6Z03BNKd56kNg=="; }; }; - "@lerna/filter-packages-3.13.0" = { + "@lerna/filter-packages-3.16.0" = { name = "_at_lerna_slash_filter-packages"; packageName = "@lerna/filter-packages"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.13.0.tgz"; - sha512 = "RWiZWyGy3Mp7GRVBn//CacSnE3Kw82PxE4+H6bQ3pDUw/9atXn7NRX+gkBVQIYeKamh7HyumJtyOKq3Pp9BADQ=="; + url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.16.0.tgz"; + sha512 = "eGFzQTx0ogkGDCnbTuXqssryR6ilp8+dcXt6B+aq1MaqL/vOJRZyqMm4TY3CUOUnzZCi9S2WWyMw3PnAJOF+kg=="; }; }; "@lerna/get-npm-exec-opts-3.13.0" = { @@ -1498,22 +1516,22 @@ let sha512 = "Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw=="; }; }; - "@lerna/get-packed-3.13.0" = { + "@lerna/get-packed-3.16.0" = { name = "_at_lerna_slash_get-packed"; packageName = "@lerna/get-packed"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-3.13.0.tgz"; - sha512 = "EgSim24sjIjqQDC57bgXD9l22/HCS93uQBbGpkzEOzxAVzEgpZVm7Fm1t8BVlRcT2P2zwGnRadIvxTbpQuDPTg=="; + url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-3.16.0.tgz"; + sha512 = "AjsFiaJzo1GCPnJUJZiTW6J1EihrPkc2y3nMu6m3uWFxoleklsSCyImumzVZJssxMi3CPpztj8LmADLedl9kXw=="; }; }; - "@lerna/github-client-3.14.2" = { + "@lerna/github-client-3.16.0" = { name = "_at_lerna_slash_github-client"; packageName = "@lerna/github-client"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.14.2.tgz"; - sha512 = "+2Xh7t4qVmXiXE2utPnh5T7YwSltG74JP7c+EiooRY5+3zjh9MpPOcTKxVY3xKclzpsyXMohk2KpTF4tzA5rrg=="; + url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.16.0.tgz"; + sha512 = "IVJjcKjkYaUEPJsDyAblHGEFFNKCRyMagbIDm14L7Ab94ccN6i4TKOqAFEJn2SJHYvKKBdp3Zj2zNlASOMe3DA=="; }; }; "@lerna/gitlab-client-3.15.0" = { @@ -1534,103 +1552,103 @@ let sha512 = "SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ=="; }; }; - "@lerna/has-npm-version-3.14.2" = { + "@lerna/has-npm-version-3.16.0" = { name = "_at_lerna_slash_has-npm-version"; packageName = "@lerna/has-npm-version"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.14.2.tgz"; - sha512 = "cG+z5bB8JPd5f+nT2eLN2LmKg06O11AxlnUxgw2W7cLyc7cnsmMSp/rxt2JBMwW2r4Yn+CLLJIRwJZ2Es8jFSw=="; + url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.16.0.tgz"; + sha512 = "TIY036dA9J8OyTrZq9J+it2DVKifL65k7hK8HhkUPpitJkw6jwbMObA/8D40LOGgWNPweJWqmlrTbRSwsR7DrQ=="; }; }; - "@lerna/import-3.15.0" = { + "@lerna/import-3.16.0" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.15.0.tgz"; - sha512 = "4GKQgeTXBTwMbZNkYyPdQIVA41HIISD7D6XRNrDaG0falUfvoPsknijQPCBmGqeh66u1Fcn2+4lkL3OCTj2FMg=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.16.0.tgz"; + sha512 = "trsOmGHzw0rL/f8BLNvd+9PjoTkXq2Dt4/V2UCha254hMQaYutbxcYu8iKPxz9x86jSPlH7FpbTkkHXDsoY7Yg=="; }; }; - "@lerna/init-3.15.0" = { + "@lerna/init-3.16.0" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.15.0.tgz"; - sha512 = "VOqH6kFbFtfUbXxhSqXKY6bjnVp9nLuLRI6x9tVHOANX2LmSlXm17OUGBnNt+eM4uJLuiUsAR8nTlpCiz//lPQ=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.16.0.tgz"; + sha512 = "Ybol/x5xMtBgokx4j7/Y3u0ZmNh0NiSWzBFVaOs2NOJKvuqrWimF67DKVz7yYtTYEjtaMdug64ohFF4jcT/iag=="; }; }; - "@lerna/link-3.15.0" = { + "@lerna/link-3.16.0" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.15.0.tgz"; - sha512 = "yKHuifADINobvDOLljBGkVGpVwy6J3mg5p9lQXBdOLXBoIKC8o/UKBR9JvZMFvT/Iy6zn6FPy1v5lz9iU1Ib0Q=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.16.0.tgz"; + sha512 = "nm9olZuvNGOqTFusgsD1eBDqTWwre3FUX0DkLORbqvvm/TIwRvXoOBmFceV2Q9zpAFRwj4vrnsPNQ/RYC3X4ZQ=="; }; }; - "@lerna/list-3.15.0" = { + "@lerna/list-3.16.0" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.15.0.tgz"; - sha512 = "8SvxnlfAnbEzQDf2NL0IxWyUuqWTykF9cHt5/f5TOzgESClpaOkDtqwh/UlE8nVTzWMnxnQUPQi3UTKyJD3i3g=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.16.0.tgz"; + sha512 = "TkvstoPsgKqqQ0KfRumpsdMXfRSEhdXqOLq519XyI5IRWYxhoqXqfi8gG37UoBPhBNoe64japn5OjphF3rOmQA=="; }; }; - "@lerna/listable-3.14.0" = { + "@lerna/listable-3.16.0" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.14.0.tgz"; - sha512 = "ZK44Mo8xf/N97eQZ236SPSq0ek6+gk4HqHIx05foEMZVV1iIDH4a/nblLsJNjGQVsIdMYFPaqNJ0z+ZQfiJazQ=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.16.0.tgz"; + sha512 = "mtdAT2EEECqrJSDm/aXlOUFr1MRE4p6hppzY//Klp05CogQy6uGaKk+iKG5yyCLaOXFFZvG4HfO11CmoGSDWzw=="; }; }; - "@lerna/log-packed-3.13.0" = { + "@lerna/log-packed-3.16.0" = { name = "_at_lerna_slash_log-packed"; packageName = "@lerna/log-packed"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.13.0.tgz"; - sha512 = "Rmjrcz+6aM6AEcEVWmurbo8+AnHOvYtDpoeMMJh9IZ9SmZr2ClXzmD7wSvjTQc8BwOaiWjjC/ukcT0UYA2m7wg=="; + url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.16.0.tgz"; + sha512 = "Fp+McSNBV/P2mnLUYTaSlG8GSmpXM7krKWcllqElGxvAqv6chk2K3c2k80MeVB4WvJ9tRjUUf+i7HUTiQ9/ckQ=="; }; }; - "@lerna/npm-conf-3.13.0" = { + "@lerna/npm-conf-3.16.0" = { name = "_at_lerna_slash_npm-conf"; packageName = "@lerna/npm-conf"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.13.0.tgz"; - sha512 = "Jg2kANsGnhg+fbPEzE0X9nX5oviEAvWj0nYyOkcE+cgWuT7W0zpnPXC4hA4C5IPQGhwhhh0IxhWNNHtjTuw53g=="; + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.16.0.tgz"; + sha512 = "HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA=="; }; }; - "@lerna/npm-dist-tag-3.15.0" = { + "@lerna/npm-dist-tag-3.16.0" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.15.0.tgz"; - sha512 = "lnbdwc4Ebs7/EI9fTIgbH3dxXnP+SuCcGhG7P5ZjOqo67SY09sRZGcygEzabpvIwXvKpBF8vCd4xxzjnF2u+PA=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.16.0.tgz"; + sha512 = "MQrBkqJJB9+eNphuj9w90QPMOs4NQXMuSRk9NqzeFunOmdDopPCV0Q7IThSxEuWnhJ2n3B7G0vWUP7tNMPdqIQ=="; }; }; - "@lerna/npm-install-3.14.2" = { + "@lerna/npm-install-3.16.0" = { name = "_at_lerna_slash_npm-install"; packageName = "@lerna/npm-install"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.14.2.tgz"; - sha512 = "JYJJRtLETrGpcQZa8Rj16vbye399RqnaXmJlZuZ2twjJ2DYVYtwkfsGEOdvdaKw5KVOEpWcAxBA9OMmKQtCLQw=="; + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.16.0.tgz"; + sha512 = "APUOIilZCzDzce92uLEwzt1r7AEMKT/hWA1ThGJL+PO9Rn8A95Km3o2XZAYG4W0hR+P4O2nSVuKbsjQtz8CjFQ=="; }; }; - "@lerna/npm-publish-3.15.0" = { + "@lerna/npm-publish-3.16.1" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.15.0.tgz"; - sha512 = "G7rcNcSGjG0La8eHPXDvCvoNXbwNnP6XJ+GPh3CH5xiR/nikfLOa+Bfm4ytdjVWWxnKfCT4qyMTCoV1rROlqQQ=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.16.1.tgz"; + sha512 = "+whucIDWaBecV4BsPrpA8nCv0eTv96BKOTVSURm3G7voR7yCSl7Fi/grC5Id9cjG3IiIE03rPTw54cUwOQSZdQ=="; }; }; "@lerna/npm-run-script-3.14.2" = { @@ -1642,13 +1660,13 @@ let sha512 = "LbVFv+nvAoRTYLMrJlJ8RiakHXrLslL7Jp/m1R18vYrB8LYWA3ey+nz5Tel2OELzmjUiemAKZsD9h6i+Re5egg=="; }; }; - "@lerna/otplease-3.14.0" = { + "@lerna/otplease-3.16.0" = { name = "_at_lerna_slash_otplease"; packageName = "@lerna/otplease"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.14.0.tgz"; - sha512 = "rYAWzaYZ81bwnrmTkYWGgcc13bl/6DlG7pjWQWNGAJNLzO5zzj0xmXN5sMFJnNvDpSiS/ZS1sIuPvb4xnwLUkg=="; + url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.16.0.tgz"; + sha512 = "uqZ15wYOHC+/V0WnD2iTLXARjvx3vNrpiIeyIvVlDB7rWse9mL4egex/QSgZ+lDx1OID7l2kgvcUD9cFpbqB7Q=="; }; }; "@lerna/output-3.13.0" = { @@ -1660,49 +1678,49 @@ let sha512 = "7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg=="; }; }; - "@lerna/pack-directory-3.14.2" = { + "@lerna/pack-directory-3.16.1" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "3.14.2"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.14.2.tgz"; - sha512 = "b3LnJEmIml3sDj94TQT8R+kVyrDlmE7Su0WwcBYZDySXPMSZ38WA2/2Xjy/EWhXlFxp/nUJKyUG78nDrZ/00Uw=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.1.tgz"; + sha512 = "mygbdbmHhM8QDWsi8QHFkv8djv6oHnP7c5OpnPbagM7QRdXxchwLrSjcSASJvljzmQeRo4zgHN71CHgyhichOA=="; }; }; - "@lerna/package-3.14.2" = { + "@lerna/package-3.16.0" = { name = "_at_lerna_slash_package"; packageName = "@lerna/package"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package/-/package-3.14.2.tgz"; - sha512 = "YR/+CzYdufJYfsUlrfuhTjA35iSZpXK7mVOZmeR9iRWhSaqesm4kq2zfxm9vCpZV2oAQQZOwi4eo5h0rQBtdiw=="; + url = "https://registry.npmjs.org/@lerna/package/-/package-3.16.0.tgz"; + sha512 = "2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw=="; }; }; - "@lerna/package-graph-3.14.0" = { + "@lerna/package-graph-3.16.0" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.14.0.tgz"; - sha512 = "dNpA/64STD5YXhaSlg4gT6Z474WPJVCHoX1ibsVIFu0fVgH609Y69bsdmbvTRdI7r6Dcu4ZfGxdR636RTrH+Eg=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.16.0.tgz"; + sha512 = "A2mum/gNbv7zCtAwJqoxzqv89As73OQNK2MgSX1SHWya46qoxO9a9Z2c5lOFQ8UFN5ZxqWMfFYXRCz7qzwmFXw=="; }; }; - "@lerna/prerelease-id-from-version-3.14.0" = { + "@lerna/prerelease-id-from-version-3.16.0" = { name = "_at_lerna_slash_prerelease-id-from-version"; packageName = "@lerna/prerelease-id-from-version"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.14.0.tgz"; - sha512 = "Ap3Z/dNhqQuSrKmK+JmzYvQYI2vowxHvUVxZJiDVilW8dyNnxkCsYFmkuZytk5sxVz4VeGLNPS2RSsU5eeSS+Q=="; + url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.16.0.tgz"; + sha512 = "qZyeUyrE59uOK8rKdGn7jQz+9uOpAaF/3hbslJVFL1NqF9ELDTqjCPXivuejMX/lN4OgD6BugTO4cR7UTq/sZA=="; }; }; - "@lerna/project-3.15.0" = { + "@lerna/project-3.16.0" = { name = "_at_lerna_slash_project"; packageName = "@lerna/project"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-3.15.0.tgz"; - sha512 = "eNGUWiMbQ9kh9kGkomtMnsLypS0rfLqxKgZP2+VnNVtIXjnLv4paeTm+1lkL+naNJUwhnpMk2NSLEeoxT/20QA=="; + url = "https://registry.npmjs.org/@lerna/project/-/project-3.16.0.tgz"; + sha512 = "NrKcKK1EqXqhrGvslz6Q36+ZHuK3zlDhGdghRqnxDcHxMPT01NgLcmsnymmQ+gjMljuLRmvKYYCuHrknzX8VrA=="; }; }; "@lerna/prompt-3.13.0" = { @@ -1714,13 +1732,13 @@ let sha512 = "P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA=="; }; }; - "@lerna/publish-3.15.0" = { + "@lerna/publish-3.16.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.15.0.tgz"; - sha512 = "6tRRBJ8olLSXfrUsR4f7vSfx0cT1oPi6/v06yI3afDSsUX6eQ3ooZh7gMY4RWmd+nM/IJHTUzhlKF6WhTvo+9g=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.16.1.tgz"; + sha512 = "a2y27d5m37sT/16eI9MLfZk+v5LDRr+Dpj8kT+FTsQqi4uS1ZOtzx9JyC9sLjZTSSivr1ZTQrrZbgyQ2YtRAMg=="; }; }; "@lerna/pulse-till-done-3.13.0" = { @@ -1732,22 +1750,22 @@ let sha512 = "1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA=="; }; }; - "@lerna/query-graph-3.14.0" = { + "@lerna/query-graph-3.16.0" = { name = "_at_lerna_slash_query-graph"; packageName = "@lerna/query-graph"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.14.0.tgz"; - sha512 = "6YTh3vDMW2hUxHdKeRvx4bosc9lZClKaN+DzC1XKTkwDbWrsjmEzLcemKL6QnyyeuryN2f/eto7P9iSe3z3pQQ=="; + url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.16.0.tgz"; + sha512 = "p0RO+xmHDO95ChJdWkcy9TNLysLkoDARXeRHzY5U54VCwl3Ot/2q8fMCVlA5UeGXDutEyyByl3URqEpcQCWI7Q=="; }; }; - "@lerna/resolve-symlink-3.13.0" = { + "@lerna/resolve-symlink-3.16.0" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.13.0.tgz"; - sha512 = "Lc0USSFxwDxUs5JvIisS8JegjA6SHSAWJCMvi2osZx6wVRkEDlWG2B1JAfXUzCMNfHoZX0/XX9iYZ+4JIpjAtg=="; + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.16.0.tgz"; + sha512 = "Ibj5e7njVHNJ/NOqT4HlEgPFPtPLWsO7iu59AM5bJDcAJcR96mLZ7KGVIsS2tvaO7akMEJvt2P+ErwCdloG3jQ=="; }; }; "@lerna/rimraf-dir-3.14.2" = { @@ -1759,58 +1777,58 @@ let sha512 = "eFNkZsy44Bu9v1Hrj5Zk6omzg8O9h/7W6QYK1TTUHeyrjTEwytaNQlqF0lrTLmEvq55sviV42NC/8P3M2cvq8Q=="; }; }; - "@lerna/run-3.15.0" = { + "@lerna/run-3.16.0" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.15.0.tgz"; - sha512 = "KQBkzZYoEKmzILKjbjsm1KKVWFBXwAdwzqJWj/lfxxd3V5LRF8STASk8aiw8bSpB0bUL9TU/pbXakRxiNzjDwQ=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.16.0.tgz"; + sha512 = "woTeLlB1OAAz4zzjdI6RyIxSGuxiUPHJZm89E1pDEPoWwtQV6HMdMgrsQd9ATsJ5Ez280HH4bF/LStAlqW8Ufg=="; }; }; - "@lerna/run-lifecycle-3.14.0" = { + "@lerna/run-lifecycle-3.16.1" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.14.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.14.0.tgz"; - sha512 = "GUM3L9MzGRSW0WQ8wbLW1+SYStU1OFjW0GBzShhBnFrO4nGRrU7VchsLpcLu0hk2uCzyhsrDKzifEdOdUyMoEQ=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.1.tgz"; + sha512 = "hKvoQis5e+ktR9zWoya/BD1oVqRKDTJHLuCJsYaNYH4p5JJ5k2Y5bw+Gv3weccqb8uNrsXPcQmGPXhmNNSrAfw=="; }; }; - "@lerna/run-parallel-batches-3.13.0" = { + "@lerna/run-parallel-batches-3.16.0" = { name = "_at_lerna_slash_run-parallel-batches"; packageName = "@lerna/run-parallel-batches"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-parallel-batches/-/run-parallel-batches-3.13.0.tgz"; - sha512 = "bICFBR+cYVF1FFW+Tlm0EhWDioTUTM6dOiVziDEGE1UZha1dFkMYqzqdSf4bQzfLS31UW/KBd/2z8jy2OIjEjg=="; + url = "https://registry.npmjs.org/@lerna/run-parallel-batches/-/run-parallel-batches-3.16.0.tgz"; + sha512 = "2J/Nyv+MvogmQEfC7VcS21ifk7w0HVvzo2yOZRPvkCzGRu/rducxtB4RTcr58XCZ8h/Bt1aqQYKExu3c/3GXwg=="; }; }; - "@lerna/run-topologically-3.14.0" = { + "@lerna/run-topologically-3.16.0" = { name = "_at_lerna_slash_run-topologically"; packageName = "@lerna/run-topologically"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.14.0.tgz"; - sha512 = "y+KBpC1YExFzGynovt9MY4O/bc3RrJaKeuXieiPfKGKxrdtmZe/r33oj/xePTXZq65jnw3SaU3H8S5CrrdkwDg=="; + url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.16.0.tgz"; + sha512 = "4Hlpv4zDtKWa5Z0tPkeu0sK+bxZEKgkNESMGmWrUCNfj7xwvAJurcraK8+a2Y0TFYwf0qjSLY/MzX+ZbJA3Cgw=="; }; }; - "@lerna/symlink-binary-3.14.2" = { + "@lerna/symlink-binary-3.16.0" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.14.2.tgz"; - sha512 = "tqMwuWi6z1da0AFFbleWyu3H9fqayiV50rjj4anFTfayel9jSjlA1xPG+56sGIP6zUUNuUSc9kLh7oRRmlauoA=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.16.0.tgz"; + sha512 = "7sgLWKP7RVxKPmnJZnq3ynqOsO6FDNFtJ/eQA46aV8ivKYoJY3+083FFErvka460V2MTBCEZsKXfX8Nezly/fg=="; }; }; - "@lerna/symlink-dependencies-3.14.2" = { + "@lerna/symlink-dependencies-3.16.0" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.14.2.tgz"; - sha512 = "Ox7WKXnHZ7IwWlejcCq3n0Hd/yMLv8AwIryhvWxM/RauAge+ML4wg578SsdCyKob8ecgm/R0ytHiU06j81iL1w=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.16.0.tgz"; + sha512 = "Pi3knz/+es8WltHBTG6UzYA3jFulv8kDGUVw225Bhv3YNcotX8ijXhm6oBO5zvFuW24b4fojZQxznM/EqJdaIw=="; }; }; "@lerna/timer-3.13.0" = { @@ -1831,13 +1849,13 @@ let sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA=="; }; }; - "@lerna/version-3.15.0" = { + "@lerna/version-3.16.1" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.15.0.tgz"; - sha512 = "vReYX1NMXZ9PwzTZm97wAl/k3bmRnRZhnQi3mq/m49xTnDavq7p4sbUdFpvu8cVZNKnYS02pNIVGHrQw+K8ZCw=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.16.1.tgz"; + sha512 = "CtDjZmrtcuKSk6xJc74ZBUJuJSH2N5BKkB29Yli1NvH+Tsn1CHHamr9bGYmRBEZlNSAxf1exlLPMX9jlZb5J8g=="; }; }; "@lerna/write-log-file-3.13.0" = { @@ -1921,22 +1939,22 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@octokit/endpoint-5.2.2" = { + "@octokit/endpoint-5.3.1" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "5.2.2"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.2.2.tgz"; - sha512 = "VhKxM4CQanIUZDffExqpdpgqu3heF51qbY1wazoNtvIKXAAVoFjqLq2BOhesXkTqxXMO1Ze1XbS8DkIjUxAB+g=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.1.tgz"; + sha512 = "4mKqSQfeTRFpQMUGIUG1ewdQT64b2YpvjG2dE1x7nhQupdI/AjdgdcIsmPtRFEXlih/uLQLRWJL4FrivpQdC7A=="; }; }; - "@octokit/plugin-enterprise-rest-2.2.2" = { + "@octokit/plugin-enterprise-rest-3.6.2" = { name = "_at_octokit_slash_plugin-enterprise-rest"; packageName = "@octokit/plugin-enterprise-rest"; - version = "2.2.2"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.2.tgz"; - sha512 = "CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw=="; + url = "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz"; + sha512 = "3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA=="; }; }; "@octokit/request-5.0.1" = { @@ -1957,13 +1975,13 @@ let sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig=="; }; }; - "@octokit/rest-16.28.4" = { + "@octokit/rest-16.28.5" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.28.4"; + version = "16.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.4.tgz"; - sha512 = "ZBsfD46t3VNkwealxm5zloVgQta8d8o4KYBR/hMAZ582IgjmSDKZdkjyv5w37IUCM3tcPZWKUT+kml9pEIC2GA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.5.tgz"; + sha512 = "W8hHSm6103c+lNdTuQBMKdZNDCOFFXJdatj92g2d6Hqk134EMDHRc02QWI/Fs1WGnWZ8Leb0QFbXPKO2njeevQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -2101,22 +2119,22 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@schematics/angular-8.1.1" = { + "@schematics/angular-8.1.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.1.1.tgz"; - sha512 = "3zyVLV/PbkRjaqBE3gOJbwFkpQ62TKKFDgxm41OPakyy0XeC9Zc+2i3UIWDDfOd6chs+NMJRXjDfvO+gkmp6FQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.1.2.tgz"; + sha512 = "BeEzuS0s4j+BPboUhl97VMfhj7V+HpNbbY3PkD3TLd0cnSEoaLmtX+YjxbxZgwk6vhDp+l6YtpWt//5H/+0rFQ=="; }; }; - "@schematics/update-0.801.1" = { + "@schematics/update-0.801.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.801.1"; + version = "0.801.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.801.1.tgz"; - sha512 = "bVIgNMt3vDYNmit7KUSmjUbTEcGNpARlKpyv6lHhlBhWLh8YeXNizD9yGJ0B6hxXVdwF+JKoaVMc1xADgDbT7w=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.801.2.tgz"; + sha512 = "xb54QXvII1JLdqgEqsh6mWu5qTt5UezmOWTZayRegsj0vNlzWFzoLXpiPFCWVEKUODa6aV4O5XW5CiQuVYPVuQ=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -2146,13 +2164,13 @@ let sha512 = "hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg=="; }; }; - "@snyk/dep-graph-1.8.1" = { + "@snyk/dep-graph-1.10.0" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.8.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.8.1.tgz"; - sha512 = "cWqJwuiU1+9hL0Fd/qgq0DYeWM/6mqPIa/B0yoEsHD8nR/IPFgalVvMbOSdPKeApvi/AxDzcRxr8tfqHJ7aq2w=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.10.0.tgz"; + sha512 = "QwQTmmnVb1mjAffGsjKKrwit8ahLWyhlKWQcTVZo9UXFgWAwiuCjTXKAXhijZjGvrXQzNf5KbIBu+SZ1Dq2toQ=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -2263,22 +2281,22 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; - "@textlint/ast-node-types-4.2.2" = { + "@textlint/ast-node-types-4.2.4" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.2.2"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.2.tgz"; - sha512 = "5VHykhxgUat7dvRWGw52Tk55SWjuZDpDO7PKDhfcLTFrD1cjbTtFFnWeJc0BfoqB2AUjfHXRoMdnqbFRGmnPVQ=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.4.tgz"; + sha512 = "ggiixpScxgdMY42b6UafD1iUboSvl9k3vGA9kynP+kd6mEhTDzxtb1aHPDAnV+DpAEw4qpHMz72GBFkX/iOSFw=="; }; }; - "@textlint/ast-traverse-2.1.3" = { + "@textlint/ast-traverse-2.1.5" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.3.tgz"; - sha512 = "djZYlEtghk1Q9Tb0XU6if0S7JA+dfoO5AB6+Tcmi04HdWlXRZl8U59Sco+JzVFd3haFbDpMvC0sQIda4uZbsOA=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.5.tgz"; + sha512 = "Xt1x8eBmXS+4nOQ+0VjIoyXgcz9VFxK3ug8EiG7tGkhezIU90HRW2O8jPOPXhOcrrRzBGQNG9tsL7+IUDzF5FQ=="; }; }; "@textlint/feature-flag-3.1.3" = { @@ -2290,76 +2308,94 @@ let sha512 = "59RaAmdsMB3e32PD04N0YOJI2L3ljWR8fEk9FDLbOJAZeu7c+TqgETHDiVnkrh8gM+m8RL0h4wWq1jbB1kj0Xw=="; }; }; - "@textlint/fixer-formatter-3.1.6" = { + "@textlint/fixer-formatter-3.1.8" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.1.6"; + version = "3.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.6.tgz"; - sha512 = "bCNQpoo5jyjNBTMrTETzIIjfwe4bAQyqLfDxe+CeclKdpOnoRRAy5oj4p0aOuCaRVlpp3HxqBfVl3a5yCnCj/w=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.8.tgz"; + sha512 = "PKpUA2EOinFSE9kEhr6C2kpdEJj4U7nHuB4dCRHV9so3hIJyqXJBx4YwTpyggIUgNv6OkY2qo8D0g3YOu99zSw=="; }; }; - "@textlint/kernel-3.1.6" = { + "@textlint/kernel-3.1.8" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.1.6"; + version = "3.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.6.tgz"; - sha512 = "0Ox1WEFrqcsp/7hmlN9N3IrbuYT11cmBBIv647Mj2dccaspRhcqi0/PUsrnvB82JW43XTQNWbHG7GqpQaTQ1Pg=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.8.tgz"; + sha512 = "ViCHoy2QMpCD8Vu+2vXHXc+Jt9D5lIKUH7+j1TzP5JPiPmV1IbEMrztk4ubjacYQTSRHXE9BCLGOffOKSxt+ag=="; }; }; - "@textlint/linter-formatter-3.1.5" = { + "@textlint/linter-formatter-3.1.7" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.1.5"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.5.tgz"; - sha512 = "UMCcwoJPa5EgfihPgpouQqoemi66fPD19rdhvdgYcMzObZ0cR+n2FczCadJnW10JxGvm9oEOzIOpWG57/63iCg=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.7.tgz"; + sha512 = "myFj1Vj22LdzDecAvfIWojobi0AIGCEuEhLlrGcn478Wv6vQgP+51o0zTu1e2Duth1Z7YYjdTIcn2yZWxWSalg=="; }; }; - "@textlint/markdown-to-ast-6.1.3" = { + "@textlint/markdown-to-ast-6.1.5" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.1.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.3.tgz"; - sha512 = "9/NJkfspGAin8raYKtkcwtXDmC/T66m7b5wRJgOPgdbjO6jnUezAUWCt2HqscSnNU/qw4GBCQDxTJLyOpZwvCg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.5.tgz"; + sha512 = "WM2z0/wXpEREXAkSoKyPLG4qp5e5XGI5ctuQ5sUG1BE4aaAxJ3ogomaocQc82MPobiQjYp5791A+cXXYx5ML5w=="; }; }; - "@textlint/text-to-ast-3.1.3" = { + "@textlint/module-interop-1.0.1" = { + name = "_at_textlint_slash_module-interop"; + packageName = "@textlint/module-interop"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.0.1.tgz"; + sha512 = "gqx1Te+lMnXX6xyGTUdzGhm8RT7IfiSRMtWoH1FeTMg2InArRT+lTksCFc/x5dtaPN4vwOFZUvU8oTzYQzXbyg=="; + }; + }; + "@textlint/text-to-ast-3.1.5" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.1.3.tgz"; - sha512 = "0Il7SGwwgl6vUsQqnII4DXQDyIsa7nhardr5us4am98dALNd28mlciFHw2JUrwppoSZcYaBibIb22eo2lEmvMA=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.1.5.tgz"; + sha512 = "LGDlK+Jk5hpVPYcBxFU1Go9bG3AYAkHwNkAy573gLBKuGjb69FY6Wpmt4XBcKCKaa1j7S9cq7OxiSu69dVyQlQ=="; }; }; - "@textlint/textlint-plugin-markdown-5.1.6" = { + "@textlint/textlint-plugin-markdown-5.1.8" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.1.6"; + version = "5.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.6.tgz"; - sha512 = "LUrxTQFBpJv0BQJkwUa0p4yY+fclOK2bPu2E5N8fWy3qg5bsIZynoUElYCpjc2c9WItZaaJINjiRVJ01FxnoNg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.8.tgz"; + sha512 = "x38FOJzbgz1DLc5inRz0qyjd879CMvWkeUJc0tcuYvZWEoQ7RS5YwjQK3Q9C3LGGM2JGy4Wnkr6jBIBFCBBbdA=="; }; }; - "@textlint/textlint-plugin-text-4.1.6" = { + "@textlint/textlint-plugin-text-4.1.8" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.1.6"; + version = "4.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.6.tgz"; - sha512 = "GxsWRmleYtWNLKOwFJnYXswHn0x21I/htPfKCJ2jAw9Kwr0mDxJvzjyYAgOtoCFZ+q1dAGyq5mtWbh8y6rhvpg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.8.tgz"; + sha512 = "QMc1xQKyQL+oLMNaij6v4Gt02m51lwM4lN5FCjUrhVA+0LfX/2whBLBcXbnw5+GVkkQmVcF98aQovEJ8YPLTtA=="; }; }; - "@textlint/types-1.1.5" = { + "@textlint/types-1.2.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.1.5.tgz"; - sha512 = "z9PqRrk9EEgSP3F83YV9A/yAYMbfubf3D85QwN/EUm3gtg0XuALqt9aHywuFcgVnvEJCUbhwz4xV51oqq5unYw=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.2.1.tgz"; + sha512 = "HNbVS+F9hNy4E/Hnv2mV/6rjlPB7Mdc5KCiT+uFjMK7vqiVuW/DeKjkYScRirQ0jf8gWUXBVTxZgwBBlJZmV1Q=="; + }; + }; + "@textlint/utils-1.0.2" = { + name = "_at_textlint_slash_utils"; + packageName = "@textlint/utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.0.2.tgz"; + sha512 = "T8med69p37s1TE/G56kxWSYz8PqWYCnqyVZp2K0WoQbkNDrckmqkJ6xTmw4uZg4kypn3+EXVuktWLOpaSUcktA=="; }; }; "@types/accepts-1.3.5" = { @@ -2506,40 +2542,40 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-10.14.12" = { + "@types/node-10.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.14.12"; + version = "10.14.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.14.12.tgz"; - sha512 = "QcAKpaO6nhHLlxWBvpc4WeLrTvPqlHOvaj0s5GriKkA1zq+bsFBPpfYCvQhLqLgYlIko8A9YrPdaMHCo5mBcpg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.13.tgz"; + sha512 = "yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ=="; }; }; - "@types/node-12.6.2" = { + "@types/node-12.6.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.6.2"; + version = "12.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.6.2.tgz"; - sha512 = "gojym4tX0FWeV2gsW4Xmzo5wxGjXGm550oVUII7f7G5o4BV6c7DBdiG1RRQd+y1bvqRyYtPfMK85UM95vsapqQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz"; + sha512 = "aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg=="; }; }; - "@types/node-6.14.6" = { + "@types/node-6.14.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.6"; + version = "6.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.6.tgz"; - sha512 = "rFs9zCFtSHuseiNXxYxFlun8ibu+jtZPgRM+2ILCmeLiGeGLiIGxuOzD+cNyHegI1GD+da3R/cIbs9+xCLp13w=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.7.tgz"; + sha512 = "YbPXbaynBTe0pVExPhL76TsWnxSPeFAvImIsmylpBWn/yfw+lHy+Q68aawvZHsgskT44ZAoeE67GM5f+Brekew=="; }; }; - "@types/node-8.10.50" = { + "@types/node-8.10.51" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.50"; + version = "8.10.51"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.50.tgz"; - sha512 = "+ZbcUwJdaBgOZpwXeT0v+gHC/jQbEfzoc9s4d0rN0JIKeQbuTrT+A2n1aQY6LpZjrLXJT7avVUqiCecCJeeZxA=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.51.tgz"; + sha512 = "cArrlJp3Yv6IyFT/DYe+rlO8o3SIHraALbBW/+CcCYW/a9QucpLI+n2p4sRxAvl2O35TiecpX2heSZtJjvEO+Q=="; }; }; "@types/q-1.5.2" = { @@ -2632,31 +2668,31 @@ let sha512 = "wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g=="; }; }; - "@vue/cli-ui-3.9.2" = { + "@vue/cli-ui-3.9.3" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.9.2.tgz"; - sha512 = "jEDd+QnY8xcRflJcHjbHAPmeC8uvxHip+RRlBvvLRzLJy04Wka7r6LPO5JMD/BwTgh8NS/DUYxYCNaO35ghdCA=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.9.3.tgz"; + sha512 = "CDMQn1An4OlaLoB0paZfXBSvuUUkR3BPU/EWTLszP1lHqTecAkj7ESIdelXfpPwRhxchE/7c9s9XXEhpHublrQ=="; }; }; - "@vue/cli-ui-addon-webpack-3.9.2" = { + "@vue/cli-ui-addon-webpack-3.9.3" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.9.2.tgz"; - sha512 = "YMeERzmWjrXd3JgH3ybDs5YOBDGJnTQ5+vz1/zeuYt5PAek63Zw+37Zu1qf6Z13gJZTSInD1XVo/MhAREI+9/Q=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.9.3.tgz"; + sha512 = "BQro2UwHx7w1DcM2MJoF7qfa/Pp48mZWLwqJjCJVqg1utFkAqwjlIM9VweYWEWO7/jJ5B4JfuKCzRrGTtGDbdw=="; }; }; - "@vue/cli-ui-addon-widgets-3.9.2" = { + "@vue/cli-ui-addon-widgets-3.9.3" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.9.2.tgz"; - sha512 = "nehd1JqV/1mLrMLv+7wGZj+Lj2/q1lVOVGF12skcfknkwLRDfBN4BQyegvgmNRlxVYyt8Q13Ni8TsE8UibrUnA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.9.3.tgz"; + sha512 = "DnIvWNbhilouNyaevH2aBKSzdUK1zhveQvGp3z9ddVNgD6MadY9qf0YIrGrtzK4gn2Jc42BpOh64Slzwq9KhcQ=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -3253,13 +3289,13 @@ let sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; - "acorn-6.2.0" = { + "acorn-6.2.1" = { name = "acorn"; packageName = "acorn"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz"; - sha512 = "8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz"; + sha512 = "JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q=="; }; }; "acorn-dynamic-import-4.0.0" = { @@ -3541,13 +3577,13 @@ let sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; - "ajv-6.10.1" = { + "ajv-6.10.2" = { name = "ajv"; packageName = "ajv"; - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz"; - sha512 = "w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; }; }; "ajv-6.5.3" = { @@ -3991,13 +4027,13 @@ let sha512 = "+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg=="; }; }; - "apollo-cache-control-0.7.5" = { + "apollo-cache-control-0.8.0" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.7.5"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.7.5.tgz"; - sha512 = "zCPwHjbo/VlmXl0sclZfBq/MlVVeGUAg02Q259OIXSgHBvn9BbExyz+EkO/DJvZfGMquxqS1X1BFO3VKuLUTdw=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.0.tgz"; + sha512 = "BBnfUmSWRws5dRSDD+R56RLJCE9v6xQuob+i/1Ju9EX4LZszU5JKVmxEvnkJ1bk/BkihjoQXTnP6fJCnt6fCmA=="; }; }; "apollo-cache-inmemory-1.6.2" = { @@ -4090,31 +4126,31 @@ let sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw=="; }; }; - "apollo-datasource-0.5.0" = { + "apollo-datasource-0.6.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.5.0.tgz"; - sha512 = "SVXxJyKlWguuDjxkY/WGlC/ykdsTmPxSF0z8FenagcQ91aPURXzXP1ZDz5PbamY+0iiCRubazkxtTQw4GWTFPg=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.0.tgz"; + sha512 = "DOzzYWEOReYRu2vWPKEulqlTb9Xjg67sjVCzve5MXa7GUXjfr8IKioljvfoBMlqm/PpbJVk2ci4n5NIFqoYsrQ=="; }; }; - "apollo-engine-reporting-1.3.6" = { + "apollo-engine-reporting-1.4.0" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.3.6"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.3.6.tgz"; - sha512 = "oCoFAUBGveg1i1Sao/2gNsf1kirJBT6vw6Zan9BCNUkyh68ewDts+xRg32VnD9lDhaHpXVJ3tVtuaV44HmdSEw=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.0.tgz"; + sha512 = "NMiO3h1cuEBt6QZNGHxivwuyZQnoU/2MMx0gUA8Gyy1ERBhK6P235qoMnvoi34rLmqJuyGPX6tXcab8MpMIzYQ=="; }; }; - "apollo-engine-reporting-protobuf-0.3.1" = { + "apollo-engine-reporting-protobuf-0.4.0" = { name = "apollo-engine-reporting-protobuf"; packageName = "apollo-engine-reporting-protobuf"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.1.tgz"; - sha512 = "Ui3nPG6BSZF8BEqxFs6EkX6mj2OnFLMejxEHSOdM82bakyeouCGd7J0fiy8AD6liJoIyc4X7XfH4ZGGMvMh11A=="; + url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.0.tgz"; + sha512 = "cXHZSienkis8v4RhqB3YG3DkaksqLpcxApRLTpRMs7IXNozgV7CUPYGFyFBEra1ZFgUyHXx4G9MpelV+n2cCfA=="; }; }; "apollo-env-0.5.1" = { @@ -4189,22 +4225,22 @@ let sha512 = "nrWh9m7k1FQw1AK1GB1VTJS0o01cpsP2RYmTAh2j+P4lL2/72WgsblhbuF+yA1/jsgVrzg6xa+TNw3UwgGp3+g=="; }; }; - "apollo-server-caching-0.4.0" = { + "apollo-server-caching-0.5.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.4.0.tgz"; - sha512 = "GTOZdbLhrSOKYNWMYgaqX5cVNSMT0bGUTZKV8/tYlyYmsB6ey7l6iId3Q7UpHS6F6OR2lstz5XaKZ+T3fDfPzQ=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.0.tgz"; + sha512 = "l7ieNCGxUaUAVAAp600HjbUJxVaxjJygtPV0tPTe1Q3HkPy6LEWoY6mNHV7T268g1hxtPTxcdRu7WLsJrg7ufw=="; }; }; - "apollo-server-core-2.6.9" = { + "apollo-server-core-2.7.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.6.9"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.6.9.tgz"; - sha512 = "r2/Kjm1UmxoTViUt5EcExWXkWl0riXsuGyS1q5LpHKKnA+6b+t4LQKECkRU4EWNpuuzJQn7aF7MmMdvURxoEig=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.7.0.tgz"; + sha512 = "CXjXAkgcMBCJZpsZgfAY5W7f5thdxUhn75UgzeH28RTUZ2aKi/LjoCixPWRSF1lU4vuEWneAnM8Vg/KCD+29lQ=="; }; }; "apollo-server-env-2.4.0" = { @@ -4225,31 +4261,40 @@ let sha512 = "errZvnh0vUQChecT7M4A/h94dnBSRL213dNxpM5ueMypaLYgnp4hiCTWIEaooo9E4yMGd1qA6WaNbLDG2+bjcg=="; }; }; - "apollo-server-express-2.6.9" = { + "apollo-server-express-2.7.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.6.9"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.6.9.tgz"; - sha512 = "iTkdIdX7m9EAlmL/ZPkKR+x/xuFk1HYZWuJIJG57hHUhcOxj50u7F1E5+5fDwl5RFIdepQ61azF31hhNZuNi4g=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.7.0.tgz"; + sha512 = "TIOaLyuxD8xIECXjbPfS9HUWgHCKsG3rR4WuTpTreVEB08EsGeg+VcNGn0hmUnch18fPXTciBHWCv/fFV/YhMg=="; }; }; - "apollo-server-plugin-base-0.5.8" = { + "apollo-server-plugin-base-0.6.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.5.8"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.8.tgz"; - sha512 = "ICbaXr0ycQZL5llbtZhg8zyHbxuZ4khdAJsJgiZaUXXP6+F47XfDQ5uwnl/4Sq9fvkpwS0ctvfZ1D+Ks4NvUzA=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.0.tgz"; + sha512 = "BjfyWpHyKwHOe819gk3wEFwbnVp9Xvos03lkkYTTcXS/8G7xO78aUcE65mmyAC56/ZQ0aodNFkFrhwNtWBQWUQ=="; }; }; - "apollo-tracing-0.7.4" = { + "apollo-server-types-0.2.0" = { + name = "apollo-server-types"; + packageName = "apollo-server-types"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.0.tgz"; + sha512 = "5dgiyXsM90vnfmdXO1ixHvsLn0d9NP4tWufmr3ZmjKv00r4JAQNUaUdgOSGbRIKoHELQGwxUuTySTZ/tYfGaNQ=="; + }; + }; + "apollo-tracing-0.8.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.7.4"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.7.4.tgz"; - sha512 = "vA0FJCBkFpwdWyVF5UtCqN+enShejyiqSGqq8NxXHU1+GEYTngWa56x9OGsyhX+z4aoDIa3HPKPnP3pjzA0qpg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.0.tgz"; + sha512 = "cNOtOlyZ56iJRsCjnxjM1V0SnQ2ZZttuyoeOejdat6llPfk5bfYTVOKMjdbSfDvU33LS9g9sqNJCT0MwrEPFKQ=="; }; }; "apollo-upload-client-10.0.1" = { @@ -4387,13 +4432,13 @@ let sha1 = "ff662b4a78201494a3ee544d3a33fe7496509ebc"; }; }; - "archiver-3.0.0" = { + "archiver-3.0.3" = { name = "archiver"; packageName = "archiver"; - version = "3.0.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-3.0.0.tgz"; - sha512 = "5QeR6Xc5hSA9X1rbQfcuQ6VZuUXOaEdB65Dhmk9duuRJHYif/ZyJfuyJqsQrj34PFjU5emv5/MmfgA8un06onw=="; + url = "https://registry.npmjs.org/archiver/-/archiver-3.0.3.tgz"; + sha512 = "d0W7NUyXoLklozHHfvWnHoHS3dvQk8eB22pv5tBwcu1jEO5eZY8W+gHytkAaJ0R8fU2TnNThrWYxjvFlKvRxpw=="; }; }; "archiver-utils-1.3.0" = { @@ -4405,13 +4450,13 @@ let sha1 = "e50b4c09c70bf3d680e32ff1b7994e9f9d895174"; }; }; - "archiver-utils-2.0.0" = { + "archiver-utils-2.1.0" = { name = "archiver-utils"; packageName = "archiver-utils"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.0.0.tgz"; - sha512 = "JRBgcVvDX4Mwu2RBF8bBaHcQCSxab7afsxAPYDQ5W+19quIPP5CfKE7Ql+UHs9wYvwsaNR8oDuhtf5iqrKmzww=="; + url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz"; + sha512 = "bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw=="; }; }; "archy-1.0.0" = { @@ -4576,6 +4621,15 @@ let sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; }; }; + "array-differ-2.1.0" = { + name = "array-differ"; + packageName = "array-differ"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-differ/-/array-differ-2.1.0.tgz"; + sha512 = "KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w=="; + }; + }; "array-differ-3.0.0" = { name = "array-differ"; packageName = "array-differ"; @@ -5116,13 +5170,13 @@ let sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; }; }; - "async-2.6.2" = { + "async-2.6.3" = { name = "async"; packageName = "async"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; - sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; + url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; "async-3.0.1" = { @@ -5305,13 +5359,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.493.0" = { + "aws-sdk-2.496.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.493.0"; + version = "2.496.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.493.0.tgz"; - sha512 = "xLNpjiNgLZoXqwmLQ+czP3UQzeRgsutpG1KGfVUaj/3giqEElpn0wYkwhkJt4Glm9xf3jgzAdbFEDYM7u+Llxg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.496.0.tgz"; + sha512 = "6xZ//phdvp7/dUZjOdDsorl+xehhkAgxOMber9vUlMO9ckBOeufIvED7oKF0NvSlfG8laHK4JprXKQvhXqVLqA=="; }; }; "aws-sign2-0.6.0" = { @@ -6007,13 +6061,13 @@ let sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; }; }; - "base64-url-2.2.2" = { + "base64-url-2.3.2" = { name = "base64-url"; packageName = "base64-url"; - version = "2.2.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-2.2.2.tgz"; - sha512 = "JMAkNo3MJ7GG2CHPVMiGPrzGQizUcVE9qvCU6pxQln4aYZZgYM6BJHXbawDegSoryvsKGrK3FuBO9IuGWErRLQ=="; + url = "https://registry.npmjs.org/base64-url/-/base64-url-2.3.2.tgz"; + sha512 = "2QpXjtjndKqPn9JKBpMTCbDGpgicfLUu+N5Y1vEfbuyqb1MN1D68C9YKCth4SjTHRvJleF3tPuxhLbH79MM0iQ=="; }; }; "base64id-0.1.0" = { @@ -6331,6 +6385,15 @@ let sha512 = "4xM4DYejOHQ/qWBfeqBXNA4mJ12PwcOibFYnH1kYh5U9BHciCqEJBqGNVnMJXUhm8mflujNRLSv7IiVQxovgjw=="; }; }; + "bitfield-3.0.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield/-/bitfield-3.0.0.tgz"; + sha512 = "hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg=="; + }; + }; "bitfield-rle-2.2.1" = { name = "bitfield-rle"; packageName = "bitfield-rle"; @@ -6376,13 +6439,13 @@ let sha512 = "SYd5H3RbN1ex+TrWAKXkEkASFWxAR7Tk6iLt9tfAT9ehBvZb/Y3AQDVRVJynlrixcWpnmsLYKI7tkRWgp7ORoQ=="; }; }; - "bittorrent-protocol-3.0.1" = { + "bittorrent-protocol-3.1.0" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.0.1.tgz"; - sha512 = "hnvOzAu9u+2H0OLLL5byoFdz6oz5f3bx5f7R+ItUohTHMq9TgUhEJfcjo7xWtQHSKOVciYWwYTJ4EjczF5RX2A=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.0.tgz"; + sha512 = "XPi4PpU8iaHA1HC8ku+3kr+r6TzhG8WFprJs/yUzTE67JSkRcKO5X+XphqeQPj6LkP0syNcUUOp22EDV7Eg4Sg=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -6421,6 +6484,15 @@ let sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; + "bl-3.0.0" = { + name = "bl"; + packageName = "bl"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz"; + sha512 = "EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A=="; + }; + }; "blake2b-2.1.3" = { name = "blake2b"; packageName = "blake2b"; @@ -6970,13 +7042,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.6.4" = { + "browserslist-4.6.6" = { name = "browserslist"; packageName = "browserslist"; - version = "4.6.4"; + version = "4.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.6.4.tgz"; - sha512 = "ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz"; + sha512 = "D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA=="; }; }; "btoa-lite-1.0.0" = { @@ -7294,13 +7366,13 @@ let sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; }; }; - "byte-size-4.0.4" = { + "byte-size-5.0.1" = { name = "byte-size"; packageName = "byte-size"; - version = "4.0.4"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/byte-size/-/byte-size-4.0.4.tgz"; - sha512 = "82RPeneC6nqCdSwCX2hZUz3JPOvN5at/nTEw/CMf05Smu3Hrpo9Psb7LjN+k+XndNArG1EY8L4+BM3aTM4BCvw=="; + url = "https://registry.npmjs.org/byte-size/-/byte-size-5.0.1.tgz"; + sha512 = "/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw=="; }; }; "bytebuffer-3.5.5" = { @@ -7402,6 +7474,15 @@ let sha512 = "p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA=="; }; }; + "cacache-12.0.2" = { + name = "cacache"; + packageName = "cacache"; + version = "12.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz"; + sha512 = "ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg=="; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -7600,6 +7681,15 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; + "camelcase-keys-5.2.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-5.2.0.tgz"; + sha512 = "mSM/OQKD1HS5Ll2AXxeaHSdqCGC/QQ8IrgTbKYA/rxnC36thBKysfIr9+OVBWuW17jyZF4swHkjtglawgBmVFg=="; + }; + }; "caniuse-api-3.0.0" = { name = "caniuse-api"; packageName = "caniuse-api"; @@ -7609,13 +7699,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30000984" = { + "caniuse-lite-1.0.30000985" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000984"; + version = "1.0.30000985"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz"; - sha512 = "n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz"; + sha512 = "1ngiwkgqAYPG0JSSUp3PUDGPKKY59EK7NrGGX+VOxaKCNzRbNc7uXMny+c3VJfZxtoK3wSImTvG9T9sXiTw2+w=="; }; }; "capture-stack-trace-1.0.1" = { @@ -7654,13 +7744,13 @@ let sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; }; }; - "catharsis-0.8.10" = { + "catharsis-0.8.11" = { name = "catharsis"; packageName = "catharsis"; - version = "0.8.10"; + version = "0.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.10.tgz"; - sha512 = "l2OUaz/3PU3MZylspVFJvwHCVfWyvcduPq4lv3AzZ2pJzZCo7kNKFNyatwujD7XgvGkNAE/Jhhbh2uARNwNkfw=="; + url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz"; + sha512 = "a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g=="; }; }; "caw-2.0.1" = { @@ -9184,6 +9274,15 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; + "compress-commons-2.0.0" = { + name = "compress-commons"; + packageName = "compress-commons"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-2.0.0.tgz"; + sha512 = "gnETNngrfsAoLBENM8M0DoiCDJkHwz3OfIg4mBtqKDcRgE4oXNwHxHxgHvwKKlrcD7eZ7BVTy4l8t9xVF7q3FQ=="; + }; + }; "compressible-2.0.17" = { name = "compressible"; packageName = "compressible"; @@ -9598,13 +9697,13 @@ let sha512 = "KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg=="; }; }; - "conventional-recommended-bump-4.1.1" = { + "conventional-recommended-bump-5.0.1" = { name = "conventional-recommended-bump"; packageName = "conventional-recommended-bump"; - version = "4.1.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-4.1.1.tgz"; - sha512 = "JT2vKfSP9kR18RXXf55BRY1O3AHG8FPg5btP3l7LYfcWJsiXI6MCf30DepQ98E8Qhowvgv7a8iev0J1bEDkTFA=="; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-5.0.1.tgz"; + sha512 = "RVdt0elRcCxL90IrNP0fYCpq1uGt2MALko0eyeQ+zQuDVWtMGAy9ng6yYn3kax42lCj9+XBxQ8ZN6S9bdKxDhQ=="; }; }; "convert-source-map-1.1.3" = { @@ -9625,6 +9724,15 @@ let sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A=="; }; }; + "convict-4.4.1" = { + name = "convict"; + packageName = "convict"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/convict/-/convict-4.4.1.tgz"; + sha512 = "celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw=="; + }; + }; "cookie-0.0.4" = { name = "cookie"; packageName = "cookie"; @@ -10291,15 +10399,6 @@ let sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA=="; }; }; - "css-tree-1.0.0-alpha.28" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.0.0-alpha.28"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz"; - sha512 = "joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w=="; - }; - }; "css-tree-1.0.0-alpha.29" = { name = "css-tree"; packageName = "css-tree"; @@ -10309,6 +10408,15 @@ let sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg=="; }; }; + "css-tree-1.0.0-alpha.33" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.33"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz"; + sha512 = "SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w=="; + }; + }; "css-unit-converter-1.1.1" = { name = "css-unit-converter"; packageName = "css-unit-converter"; @@ -10318,15 +10426,6 @@ let sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996"; }; }; - "css-url-regex-1.1.0" = { - name = "css-url-regex"; - packageName = "css-url-regex"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz"; - sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec"; - }; - }; "css-what-2.1.3" = { name = "css-what"; packageName = "css-what"; @@ -10462,13 +10561,13 @@ let sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; }; }; - "cssstyle-1.3.0" = { + "cssstyle-1.4.0" = { name = "cssstyle"; packageName = "cssstyle"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.3.0.tgz"; - sha512 = "wXsoRfsRfsLVNaVzoKdqvEmK/5PFaEXNspVT22Ots6K/cnJdpoDKuQFw+qlMiXnmaif1OgeC466X1zISgAOcGg=="; + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz"; + sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; }; }; "csurf-1.8.3" = { @@ -10822,13 +10921,13 @@ let sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; }; }; - "date-format-2.0.0" = { + "date-format-2.1.0" = { name = "date-format"; packageName = "date-format"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz"; - sha512 = "M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA=="; + url = "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz"; + sha512 = "bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA=="; }; }; "date-now-0.1.4" = { @@ -11200,6 +11299,15 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; + "deep-freeze-0.0.1" = { + name = "deep-freeze"; + packageName = "deep-freeze"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz"; + sha1 = "3a0b0005de18672819dfd38cd31f91179c893e84"; + }; + }; "deep-is-0.1.2" = { name = "deep-is"; packageName = "deep-is"; @@ -12478,13 +12586,13 @@ let sha512 = "PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="; }; }; - "electron-to-chromium-1.3.191" = { + "electron-to-chromium-1.3.198" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.191"; + version = "1.3.198"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.191.tgz"; - sha512 = "jasjtY5RUy/TOyiUYM2fb4BDaPZfm6CXRFeJDMfFsXYADGxUN49RBqtgB7EL2RmJXeIRUk9lM1U6A5yk2YJMPQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.198.tgz"; + sha512 = "2GcPd1bkU8EGPa3AhxzPswbNvh5wgK4/8r3fg+sSVyVlCWaN9Tq+tVkJLktMZIcrHiZF0vJpnktfoYXFTvjCVg=="; }; }; "elegant-spinner-1.0.1" = { @@ -13271,13 +13379,13 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; - "eslint-6.0.1" = { + "eslint-6.1.0" = { name = "eslint"; packageName = "eslint"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-6.0.1.tgz"; - sha512 = "DyQRaMmORQ+JsWShYsSg4OPTjY56u1nCjAmICrE8vLWqyLKxhFXOthwMj1SA8xwfrv0CofLNVnqbfyhwCkaO0w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz"; + sha512 = "QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -13325,13 +13433,22 @@ let sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; - "eslint-utils-1.3.1" = { + "eslint-scope-5.0.0" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz"; + sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw=="; + }; + }; + "eslint-utils-1.4.0" = { name = "eslint-utils"; packageName = "eslint-utils"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz"; - sha512 = "Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q=="; + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz"; + sha512 = "7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ=="; }; }; "eslint-visitor-keys-1.0.0" = { @@ -14900,13 +15017,13 @@ let sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; }; }; - "flow-parser-0.102.0" = { + "flow-parser-0.103.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.102.0"; + version = "0.103.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.102.0.tgz"; - sha512 = "lePuMLr6QXv3AwTCl/pnh55YIzHNHHNPl0FW0wuug+tJKSN2UoWFCriANsYNax0Bm0GivHUGQPPQ/GmGgEXbSA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.103.0.tgz"; + sha512 = "H5UaM7mCzrssGa/HiPcr+oWBKosZTI7AlRk3jCEznBC786mdWIrTRjjGIAlRwuTVwT6SlPzV0M7kM6e3GGIQYA=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -14954,13 +15071,13 @@ let sha512 = "Bwol+72GU5z2DxZlnaxUA9A8qaRcQcdTprmRcgfqn2ldn147ByVh9Zyp90hVGPlo/oEN/yjOBUXcNkK3SYjbgA=="; }; }; - "flumelog-offset-3.4.2" = { + "flumelog-offset-3.4.3" = { name = "flumelog-offset"; packageName = "flumelog-offset"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.4.2.tgz"; - sha512 = "pj8gc3idzbpWjGQPXvRwNdkqtHPx/0olLsyip3u1lULP+LVvcYGYvTt8AU0frKWSFsGST0B8WVh9DrZ5rsEzbg=="; + url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.4.3.tgz"; + sha512 = "XG2uVxoMjwcWKHniKSp1Iyo4XSZqvpK/KcQNDfTUM+ajpehLveMTd5H0cXWzaVlNjkHE0oGDGL7CgHrDyixiIg=="; }; }; "flumeview-hashtable-1.1.1" = { @@ -15593,13 +15710,13 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fx-runner-1.0.10" = { + "fx-runner-1.0.11" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.10.tgz"; - sha512 = "tXj0lMnSey89Dx7R3Lq+HMUy3ODmOmj5lhRYBgMWNOqbh7Vx8vPUiWMbyJ3HIzGuLnNeXAPH0x/GdFZ7h6h0vQ=="; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.11.tgz"; + sha512 = "igHogHf5wTqqaPPTOav18MMTVq/eoeTJiw/PvPUuwnzU8vbyZInFPgR66G9ZBwvwxC7e611nbtB4xSMcYVhlvg=="; }; }; "gauge-1.2.7" = { @@ -15737,6 +15854,15 @@ let sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; + "get-port-4.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz"; + sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="; + }; + }; "get-prototype-chain-1.0.1" = { name = "get-prototype-chain"; packageName = "get-prototype-chain"; @@ -16214,13 +16340,13 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "global-agent-2.0.0" = { + "global-agent-2.0.1" = { name = "global-agent"; packageName = "global-agent"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/global-agent/-/global-agent-2.0.0.tgz"; - sha512 = "UxnV7o81DW5aNEg3AjmAbJI7PsXLrJZn3KM/eHDfxjKsLHB4RC2QzSajfTadPqYQCzaOd+Wb8zjvaiHiwwqPUQ=="; + url = "https://registry.npmjs.org/global-agent/-/global-agent-2.0.1.tgz"; + sha512 = "2iGb96/51XxsekctZR4IiP7SoWuGEkmFpsyySasq3RFmvIwDCQJzatB2NqK0sk7h2hVYQdRphL52lrO5grF/jg=="; }; }; "global-dirs-0.1.1" = { @@ -16584,13 +16710,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.7.7" = { + "graphql-extensions-0.8.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.7.7"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.7.7.tgz"; - sha512 = "xiTbVGPUpLbF86Bc+zxI/v/axRkwZx3s+y2/kUb2c2MxNZeNhMZEw1dSutuhY2f2JkRkYFJii0ucjIVqPAQ/Lg=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.8.0.tgz"; + sha512 = "zV9RefkusIXqi9ZJtl7IJ5ecjDKdb7PLAb5E3CmxX3OK1GwNCIubp0vE7Fp4fXlCUKgTB1Woubs0zj71JT8o0A=="; }; }; "graphql-import-0.4.5" = { @@ -18105,15 +18231,6 @@ let sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; - "import-local-1.0.0" = { - name = "import-local"; - packageName = "import-local"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz"; - sha512 = "vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ=="; - }; - }; "import-local-2.0.0" = { name = "import-local"; packageName = "import-local"; @@ -18195,6 +18312,15 @@ let sha1 = "15dcf56ee9cf65c0234c513c27fbd580e70fbc50"; }; }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; "inflected-2.0.4" = { name = "inflected"; packageName = "inflected"; @@ -18528,15 +18654,6 @@ let sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q=="; }; }; - "interop-require-1.0.0" = { - name = "interop-require"; - packageName = "interop-require"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interop-require/-/interop-require-1.0.0.tgz"; - sha1 = "e53103679944c88d7e6105b62a9f4475c783971e"; - }; - }; "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; @@ -18681,6 +18798,15 @@ let sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; }; }; + "ipaddr.js-1.9.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; + }; + }; "irc-replies-2.0.1" = { name = "irc-replies"; packageName = "irc-replies"; @@ -19959,13 +20085,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joplin-turndown-4.0.15" = { + "joplin-turndown-4.0.17" = { name = "joplin-turndown"; packageName = "joplin-turndown"; - version = "4.0.15"; + version = "4.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.15.tgz"; - sha512 = "68ukx19XFbKtJ5hfPfPX6IDLFZ1+NI+CpxJZyDEXAN5rPkyGXDw9xnEfo1IYRd+fq56upjo5Fn7J1hTCQTVTIA=="; + url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.17.tgz"; + sha512 = "57mw92ZOKoR77YBLUkauN1xNq1xlxOm2KaPty/jlYrkEyGotUBBvq46a6wXh6d3aM4CccGuwymSge18/9IoB3A=="; }; }; "joplin-turndown-plugin-gfm-1.0.8" = { @@ -20013,13 +20139,13 @@ let sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; - "js-beautify-1.10.0" = { + "js-beautify-1.10.1" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.0.tgz"; - sha512 = "OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.1.tgz"; + sha512 = "4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA=="; }; }; "js-levenshtein-1.1.6" = { @@ -21256,22 +21382,22 @@ let sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; }; }; - "libsodium-0.7.4" = { + "libsodium-0.7.5" = { name = "libsodium"; packageName = "libsodium"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.4.tgz"; - sha512 = "fTU3vUdrxQzhPAAjmTSqKk4LzYbR0OtcYjp1P92AlH50JIxXZFEIXWh1yryCmU6RLGfwS2IzBdZjbmpYf/TlyQ=="; + url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.5.tgz"; + sha512 = "0YVU2QJc5sDR5HHkGCaliYImS7pGeXi11fiOfm4DirBd96PJVZIn3LJa06ZOFjLNsWkL3UbNjYhLRUOABPL9vw=="; }; }; - "libsodium-wrappers-0.7.4" = { + "libsodium-wrappers-0.7.5" = { name = "libsodium-wrappers"; packageName = "libsodium-wrappers"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.4.tgz"; - sha512 = "axKkW01L0q+urLeE7UMSZKWwk4LrRbi6s5pjKBAvbgDBYnsSaolK1oN/Syilm1dqJFkJQNi6qodwOp8dzSoc9Q=="; + url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.5.tgz"; + sha512 = "QE9Q+FxLLGdJRiJTuC2GB3LEHZeHX/VcbMQeNPdAixEKo86JPy6bOWND1XmMLu0tjWUu0xIY0YpJYQApxIZwbQ=="; }; }; "lie-3.3.0" = { @@ -21391,6 +21517,15 @@ let sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; }; }; + "load-json-file-5.3.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz"; + sha512 = "cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw=="; + }; + }; "load-plugin-2.3.1" = { name = "load-plugin"; packageName = "load-plugin"; @@ -21499,22 +21634,13 @@ let sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; - "lodash-4.17.11" = { + "lodash-4.17.15" = { name = "lodash"; packageName = "lodash"; - version = "4.17.11"; + version = "4.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; - sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; - }; - }; - "lodash-4.17.14" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.14"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz"; - sha512 = "mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; "lodash-4.17.5" = { @@ -21544,13 +21670,13 @@ let sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183"; }; }; - "lodash-es-4.17.14" = { + "lodash-es-4.17.15" = { name = "lodash-es"; packageName = "lodash-es"; - version = "4.17.14"; + version = "4.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.14.tgz"; - sha512 = "7zchRrGa8UZXjD/4ivUWP1867jDkhzTG2c/uj739utSd7O/pFFdxspCemIFKEEjErbcqRzn8nKnGsi7mvTgRPA=="; + url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz"; + sha512 = "rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="; }; }; "lodash-id-0.14.0" = { @@ -23029,6 +23155,15 @@ let sha512 = "YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA=="; }; }; + "make-fetch-happen-5.0.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz"; + sha512 = "nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA=="; + }; + }; "make-iterator-1.0.1" = { name = "make-iterator"; packageName = "make-iterator"; @@ -23119,6 +23254,15 @@ let sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; }; }; + "map-obj-3.1.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-3.1.0.tgz"; + sha512 = "Xg1iyYz/+iIW6YoMldux47H/e5QZyDSB41Kb0ev+YYHh3FJnyyzY0vTk/WbVeWcCvdXd70cOriUBmhP8alUFBA=="; + }; + }; "map-stream-0.0.7" = { name = "map-stream"; packageName = "map-stream"; @@ -23227,6 +23371,15 @@ let sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ=="; }; }; + "marked-0.7.0" = { + name = "marked"; + packageName = "marked"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz"; + sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; + }; + }; "match-casing-1.0.2" = { name = "match-casing"; packageName = "match-casing"; @@ -23236,13 +23389,13 @@ let sha512 = "NH4X/9dxkjgl08sGHg0M15YJH8xk49kPpeSsVqr+5Ct4Qd8gaBn41ubSBd+nEzMZt5iJDdoeSnKXV57UVeyK2w=="; }; }; - "match-index-1.0.1" = { + "match-index-1.0.3" = { name = "match-index"; packageName = "match-index"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/match-index/-/match-index-1.0.1.tgz"; - sha1 = "b4b673e99ab3ac5a6af303ccf4db709812bc3f58"; + url = "https://registry.npmjs.org/match-index/-/match-index-1.0.3.tgz"; + sha512 = "1XjyBWqCvEFFUDW/MPv0RwbITRD4xQXOvKoPYtLDq8IdZTfdF/cQSo5Yn4qvhfSSZgjgkTFsqJD2wOUG4ovV8Q=="; }; }; "matchdep-2.0.0" = { @@ -23344,6 +23497,15 @@ let sha512 = "FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA=="; }; }; + "mdn-data-2.0.4" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; + }; + }; "mdns-js-0.5.0" = { name = "mdns-js"; packageName = "mdns-js"; @@ -24109,6 +24271,15 @@ let sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317"; }; }; + "moment-2.22.2" = { + name = "moment"; + packageName = "moment"; + version = "2.22.2"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; + sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + }; + }; "moment-2.24.0" = { name = "moment"; packageName = "moment"; @@ -24325,6 +24496,15 @@ let sha512 = "zzOLNRxzszwd+61JFuAo0fxdQfvku12aNJgnla0AQ+hHxFmfc/B7jBVuPr5Rmvu46Jze/iJrFpSOsD7afO8SDw=="; }; }; + "multer-1.4.2" = { + name = "multer"; + packageName = "multer"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.4.2.tgz"; + sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; + }; + }; "multi-random-access-2.1.1" = { name = "multi-random-access"; packageName = "multi-random-access"; @@ -24406,6 +24586,15 @@ let sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; }; }; + "multimatch-3.0.0" = { + name = "multimatch"; + packageName = "multimatch"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multimatch/-/multimatch-3.0.0.tgz"; + sha512 = "22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA=="; + }; + }; "multimatch-4.0.0" = { name = "multimatch"; packageName = "multimatch"; @@ -24451,13 +24640,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.3.6" = { + "multiserver-3.4.0" = { name = "multiserver"; packageName = "multiserver"; - version = "3.3.6"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.3.6.tgz"; - sha512 = "zuPjEaPEVMosWXnfNalXv3QyjYCwaD2emC6l/ozwMeaCcZ/Do7WMb/ZF8MC6TVwhV9Y7eTcnBiYEP/hq8zA2nA=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.4.0.tgz"; + sha512 = "HSGnZBXDM9e8gi3YyhObwiDYP3BFeL+TV22H1dAReigHHMc52IDBsz9N1OR72OKxCd7SMD+gKBpVJbJohhb3og=="; }; }; "multiserver-address-1.0.1" = { @@ -25347,13 +25536,13 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; - "node-gyp-4.0.0" = { + "node-gyp-5.0.3" = { name = "node-gyp"; packageName = "node-gyp"; - version = "4.0.0"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; - sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.3.tgz"; + sha512 = "z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ=="; }; }; "node-gyp-build-3.7.0" = { @@ -25509,13 +25698,13 @@ let sha512 = "ft/8/dTRGzGQ9vCnAzuBxzR+aDv4Yun/vuSKi/eI5Qj2/ZBal28L9HpWziSTWlLrMhZns8CRz7s2p84P2ee/vA=="; }; }; - "node-red-node-sentiment-0.1.3" = { + "node-red-node-sentiment-0.1.4" = { name = "node-red-node-sentiment"; packageName = "node-red-node-sentiment"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-sentiment/-/node-red-node-sentiment-0.1.3.tgz"; - sha512 = "X3F7VdfFJ4iioWCiMgIv1Pyp6YxUuA8Mod/zcHN3FHBM8aue2vL4bvAT/1zQgxqxehUVkKCbXr+cdRnJx5e7nw=="; + url = "https://registry.npmjs.org/node-red-node-sentiment/-/node-red-node-sentiment-0.1.4.tgz"; + sha512 = "lZxov4OdGKoqvXcUK7oyVeW5a2qJsBr5+T8cq9kP5N0bnI9AQoywiIiVQ2HcFCHXy70U4ZIAhetGroNfAb68Zg=="; }; }; "node-red-node-tail-0.0.2" = { @@ -25635,13 +25824,13 @@ let sha512 = "/x5MRIh56VyuuhLfcz+DL2SlBARpZpgQIf2A4Ao4hMb69MHSgDIMPwYmFwesGT1lkRDZ0eBSoym5+JoIZ3N+cQ=="; }; }; - "nodemailer-6.2.1" = { + "nodemailer-6.3.0" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.2.1.tgz"; - sha512 = "TagB7iuIi9uyNgHExo8lUDq3VK5/B0BpbkcjIgNvxbtVrjNqq0DwAOTuzALPVkK76kMhTSzIgHqg8X1uklVs6g=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.3.0.tgz"; + sha512 = "TEHBNBPHv7Ie/0o3HXnb7xrPSSQmH1dXwQKRaMKDBGt/ZN54lvDVujP6hKkO/vjkIYL9rK8kHSG11+G42Nhxuw=="; }; }; "nodemon-1.19.1" = { @@ -25851,13 +26040,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-lifecycle-2.1.1" = { + "npm-lifecycle-3.0.0" = { name = "npm-lifecycle"; packageName = "npm-lifecycle"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.1.1.tgz"; - sha512 = "+Vg6I60Z75V/09pdcH5iUo/99Q/vop35PaI99elvxk56azSVVsdsSsS/sXqKDNwbRRNN1qSxkcO45ZOu0yOWew=="; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.0.0.tgz"; + sha512 = "/x/8zxo5Tn3qWj1eSUXgyr2pLBnEoFkpJQE/8pRwrEpJI4irZM0+YSp7W8NGDLzN6SaBOGOPaJV9O2dhY1IWwQ=="; }; }; "npm-package-arg-6.1.0" = { @@ -25941,6 +26130,15 @@ let sha512 = "VQCEZlydXw4AwLROAXWUR7QDfe2Y8Id/vpAgp6TI1/H78a4SiQ1kQrKZALm5/zxM5n4HIi+aYb+idUAV/RuY0Q=="; }; }; + "npm-registry-fetch-4.0.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz"; + sha512 = "Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw=="; + }; + }; "npm-run-4.1.2" = { name = "npm-run"; packageName = "npm-run"; @@ -26401,13 +26599,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "omggif-1.0.9" = { + "omggif-1.0.10" = { name = "omggif"; packageName = "omggif"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz"; - sha1 = "dcb7024dacd50c52b4d303f04802c91c057c765f"; + url = "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz"; + sha512 = "LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="; }; }; "on-change-network-0.0.2" = { @@ -26617,13 +26815,13 @@ let sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; }; }; - "opentracing-0.14.3" = { + "opentracing-0.14.4" = { name = "opentracing"; packageName = "opentracing"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.3.tgz"; - sha1 = "23e3ad029fa66a653926adbe57e834469f8550aa"; + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.4.tgz"; + sha512 = "nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA=="; }; }; "opn-5.3.0" = { @@ -27013,13 +27211,13 @@ let sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; - "p-map-1.2.0" = { + "p-map-2.1.0" = { name = "p-map"; packageName = "p-map"; - version = "1.2.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz"; - sha512 = "r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="; + url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; "p-map-series-1.0.0" = { @@ -27193,13 +27391,13 @@ let sha512 = "Zqvczvf/zZ7QNosdE9uTC7SRuvSs9tFqRkF6cJl+2HH7COBnx4BRAGpeXJlrbN+mM0CMHpbi620xdEHhCflghA=="; }; }; - "pacote-9.5.2" = { + "pacote-9.5.4" = { name = "pacote"; packageName = "pacote"; - version = "9.5.2"; + version = "9.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.5.2.tgz"; - sha512 = "KVxalD57jaHnWIBQKPeU/eFU4UoMqUOj3h5AXvVMp9oJd8BZvIdTm8qmazy4jpYBf7RX9xCFmeFcU3ebvrUSZQ=="; + url = "https://registry.npmjs.org/pacote/-/pacote-9.5.4.tgz"; + sha512 = "nWr0ari6E+apbdoN0hToTKZElO5h4y8DGFa2pyNA5GQIdcP0imC96bA0bbPw1gpeguVIiUgHHaAlq/6xfPp8Qw=="; }; }; "pad-0.0.5" = { @@ -28165,15 +28363,6 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; - "pkg-dir-2.0.0" = { - name = "pkg-dir"; - packageName = "pkg-dir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; - }; - }; "pkg-dir-3.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -29156,13 +29345,13 @@ let sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; }; - "property-information-5.1.0" = { + "property-information-5.2.2" = { name = "property-information"; packageName = "property-information"; - version = "5.1.0"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-5.1.0.tgz"; - sha512 = "tODH6R3+SwTkAQckSp2S9xyYX8dEKYkeXw+4TmJzTxnNzd6mQPu1OD4f9zPrvw/Rm4wpPgI+Zp63mNSGNzUgHg=="; + url = "https://registry.npmjs.org/property-information/-/property-information-5.2.2.tgz"; + sha512 = "N2moasZmjn2mjVGIWpaqz5qnz6QyeQSGgGvMtl81gA9cPTWa6wpesRSe/quNnOjUHpvSH1oZx0pdz0EEckLFnA=="; }; }; "proto-list-1.2.4" = { @@ -30857,6 +31046,15 @@ let sha512 = "S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="; }; }; + "regenerator-runtime-0.13.3" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; + sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="; + }; + }; "regenerator-runtime-0.9.6" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -30866,13 +31064,13 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "regenerator-transform-0.14.0" = { + "regenerator-transform-0.14.1" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz"; - sha512 = "rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; + sha512 = "flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ=="; }; }; "regex-cache-0.4.4" = { @@ -30965,15 +31163,6 @@ let sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; - "registry-auth-token-4.0.0" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.0.0.tgz"; - sha512 = "lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw=="; - }; - }; "registry-url-3.1.0" = { name = "registry-url"; packageName = "registry-url"; @@ -31460,13 +31649,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "requizzle-0.2.2" = { + "requizzle-0.2.3" = { name = "requizzle"; packageName = "requizzle"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.2.tgz"; - sha512 = "oJ6y7JcUJkblRGhMByGNcszeLgU0qDxNKFCiUZR1XyzHyVsev+Mxb1tyygxLd1ORsKee1SA5BInFdUwY64GE/A=="; + url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz"; + sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; }; }; "resolve-1.1.7" = { @@ -32225,13 +32414,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "safer-eval-1.3.3" = { + "safer-eval-1.3.5" = { name = "safer-eval"; packageName = "safer-eval"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.3.tgz"; - sha512 = "j/qb0rtnwTp5V1D7nR0Ns/14HU8OiHPaoZNJhM+Lfmv1nbXZCXG9LHaVW157agEocdSVAeeRNddK/yuWfalzGQ=="; + url = "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.5.tgz"; + sha512 = "BJ//K2Y+EgCbOHEsDGS5YahYBcYy7JcFpKDo2ba5t4MnOGHYtk7HvQkcxTDFvjQvJ0CRcdas/PyF+gTTCay+3w=="; }; }; "sander-0.5.1" = { @@ -32882,13 +33071,13 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "seventh-0.7.23" = { + "seventh-0.7.27" = { name = "seventh"; packageName = "seventh"; - version = "0.7.23"; + version = "0.7.27"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.23.tgz"; - sha512 = "QPxE3WAc7N/IJz1Gw5HbdNUXLt3GFPco7z/RfZViQ1LgiCsuayN+us15NSve2pL+C3Ad/lqhx3hqikCZpLEuCQ=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.27.tgz"; + sha512 = "vId7EbEQ7xr+wjBBFQBChtLzbqIQWe0cNtZMGtOVBig5p1XrsjVXvkBhdVcJRJdDh6pnn/5h5ai+208fDldXXA=="; }; }; "sha.js-2.4.11" = { @@ -33116,13 +33305,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.120.0" = { + "simple-git-1.122.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.120.0"; + version = "1.122.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.120.0.tgz"; - sha512 = "caF3eLrUSrL6d5fBVU85bmY0lpbMpbkWze1W2Tg946kN75s/WWvKqpc4Agn3DLHyzXEeiWfv8yPULiCKumuIQg=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.122.0.tgz"; + sha512 = "plTwhnkIHrw2TFMJbJH/mKwWGgFbj03V9wcfBKa4FsuvgJbpwdlSJnlvkIQWDV1CVLaf2Gl6zSNeRRnxBRhX1g=="; }; }; "simple-markdown-0.4.4" = { @@ -33431,22 +33620,22 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.193.1" = { + "snyk-1.195.1" = { name = "snyk"; packageName = "snyk"; - version = "1.193.1"; + version = "1.195.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.193.1.tgz"; - sha512 = "bwxrpR8T5tOQgLGwBMq7BYKDvLQRVsB3znMJpdZpYnMCY34MpmkuDhU+546TA8kmp5cLPCg+0BlaO7Yrj3Ouag=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.195.1.tgz"; + sha512 = "PJ5K8W+gTkg/CktePxvhahiHZ75PC6ZPVpsk2icYX9nx9Fx4VYZ8pt8GJYo31KLrlwENG3WxBNV5xas+dd2csg=="; }; }; - "snyk-config-2.2.1" = { + "snyk-config-2.2.2" = { name = "snyk-config"; packageName = "snyk-config"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.1.tgz"; - sha512 = "eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.2.tgz"; + sha512 = "ud1UJhU5b3z2achCVbXin6m3eeESvJTn9hBDYjp5BafI+1ajOJt0LnUB9+SAZ3CnQIK90PUb/3nSx0xjtda7sA=="; }; }; "snyk-docker-plugin-1.25.1" = { @@ -33575,13 +33764,13 @@ let sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A=="; }; }; - "snyk-sbt-plugin-2.5.6" = { + "snyk-sbt-plugin-2.5.7" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.5.6"; + version = "2.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.5.6.tgz"; - sha512 = "ioZW6WxN0lYnVkUHxSXR+6DBeA1Jlah/r3mMwEhnCwp1um2pE9O9F+piQzbuQi1+q64ZDb7EzBnvmL/aqJdwdA=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.5.7.tgz"; + sha512 = "nVGsYq/EZfSFzKaXJvUTqaf9phH5+EgZNN3ynN9Y54EO8Lh4Dljnd/gBIQzxHMI2joQDH4FMB3ojDZeiCkeQ1Q=="; }; }; "snyk-tree-1.0.0" = { @@ -33791,13 +33980,13 @@ let sha512 = "FbZ/X/2Xq3DAMhuRA4bnN0jy1QxaPTVPLFvyv6CEj0QDKSTdWp9yRxo1JhqXmWKhPQeJyUMajHJB2UjT43pFcw=="; }; }; - "sodium-browserify-1.2.7" = { + "sodium-browserify-1.3.0" = { name = "sodium-browserify"; packageName = "sodium-browserify"; - version = "1.2.7"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.7.tgz"; - sha512 = "PGhNO8KravjroRDYvurMPRYi4xMM7zjTW10R77Nq9sjkU314YA2sPeXS6UA5k/rLHaXLaZ6YfLLVz+DdCU5w0g=="; + url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.3.0.tgz"; + sha512 = "1KRS6Oew3X13AIZhbmGF0YBdt2pQdafJMfv83OZHWbzxG92YBBnN8HYx/VKmYB4xCe90eidNaDJWBEFw/o3ahw=="; }; }; "sodium-browserify-tweetnacl-0.2.6" = { @@ -34457,13 +34646,13 @@ let sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; }; }; - "ssb-keys-7.1.7" = { + "ssb-keys-7.2.0" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "7.1.7"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.1.7.tgz"; - sha512 = "Zncn++gtpoF4Wjz/po4Jvt7mCHbQfU6ATljahqf1CprWAio4JBUJnQrUeUlmlTn3f4Tseo0/hoh3vk7Bu6M/Sw=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.2.0.tgz"; + sha512 = "qxbVBYB5CsxWPEFg6qe+98hL6Jbs0rztA5zYsoQmYqz2+j3EhhIuXMTki92K4xREOCA2x45FFdOjDFy7ReDpBA=="; }; }; "ssb-links-3.0.8" = { @@ -35762,13 +35951,13 @@ let sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; }; }; - "svgo-1.2.2" = { + "svgo-1.3.0" = { name = "svgo"; packageName = "svgo"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz"; - sha512 = "rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA=="; + url = "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz"; + sha512 = "MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ=="; }; }; "swagger-converter-0.1.7" = { @@ -35906,13 +36095,13 @@ let sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA=="; }; }; - "table-5.4.1" = { + "table-5.4.4" = { name = "table"; packageName = "table"; - version = "5.4.1"; + version = "5.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-5.4.1.tgz"; - sha512 = "E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w=="; + url = "https://registry.npmjs.org/table/-/table-5.4.4.tgz"; + sha512 = "IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg=="; }; }; "table-layout-0.4.5" = { @@ -36069,6 +36258,15 @@ let sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; }; }; + "tar-stream-2.1.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz"; + sha512 = "+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw=="; + }; + }; "taskkill-2.0.0" = { name = "taskkill"; packageName = "taskkill"; @@ -36195,13 +36393,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "terminal-kit-1.28.7" = { + "terminal-kit-1.28.19" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.28.7"; + version = "1.28.19"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.28.7.tgz"; - sha512 = "ouEiquaNQyiwvS2WBMji17rFZAzEr+0L0N7TkloeywAb04sJ7NSFo8af7qSVJj+9rqhs9WBlO3AjD41+FGMoPg=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.28.19.tgz"; + sha512 = "lcQgNFfjb+VKCtmXG8K6VCryUMURLKTM3xumY4Y1eXV4ikpjAZ/SFdnb44bnL5iJTEr20xw2m20rJyTsDUeFSw=="; }; }; "terser-3.17.0" = { @@ -38391,15 +38589,6 @@ let sha512 = "gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw=="; }; }; - "update-notifier-3.0.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-3.0.0.tgz"; - sha512 = "6Xe3oF2bvuoj4YECUc52yxVs94yWrxwqHbzyveDktTS1WhnlTRpNcQMxUshcB7nRVGi1jEXiqL5cW1S5WSyzKg=="; - }; - }; "update-notifier-3.0.1" = { name = "update-notifier"; packageName = "update-notifier"; @@ -38625,13 +38814,13 @@ let sha512 = "4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw=="; }; }; - "ut_metadata-3.3.0" = { + "ut_metadata-3.4.0" = { name = "ut_metadata"; packageName = "ut_metadata"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.3.0.tgz"; - sha512 = "IK+ke9yL6a4oPLz/3oSW9TW7m9Wr4RG+5kW5aS2YulzEU1QDGAtago/NnOlno91fo3fSO7mnsqzn3NXNXdv8nA=="; + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.4.0.tgz"; + sha512 = "/Igrr2rPD0NH/dNx493alpHxGBF/XREu68bZU4zigrYiQMQpYL68sKbNo9ND5DcmbMp0lNppw4mOhSSONgUYKw=="; }; }; "ut_pex-1.2.1" = { @@ -38931,6 +39120,15 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; + "validator-10.8.0" = { + name = "validator"; + packageName = "validator"; + version = "10.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz"; + sha512 = "mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g=="; + }; + }; "value-or-function-3.0.0" = { name = "value-or-function"; packageName = "value-or-function"; @@ -39759,22 +39957,22 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.35.3" = { + "webpack-4.36.1" = { name = "webpack"; packageName = "webpack"; - version = "4.35.3"; + version = "4.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.35.3.tgz"; - sha512 = "xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz"; + sha512 = "Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg=="; }; }; - "webpack-cli-3.3.5" = { + "webpack-cli-3.3.6" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.5.tgz"; - sha512 = "w0j/s42c5UhchwTmV/45MLQnTVwRoaUTu9fM5LuyOd/8lFoCNCELDogFoecx5NzRUndO0yD/gF2b02XKMnmAWQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz"; + sha512 = "0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A=="; }; }; "webpack-core-0.6.9" = { @@ -40308,6 +40506,15 @@ let sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f"; }; }; + "write-json-file-3.2.0" = { + name = "write-json-file"; + packageName = "write-json-file"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz"; + sha512 = "3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ=="; + }; + }; "write-pkg-3.2.0" = { name = "write-pkg"; packageName = "write-pkg"; @@ -40389,13 +40596,13 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.1.0" = { + "ws-7.1.1" = { name = "ws"; packageName = "ws"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz"; - sha512 = "Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g=="; + url = "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz"; + sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; "wtf-8-1.0.0" = { @@ -40885,6 +41092,15 @@ let sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; }; }; + "yargs-parser-11.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.0.0.tgz"; + sha512 = "dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ=="; + }; + }; "yargs-parser-11.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -41092,13 +41308,13 @@ let sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"; }; }; - "zip-stream-2.0.1" = { + "zip-stream-2.1.0" = { name = "zip-stream"; packageName = "zip-stream"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-2.0.1.tgz"; - sha512 = "c+eUhhkDpaK87G/py74wvWLtz2kzMPNCCkUApkun50ssE0oQliIQzWpTnwjB+MTKVIf2tGzIgHyqW/Y+W77ecQ=="; + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.0.tgz"; + sha512 = "F/xoLqlQShgvn1BzHQCNiYIoo2R93GQIMH+tA6JC3ckMDkme4bnhEEXSferZcG5ea/6bZNx3GqSUHqT8TUO6uQ=="; }; }; }; @@ -41107,17 +41323,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-8.1.1.tgz"; - sha512 = "7EXTjS7XXZyWhW4JMuGRRSLmdn8KSWK41xoAiod8P6csJkGgsmFGLs2QkZd/mvGnU9rOKaNkEjHPI9QO+iprxw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-8.1.2.tgz"; + sha512 = "Zz9WGqPgr+w9SfpDeKLPzGFLZaX7uu2kU7/r6vxvnESJcnoxKOJBf+ipXu42TY7D3FtSiPBO27GBTSVgPCseoQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.801.1" - sources."@angular-devkit/core-8.1.1" - sources."@angular-devkit/schematics-8.1.1" - sources."@schematics/angular-8.1.1" - sources."@schematics/update-0.801.1" + sources."@angular-devkit/architect-0.801.2" + sources."@angular-devkit/core-8.1.2" + sources."@angular-devkit/schematics-8.1.2" + sources."@schematics/angular-8.1.2" + sources."@schematics/update-0.801.2" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" @@ -41238,7 +41454,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lru-cache-5.1.1" sources."magic-string-0.25.3" sources."make-fetch-happen-4.0.2" @@ -41447,6 +41663,51 @@ in bypassCache = true; reconstructLock = true; }; + "@antora/cli" = nodeEnv.buildNodePackage { + name = "_at_antora_slash_cli"; + packageName = "@antora/cli"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.0.0.tgz"; + sha512 = "vgoGTRRFkPtKeMgGoBevYzK97DwT75rxUeE6yAtm50i7e/aIGoXFyCglaXdsyP4FAfENVqN+DWy3ZuKxhPfc7g=="; + }; + dependencies = [ + sources."@antora/playbook-builder-2.0.0" + sources."@iarna/toml-2.2.3" + sources."argparse-1.0.10" + sources."camelcase-5.3.1" + sources."camelcase-keys-5.2.0" + sources."commander-2.20.0" + (sources."convict-4.4.1" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."decamelize-1.2.0" + sources."deep-freeze-0.0.1" + sources."depd-1.1.2" + sources."esprima-4.0.1" + sources."js-yaml-3.13.1" + sources."json5-2.1.0" + sources."lodash.clonedeep-4.5.0" + sources."map-obj-3.1.0" + sources."minimist-1.2.0" + sources."moment-2.22.2" + sources."quick-lru-1.1.0" + sources."sprintf-js-1.0.3" + sources."validator-10.8.0" + sources."yargs-parser-11.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The command line interface for Antora."; + homepage = https://antora.org/; + license = "MPL-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; aws-azure-login = nodeEnv.buildNodePackage { name = "aws-azure-login"; packageName = "aws-azure-login"; @@ -41456,14 +41717,14 @@ in sha512 = "rVvYFWwCmm65WdXxpkw/A9CIOuX2alccau2Pq97rkEweELN/jfj2hDOUMyheDdMQyywiecrbZG0VDbxr3US2Jw=="; }; dependencies = [ - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."agent-base-4.3.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."ast-types-0.13.2" sources."async-limiter-1.0.0" - sources."aws-sdk-2.493.0" + sources."aws-sdk-2.496.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bluebird-3.5.5" @@ -41493,7 +41754,7 @@ in sources."css-what-2.1.3" (sources."data-uri-to-buffer-2.0.1" // { dependencies = [ - sources."@types/node-8.10.50" + sources."@types/node-8.10.51" ]; }) sources."debug-4.1.1" @@ -41561,7 +41822,7 @@ in sources."isarray-1.0.0" sources."jmespath-0.15.0" sources."levn-0.3.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lru-cache-4.1.5" sources."mime-2.4.4" sources."mimic-fn-1.2.0" @@ -41663,10 +41924,10 @@ in azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; packageName = "azure-functions-core-tools"; - version = "2.7.1373"; + version = "2.7.1480"; src = fetchurl { - url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1373.tgz"; - sha512 = "EC4lgHBgmSoDFjJSIXMWT24Ner3ctUzDBKM0Xz8mX+RlrpIkKHJq7I8EtcGXBWpF4QIAJYbD3sGP/9h6JqI10A=="; + url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1480.tgz"; + sha512 = "Yr0YtXQ6JHB8ep68X9E5FQvbNb0Hs05t8o8exl+LJ8c/0VpIg2Ff7slzRHseTuQF4RysYk2VbRNPaN6ZPS1kWw=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -41744,11 +42005,11 @@ in sources."acorn-5.7.3" (sources."acorn-globals-4.3.2" // { dependencies = [ - sources."acorn-6.2.0" + sources."acorn-6.2.1" ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -41775,7 +42036,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."cssom-0.3.8" - sources."cssstyle-1.3.0" + sources."cssstyle-1.4.0" sources."dashdash-1.14.1" (sources."data-urls-1.1.0" // { dependencies = [ @@ -41830,7 +42091,7 @@ in sources."jsprim-1.4.1" sources."left-pad-1.3.0" sources."levn-0.3.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.sortby-4.7.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" @@ -42109,7 +42370,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.2.0" + sources."acorn-6.2.1" sources."acorn-dynamic-import-4.0.0" sources."acorn-node-1.7.0" sources."acorn-walk-6.2.0" @@ -42296,7 +42557,7 @@ in dependencies = [ sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -42425,7 +42686,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.0" + sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-finite-1.0.2" sources."is-typedarray-1.0.0" @@ -42786,7 +43047,7 @@ in sha512 = "HwWCWql35j7EIp29mO4yRAxPH+Z2t2gwsLk3RLr6wktYjRacy0S83sG4RBDNfbfyLqJeZxFgMoKaCC/bTNxoWA=="; }; dependencies = [ - sources."async-2.6.2" + sources."async-2.6.3" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -42810,7 +43071,7 @@ in sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."logform-2.1.2" sources."lynx-0.2.0" sources."mersenne-0.0.4" @@ -42860,10 +43121,10 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -42880,7 +43141,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-2.6.2" + sources."async-2.6.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -43170,7 +43431,7 @@ in sources."kind-of-6.0.2" sources."latest-version-3.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.debounce-4.0.8" sources."loud-rejection-2.1.0" sources."lowercase-keys-1.0.1" @@ -43492,7 +43753,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -43820,7 +44081,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -43875,7 +44136,7 @@ in sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -44004,7 +44265,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."jsonfile-4.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -44154,7 +44415,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -44981,12 +45242,12 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.2" + sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.493.0" + sources."aws-sdk-2.496.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -45030,7 +45291,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.find-4.6.0" sources."lodash.max-4.0.1" sources."lodash.merge-4.6.2" @@ -45177,7 +45438,7 @@ in sources."inherits-2.0.3" sources."internal-ip-3.0.1" sources."ip-regex-2.1.0" - sources."ipaddr.js-1.9.0" + sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-extglob-2.1.1" @@ -45375,7 +45636,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.debounce-4.0.8" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" @@ -45505,19 +45766,19 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-6.0.1.tgz"; - sha512 = "DyQRaMmORQ+JsWShYsSg4OPTjY56u1nCjAmICrE8vLWqyLKxhFXOthwMj1SA8xwfrv0CofLNVnqbfyhwCkaO0w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz"; + sha512 = "QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ=="; }; dependencies = [ - sources."@babel/code-frame-7.0.0" + sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" - sources."acorn-6.2.0" + sources."acorn-6.2.1" sources."acorn-jsx-5.0.1" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-1.0.0" @@ -45531,14 +45792,18 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."debug-4.1.1" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" - sources."eslint-utils-1.3.1" + sources."eslint-scope-5.0.0" + sources."eslint-utils-1.4.0" sources."eslint-visitor-keys-1.0.0" sources."espree-6.0.0" sources."esprima-4.0.1" @@ -45557,11 +45822,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.4" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."glob-parent-5.0.0" sources."globals-11.12.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -45570,11 +45831,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-6.5.0" // { - dependencies = [ - sources."strip-ansi-5.2.0" - ]; - }) + sources."inquirer-6.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -45585,7 +45842,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -45599,7 +45856,6 @@ in sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" - sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."prelude-ls-1.1.2" @@ -45612,24 +45868,27 @@ in sources."run-async-2.3.0" sources."rxjs-6.5.2" sources."safer-buffer-2.1.2" - sources."semver-5.7.0" + sources."semver-6.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slice-ansi-2.1.0" sources."sprintf-js-1.0.3" - sources."string-width-2.1.1" - (sources."strip-ansi-4.0.0" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) - sources."strip-json-comments-2.0.1" + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" - (sources."table-5.4.1" // { + (sources."table-5.4.4" // { dependencies = [ sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" ]; }) sources."text-table-0.2.0" @@ -45638,6 +45897,7 @@ in sources."tslib-1.10.0" sources."type-check-0.3.2" sources."uri-js-4.2.2" + sources."v8-compile-cache-2.0.3" sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -45662,13 +45922,13 @@ in sha512 = "9I+AC6Y7WTX4J1O3GGg1LqGiDxOUedLxzIxtKSWnD1FP3z2MPQbnWNNycg9Pq/L5B0NlszdaBlajUexZ8qzuag=="; }; dependencies = [ - sources."@babel/code-frame-7.0.0" + sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" - sources."acorn-6.2.0" + sources."acorn-6.2.1" sources."acorn-jsx-5.0.1" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-1.0.0" @@ -45683,15 +45943,19 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."core_d-1.0.1" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."debug-4.1.1" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-6.0.1" - sources."eslint-scope-4.0.3" - sources."eslint-utils-1.3.1" + sources."eslint-6.1.0" + sources."eslint-scope-5.0.0" + sources."eslint-utils-1.4.0" sources."eslint-visitor-keys-1.0.0" sources."espree-6.0.0" sources."esprima-4.0.1" @@ -45710,11 +45974,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.4" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."glob-parent-5.0.0" sources."globals-11.12.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -45723,11 +45983,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-6.5.0" // { - dependencies = [ - sources."strip-ansi-5.2.0" - ]; - }) + sources."inquirer-6.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -45738,7 +45994,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -45753,7 +46009,6 @@ in sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" - sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -45768,24 +46023,27 @@ in sources."run-async-2.3.0" sources."rxjs-6.5.2" sources."safer-buffer-2.1.2" - sources."semver-5.7.0" + sources."semver-6.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slice-ansi-2.1.0" sources."sprintf-js-1.0.3" - sources."string-width-2.1.1" - (sources."strip-ansi-4.0.0" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) - sources."strip-json-comments-2.0.1" + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" - (sources."table-5.4.1" // { + (sources."table-5.4.4" // { dependencies = [ sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" ]; }) sources."text-table-0.2.0" @@ -45794,6 +46052,7 @@ in sources."tslib-1.10.0" sources."type-check-0.3.2" sources."uri-js-4.2.2" + sources."v8-compile-cache-2.0.3" sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -45835,7 +46094,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -46094,7 +46353,7 @@ in sources."json-stringify-safe-5.0.1" sources."load-json-file-4.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."loud-rejection-1.6.0" sources."lru-cache-4.1.5" sources."map-obj-2.0.0" @@ -46644,14 +46903,14 @@ in sha512 = "76zCOpXUl/85CMk9aJwWbBy2vGYv+Yn17PcUMhksTtMJLAUujje3eP8v7FufC2pN9SbQx88Gtr4ARXGeVWwAJA=="; }; dependencies = [ - sources."async-2.6.2" + sources."async-2.6.3" sources."debug-4.1.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.2" - sources."simple-git-1.120.0" + sources."simple-git-1.122.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -46705,8 +46964,8 @@ in sources."jsonpointer-4.0.1" sources."kvgraph-0.1.0" sources."kvset-1.0.0" - sources."libsodium-0.7.4" - sources."libsodium-wrappers-0.7.4" + sources."libsodium-0.7.5" + sources."libsodium-wrappers-0.7.5" sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" @@ -46722,7 +46981,7 @@ in sources."moo-0.4.3" sources."ms-2.1.2" sources."multicb-1.2.2" - sources."multiserver-3.3.6" + sources."multiserver-3.4.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" @@ -46795,7 +47054,7 @@ in sources."sha.js-2.4.5" sources."smart-buffer-4.0.2" sources."socks-2.3.2" - sources."sodium-browserify-1.2.7" + sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ sources."sha.js-2.4.11" @@ -46816,7 +47075,7 @@ in sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" - sources."ssb-keys-7.1.7" + sources."ssb-keys-7.2.0" sources."ssb-marked-0.6.0" (sources."ssb-mentions-0.1.2" // { dependencies = [ @@ -46895,7 +47154,7 @@ in }) sources."accepts-1.3.7" sources."agent-base-4.3.0" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -46918,7 +47177,7 @@ in sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.2" + sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -47211,7 +47470,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" @@ -48571,7 +48830,7 @@ in sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA=="; }; dependencies = [ - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -48638,7 +48897,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" @@ -48827,10 +49086,10 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-5.2.2.tgz"; - sha512 = "sTPHEGOp0Od+b3d6vfRshjQm24xwOCK0ZNNfVCobUhFpi1/dosfGK8RRQfWKbWSIW3dLL9QwNgcoW+GymDtcCw=="; + url = "https://registry.npmjs.org/ionic/-/ionic-5.2.3.tgz"; + sha512 = "4TX29yrOhlcSFX8LRoB3ss2PaSyV6DBVnnCC7S/hBhmN0jS6/bQS7nO7gafvX8he08MF9DEfz5GVqXvME9a4og=="; }; dependencies = [ sources."@ionic/cli-framework-2.1.2" @@ -48843,7 +49102,7 @@ in sources."@ionic/utils-stream-2.0.0" sources."@ionic/utils-subprocess-1.0.3" sources."@ionic/utils-terminal-1.0.1" - sources."@types/node-8.10.50" + sources."@types/node-8.10.51" sources."agent-base-4.3.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -48960,7 +49219,7 @@ in ]; }) sources."levn-0.3.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -49113,7 +49372,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.0" - sources."ws-7.1.0" + sources."ws-7.1.1" sources."xregexp-2.0.0" sources."yallist-2.1.2" ]; @@ -49313,7 +49572,7 @@ in sources."opentracing-0.13.0" ]; }) - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."long-2.4.0" sources."minimatch-3.0.4" sources."mz-2.7.0" @@ -49321,7 +49580,7 @@ in sources."object-assign-4.1.1" sources."object-hash-1.3.1" sources."once-1.4.0" - sources."opentracing-0.14.3" + sources."opentracing-0.14.4" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" sources."rxjs-5.5.12" @@ -49370,11 +49629,11 @@ in sources."acorn-5.7.3" (sources."acorn-globals-4.3.2" // { dependencies = [ - sources."acorn-6.2.0" + sources."acorn-6.2.1" ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.10.1" + sources."ajv-6.10.2" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -49433,7 +49692,7 @@ in sources."crypt-0.0.2" sources."css-2.2.4" sources."cssom-0.3.8" - sources."cssstyle-1.3.0" + sources."cssstyle-1.4.0" sources."cwise-compiler-1.1.3" sources."dashdash-1.14.1" (sources."data-urls-1.1.0" // { @@ -49569,7 +49828,7 @@ in }) sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."joplin-turndown-4.0.15" + sources."joplin-turndown-4.0.17" sources."joplin-turndown-plugin-gfm-1.0.8" sources."jpeg-js-0.1.2" sources."js-tokens-4.0.0" @@ -49588,8 +49847,8 @@ in sources."levn-0.3.0" sources."linkify-it-2.2.0" sources."locate-path-2.0.0" - sources."lodash-4.17.14" - sources."lodash-es-4.17.14" + sources."lodash-4.17.15" + sources."lodash-es-4.17.15" sources."lodash.padend-4.6.1" sources."lodash.sortby-4.7.0" sources."lodash.toarray-4.4.0" @@ -49647,7 +49906,7 @@ in sources."magicli-0.0.5" ]; }) - sources."omggif-1.0.9" + sources."omggif-1.0.10" sources."once-1.4.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" @@ -49714,7 +49973,7 @@ in sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" - sources."seventh-0.7.23" + sources."seventh-0.7.27" sources."sharp-0.22.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" @@ -49776,7 +50035,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.28.7" + sources."terminal-kit-1.28.19" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -49852,30 +50111,30 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.2.tgz"; - sha512 = "S2vzg99C5+gb7FWlrK4TVdyzVPGGkdvpDkCEJH1JABi2PKzPeLu5/zZffcJUifgWUJqXWl41Hoc+MmuM2GukIg=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.3.tgz"; + sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A=="; }; dependencies = [ - sources."@babel/parser-7.5.0" + sources."@babel/parser-7.5.5" sources."argparse-1.0.10" sources."bluebird-3.5.5" - sources."catharsis-0.8.10" + sources."catharsis-0.8.11" sources."entities-1.1.2" sources."escape-string-regexp-2.0.0" sources."graceful-fs-4.2.0" sources."js2xmlparser-4.0.0" sources."klaw-3.0.0" sources."linkify-it-2.2.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."markdown-it-8.4.2" sources."markdown-it-anchor-5.2.4" - sources."marked-0.6.3" + sources."marked-0.7.0" sources."mdurl-1.0.1" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."requizzle-0.2.2" + sources."requizzle-0.2.3" sources."sprintf-js-1.0.3" sources."strip-json-comments-3.0.1" sources."taffydb-2.6.2" @@ -49925,7 +50184,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -49965,10 +50224,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.0.tgz"; - sha512 = "OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.1.tgz"; + sha512 = "4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -50087,7 +50346,7 @@ in sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.13.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.40.0" @@ -50129,7 +50388,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-align-3.0.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -50260,7 +50519,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."locate-path-3.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" @@ -50439,7 +50698,7 @@ in sources."after-0.8.2" sources."anymatch-3.0.3" sources."arraybuffer.slice-0.0.7" - sources."async-2.6.2" + sources."async-2.6.3" sources."async-limiter-1.0.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" @@ -50468,7 +50727,7 @@ in sources."cookie-0.3.1" sources."core-js-3.1.4" sources."custom-event-1.0.1" - sources."date-format-2.0.0" + sources."date-format-2.1.0" sources."debug-2.6.9" sources."depd-1.1.2" sources."di-0.0.1" @@ -50520,7 +50779,7 @@ in sources."isarray-2.0.1" sources."isbinaryfile-3.0.3" sources."jsonfile-4.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" (sources."log4js-4.5.1" // { dependencies = [ sources."debug-4.1.1" @@ -50721,7 +50980,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -50818,7 +51077,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" (sources."mem-4.3.0" // { @@ -50968,96 +51227,113 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.15.0.tgz"; - sha512 = "kRIQ3bgzkmew5/WZQ0C9WjH0IUf3ZmTNnBwTHfXgLkVY7td0lbwMQFD7zehflUn0zG4ou54o/gn+IfjF0ti/5A=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.16.1.tgz"; + sha512 = "MjVOWbSq5GABjfSG4q4wTw2eOTTFR5pwNmbDioI3nmrGsXI/kzzo3iRPTJlqL1klL+7O6s3lio7838vsPz9Iew=="; }; dependencies = [ - (sources."@evocateur/libnpmaccess-3.1.0" // { + (sources."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ sources."aproba-2.0.0" ]; }) - (sources."@evocateur/libnpmpublish-1.2.0" // { + (sources."@evocateur/libnpmpublish-1.2.2" // { dependencies = [ sources."aproba-2.0.0" + sources."semver-5.7.0" ]; }) - (sources."@evocateur/npm-registry-fetch-3.9.1" // { + sources."@evocateur/npm-registry-fetch-4.0.0" + (sources."@evocateur/pacote-9.6.3" // { dependencies = [ - sources."lru-cache-4.1.5" + sources."semver-5.7.0" ]; }) - sources."@evocateur/pacote-9.6.0" - sources."@lerna/add-3.15.0" - sources."@lerna/batch-packages-3.14.0" - sources."@lerna/bootstrap-3.15.0" - sources."@lerna/changed-3.15.0" + sources."@lerna/add-3.16.1" + sources."@lerna/batch-packages-3.16.0" + sources."@lerna/bootstrap-3.16.1" + sources."@lerna/changed-3.16.1" sources."@lerna/check-working-tree-3.14.2" sources."@lerna/child-process-3.14.2" - sources."@lerna/clean-3.15.0" + sources."@lerna/clean-3.16.0" sources."@lerna/cli-3.13.0" sources."@lerna/collect-uncommitted-3.14.2" - sources."@lerna/collect-updates-3.14.2" - sources."@lerna/command-3.15.0" - sources."@lerna/conventional-commits-3.14.0" - sources."@lerna/create-3.15.0" - sources."@lerna/create-symlink-3.14.0" + sources."@lerna/collect-updates-3.16.0" + sources."@lerna/command-3.16.0" + (sources."@lerna/conventional-commits-3.16.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) + (sources."@lerna/create-3.16.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) + sources."@lerna/create-symlink-3.16.0" sources."@lerna/describe-ref-3.14.2" - sources."@lerna/diff-3.15.0" - sources."@lerna/exec-3.15.0" - sources."@lerna/filter-options-3.14.2" - sources."@lerna/filter-packages-3.13.0" + sources."@lerna/diff-3.16.0" + sources."@lerna/exec-3.16.0" + sources."@lerna/filter-options-3.16.0" + sources."@lerna/filter-packages-3.16.0" sources."@lerna/get-npm-exec-opts-3.13.0" - sources."@lerna/get-packed-3.13.0" - sources."@lerna/github-client-3.14.2" + sources."@lerna/get-packed-3.16.0" + sources."@lerna/github-client-3.16.0" sources."@lerna/gitlab-client-3.15.0" sources."@lerna/global-options-3.13.0" - sources."@lerna/has-npm-version-3.14.2" - sources."@lerna/import-3.15.0" - sources."@lerna/init-3.15.0" - sources."@lerna/link-3.15.0" - sources."@lerna/list-3.15.0" - sources."@lerna/listable-3.14.0" - sources."@lerna/log-packed-3.13.0" - sources."@lerna/npm-conf-3.13.0" - sources."@lerna/npm-dist-tag-3.15.0" - sources."@lerna/npm-install-3.14.2" - sources."@lerna/npm-publish-3.15.0" + sources."@lerna/has-npm-version-3.16.0" + sources."@lerna/import-3.16.0" + sources."@lerna/init-3.16.0" + sources."@lerna/link-3.16.0" + sources."@lerna/list-3.16.0" + sources."@lerna/listable-3.16.0" + sources."@lerna/log-packed-3.16.0" + (sources."@lerna/npm-conf-3.16.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) + sources."@lerna/npm-dist-tag-3.16.0" + sources."@lerna/npm-install-3.16.0" + (sources."@lerna/npm-publish-3.16.1" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) sources."@lerna/npm-run-script-3.14.2" - sources."@lerna/otplease-3.14.0" + sources."@lerna/otplease-3.16.0" sources."@lerna/output-3.13.0" - sources."@lerna/pack-directory-3.14.2" - sources."@lerna/package-3.14.2" - sources."@lerna/package-graph-3.14.0" - sources."@lerna/prerelease-id-from-version-3.14.0" - sources."@lerna/project-3.15.0" + sources."@lerna/pack-directory-3.16.1" + sources."@lerna/package-3.16.0" + sources."@lerna/package-graph-3.16.0" + sources."@lerna/prerelease-id-from-version-3.16.0" + sources."@lerna/project-3.16.0" sources."@lerna/prompt-3.13.0" - sources."@lerna/publish-3.15.0" + sources."@lerna/publish-3.16.1" sources."@lerna/pulse-till-done-3.13.0" - sources."@lerna/query-graph-3.14.0" - sources."@lerna/resolve-symlink-3.13.0" + sources."@lerna/query-graph-3.16.0" + sources."@lerna/resolve-symlink-3.16.0" sources."@lerna/rimraf-dir-3.14.2" - sources."@lerna/run-3.15.0" - sources."@lerna/run-lifecycle-3.14.0" - sources."@lerna/run-parallel-batches-3.13.0" - sources."@lerna/run-topologically-3.14.0" - sources."@lerna/symlink-binary-3.14.2" - sources."@lerna/symlink-dependencies-3.14.2" + sources."@lerna/run-3.16.0" + sources."@lerna/run-lifecycle-3.16.1" + sources."@lerna/run-parallel-batches-3.16.0" + sources."@lerna/run-topologically-3.16.0" + sources."@lerna/symlink-binary-3.16.0" + sources."@lerna/symlink-dependencies-3.16.0" sources."@lerna/timer-3.13.0" sources."@lerna/validation-error-3.13.0" - sources."@lerna/version-3.15.0" + sources."@lerna/version-3.16.1" sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - (sources."@octokit/endpoint-5.2.2" // { + (sources."@octokit/endpoint-5.3.1" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" ]; }) - sources."@octokit/plugin-enterprise-rest-2.2.2" + sources."@octokit/plugin-enterprise-rest-3.6.2" (sources."@octokit/request-5.0.1" // { dependencies = [ sources."is-plain-object-3.0.0" @@ -51065,12 +51341,16 @@ in ]; }) sources."@octokit/request-error-1.0.4" - sources."@octokit/rest-16.28.4" + sources."@octokit/rest-16.28.5" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-12.6.8" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -51080,7 +51360,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-differ-1.0.0" + sources."array-differ-2.1.0" sources."array-find-index-1.0.2" sources."array-ify-1.0.0" sources."array-union-1.0.2" @@ -51115,8 +51395,8 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."byline-5.0.0" - sources."byte-size-4.0.4" - sources."cacache-11.3.3" + sources."byte-size-5.0.1" + sources."cacache-12.0.2" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -51132,7 +51412,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."chownr-1.1.2" - sources."ci-info-1.6.0" + sources."ci-info-2.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -51186,7 +51466,6 @@ in sources."conventional-changelog-preset-loader-2.1.1" (sources."conventional-changelog-writer-4.0.6" // { dependencies = [ - sources."semver-6.2.0" sources."through2-3.0.1" ]; }) @@ -51196,7 +51475,7 @@ in sources."through2-3.0.1" ]; }) - (sources."conventional-recommended-bump-4.1.1" // { + (sources."conventional-recommended-bump-5.0.1" // { dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.4.0" @@ -51206,7 +51485,11 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."currently-unhandled-0.4.1" sources."cyclist-0.2.2" sources."dargs-4.1.0" @@ -51235,13 +51518,14 @@ in sources."deprecation-2.3.1" sources."detect-indent-5.0.0" sources."dezalgo-1.0.3" - sources."dir-glob-2.0.0" + sources."dir-glob-2.2.2" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" + sources."env-paths-1.0.0" sources."err-code-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.13.0" @@ -51289,7 +51573,11 @@ in sources."fast-deep-equal-2.0.1" (sources."fast-glob-2.2.7" // { dependencies = [ - sources."is-glob-4.0.1" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) ]; }) sources."fast-json-stable-stringify-2.0.0" @@ -51307,7 +51595,7 @@ in sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."from2-2.3.0" - sources."fs-extra-7.0.1" + sources."fs-extra-8.1.0" sources."fs-minipass-1.2.6" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" @@ -51342,7 +51630,7 @@ in sources."trim-newlines-1.0.0" ]; }) - sources."get-port-3.2.0" + sources."get-port-4.2.0" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -51353,18 +51641,18 @@ in sources."pify-2.3.0" ]; }) - (sources."git-semver-tags-2.0.3" // { - dependencies = [ - sources."semver-6.2.0" - ]; - }) + sources."git-semver-tags-2.0.3" sources."git-up-4.0.1" sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" sources."glob-7.1.4" - sources."glob-parent-3.1.0" + sources."glob-parent-5.0.0" sources."glob-to-regexp-0.3.0" - sources."globby-8.0.2" + (sources."globby-9.2.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) sources."graceful-fs-4.2.0" (sources."handlebars-4.1.2" // { dependencies = [ @@ -51391,20 +51679,25 @@ in sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."iferr-0.1.5" - sources."ignore-3.3.10" + sources."ignore-4.0.6" sources."ignore-walk-3.0.1" (sources."import-fresh-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" ]; }) - sources."import-local-1.0.0" + sources."import-local-2.0.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."init-package-json-1.10.3" + (sources."init-package-json-1.10.3" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) (sources."inquirer-6.5.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -51417,7 +51710,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" - sources."is-ci-1.2.1" + sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.1" sources."is-descriptor-1.0.2" @@ -51426,7 +51719,7 @@ in sources."is-extglob-2.1.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-3.1.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -51459,9 +51752,13 @@ in sources."jsprim-1.4.1" sources."kind-of-6.0.2" sources."lcid-2.0.0" - sources."load-json-file-4.0.0" + (sources."load-json-file-5.3.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) sources."locate-path-3.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" sources."lodash.get-4.4.2" @@ -51472,14 +51769,10 @@ in sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" sources."loud-rejection-1.6.0" - (sources."lru-cache-5.1.1" // { - dependencies = [ - sources."yallist-3.0.3" - ]; - }) + sources."lru-cache-5.1.1" sources."macos-release-2.3.0" sources."make-dir-1.3.0" - sources."make-fetch-happen-4.0.2" + sources."make-fetch-happen-5.0.0" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-obj-2.0.0" @@ -51502,11 +51795,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minimist-options-3.0.2" - (sources."minipass-2.3.5" // { - dependencies = [ - sources."yallist-3.0.3" - ]; - }) + sources."minipass-2.3.5" sources."minizlib-1.2.1" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { @@ -51518,26 +51807,38 @@ in sources."modify-values-1.0.1" sources."move-concurrently-1.0.1" sources."ms-2.1.2" - sources."multimatch-2.1.0" + sources."multimatch-3.0.0" sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" sources."neo-async-2.6.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.0" sources."node-fetch-npm-2.0.2" - (sources."node-gyp-4.0.0" // { + (sources."node-gyp-5.0.3" // { dependencies = [ sources."semver-5.3.0" ]; }) sources."nopt-3.0.6" - sources."normalize-package-data-2.5.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."normalize-url-3.3.0" sources."npm-bundled-1.0.6" - sources."npm-lifecycle-2.1.1" - sources."npm-package-arg-6.1.0" + sources."npm-lifecycle-3.0.0" + (sources."npm-package-arg-6.1.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."npm-packlist-1.4.4" - sources."npm-pick-manifest-2.2.3" + (sources."npm-pick-manifest-2.2.3" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -51574,7 +51875,7 @@ in sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-map-1.2.0" + sources."p-map-2.1.0" sources."p-map-series-1.0.0" sources."p-pipe-1.2.0" sources."p-queue-4.0.0" @@ -51597,15 +51898,7 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-2.0.0" // { - dependencies = [ - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - ]; - }) + sources."pkg-dir-3.0.0" sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" @@ -51614,7 +51907,6 @@ in sources."proto-list-1.2.4" sources."protocols-1.4.7" sources."protoduck-5.0.1" - sources."pseudomap-1.0.2" sources."psl-1.2.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { @@ -51628,9 +51920,17 @@ in sources."quick-lru-1.1.0" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" - sources."read-package-json-2.0.13" + (sources."read-package-json-2.0.13" // { + dependencies = [ + sources."slash-1.0.0" + ]; + }) sources."read-package-tree-5.3.1" - sources."read-pkg-3.0.0" + (sources."read-pkg-3.0.0" // { + dependencies = [ + sources."load-json-file-4.0.0" + ]; + }) (sources."read-pkg-up-3.0.0" // { dependencies = [ sources."find-up-2.1.0" @@ -51672,7 +51972,7 @@ in sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-5.7.0" + sources."semver-6.2.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -51682,7 +51982,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."slash-1.0.0" + sources."slash-2.0.0" sources."slide-1.1.6" sources."smart-buffer-4.0.2" (sources."snapdragon-0.8.2" // { @@ -51775,11 +52075,7 @@ in ]; }) sources."supports-color-5.5.0" - (sources."tar-4.4.10" // { - dependencies = [ - sources."yallist-3.0.3" - ]; - }) + sources."tar-4.4.10" sources."temp-dir-1.0.0" sources."temp-write-3.4.0" sources."text-extensions-2.0.0" @@ -51804,6 +52100,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-fest-0.3.1" sources."typedarray-0.0.6" (sources."uglify-js-3.6.0" // { dependencies = [ @@ -51853,11 +52150,21 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."write-json-file-2.3.0" - sources."write-pkg-3.2.0" + (sources."write-json-file-3.2.0" // { + dependencies = [ + sources."make-dir-2.1.0" + sources."pify-4.0.1" + sources."semver-5.7.0" + ]; + }) + (sources."write-pkg-3.2.0" // { + dependencies = [ + sources."write-json-file-2.3.0" + ]; + }) sources."xtend-4.0.2" sources."y18n-4.0.0" - sources."yallist-2.1.2" + sources."yallist-3.0.3" sources."yargs-12.0.5" sources."yargs-parser-11.1.1" ]; @@ -51880,7 +52187,7 @@ in sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -52311,7 +52618,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -52807,38 +53114,38 @@ in version = "1.9.0"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.0.0" - sources."@babel/core-7.5.4" - sources."@babel/generator-7.5.0" + sources."@babel/code-frame-7.5.5" + sources."@babel/core-7.5.5" + sources."@babel/generator-7.5.5" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-call-delegate-7.4.4" - sources."@babel/helper-create-class-features-plugin-7.5.0" - sources."@babel/helper-define-map-7.4.4" + sources."@babel/helper-create-class-features-plugin-7.5.5" + sources."@babel/helper-define-map-7.5.5" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" sources."@babel/helper-get-function-arity-7.0.0" sources."@babel/helper-hoist-variables-7.4.4" - sources."@babel/helper-member-expression-to-functions-7.0.0" + sources."@babel/helper-member-expression-to-functions-7.5.5" sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.4.4" + sources."@babel/helper-module-transforms-7.5.5" sources."@babel/helper-optimise-call-expression-7.0.0" sources."@babel/helper-plugin-utils-7.0.0" - sources."@babel/helper-regex-7.4.4" + sources."@babel/helper-regex-7.5.5" sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.4.4" + sources."@babel/helper-replace-supers-7.5.5" sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.4.4" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.5.4" + sources."@babel/helpers-7.5.5" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.5.0" + sources."@babel/parser-7.5.5" sources."@babel/plugin-external-helpers-7.0.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-class-properties-7.5.0" + sources."@babel/plugin-proposal-class-properties-7.5.5" sources."@babel/plugin-proposal-dynamic-import-7.5.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.5.4" + sources."@babel/plugin-proposal-object-rest-spread-7.5.5" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -52849,8 +53156,8 @@ in sources."@babel/plugin-transform-arrow-functions-7.2.0" sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.4.4" - sources."@babel/plugin-transform-classes-7.4.4" + sources."@babel/plugin-transform-block-scoping-7.5.5" + sources."@babel/plugin-transform-classes-7.5.5" sources."@babel/plugin-transform-computed-properties-7.2.0" sources."@babel/plugin-transform-destructuring-7.5.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" @@ -52866,24 +53173,24 @@ in sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" sources."@babel/plugin-transform-new-target-7.4.4" - sources."@babel/plugin-transform-object-super-7.2.0" + sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-property-literals-7.2.0" sources."@babel/plugin-transform-regenerator-7.4.5" sources."@babel/plugin-transform-reserved-words-7.2.0" - sources."@babel/plugin-transform-runtime-7.5.0" + sources."@babel/plugin-transform-runtime-7.5.5" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.4.4" - sources."@babel/preset-env-7.5.4" + sources."@babel/preset-env-7.5.5" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.5.4" + sources."@babel/runtime-7.5.5" sources."@babel/template-7.4.4" - sources."@babel/traverse-7.5.0" - sources."@babel/types-7.5.0" + sources."@babel/traverse-7.5.5" + sources."@babel/types-7.5.5" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -52894,7 +53201,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -52916,8 +53223,8 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ace.improved-0.2.1" - sources."acorn-6.2.0" - sources."ajv-6.10.1" + sources."acorn-6.2.1" + sources."ajv-6.10.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."amdefine-1.0.1" @@ -53087,7 +53394,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.6.4" + sources."browserslist-4.6.6" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -53110,7 +53417,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30000984" + sources."caniuse-lite-1.0.30000985" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -53269,7 +53576,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.191" + sources."electron-to-chromium-1.3.198" sources."elliptic-6.5.0" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -53572,7 +53879,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.isplainobject-4.0.6" sources."lodash.some-4.6.0" sources."log-symbols-2.2.0" @@ -53821,8 +54128,8 @@ in }) sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.1.0" - sources."regenerator-runtime-0.13.2" - sources."regenerator-transform-0.14.0" + sources."regenerator-runtime-0.13.3" + sources."regenerator-transform-0.14.1" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexp-tree-0.1.11" @@ -54056,7 +54363,7 @@ in sources."vm-browserify-1.1.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.35.3" // { + (sources."webpack-4.36.1" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -54098,7 +54405,7 @@ in sources."ms-2.0.0" ]; }) - (sources."webpack-cli-3.3.5" // { + (sources."webpack-cli-3.3.6" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -54186,11 +54493,11 @@ in sha512 = "X/HWomzeox5HtkKLupin4affBXHq22r7RNqiSKsxlgZQMSU9n+zpGY0sbzJr1IycB6FXpKUZet1VH3Rs1/8WQg=="; }; dependencies = [ - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.2" + sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -54228,7 +54535,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."link-check-4.4.5" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."markdown-link-extractor-1.2.1" sources."marked-0.6.3" sources."mime-db-1.40.0" @@ -54647,7 +54954,7 @@ in }) (sources."gulp-uglify-3.0.1" // { dependencies = [ - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -55045,10 +55352,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "6.1.4"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-6.1.4.tgz"; - sha512 = "PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.2.0.tgz"; + sha512 = "qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ=="; }; dependencies = [ sources."ansi-colors-3.2.3" @@ -55107,7 +55414,7 @@ in sources."js-yaml-3.13.1" sources."lcid-2.0.0" sources."locate-path-3.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" sources."mem-4.3.0" @@ -55219,7 +55526,7 @@ in sources."commander-2.19.0" ]; }) - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.40.0" @@ -55267,7 +55574,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."msgpack-lite-0.1.26" sources."semver-5.7.0" sources."stack-trace-0.0.10" @@ -55317,7 +55624,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -55500,14 +55807,14 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.2.tgz"; - sha512 = "sNcb5O7eJ9XiNAhWZ/UE2bWsBJn3Jb7rayMqMP4wjenlr1DwzZxUmbtmIrl04EU0p5fN2rU9WIDV+u0EbsI8oQ=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.3.tgz"; + sha512 = "z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -56384,7 +56691,7 @@ in sha512 = "klwQup/74kYGLBujQj4txrmpMYUdR88A68xjdycedD9dwMDwWCu8NL5t+O8XMWYxJ332hOIgLS62tm8ChxrkuQ=="; }; dependencies = [ - sources."@babel/runtime-7.5.4" + sources."@babel/runtime-7.5.5" sources."@node-red/editor-api-0.20.7" sources."@node-red/editor-client-0.20.7" (sources."@node-red/nodes-0.20.7" // { @@ -56622,7 +56929,7 @@ in sources."libmime-4.1.1" sources."libqp-1.1.0" sources."linkify-it-2.1.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" @@ -56700,10 +57007,10 @@ in sources."node-red-node-email-1.6.2" sources."node-red-node-feedparser-0.1.14" sources."node-red-node-rbe-0.2.4" - sources."node-red-node-sentiment-0.1.3" + sources."node-red-node-sentiment-0.1.4" sources."node-red-node-tail-0.0.2" sources."node-red-node-twitter-1.1.5" - sources."nodemailer-6.2.1" + sources."nodemailer-6.3.0" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" sources."npm-packlist-1.4.4" @@ -56759,7 +57066,7 @@ in sources."raw-body-2.4.0" sources."rc-1.2.8" sources."readable-stream-3.4.0" - sources."regenerator-runtime-0.13.2" + sources."regenerator-runtime-0.13.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" (sources."request-2.88.0" // { @@ -56898,7 +57205,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -57067,10 +57374,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.1.18"; + version = "3.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.18.tgz"; - sha512 = "e4UGOGdFs9+9uRrZrojueT+fjg4uVZzi8fyDdWIS9+JIl4J4xqODh0vp1TdCnedjn8jTPy1dhUtbjQtRWAhV8w=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.20.tgz"; + sha512 = "mc9BAoOYSTwP/IvoA+ofdkWSipwRvhgC0qop1PvlMZojgzi7N/dykdxOIWrw0OlZPnEKvXkKFEuPk97LrvXE1A=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -57089,7 +57396,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."builtins-1.0.3" - sources."cacache-11.3.3" + sources."cacache-12.0.2" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.1.0" @@ -57174,6 +57481,7 @@ in sources."ignore-walk-3.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -57211,11 +57519,11 @@ in ]; }) sources."locate-path-5.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."make-dir-1.3.0" - sources."make-fetch-happen-4.0.2" + sources."make-fetch-happen-5.0.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -57252,7 +57560,7 @@ in sources."semver-5.7.0" ]; }) - sources."npm-registry-fetch-3.9.1" + sources."npm-registry-fetch-4.0.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."object-keys-1.1.1" @@ -57265,12 +57573,8 @@ in sources."p-limit-2.2.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - (sources."package-json-6.4.0" // { - dependencies = [ - sources."registry-auth-token-3.4.0" - ]; - }) - (sources."pacote-9.5.2" // { + sources."package-json-6.4.0" + (sources."pacote-9.5.4" // { dependencies = [ sources."semver-5.7.0" ]; @@ -57312,7 +57616,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."registry-auth-token-4.0.0" + sources."registry-auth-token-3.4.0" sources."registry-url-5.1.0" sources."require-from-string-2.0.2" (sources."requireg-0.2.2" // { @@ -57564,7 +57868,7 @@ in sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -57573,7 +57877,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.0" + sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" @@ -57764,13 +58068,17 @@ in sources."accepts-1.2.13" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.10.1" - sources."archiver-3.0.0" - sources."archiver-utils-2.0.0" + sources."ajv-6.10.2" + sources."archiver-3.0.3" + (sources."archiver-utils-2.1.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.2" + sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -57794,7 +58102,7 @@ in sources."minimist-1.2.0" ]; }) - sources."bl-1.2.2" + sources."bl-3.0.0" sources."blob-0.0.4" sources."bn.js-4.11.8" sources."bncode-0.5.3" @@ -57823,9 +58131,9 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - (sources."compress-commons-1.2.2" // { + (sources."compress-commons-2.0.0" // { dependencies = [ - sources."normalize-path-2.1.1" + sources."readable-stream-2.3.6" ]; }) sources."compressible-2.0.17" @@ -57855,7 +58163,11 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."crc-3.8.0" - sources."crc32-stream-2.0.0" + (sources."crc32-stream-2.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) (sources."csrf-3.0.6" // { dependencies = [ sources."uid-safe-2.1.4" @@ -57975,14 +58287,16 @@ in sources."bencode-2.0.1" ]; }) - sources."lazystream-1.0.0" - sources."lodash-4.17.14" - sources."lodash.assign-4.2.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) + sources."lodash-4.17.15" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.isplainobject-4.0.6" - sources."lodash.toarray-4.4.0" sources."lodash.union-4.6.0" sources."lru-2.0.1" sources."magnet-uri-2.0.1" @@ -58062,8 +58376,7 @@ in }) sources."re-emitter-1.1.4" sources."read-torrent-1.3.1" - sources."readable-stream-2.3.6" - sources."remove-trailing-separator-1.1.0" + sources."readable-stream-3.4.0" sources."request-2.88.0" sources."response-time-2.3.2" sources."rimraf-2.6.3" @@ -58105,10 +58418,15 @@ in sources."setprototypeof-1.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - sources."simple-peer-6.4.4" + (sources."simple-peer-6.4.4" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."simple-sha1-2.1.2" (sources."simple-websocket-4.3.1" // { dependencies = [ + sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" sources."ultron-1.1.1" sources."ws-2.3.1" @@ -58150,11 +58468,10 @@ in }) sources."string2compact-1.3.0" sources."string_decoder-1.1.1" - sources."tar-stream-1.6.2" + sources."tar-stream-2.1.0" sources."thirty-two-0.0.2" sources."thunky-1.0.3" sources."to-array-0.1.4" - sources."to-buffer-1.1.1" sources."toidentifier-1.0.0" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.2" @@ -58193,7 +58510,7 @@ in sources."xmlhttprequest-ssl-1.5.3" sources."xtend-4.0.2" sources."yeast-0.1.2" - sources."zip-stream-2.0.1" + sources."zip-stream-2.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -58208,10 +58525,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.5.7"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.5.7.tgz"; - sha512 = "RmUJo7V8mSw9Tu8hRhi4tXagjO3+S/qHdDkAtYxZA/v9fvG3ux1aSiKcIeOmN4A1FCRHG7xy/sfFQC1lhSm5uQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.0.tgz"; + sha512 = "tjBYCFDvnGdA/FHlOfLn4WZ2Iy1JO8GRFem0RkbtbKO91Z9Jz8v2oYQYkMspY7/7lCBbjQA8+eUatTUu3d6eqw=="; }; buildInputs = globalBuildInputs; meta = { @@ -58249,16 +58566,17 @@ in sources."@babel/helper-builder-react-jsx-7.3.0" (sources."@babel/helper-call-delegate-7.4.4" // { dependencies = [ - sources."@babel/generator-7.5.0" - sources."@babel/parser-7.5.0" - sources."@babel/traverse-7.5.0" - sources."@babel/types-7.5.0" + sources."@babel/code-frame-7.5.5" + sources."@babel/generator-7.5.5" + sources."@babel/parser-7.5.5" + sources."@babel/traverse-7.5.5" + sources."@babel/types-7.5.5" sources."source-map-0.5.7" ]; }) - (sources."@babel/helper-define-map-7.4.4" // { + (sources."@babel/helper-define-map-7.5.5" // { dependencies = [ - sources."@babel/types-7.5.0" + sources."@babel/types-7.5.5" ]; }) sources."@babel/helper-explode-assignable-expression-7.1.0" @@ -58266,45 +58584,51 @@ in sources."@babel/helper-get-function-arity-7.0.0" (sources."@babel/helper-hoist-variables-7.4.4" // { dependencies = [ - sources."@babel/types-7.5.0" + sources."@babel/types-7.5.5" ]; }) - sources."@babel/helper-member-expression-to-functions-7.0.0" - sources."@babel/helper-module-imports-7.0.0" - (sources."@babel/helper-module-transforms-7.4.4" // { + (sources."@babel/helper-member-expression-to-functions-7.5.5" // { dependencies = [ - sources."@babel/parser-7.5.0" + sources."@babel/types-7.5.5" + ]; + }) + sources."@babel/helper-module-imports-7.0.0" + (sources."@babel/helper-module-transforms-7.5.5" // { + dependencies = [ + sources."@babel/parser-7.5.5" sources."@babel/template-7.4.4" - sources."@babel/types-7.5.0" + sources."@babel/types-7.5.5" ]; }) sources."@babel/helper-optimise-call-expression-7.0.0" sources."@babel/helper-plugin-utils-7.0.0" - sources."@babel/helper-regex-7.4.4" + sources."@babel/helper-regex-7.5.5" sources."@babel/helper-remap-async-to-generator-7.1.0" - (sources."@babel/helper-replace-supers-7.4.4" // { + (sources."@babel/helper-replace-supers-7.5.5" // { dependencies = [ - sources."@babel/generator-7.5.0" - sources."@babel/parser-7.5.0" - sources."@babel/traverse-7.5.0" - sources."@babel/types-7.5.0" + sources."@babel/code-frame-7.5.5" + sources."@babel/generator-7.5.5" + sources."@babel/parser-7.5.5" + sources."@babel/traverse-7.5.5" + sources."@babel/types-7.5.5" sources."source-map-0.5.7" ]; }) sources."@babel/helper-simple-access-7.1.0" (sources."@babel/helper-split-export-declaration-7.4.4" // { dependencies = [ - sources."@babel/types-7.5.0" + sources."@babel/types-7.5.5" ]; }) sources."@babel/helper-wrap-function-7.2.0" - (sources."@babel/helpers-7.5.4" // { + (sources."@babel/helpers-7.5.5" // { dependencies = [ - sources."@babel/generator-7.5.0" - sources."@babel/parser-7.5.0" + sources."@babel/code-frame-7.5.5" + sources."@babel/generator-7.5.5" + sources."@babel/parser-7.5.5" sources."@babel/template-7.4.4" - sources."@babel/traverse-7.5.0" - sources."@babel/types-7.5.0" + sources."@babel/traverse-7.5.5" + sources."@babel/types-7.5.5" sources."source-map-0.5.7" ]; }) @@ -58312,7 +58636,7 @@ in sources."@babel/parser-7.3.4" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.5.4" + sources."@babel/plugin-proposal-object-rest-spread-7.5.5" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -58324,8 +58648,8 @@ in sources."@babel/plugin-transform-arrow-functions-7.2.0" sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.4.4" - sources."@babel/plugin-transform-classes-7.4.4" + sources."@babel/plugin-transform-block-scoping-7.5.5" + sources."@babel/plugin-transform-classes-7.5.5" sources."@babel/plugin-transform-computed-properties-7.2.0" sources."@babel/plugin-transform-destructuring-7.5.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" @@ -58341,7 +58665,7 @@ in sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" sources."@babel/plugin-transform-new-target-7.4.4" - sources."@babel/plugin-transform-object-super-7.2.0" + sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-react-jsx-7.3.0" sources."@babel/plugin-transform-regenerator-7.4.5" @@ -58370,11 +58694,11 @@ in sources."acorn-5.7.3" (sources."acorn-globals-4.3.2" // { dependencies = [ - sources."acorn-6.2.0" + sources."acorn-6.2.1" ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -58445,7 +58769,7 @@ in sources."pako-1.0.10" ]; }) - sources."browserslist-4.6.4" + sources."browserslist-4.6.6" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -58461,7 +58785,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30000984" + sources."caniuse-lite-1.0.30000985" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.6" @@ -58524,13 +58848,12 @@ in sources."regjsparser-0.1.5" ]; }) - (sources."css-tree-1.0.0-alpha.28" // { + (sources."css-tree-1.0.0-alpha.33" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."css-unit-converter-1.1.1" - sources."css-url-regex-1.1.0" sources."css-what-2.1.3" sources."cssesc-0.1.0" sources."cssnano-4.1.10" @@ -58542,11 +58865,12 @@ in (sources."csso-3.5.1" // { dependencies = [ sources."css-tree-1.0.0-alpha.29" + sources."mdn-data-1.1.4" sources."source-map-0.5.7" ]; }) sources."cssom-0.3.8" - sources."cssstyle-1.3.0" + sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."date-now-0.1.4" @@ -58594,7 +58918,7 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.191" + sources."electron-to-chromium-1.3.198" sources."elliptic-6.5.0" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -58744,7 +59068,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-beautify-1.10.0" + sources."js-beautify-1.10.1" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" (sources."js-yaml-3.13.1" // { @@ -58755,9 +59079,9 @@ in sources."jsbn-0.1.1" (sources."jsdom-15.1.1" // { dependencies = [ - sources."acorn-6.2.0" + sources."acorn-6.2.1" sources."escodegen-1.11.1" - sources."ws-7.1.0" + sources."ws-7.1.1" ]; }) sources."jsesc-2.5.2" @@ -58769,7 +59093,7 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."levn-0.3.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" @@ -58781,7 +59105,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" - sources."mdn-data-1.1.4" + sources."mdn-data-2.0.4" (sources."merge-source-map-1.0.4" // { dependencies = [ sources."source-map-0.5.7" @@ -58971,7 +59295,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.1.0" sources."regenerator-runtime-0.12.1" - sources."regenerator-transform-0.14.0" + sources."regenerator-transform-0.14.1" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -59013,7 +59337,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."safer-eval-1.3.3" + sources."safer-eval-1.3.5" sources."sax-1.2.4" sources."saxes-3.1.11" sources."semver-5.7.0" @@ -59084,7 +59408,7 @@ in ]; }) sources."supports-color-5.5.0" - sources."svgo-1.2.2" + sources."svgo-1.3.0" sources."symbol-tree-3.2.4" sources."terser-3.17.0" sources."through2-2.0.5" @@ -59214,7 +59538,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.2.0" + sources."acorn-6.2.1" sources."acorn-dynamic-import-4.0.0" sources."acorn-node-1.7.0" sources."acorn-walk-6.2.0" @@ -59327,7 +59651,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" @@ -59596,7 +59920,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -59860,7 +60184,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -60198,7 +60522,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.2" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."micromatch-3.1.10" @@ -60469,19 +60793,19 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.193.1"; + version = "1.195.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.193.1.tgz"; - sha512 = "bwxrpR8T5tOQgLGwBMq7BYKDvLQRVsB3znMJpdZpYnMCY34MpmkuDhU+546TA8kmp5cLPCg+0BlaO7Yrj3Ouag=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.195.1.tgz"; + sha512 = "PJ5K8W+gTkg/CktePxvhahiHZ75PC6ZPVpsk2icYX9nx9Fx4VYZ8pt8GJYo31KLrlwENG3WxBNV5xas+dd2csg=="; }; dependencies = [ sources."@snyk/composer-lockfile-parser-1.0.3" - sources."@snyk/dep-graph-1.8.1" + sources."@snyk/dep-graph-1.10.0" sources."@snyk/gemfile-1.2.0" sources."@types/agent-base-4.2.0" sources."@types/debug-4.1.4" sources."@types/events-3.0.0" - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -60537,7 +60861,7 @@ in sources."crypto-random-string-1.0.0" (sources."data-uri-to-buffer-2.0.1" // { dependencies = [ - sources."@types/node-8.10.50" + sources."@types/node-8.10.51" ]; }) sources."debug-3.2.6" @@ -60650,7 +60974,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."lie-3.3.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -60745,7 +61069,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."smart-buffer-4.0.2" - sources."snyk-config-2.2.1" + sources."snyk-config-2.2.2" (sources."snyk-docker-plugin-1.25.1" // { dependencies = [ sources."debug-4.1.1" @@ -60780,7 +61104,7 @@ in sources."semver-5.7.0" ]; }) - (sources."snyk-sbt-plugin-2.5.6" // { + (sources."snyk-sbt-plugin-2.5.7" // { dependencies = [ sources."tmp-0.1.0" ]; @@ -61130,10 +61454,10 @@ in ssb-server = nodeEnv.buildNodePackage { name = "ssb-server"; packageName = "ssb-server"; - version = "15.0.2"; + version = "15.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.0.2.tgz"; - sha512 = "xY3H+E3P5vSQREtoBohUT/1Lhx01NNTkooud29h+fhwXX1+Erowds/b0M+HpVpVClY8/yR4/0jATBg0oKvD+VA=="; + url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.1.0.tgz"; + sha512 = "4qn3Q+xpKL6BKBTgO1dHSt5ljyrZkWVoHYaZzCYbs75rGbaGvc0evSyu2TpaYwiiSxrVxJGYr8s4MyXzdPqUVQ=="; }; dependencies = [ sources."abstract-leveldown-6.0.3" @@ -61165,7 +61489,7 @@ in sources."isobject-3.0.1" ]; }) - sources."base64-url-2.2.2" + sources."base64-url-2.3.2" sources."bash-color-0.0.4" sources."binary-extensions-1.13.1" sources."binary-search-1.3.5" @@ -61289,7 +61613,7 @@ in ]; }) sources."flumedb-1.1.0" - sources."flumelog-offset-3.4.2" + sources."flumelog-offset-3.4.3" sources."flumeview-hashtable-1.1.1" sources."flumeview-level-3.0.13" (sources."flumeview-query-6.3.0" // { @@ -61443,8 +61767,8 @@ in }) sources."levelup-4.1.0" sources."libnested-1.4.1" - sources."libsodium-0.7.4" - sources."libsodium-wrappers-0.7.4" + sources."libsodium-0.7.5" + sources."libsodium-wrappers-0.7.5" sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" sources."log-update-1.0.2" @@ -61478,7 +61802,7 @@ in sources."multiblob-1.13.4" sources."multiblob-http-1.0.0" sources."multicb-1.2.2" - sources."multiserver-3.3.6" + sources."multiserver-3.4.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" @@ -61753,7 +62077,7 @@ in }) sources."snapdragon-util-3.0.1" sources."socks-2.3.2" - sources."sodium-browserify-1.2.7" + sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ sources."sha.js-2.4.11" @@ -61776,7 +62100,7 @@ in sources."ssb-friends-4.1.4" sources."ssb-gossip-1.1.0" sources."ssb-invite-2.1.3" - sources."ssb-keys-7.1.7" + sources."ssb-keys-7.2.0" sources."ssb-links-3.0.8" sources."ssb-local-1.0.0" sources."ssb-logging-1.0.0" @@ -61930,10 +62254,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz"; - sha512 = "rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA=="; + url = "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz"; + sha512 = "MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ=="; }; dependencies = [ sources."@types/q-1.5.2" @@ -61946,12 +62270,12 @@ in sources."color-name-1.1.3" sources."css-select-2.0.2" sources."css-select-base-adapter-0.1.1" - sources."css-tree-1.0.0-alpha.28" - sources."css-url-regex-1.1.0" + sources."css-tree-1.0.0-alpha.33" sources."css-what-2.1.3" (sources."csso-3.5.1" // { dependencies = [ sources."css-tree-1.0.0-alpha.29" + sources."mdn-data-1.1.4" ]; }) sources."define-properties-1.1.3" @@ -61972,7 +62296,7 @@ in sources."is-regex-1.0.4" sources."is-symbol-1.0.2" sources."js-yaml-3.13.1" - sources."mdn-data-1.1.4" + sources."mdn-data-2.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.2" @@ -62204,7 +62528,7 @@ in sources."graceful-fs-4.2.0" (sources."graphlib-2.1.7" // { dependencies = [ - sources."lodash-4.17.14" + sources."lodash-4.17.15" ]; }) sources."growl-1.9.2" @@ -62275,7 +62599,7 @@ in sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ - sources."lodash-4.17.14" + sources."lodash-4.17.15" ]; }) sources."jsonfile-2.4.0" @@ -62342,7 +62666,7 @@ in }) sources."mpath-0.2.1" sources."ms-2.0.0" - sources."multer-1.4.1" + sources."multer-1.4.2" sources."mute-stream-0.0.5" sources."nan-2.14.0" sources."nanomatch-1.2.13" @@ -62635,8 +62959,8 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-12.6.2" - sources."ajv-6.10.1" + sources."@types/node-12.6.8" + sources."ajv-6.10.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -62760,7 +63084,7 @@ in sha512 = "6jK0DcgziZ0NAitZNncg+do/fKGh8hQJShcVU7dHoAljdckr7qr2oozd4l4kTIA7M+0FoKXy6gvRBLO8oWpTEw=="; }; dependencies = [ - sources."acorn-6.2.0" + sources."acorn-6.2.1" sources."acorn-loose-6.1.0" sources."acorn-walk-6.2.0" sources."balanced-match-1.0.0" @@ -62803,25 +63127,27 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.2.6"; + version = "11.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.2.6.tgz"; - sha512 = "TkiRpF6kdP2WMSeJSZjeLU2Kec8+kd369H4zIdTOBSiQ6QgWG8aM2MUw9R07HFe28G9CRTU6wF7C9hguWBnAyg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.3.1.tgz"; + sha512 = "svbO/fhj7dLTJcdKgrW5fJtNRHoFFVL+sutsKBmNUcSJgvgWteLOUZAKT/dp/4S0QfkwkpNOts7Bzn9T+0h0Cw=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-4.2.2" - sources."@textlint/ast-traverse-2.1.3" + sources."@textlint/ast-node-types-4.2.4" + sources."@textlint/ast-traverse-2.1.5" sources."@textlint/feature-flag-3.1.3" - sources."@textlint/fixer-formatter-3.1.6" - sources."@textlint/kernel-3.1.6" - sources."@textlint/linter-formatter-3.1.5" - sources."@textlint/markdown-to-ast-6.1.3" - sources."@textlint/text-to-ast-3.1.3" - sources."@textlint/textlint-plugin-markdown-5.1.6" - sources."@textlint/textlint-plugin-text-4.1.6" - sources."@textlint/types-1.1.5" + sources."@textlint/fixer-formatter-3.1.8" + sources."@textlint/kernel-3.1.8" + sources."@textlint/linter-formatter-3.1.7" + sources."@textlint/markdown-to-ast-6.1.5" + sources."@textlint/module-interop-1.0.1" + sources."@textlint/text-to-ast-3.1.5" + sources."@textlint/textlint-plugin-markdown-5.1.8" + sources."@textlint/textlint-plugin-text-4.1.8" + sources."@textlint/types-1.2.1" + sources."@textlint/utils-1.0.2" sources."@types/bluebird-3.5.27" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" @@ -62875,7 +63201,6 @@ in sources."hosted-git-info-2.7.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."interop-require-1.0.0" sources."is-alphabetical-1.0.3" sources."is-alphanumerical-1.0.3" sources."is-arrayish-0.2.1" @@ -62905,7 +63230,7 @@ in sources."levn-0.3.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."log-symbols-1.0.2" sources."map-like-2.0.0" sources."markdown-escapes-1.0.3" @@ -63027,7 +63352,7 @@ in sha1 = "9139c65b8da891c983b368a50a286338cd76777a"; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.2" + sources."@textlint/ast-node-types-4.2.4" sources."txt-to-ast-3.0.3" ]; buildInputs = globalBuildInputs; @@ -63050,7 +63375,7 @@ in }; dependencies = [ sources."define-properties-1.1.3" - sources."match-index-1.0.1" + sources."match-index-1.0.3" sources."object-keys-1.1.1" sources."regexp.prototype.flags-1.2.0" ]; @@ -63073,8 +63398,8 @@ in sha512 = "TP+dtJcCe0+ZR7Gp1E3iJdf3XtOImrEIcUdaQnok4QJJEutZ1dTiP4rCfnyOxz70NZ+2RdBJgZeZZWGhuJzSwA=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.2" - sources."@textlint/types-1.1.5" + sources."@textlint/ast-node-types-4.2.4" + sources."@textlint/types-1.2.1" sources."alex-5.1.0" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" @@ -63507,8 +63832,8 @@ in sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.2" - sources."@textlint/types-1.1.5" + sources."@textlint/ast-node-types-4.2.4" + sources."@textlint/types-1.2.1" sources."boundary-1.0.1" sources."buffer-from-1.1.1" sources."concat-stream-1.6.2" @@ -63589,16 +63914,16 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "1.0.14"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-1.0.14.tgz"; - sha512 = "Erogu6UvuFHHzUrEG9Jq2oMWYVcJ5eYy9/CLw2yRbfmSvTwo1MqAE5Ua4NJsdm5vcMARHJsQCPyWzLIgVIVsRA=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-1.0.16.tgz"; + sha512 = "gteiC5eaOlb0jqewGVb5u85MudqCIPdoDn8Un8TgPJQR0w5BxfBNJEXxDgegeh4d+e2yeEJCgUzfLrdt1rHVMg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.2" - sources."@textlint/types-1.1.5" + sources."@textlint/ast-node-types-4.2.4" + sources."@textlint/types-1.2.1" sources."boundary-1.0.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."split-lines-2.0.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -63625,10 +63950,10 @@ in sha512 = "PsLiridAdaLyho236adWnTEAbAcxxUsxVqaXWaJce+aRsjCOeyYPBLNRisFGz90KZ0S1NDYT/v5CvzBrgsiuzQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.2" - sources."@textlint/types-1.1.5" + sources."@textlint/ast-node-types-4.2.4" + sources."@textlint/types-1.2.1" sources."boundary-1.0.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -63688,8 +64013,8 @@ in sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.2" - sources."@textlint/types-1.1.5" + sources."@textlint/ast-node-types-4.2.4" + sources."@textlint/types-1.2.1" sources."adverb-where-0.0.9" sources."boundary-1.0.1" sources."define-properties-1.1.3" @@ -63758,10 +64083,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.1.1"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.1.1.tgz"; - sha512 = "BVo5Xc7R6VLw1AIyPUSbc5mQ5z9b7TzyU3bRzknIYwWDcK1QgrXYJy5NR4C3Yzsyl0pzRyNoX6hfIevDaG+pqA=="; + url = "https://registry.npmjs.org/triton/-/triton-7.3.0.tgz"; + sha512 = "7O44Ds3J1bVeTHW4uZKSaEzxyV4+Dy5P29hQ4G9XgxGMUAVGtfUZEe77gppEqIxoIscDP9LRpzBPim21b6p+8Q=="; }; dependencies = [ sources."asn1-0.2.4" @@ -63817,7 +64142,7 @@ in ]; }) sources."keep-alive-agent-0.0.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" (sources."lomstream-1.1.0" // { dependencies = [ sources."assert-plus-0.1.5" @@ -63956,7 +64281,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.6" + sources."@types/node-6.14.7" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -64096,7 +64421,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" @@ -64299,7 +64624,7 @@ in sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."locks-0.2.2" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.merge-4.6.2" sources."lru-cache-4.1.5" sources."map-age-cleaner-0.1.3" @@ -64602,7 +64927,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -64615,7 +64940,7 @@ in sources."arrify-1.0.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.2" + sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -64744,7 +65069,7 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."log-symbols-2.2.0" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { @@ -64891,50 +65216,50 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.9.2.tgz"; - sha512 = "JKDt7plf3FOCK6X4OpK6ZETFFFw0AkrnmPqwyyi1Jc/irFz6eNVRBlodXk8rikQuY5MKbi+6hVOXitHPXbZc+w=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.9.3.tgz"; + sha512 = "+l/N5sNSwvDe6UsVrqcz8GIWp8QO5Q72OUW7P0X3xdcVo0XPnzwJ/jzKaYGnp7/syOFTIfL6KyW4gVezPE2oPA=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" sources."@apollographql/apollo-tools-0.3.7" sources."@apollographql/graphql-playground-html-1.6.24" - sources."@babel/code-frame-7.0.0" - (sources."@babel/core-7.5.4" // { + sources."@babel/code-frame-7.5.5" + (sources."@babel/core-7.5.5" // { dependencies = [ sources."semver-5.7.0" ]; }) - sources."@babel/generator-7.5.0" + sources."@babel/generator-7.5.5" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-call-delegate-7.4.4" - sources."@babel/helper-create-class-features-plugin-7.5.0" - sources."@babel/helper-define-map-7.4.4" + sources."@babel/helper-create-class-features-plugin-7.5.5" + sources."@babel/helper-define-map-7.5.5" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" sources."@babel/helper-get-function-arity-7.0.0" sources."@babel/helper-hoist-variables-7.4.4" - sources."@babel/helper-member-expression-to-functions-7.0.0" + sources."@babel/helper-member-expression-to-functions-7.5.5" sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.4.4" + sources."@babel/helper-module-transforms-7.5.5" sources."@babel/helper-optimise-call-expression-7.0.0" sources."@babel/helper-plugin-utils-7.0.0" - sources."@babel/helper-regex-7.4.4" + sources."@babel/helper-regex-7.5.5" sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.4.4" + sources."@babel/helper-replace-supers-7.5.5" sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.4.4" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.5.4" + sources."@babel/helpers-7.5.5" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.5.0" + sources."@babel/parser-7.5.5" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-class-properties-7.5.0" + sources."@babel/plugin-proposal-class-properties-7.5.5" sources."@babel/plugin-proposal-dynamic-import-7.5.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.5.4" + sources."@babel/plugin-proposal-object-rest-spread-7.5.5" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -64947,8 +65272,8 @@ in sources."@babel/plugin-transform-arrow-functions-7.2.0" sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.4.4" - sources."@babel/plugin-transform-classes-7.4.4" + sources."@babel/plugin-transform-block-scoping-7.5.5" + sources."@babel/plugin-transform-classes-7.5.5" sources."@babel/plugin-transform-computed-properties-7.2.0" sources."@babel/plugin-transform-destructuring-7.5.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" @@ -64965,7 +65290,7 @@ in sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" sources."@babel/plugin-transform-new-target-7.4.4" - sources."@babel/plugin-transform-object-super-7.2.0" + sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-property-literals-7.2.0" sources."@babel/plugin-transform-regenerator-7.4.5" @@ -64975,19 +65300,19 @@ in sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-typescript-7.5.2" + sources."@babel/plugin-transform-typescript-7.5.5" sources."@babel/plugin-transform-unicode-regex-7.4.4" - (sources."@babel/preset-env-7.5.4" // { + (sources."@babel/preset-env-7.5.5" // { dependencies = [ sources."semver-5.7.0" ]; }) sources."@babel/preset-flow-7.0.0" sources."@babel/preset-typescript-7.3.3" - sources."@babel/register-7.4.4" + sources."@babel/register-7.5.5" sources."@babel/template-7.4.4" - sources."@babel/traverse-7.5.0" - sources."@babel/types-7.5.0" + sources."@babel/traverse-7.5.5" + sources."@babel/types-7.5.5" sources."@hapi/address-2.0.0" sources."@hapi/hoek-6.2.4" sources."@hapi/joi-15.1.0" @@ -65020,25 +65345,25 @@ in sources."@types/long-4.0.0" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."@types/ws-6.0.1" sources."@types/zen-observable-0.8.0" sources."@vue/cli-shared-utils-3.9.0" - (sources."@vue/cli-ui-3.9.2" // { + (sources."@vue/cli-ui-3.9.3" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.9.2" - sources."@vue/cli-ui-addon-widgets-3.9.2" + sources."@vue/cli-ui-addon-webpack-3.9.3" + sources."@vue/cli-ui-addon-widgets-3.9.3" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.9" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.0.0" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" @@ -65049,12 +65374,12 @@ in ]; }) sources."apollo-cache-1.3.2" - sources."apollo-cache-control-0.7.5" + sources."apollo-cache-control-0.8.0" sources."apollo-cache-inmemory-1.6.2" sources."apollo-client-2.6.3" - sources."apollo-datasource-0.5.0" - sources."apollo-engine-reporting-1.3.6" - sources."apollo-engine-reporting-protobuf-0.3.1" + sources."apollo-datasource-0.6.0" + sources."apollo-engine-reporting-1.4.0" + sources."apollo-engine-reporting-protobuf-0.4.0" sources."apollo-env-0.5.1" sources."apollo-graphql-0.3.3" sources."apollo-link-1.2.12" @@ -65063,13 +65388,14 @@ in sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.18" - sources."apollo-server-caching-0.4.0" - sources."apollo-server-core-2.6.9" + sources."apollo-server-caching-0.5.0" + sources."apollo-server-core-2.7.0" sources."apollo-server-env-2.4.0" sources."apollo-server-errors-2.3.1" - sources."apollo-server-express-2.6.9" - sources."apollo-server-plugin-base-0.5.8" - sources."apollo-tracing-0.7.4" + sources."apollo-server-express-2.7.0" + sources."apollo-server-plugin-base-0.6.0" + sources."apollo-server-types-0.2.0" + sources."apollo-tracing-0.8.0" sources."apollo-upload-client-10.0.1" sources."apollo-utilities-1.3.2" sources."arg-4.1.1" @@ -65121,7 +65447,7 @@ in sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.6.4" + sources."browserslist-4.6.6" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -65134,7 +65460,7 @@ in sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30000984" + sources."caniuse-lite-1.0.30000985" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" @@ -65259,7 +65585,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.6.2" - sources."electron-to-chromium-1.3.191" + sources."electron-to-chromium-1.3.198" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" @@ -65340,7 +65666,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.102.0" + sources."flow-parser-0.103.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -65388,7 +65714,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.7.7" + sources."graphql-extensions-0.8.0" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.5" @@ -65499,7 +65825,7 @@ in sources."latest-version-3.1.0" sources."launch-editor-2.2.1" sources."locate-path-3.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.clonedeep-4.5.0" sources."lodash.merge-4.6.2" sources."lodash.sortby-4.7.0" @@ -65662,7 +65988,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.14.12" + sources."@types/node-10.14.13" ]; }) sources."proxy-addr-2.0.5" @@ -65691,7 +66017,7 @@ in }) sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.1.0" - sources."regenerator-transform-0.14.0" + sources."regenerator-transform-0.14.1" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -65991,7 +66317,7 @@ in sha512 = "o0CSn0HJdo1/ASh2nY9MZh/dZrq+U+fVfIL4XDL/VRMrFAyr9pPmhT9/pdRZlHPN46r05UhBfGQXnbeOOssguA=="; }; dependencies = [ - sources."@babel/code-frame-7.0.0" + sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@starptech/expression-parser-0.9.0" @@ -66004,14 +66330,14 @@ in sources."@starptech/rehype-minify-whitespace-0.9.0" sources."@starptech/rehype-webparser-0.9.0" sources."@starptech/webparser-0.9.0" - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-1.0.1" sources."abbrev-1.1.1" - sources."acorn-6.2.0" + sources."acorn-6.2.1" sources."acorn-jsx-5.0.1" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ajv-keywords-2.1.1" sources."amdefine-1.0.1" sources."ansi-align-2.0.0" @@ -66181,7 +66507,7 @@ in ]; }) sources."eslint-scope-4.0.3" - sources."eslint-utils-1.3.1" + sources."eslint-utils-1.4.0" sources."eslint-visitor-keys-1.0.0" sources."espree-5.0.1" sources."esprima-4.0.1" @@ -66338,7 +66664,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-beautify-1.10.0" + sources."js-beautify-1.10.1" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" @@ -66357,7 +66683,7 @@ in sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.assign-4.2.0" sources."lodash.assigninwith-4.2.0" sources."lodash.defaults-4.0.1" @@ -66523,7 +66849,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.1.0" + sources."property-information-5.2.2" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."punycode-2.1.1" @@ -66744,7 +67070,7 @@ in sources."stylus-supremacy-2.12.7" sources."supports-color-5.5.0" sources."symbol-0.2.3" - (sources."table-5.4.1" // { + (sources."table-5.4.4" // { dependencies = [ sources."ansi-regex-4.1.0" sources."string-width-3.1.0" @@ -67040,12 +67366,12 @@ in sha512 = "yeYV4sTOLCWEjbJrR/g43vUFAKj73813JV2cN60AIf7Bcikzao3scoUKvPvMQxgUC2dTYSvEpdzp2KGS3c/sUg=="; }; dependencies = [ - sources."@babel/code-frame-7.0.0" - sources."@babel/generator-7.5.0" + sources."@babel/code-frame-7.5.5" + sources."@babel/generator-7.5.5" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.5.0" + sources."@babel/parser-7.5.5" sources."@babel/template-7.4.4" - sources."@babel/types-7.5.0" + sources."@babel/types-7.5.5" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -67071,7 +67397,7 @@ in sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."mamacro-0.0.3" sources."source-map-0.5.7" sources."supports-color-5.5.0" @@ -67120,10 +67446,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.35.3"; + version = "4.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.35.3.tgz"; - sha512 = "xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz"; + sha512 = "Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -67146,8 +67472,8 @@ in sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.2.0" - sources."ajv-6.10.1" + sources."acorn-6.2.1" + sources."ajv-6.10.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" (sources."anymatch-2.0.0" // { @@ -67595,10 +67921,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.5.tgz"; - sha512 = "w0j/s42c5UhchwTmV/45MLQnTVwRoaUTu9fM5LuyOd/8lFoCNCELDogFoecx5NzRUndO0yD/gF2b02XKMnmAWQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz"; + sha512 = "0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A=="; }; dependencies = [ sources."ansi-regex-4.1.0" @@ -67924,10 +68250,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-2.0.1.tgz"; - sha512 = "isbO4uXmNAPgHA0rD3FAlxC6Z8nOf8zeUgntweT/BahVqjyxZa3KuNCusjyaeShqgx+T6+kZmzJvSOTTDIG3Qw=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-2.0.2.tgz"; + sha512 = "thdHJQpoOLDXZMJQ708JhAQvqceds3R79LIDmzAALLRV5h1O/Ezmj7en3L3b/s1ek0TLkYW9TJxs1ohDcjaU9Q=="; }; dependencies = [ sources."addr-to-ip-port-1.5.1" @@ -67945,12 +68271,11 @@ in ]; }) sources."bittorrent-peerid-1.3.0" - (sources."bittorrent-protocol-3.0.1" // { + (sources."bittorrent-protocol-3.1.0" // { dependencies = [ - sources."debug-3.2.6" + sources."bitfield-3.0.0" + sources."debug-4.1.1" sources."ms-2.1.2" - sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.2" ]; }) (sources."bittorrent-tracker-9.11.0" // { @@ -67991,6 +68316,7 @@ in sources."clivas-0.2.0" sources."closest-to-2.0.0" sources."colour-0.7.1" + sources."common-tags-1.8.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -68038,7 +68364,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.0" + sources."ipaddr.js-1.9.1" sources."is-ascii-1.0.0" sources."is-file-1.0.0" sources."is-typedarray-1.0.0" @@ -68185,9 +68511,10 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.2.4" sources."url-join-4.0.1" - (sources."ut_metadata-3.3.0" // { + (sources."ut_metadata-3.4.0" // { dependencies = [ - sources."debug-3.2.6" + sources."bitfield-3.0.0" + sources."debug-4.1.1" sources."ms-2.1.2" ]; }) @@ -68224,29 +68551,29 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-3.1.0.tgz"; - sha512 = "uuJRuAJFHJqHKkfHcZcSPb0ceOsVf/EoLJHynAgFOMxCIPAjbnq7gWT2e792hTpQEMXZE7XsXIeXwqogjLxofA=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-3.1.1.tgz"; + sha512 = "snTfhuxoplm8QAlv+CwOaF0XSaycDUmxsrLfi4NtZRvZ6J79+ijOu9HyTXP0rd1zT3uagWYOBc3ol/ZOsf1LQQ=="; }; dependencies = [ - sources."@babel/code-frame-7.0.0" + sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" sources."@babel/polyfill-7.4.4" sources."@babel/runtime-7.4.5" - sources."@babel/runtime-corejs2-7.5.4" + sources."@babel/runtime-corejs2-7.5.5" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@snyk/composer-lockfile-parser-1.0.3" - sources."@snyk/dep-graph-1.8.1" + sources."@snyk/dep-graph-1.10.0" sources."@snyk/gemfile-1.2.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/agent-base-4.2.0" sources."@types/debug-4.1.4" sources."@types/events-3.0.0" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.2" + sources."@types/node-12.6.8" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -68259,7 +68586,11 @@ in sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - sources."addons-linter-1.10.0" + (sources."addons-linter-1.10.0" // { + dependencies = [ + sources."regenerator-runtime-0.13.2" + ]; + }) sources."adm-zip-0.4.13" (sources."agent-base-4.3.0" // { dependencies = [ @@ -68279,7 +68610,7 @@ in sources."anymatch-2.0.0" (sources."archiver-2.1.1" // { dependencies = [ - sources."async-2.6.2" + sources."async-2.6.3" sources."isarray-1.0.0" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -68482,7 +68813,7 @@ in sources."dashdash-1.14.1" (sources."data-uri-to-buffer-2.0.1" // { dependencies = [ - sources."@types/node-8.10.50" + sources."@types/node-8.10.51" ]; }) sources."debounce-1.2.0" @@ -68597,11 +68928,11 @@ in ]; }) sources."eslint-scope-4.0.3" - sources."eslint-utils-1.3.1" + sources."eslint-utils-1.4.0" sources."eslint-visitor-keys-1.0.0" (sources."espree-5.0.1" // { dependencies = [ - sources."acorn-6.2.0" + sources."acorn-6.2.1" sources."acorn-jsx-5.0.1" ]; }) @@ -68692,11 +69023,10 @@ in ]; }) sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.10" // { + (sources."fx-runner-1.0.11" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" - sources."lodash-4.17.11" sources."which-1.2.4" ]; }) @@ -68883,7 +69213,7 @@ in sources."levn-0.3.0" sources."lie-3.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -69118,7 +69448,7 @@ in ]; }) sources."rechoir-0.6.2" - sources."regenerator-runtime-0.13.2" + sources."regenerator-runtime-0.13.3" sources."regex-not-1.0.2" sources."regexpp-2.0.1" sources."registry-auth-token-3.4.0" @@ -69222,7 +69552,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.193.1" // { + (sources."snyk-1.195.1" // { dependencies = [ sources."ansi-regex-4.1.0" sources."debug-3.2.6" @@ -69231,7 +69561,7 @@ in sources."update-notifier-2.5.0" ]; }) - (sources."snyk-config-2.2.1" // { + (sources."snyk-config-2.2.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -69302,7 +69632,7 @@ in sources."semver-5.7.0" ]; }) - (sources."snyk-sbt-plugin-2.5.6" // { + (sources."snyk-sbt-plugin-2.5.7" // { dependencies = [ sources."semver-6.2.0" ]; @@ -69372,8 +69702,9 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" - (sources."table-5.4.1" // { + (sources."table-5.4.4" // { dependencies = [ + sources."ajv-6.10.2" sources."ansi-regex-4.1.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" @@ -69444,7 +69775,7 @@ in }) sources."unzip-response-2.0.1" sources."upath-1.1.2" - (sources."update-notifier-3.0.0" // { + (sources."update-notifier-3.0.1" // { dependencies = [ sources."ansi-align-3.0.0" sources."ansi-regex-4.1.0" @@ -69618,7 +69949,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -69637,7 +69968,7 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" - sources."async-2.6.2" + sources."async-2.6.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -69826,7 +70157,7 @@ in ]; }) sources."glob-to-regexp-0.3.0" - (sources."global-agent-2.0.0" // { + (sources."global-agent-2.0.1" // { dependencies = [ sources."semver-6.2.0" ]; @@ -69935,7 +70266,7 @@ in }) sources."locate-path-2.0.0" sources."locutus-2.0.11" - sources."lodash-4.17.14" + sources."lodash-4.17.15" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index 25a83fa7912..36205c7c1ff 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, cppo, ppx_tools, ppx_deriving, result }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-visitors-20180513"; + name = "ocaml${ocaml.version}-visitors-20190711"; src = fetchurl { - url = http://gallium.inria.fr/~fpottier/visitors/visitors-20180513.tar.gz; - sha256 = "12j8n9fkl43sd0j78x2zqix8m1vinswl2jgwndd62vmx98f5rl1v"; + url = http://gallium.inria.fr/~fpottier/visitors/visitors-20190711.tar.gz; + sha256 = "1h794xczfczf573mpwzm4ah9ir1rbbrkqipbh3aflfpdq2mgsbvg"; }; buildInputs = [ ocaml findlib ocamlbuild cppo ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 37e0211d98d..d8e4c9f2943 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "54630f769b0a25e83744673068db89cdd099f830818cea7ea9c43eb23add7941"; + sha256 = "0g4pqdm2kp2abam0nx0pgs5lk19f8lsfpcgwxpigdwmy1lvblsa5"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; diff --git a/pkgs/development/python-modules/cerberus11/default.nix b/pkgs/development/python-modules/cerberus11/default.nix new file mode 100644 index 00000000000..614e3ca8135 --- /dev/null +++ b/pkgs/development/python-modules/cerberus11/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: + +buildPythonPackage rec { + pname = "Cerberus"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; + }; + + checkInputs = [ pytestrunner pytest ]; + + meta = with stdenv.lib; { + homepage = http://python-cerberus.org/; + description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 2b38f4a9e36..aaaad292df0 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "5.4.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1qms1kmzr543hz30jmcmx20cf9xbgzl97a9k44xizsk785dwakbn"; + sha256 = "168xi92pfk80n2k47qc5zim7jai3kcmj3j157fynz9c8dfw4sbn4"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix new file mode 100644 index 00000000000..71ec20faed8 --- /dev/null +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "django-webpack-loader"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bwpgmkh32d7a5dgppin9m0mnh8a33ccl5ksnpw5vjp4lal3xq73"; + }; + + # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) + doCheck = false; + + meta = with lib; { + description = "Use webpack to generate your static bundles"; + homepage = https://github.com/owais/django-webpack-loader; + maintainers = with maintainers; [ peterromfeldhk ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index 1ce86daf992..67345cd8d6a 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -1,17 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ stdenv, buildPythonPackage, fetchFromGitHub, six, django }: buildPythonPackage rec { pname = "django-appconf"; version = "1.0.3"; - src = fetchPypi { - inherit pname version; - sha256 = "35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3"; + src = fetchFromGitHub { + owner = "django-compressor"; + repo = "django-appconf"; + rev = version; + sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h"; }; - # No tests in archive - doCheck = false; + propagatedBuildInputs = [ six django ]; - propagatedBuildInputs = [ six ]; + checkPhase = '' + # prove we're running tests against installed package, not build dir + rm -r appconf + python -m django test --settings="tests.test_settings" + ''; meta = with stdenv.lib; { description = "A helper class for handling configuration defaults of packaged apps gracefully"; diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index 845d4928805..30343f76570 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -8,8 +8,12 @@ buildPythonPackage rec { inherit pname version; sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f"; }; + postPatch = '' + substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \ + --replace 'rjsmin == 1.0.12' 'rjsmin' + ''; - # Need to setup django testing + # requires django-sekizai, which we don't have packaged yet doCheck = false; propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 93e52c51dda..a717a0ef6e8 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.7.3"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0mp1hbj7ciwpair7z445zj1grfv8c75gby9lih01c3mvw4pff7v2"; + sha256 = "0rjpmxcd4hphq41y7frg6by6gwjjmrdbnim8jvx951ps5gzyfpgc"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 967fc1c5745..2e802e05c07 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "6.3.8"; + version = "8.0.0"; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq"; + sha256 = "0xllr43dizvybmb68i0ybk1xhaqx5abjwxa9vrg43b9ds0pggvk1"; }; buildInputs = [ pkgs.ncurses ]; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 149b07d63e3..eb10edeaca9 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "2.3"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "0x7l9k2dvxzd5mjgiq15nl9b0sxcqy1cqaz744bjwkz4z5mrypzg"; + sha256 = "135rwh7izzmj4lwkrfb9xw4ik0gcwjz34ygnmx3vyvki2xbbp2xp"; }; doCheck = false; # something about yajl diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index a0bc3a88745..c06f5d6cd08 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.3.0"; + version = "0.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1b2phizcx2wbdm5np0s16yd68fc0isqnm8qs6l9pmlrlyf9gm87j"; + sha256 = "14pmxyx4kwyafdifqzal121mpdd89lxbjgn0zzi9z6fmzk6pr5h2"; }; checkInputs = [ pytest colorama ]; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix new file mode 100644 index 00000000000..775cfeded8b --- /dev/null +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, cython +, numpy +, msgpack +, pytest +, python +}: + +buildPythonPackage rec { + pname = "numcodecs"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "086qwlyi01rpgyyyy8bmhh9i7hpksyz33ldci3wdwmhiblyl362y"; + }; + + nativeBuildInputs = [ + setuptools_scm + cython + ]; + + propagatedBuildInputs = [ + numpy + msgpack + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest $out/${python.sitePackages}/numcodecs -k "not test_backwards_compatibility" + ''; + + meta = with lib;{ + homepage = https://github.com/alimanfoo/numcodecs; + license = licenses.mit; + description = "Buffer compression and transformation codecs for use in data storage and communication applications"; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index f593c5dbeea..2dcc3e5b873 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -6,30 +6,35 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "09fcwnnfln0cl5v0qpxzrllj27znrg6dbhaksxrl0192c3mbyjvl"; + sha256 = "1ww3kc5bzp5q7b23n2vmzqch1z06l7vrscn0h96cscvk45sxc7yz"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/pelican/tests/output/custom_locale/posts + ''; }; doCheck = true; + # Exclude custom locale test, which files were removed above to fix the source checksum checkPhase = '' - python -Wd -m unittest discover + nosetests -sv --exclude=test_custom_locale_generation_works pelican ''; buildInputs = [ glibcLocales # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this # again. Compare https://github.com/getpelican/pelican/pull/2252. - # Version 4.0.1 is incompatible with our current pandoc version. + # Version 4.1.0 is incompatible with our current pandoc version. # pandoc git mock - nose markdown typogrify ]; @@ -39,6 +44,10 @@ buildPythonPackage rec { blinker pillow beautifulsoup4 markupsafe lxml ]; + checkInputs = [ + nose + ]; + postPatch= '' substituteInPlace pelican/tests/test_pelican.py \ --replace "'git'" "'${git}/bin/git'" diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index b2b103858cc..38642f066d7 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f"; + sha256 = "1bhzkzjvz6zb6rc5zmvgqfszrcyh64v1hay7m1m5dn083gaznyk9"; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 1c87a3f1837..d75458acf7c 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "1pby2lbzwy2pwdbq8xaqi4560b1ih5m0y141mmbc446j3w168fvv"; + sha256 = "0xlmx280mzd3f63ydqhr76whbr2lhcwihyg9my9d5hjklkrhdn58"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index ed50c28f4c3..88174a94ef4 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "fe85a79f58a01dd335968523b91c5fce760e7fe78bf25a6e71c72204fe499d0b"; + sha256 = "0sri92mzhkifn16klkk2mhc2vcrvdmfp2wvkpfss518sln5q5gca"; }; doCheck = false; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index f7772492dfd..b2bb8a740a8 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.29.0"; + version = "6.29.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1xsg862d68rdrl6m3v9zcq20h42jn6x9cv1bk2ydiizyn6ngqz8w"; + sha256 = "1g2wdy62w25sjibggr25b3833x0fhc7w6ypy8g1fgix217rja7pz"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix new file mode 100644 index 00000000000..1c924d8973d --- /dev/null +++ b/pkgs/development/python-modules/vdf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, pytest, pytestcov, mock }: + +buildPythonPackage rec { + pname = "vdf"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "ValvePython"; + repo = pname; + rev = "v${version}"; + sha256 = "19xqjq2159w2l9vaxlkickvy3zksp9ssdkvbfcfggxz31miwp1zr"; + }; + + checkInputs = [ pytest pytestcov mock ]; + checkPhase = "make test"; + + meta = with stdenv.lib; { + description = "Library for working with Valve's VDF text format"; + homepage = https://github.com/ValvePython/vdf; + license = licenses.mit; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix new file mode 100644 index 00000000000..5570688e98b --- /dev/null +++ b/pkgs/development/python-modules/zarr/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, asciitree +, numpy +, fasteners +, numcodecs +, pytest +}: + +buildPythonPackage rec { + pname = "zarr"; + version = "2.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "c62d0158fb287151c978904935a177b3d2d318dea3057cfbeac8541915dfa105"; + }; + + nativeBuildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + asciitree + numpy + fasteners + numcodecs + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "An implementation of chunked, compressed, N-dimensional arrays for Python"; + homepage = https://github.com/zarr-developers/zarr; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 5d1489ba200..b3f91b678c4 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -13,6 +13,7 @@ , document ? [] , meta ? {} , ignoreCollisions ? false +, passthru ? {} , ... }@args: @@ -55,5 +56,5 @@ in passthru = basicEnv.passthru // { inherit basicEnv; inherit (basicEnv) env; - }; + } // passthru; }) diff --git a/pkgs/development/ruby-modules/bundler-update-script/default.nix b/pkgs/development/ruby-modules/bundler-update-script/default.nix new file mode 100644 index 00000000000..50d0364aa06 --- /dev/null +++ b/pkgs/development/ruby-modules/bundler-update-script/default.nix @@ -0,0 +1,25 @@ +{ runtimeShell, lib, writeScript, bundix, bundler, bundler-audit, coreutils, git, nix }: + +attrPath: + +let + updateScript = writeScript "bundler-update-script" '' + #!${runtimeShell} + PATH=${lib.makeBinPath [ bundler bundler-audit bundix coreutils git nix ]} + set -o errexit + set -o nounset + set -o pipefail + + attrPath=$1 + + toplevel=$(git rev-parse --show-toplevel) + position=$(nix eval -f "$toplevel" --raw "$attrPath.meta.position") + gemdir=$(dirname "$position") + + cd "$gemdir" + + bundler lock --update + bundler-audit check --update + bundix + ''; +in [ updateScript attrPath ] diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index 2f60dacd358..0cfd8c5d66b 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp rec { pname = "solargraph"; exes = ["solargraph" "solargraph-runtime"]; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "solargraph"; + meta = with lib; { description = "IDE tools for the Ruby language"; homepage = http://www.github.com/castwide/solargraph; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ worldofpeace nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index db04c2026d8..51aeebb82e5 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -62,7 +62,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "01d4m4kb2mhz8fxl9apzsdq0pd7i79w3q49x51rwa524caml9zfv"; + sha256 = "1i3b6kn9kq70a34wkpm8zjqj1skawdxs3r01b7r6ws1rbdnfj6mp"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/development/tools/build-managers/drake/default.nix index a7bb93d52ed..15fc682a315 100644 --- a/pkgs/development/tools/build-managers/drake/default.nix +++ b/pkgs/development/tools/build-managers/drake/default.nix @@ -1,14 +1,16 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "drake"; gemdir = ./.; exes = [ "drake" ]; + passthru.updateScript = bundlerUpdateScript "drake"; + meta = with lib; { description = "A branch of Rake supporting automatic parallelizing of tasks"; homepage = http://quix.github.io/rake/; - maintainers = with maintainers; [ romildo manveru ]; + maintainers = with maintainers; [ romildo manveru nicknovitski ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/development/tools/build-managers/rake/default.nix index 8de0130d31b..2ce65b28fae 100644 --- a/pkgs/development/tools/build-managers/rake/default.nix +++ b/pkgs/development/tools/build-managers/rake/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "rake"; gemdir = ./.; exes = [ "rake" ]; + passthru.updateScript = bundlerUpdateScript "rake"; + meta = with lib; { description = "A software task management and build automation tool"; homepage = https://github.com/ruby/rake; license = with licenses; mit; - maintainers = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/cadre/default.nix b/pkgs/development/tools/cadre/default.nix index 93eb32cfb51..77b49107e16 100644 --- a/pkgs/development/tools/cadre/default.nix +++ b/pkgs/development/tools/cadre/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "cadre"; gemdir = ./.; exes = [ "cadre" ]; + passthru.updateScript = bundlerUpdateScript "cadre"; + meta = with lib; { description = "Toolkit to add Ruby development - in-editor coverage, libnotify of test runs"; homepage = https://github.com/nyarly/cadre; license = licenses.mit; - maintainers = [ maintainers.nyarly ]; + maintainers = with maintainers; [ nyarly nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/cbor-diag/default.nix b/pkgs/development/tools/cbor-diag/default.nix index 049d9f38c0c..7942ff52645 100644 --- a/pkgs/development/tools/cbor-diag/default.nix +++ b/pkgs/development/tools/cbor-diag/default.nix @@ -1,9 +1,8 @@ -{ lib, bundlerApp, ruby }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "cbor-diag"; - inherit ruby; gemdir = ./.; exes = [ @@ -20,11 +19,13 @@ bundlerApp { "yaml2cbor.rb" ]; + passthru.updateScript = bundlerUpdateScript "cbor-diag"; + meta = with lib; { description = "CBOR diagnostic utilities"; homepage = https://github.com/cabo/cbor-diag; license = with licenses; asl20; - maintainers = with maintainers; [ fdns ]; + maintainers = with maintainers; [ fdns nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix index 37ad593d796..60e7edc7520 100644 --- a/pkgs/development/tools/cddl/default.nix +++ b/pkgs/development/tools/cddl/default.nix @@ -1,17 +1,18 @@ -{ lib, bundlerApp, ruby }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "cddl"; - inherit ruby; gemdir = ./.; exes = [ "cddl" ]; + passthru.updateScript = bundlerUpdateScript "cddl"; + meta = with lib; { description = "A parser, generator, and validator for CDDL"; homepage = https://rubygems.org/gems/cddl; license = with licenses; mit; - maintainers = with maintainers; [ fdns ]; + maintainers = with maintainers; [ fdns nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 1d81d469eb2..921448855a6 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,20 +1,20 @@ -{ lib, bundlerEnv, ruby_2_4, perl, autoconf }: +{ lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }: -bundlerEnv { - # Last updated via: - # nix-shell -p bundix -p gcc -p libxml2 -p zlib --run "bundix -mdl" - name = "chefdk-2.4.17"; +bundlerEnv rec { + pname = "chef-dk"; ruby = ruby_2_4; gemdir = ./.; buildInputs = [ perl autoconf ]; + passthru.updateScript = bundlerUpdateScript "chefdk"; + meta = with lib; { description = "A streamlined development and deployment workflow for Chef platform"; homepage = https://downloads.chef.io/chef-dk/; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index c47bddd4d9c..516900c2067 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "compass"; gemdir = ./.; exes = [ "compass" ]; + passthru.updateScript = bundlerUpdateScript "compass"; + meta = with lib; { description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain"; homepage = https://github.com/Compass/compass; license = with licenses; mit; - maintainers = with maintainers; [ offline manveru ]; + maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix index 932a02cf2bc..fe83a9aa170 100644 --- a/pkgs/development/tools/continuous-integration/cide/default.nix +++ b/pkgs/development/tools/continuous-integration/cide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, makeWrapper, docker, git, gnutar, gzip }: +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, docker, git, gnutar, gzip }: stdenv.mkDerivation rec { name = "cide-${version}"; @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { --set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]} ''; + passthru.updateScript = bundlerUpdateScript "cide"; + meta = with lib; { description = "Isolated test runner with Docker"; homepage = http://zimbatm.github.io/cide/; license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; + maintainers = with maintainers; [ zimbatm nicknovitski ]; platforms = docker.meta.platforms; }; } diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix index 22d7b236ffa..0d1c6985663 100644 --- a/pkgs/development/tools/corundum/default.nix +++ b/pkgs/development/tools/corundum/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "corundum"; gemdir = ./.; exes = [ "corundum-skel" ]; + passthru.updateScript = bundlerUpdateScript "corundum"; + meta = with lib; { description = "Tool and libraries for maintaining Ruby gems."; homepage = https://github.com/nyarly/corundum; license = licenses.mit; - maintainers = [ maintainers.nyarly ]; + maintainers = with maintainers; [ nyarly nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/cucumber/default.nix b/pkgs/development/tools/cucumber/default.nix index 4a3ed739550..15db6013deb 100644 --- a/pkgs/development/tools/cucumber/default.nix +++ b/pkgs/development/tools/cucumber/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "cucumber"; gemdir = ./.; exes = [ "cucumber" ]; + passthru.updateScript = bundlerUpdateScript "cucumber"; + meta = with lib; { description = "A tool for executable specifications"; homepage = https://cucumber.io/; license = with licenses; mit; - maintainers = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix index 02de300138d..39aab9cfa27 100644 --- a/pkgs/development/tools/github-changelog-generator/default.nix +++ b/pkgs/development/tools/github-changelog-generator/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp}: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp rec { pname = "github_changelog_generator"; gemdir = ./.; exes = [ "github_changelog_generator" ]; + passthru.updateScript = bundlerUpdateScript "github-changelog-generator"; + meta = with lib; { description = "Fully automated changelog generation - This gem generates a changelog file based on tags, issues and merged pull requests"; homepage = https://github.com/github-changelog-generator/github-changelog-generator; license = licenses.mit; - maintainers = with maintainers; [ Scriptkiddi ]; + maintainers = with maintainers; [ Scriptkiddi nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index 7fff98e0325..ad71dfb22a8 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -1,12 +1,11 @@ -{ lib, bundlerApp, ruby }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp rec { - inherit ruby; pname = "jazzy"; gemdir = ./.; exes = [ "jazzy" ]; - passthru.updateScript = ./update; + passthru.updateScript = bundlerUpdateScript "jazzy"; meta = with lib; { description = "A command-line utility that generates documentation for Swift or Objective-C"; @@ -16,6 +15,7 @@ bundlerApp rec { maintainers = with maintainers; [ peterromfeldhk lilyball + nicknovitski ]; }; } diff --git a/pkgs/development/tools/jazzy/update b/pkgs/development/tools/jazzy/update deleted file mode 100755 index 1f0d11c7dde..00000000000 --- a/pkgs/development/tools/jazzy/update +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p bash bundler bundix - -set -e - -cd "$(dirname "${BASH_SOURCE[0]}")" - -rm -f Gemfile.lock -bundler lock -bundix diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index ef89517966d..dc8e618910c 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, bundlerEnv, makeWrapper, }: +{ stdenv, lib, bundlerEnv, makeWrapper, bundlerUpdateScript }: stdenv.mkDerivation rec { pname = "jsduck"; name = "${pname}-${version}"; - version = "5.3.4"; + version = (import ./gemset.nix).jsduck.version; env = bundlerEnv { name = "${pname}"; @@ -21,11 +21,13 @@ stdenv.mkDerivation rec { makeWrapper ${env}/bin/jsduck $out/bin/jsduck ''; + passthru.updateScript = bundlerUpdateScript "jsduck"; + meta = with lib; { description = "Simple JavaScript Duckumentation generator."; homepage = https://github.com/senchalabs/jsduck; license = with licenses; gpl3; - maintainers = with stdenv.lib.maintainers; [ periklis ]; + maintainers = with maintainers; [ periklis nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 0bfe54508b8..1bc9aa14e44 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktlint-${version}"; - version = "0.33.0"; + version = "0.34.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "11yh4d7ybmddw86n8ms259rwd3q0gx2qqir2x92dhywp6pb8g11b"; + sha256 = "1mry999aqmbljp2ybkgf9hps8z4aa254b1bsivi559gzsvdkmqh7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/mdl/.bundle/config b/pkgs/development/tools/misc/mdl/.bundle/config deleted file mode 100644 index d28c8337bc4..00000000000 --- a/pkgs/development/tools/misc/mdl/.bundle/config +++ /dev/null @@ -1,3 +0,0 @@ ---- -BUNDLE_PATH: "vendor/bundle" -BUNDLE_CACHE_ALL: "true" diff --git a/pkgs/development/tools/misc/mdl/default.nix b/pkgs/development/tools/misc/mdl/default.nix index f0aca5c36a1..eda2fabd9c6 100644 --- a/pkgs/development/tools/misc/mdl/default.nix +++ b/pkgs/development/tools/misc/mdl/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "mdl"; gemdir = ./.; exes = [ "mdl" ]; + passthru.updateScript = bundlerUpdateScript "mdl"; + meta = with lib; { description = "A tool to check markdown files and flag style issues"; homepage = https://github.com/markdownlint/markdownlint; license = licenses.mit; - maintainers = with maintainers; [ gerschtli manveru ]; + maintainers = with maintainers; [ gerschtli manveru nicknovitski ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/one_gadget/default.nix b/pkgs/development/tools/misc/one_gadget/default.nix index cf4a719292c..1c2cbe35439 100644 --- a/pkgs/development/tools/misc/one_gadget/default.nix +++ b/pkgs/development/tools/misc/one_gadget/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "one_gadget"; gemdir = ./.; exes = [ "one_gadget" ]; + passthru.updateScript = bundlerUpdateScript "one_gadget"; + meta = with lib; { description = "The best tool for finding one gadget RCE in libc.so.6"; homepage = https://github.com/david942j/one_gadget; license = licenses.mit; - maintainers = [ maintainers.artemist ]; + maintainers = with maintainers; [ artemist nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix index b5c5740e80f..9020766fd86 100644 --- a/pkgs/development/tools/misc/travis/default.nix +++ b/pkgs/development/tools/misc/travis/default.nix @@ -1,19 +1,16 @@ -{ lib, bundlerEnv, ruby }: - -# Maintainer notes for updating -# 1. increment version number in Gemfile -# 2. run $ nix-shell --command "bundler install && bundix" -# in the travis directory in nixpkgs +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; pname = "travis"; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "travis"; + meta = with lib; { description = "CLI and Ruby client library for Travis CI"; homepage = https://github.com/travis-ci/travis.rb; license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; + maintainers = with maintainers; [ zimbatm nicknovitski ]; }; } diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 32f94a1f228..d6b8eb5b95f 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby }: +{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: stdenv.mkDerivation rec { @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { ln -s ${env}/bin/watson $out/bin/watson ''; + passthru.updateScript = bundlerUpdateScript "watson-ruby"; + meta = with stdenv.lib; { description = "An inline issue manager"; homepage = http://goosecode.com/watson/; license = with licenses; mit; - maintainers = with maintainers; [ robertodr ]; + maintainers = with maintainers; [ robertodr nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index c8311786010..646d04c266f 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "redis-dump"; gemdir = ./.; exes = [ "redis-dump" ]; + passthru.updateScript = bundlerUpdateScript "redis-dump"; + meta = with lib; { description = "Backup and restore your Redis data to and from JSON"; homepage = http://delanotes.com/redis-dump/; license = licenses.mit; - maintainers = with maintainers; [ offline manveru ]; + maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 460fb46671f..eb70a7b326d 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "remarshal"; - version = "0.9.1"; + version = "0.10.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "564ffe9cbde85bd28a9c184b90c764abd2003abd6101a30802262198b5c7fc40"; + sha256 = "1prpczb8q996i5sf27vfmp0nv85zwsiajnf9jbjkhm0k21wfvmdd"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 5f20e89d408..499cec2e6a7 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, makeWrapper, groff }: +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff }: stdenv.mkDerivation rec { name = "ronn-${version}"; @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { --set PATH ${groff}/bin ''; + passthru.updateScript = bundlerUpdateScript "ronn"; + meta = with lib; { description = "markdown-based tool for building manpages"; homepage = https://rtomayko.github.io/ronn/; license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; + maintainers = with maintainers; [ zimbatm nicknovitski ]; platforms = env.ruby.meta.platforms; }; } diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index b91a36cb061..5d965fc87a7 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv rec { pname = "rubocop"; @@ -7,6 +7,8 @@ bundlerEnv rec { gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "rubocop"; + meta = with lib; { description = "Automatic Ruby code style checking tool"; homepage = "https://docs.rubocop.org/"; diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix new file mode 100644 index 00000000000..1c4e176966d --- /dev/null +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, pkgconfig, curl, libgit2, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-raze"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "0d87azip59bmkk38par23f5yvb9w8ikvdg6grn689zpgc3di2phx"; + }; + sourceRoot = "source/impl"; + + cargoSha256 = "06rl7v0f1lgj9ii07fcnaxmhn28ckr03cpf5b93q8ripm5qh7my9"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ curl libgit2 openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Generate Bazel BUILD files from Cargo dependencies"; + homepage = https://github.com/google/cargo-raze; + license = licenses.asl20; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix index c204ba8cd40..6d9a7f1c080 100644 --- a/pkgs/development/tools/sass/default.nix +++ b/pkgs/development/tools/sass/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "sass"; gemdir = ./.; exes = [ "sass" "sass-convert" "scss" ]; + passthru.updateScript = bundlerUpdateScript "sass"; + meta = with lib; { description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS"; homepage = https://sass-lang.com; license = licenses.mit; - maintainers = with maintainers; [ romildo manveru ]; + maintainers = with maintainers; [ romildo manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/scss-lint/default.nix b/pkgs/development/tools/scss-lint/default.nix index d1d0dbababa..8d17969b55e 100644 --- a/pkgs/development/tools/scss-lint/default.nix +++ b/pkgs/development/tools/scss-lint/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "scss_lint"; gemdir = ./.; exes = [ "scss-lint" ]; + passthru.updateScript = bundlerUpdateScript "scss-lint"; + meta = with lib; { description = "A tool to help keep your SCSS files clean and readable"; homepage = https://github.com/brigade/scss-lint; license = licenses.mit; - maintainers = [ maintainers.lovek323 ]; + maintainers = with maintainers; [ lovek323 nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 4c5b1843229..f2f50c18e0b 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, autoPatchelfHook -, zlib, expat, dbus, openssl}: +, zlib, expat, dbus, openssl, python3 }: stdenv.mkDerivation rec { name = "sourcetrail-${version}"; - version = "2019.1.11"; + version = "2019.2.39"; src = fetchurl { name = "sourtrail.tar.gz"; url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit"; - sha256 = "09f3qdgdqg6dlai43050qh4iv1d4j43isk81q68swalpnvjn72w0"; + sha256 = "13kzfnsb5lf9v6bqw41qljp5bgz2rd3w163r6xg59hzd3dv8f90q"; }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ zlib expat dbus stdenv.cc.cc openssl ]; + buildInputs = [ zlib expat dbus stdenv.cc.cc openssl python3 ]; installPhase = '' runHook preInstall @@ -38,28 +38,30 @@ stdenv.mkDerivation rec { --replace /usr/bin/ $out/bin/ cat < $out/bin/sourcetrail - #! ${stdenv.shell} -e + #! ${stdenv.shell} -e - # XXX: Sourcetrail somehow copies the initial config files into the home - # directory without write permissions. We currently just copy them - # ourselves to work around this problem. - setup_config() { - local src dst + # XXX: Sourcetrail somehow copies the initial config files into the home + # directory without write permissions. We currently just copy them + # ourselves to work around this problem. + setup_config() { + local src dst - [ ! -d ~/.config/sourcetrail ] && mkdir -p ~/.config/sourcetrail - for src in $out/opt/data/fallback/*; do - dst=~/.config/sourcetrail/"\$(basename "\$src")" - if [ ! -e "\$dst" ]; then - cp -r "\$src" "\$dst" - fi - done + [ ! -d ~/.config/sourcetrail ] && mkdir -p ~/.config/sourcetrail + for src in $out/opt/data/fallback/*; do + dst=~/.config/sourcetrail/"\$(basename "\$src")" + if [ ! -e "\$dst" ]; then + cp -r "\$src" "\$dst" + fi + done - chmod -R u+w ~/.config/sourcetrail - } + chmod -R u+w ~/.config/sourcetrail + } - [ -d "\$HOME" ] && setup_config - exec "$out/opt/Sourcetrail.sh" "\$@" + [ -d "\$HOME" ] && setup_config + export PATH="\$PATH:${python3}/bin" + exec "$out/opt/Sourcetrail.sh" "\$@" EOF + chmod +x $out/bin/sourcetrail runHook postInstall diff --git a/pkgs/development/tools/sqlint/default.nix b/pkgs/development/tools/sqlint/default.nix index 67fbd09f102..d7ff9199460 100644 --- a/pkgs/development/tools/sqlint/default.nix +++ b/pkgs/development/tools/sqlint/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, fetchurl, ruby }: +{ lib, bundlerApp, fetchurl, bundlerUpdateScript }: let LIB_PG_QUERY_TAG = "10-1.0.1"; @@ -10,7 +10,6 @@ let in bundlerApp { pname = "sqlint"; gemdir = ./.; - inherit ruby; exes = [ "sqlint" ]; @@ -24,11 +23,13 @@ in bundlerApp { }; }; + passthru.updateScript = bundlerUpdateScript "sqlint"; + meta = with lib; { description = "Simple SQL linter"; homepage = https://github.com/purcell/sqlint; license = licenses.mit; - maintainers = with maintainers; [ ariutta ]; + maintainers = with maintainers; [ ariutta nicknovitski ]; platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index cb10a252d12..f62cd1aabb1 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "uftrace-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "0s7yfnf7kcqlfw3zzv4y8akkd12f8di69c4sranympnl7z5srfam"; + sha256 = "0m5f4azm2gdl0li7dfq00ys07j8r2lfjkbb4rx5l7q0kj67ldr7s"; }; postUnpack = '' diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index c6c001143a9..14e55f99e0b 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,53 +1,49 @@ -{ stdenv, lib, fetchurl, php, runtimeShell }: +{ stdenv, lib, fetchurl, writeText, php, makeWrapper }: let - version = "2.0.1"; + version = "2.2.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; }; + ini = writeText "php.ini" '' + [PHP] + memory_limit = -1 ; no limit as composer uses a lot of memory + + [Phar] + phar.readonly = Off + ''; + in stdenv.mkDerivation rec { - name = "wp-cli-${version}"; + pname = "wp-cli"; inherit version; src = fetchurl { - url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "05lbay4c0477465vv4h8d2j94pk3haz1a7f0ncb127fvxz3a2pcg"; + url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; + sha256 = "0s03jbsjwvkcbyss6rvpgw867hiwvk5p4n1qznkghyzi94j8mvki"; }; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' dir=$out/share/wp-cli mkdir -p $out/bin $dir - cat <<_EOF > $out/bin/wp -#!${runtimeShell} + install -Dm444 ${src} $dir/wp-cli + install -Dm444 ${ini} $dir/php.ini + install -Dm444 ${completion} $out/share/bash-completion/completions/wp -set -euo pipefail - -exec ${lib.getBin php}/bin/php \\ - -c $dir/php.ini \\ - -f $dir/wp-cli -- "\$@" -_EOF - chmod 0755 $out/bin/wp - - cat <<_EOF > $dir/php.ini -[PHP] -memory_limit = -1 ; no limit as composer uses a lot of memory - -[Phar] -phar.readonly = Off -_EOF - - install -Dm644 ${src} $dir/wp-cli - install -Dm644 ${completion} $out/share/bash-completion/completions/wp + makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ + --add-flags "-c $dir/php.ini" \ + --add-flags "-f $dir/wp-cli" # this is a very basic run test - $out/bin/wp --info + $out/bin/wp --info >/dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface for WordPress"; homepage = https://wp-cli.org; license = licenses.mit; diff --git a/pkgs/development/tools/xcpretty/default.nix b/pkgs/development/tools/xcpretty/default.nix index 99af752086f..84a6798afe3 100644 --- a/pkgs/development/tools/xcpretty/default.nix +++ b/pkgs/development/tools/xcpretty/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, bundler, bundix }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "xcpretty"; @@ -7,13 +7,7 @@ bundlerApp { exes = [ "xcpretty" ]; passthru = { - updateScript = '' - set -e - echo - cd ${toString ./.} - ${bundler}/bin/bundle lock --update - ${bundix}/bin/bundix - ''; + updateScript = bundlerUpdateScript "xcpretty"; }; meta = with lib; { diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index b5263673faa..5dc0a63c26e 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.17.0"; + version = "1.17.3"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1gviq2c96l8gh8hy7ygxyd62xc3laiglr5mhsfwhxdn039fdh0vr"; + sha256 = "050bd7bzn1kkva03q3ay2jlq574yp4k5g1pyrrdvk2cr60c4j1vj"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index e36b950f1f2..0768e98f73b 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip }: +{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: stdenv.mkDerivation rec{ pname = "cypress"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook ]; buildInputs = with xorg; [ libXScrnSaver libXdamage libXtst diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix index a2fa509232d..f960fe19278 100644 --- a/pkgs/development/web/mailcatcher/default.nix +++ b/pkgs/development/web/mailcatcher/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "mailcatcher"; gemdir = ./.; exes = [ "mailcatcher" "catchmail" ]; + passthru.updateScript = bundlerUpdateScript "mailcatcher"; + meta = with lib; { description = "SMTP server and web interface to locally test outbound emails"; homepage = https://mailcatcher.me/; license = licenses.mit; - maintainers = [ maintainers.zarelit ]; + maintainers = with maintainers; [ zarelit nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/games/nxengine-evo/default.nix new file mode 100644 index 00000000000..909737a6804 --- /dev/null +++ b/pkgs/games/nxengine-evo/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchpatch +, fetchurl +, cmake +, libpng +, SDL2 +, SDL2_mixer +}: + +stdenv.mkDerivation rec { + pname = "nxengine-evo"; + version = "2.6.4"; + src = fetchurl { + url = "https://github.com/nxengine/nxengine-evo/archive/v${version}.tar.gz"; + sha256 = "1xir74l0vrzrpyl7sfqfxp083dakbix26hd0arwf2y57w1mbjas8"; + }; + assets = fetchurl { + url = "https://github.com/nxengine/nxengine-evo/releases/download/v${version}/NXEngine-v${version}-Linux.tar.xz"; + sha256 = "1b5hkmsrrhnjjf825ri6n62kb3fldwl7v5f1cqvqyv47zv15g5gy"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch"; + sha256 = "18j22vzkikcwqd42vlhzd6rjp26dq0zslxw5yyl07flivms0hny2"; + }) + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch"; + sha256 = "0sjr7z63gp7nfxifxisvp2w664mxxk3xi4a3d86mm0470dj5m5bx"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libpng + SDL2 + SDL2_mixer + ]; + + # Allow finding game assets. + postPatch = '' + sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp + ''; + + installPhase = '' + cd .. + unpackFile ${assets} + mkdir -p $out/bin/ $out/share/nxengine/ + install bin/* $out/bin/ + cp -r NXEngine-evo-${version}-Linux/data/ $out/share/nxengine/data + chmod -R a=r,a+X $out/share/nxengine/data + ''; + + meta = { + description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; + license = with stdenv.lib.licenses; [ + gpl3 # Game engine + unfreeRedistributable # Game assets, freeware + ]; + maintainers = [ stdenv.lib.maintainers.scubed2 ]; + homepage = "https://github.com/nxengine/nxengine-evo"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index a3ad0e637e5..2bc34a6ec9d 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,102 +1,77 @@ -{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, libXt, writeScriptBin, makeWrapper, ncurses, libGL, luajit }: +{ stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper }: + +# revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let - version = "0.7.0-alpha"; - TES3MP = fetchFromGitHub { - owner = "TES3MP"; - repo = "openmw-tes3mp"; - rev = version; - sha256 = "012f50f9jd29qcdww2vk4habg6pmxvxl0q6rrjq8xchb0566712q"; - }; - CallFF = fetchFromGitHub { - owner = "Koncord"; - repo = "CallFF"; - rev = "da94b59ffe95d45bf98b9264e3d1279c9f6ebb6b"; - sha256 = "10wgiqmknh0av968c6r74n5n2izxsx8qawfrab57kkmj9h0zp0pm"; - }; - CrabNet = fetchFromGitHub { + # TES3MP_STABLE_VERSION_FILE + compatHash = "292536439eeda58becdb7e441fe2e61ebb74529e"; + rakNet = fetchFromGitHub { owner = "TES3MP"; repo = "CrabNet"; - rev = "ab1306050fe0f5b0f9c4f56893a79e56a9459567"; - sha256 = "03q76pjv9mdi7w832b23q1mj4r2wb0hsnh4kpvwai607g04l0pp0"; + # usually fixed: + # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589 + rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b"; + sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3"; }; - CoreScripts = fetchFromGitHub { + rakNetLibrary = stdenv.mkDerivation { + name = "RakNetLibrary"; + src = rakNet; + nativeBuildInputs = [ cmake ]; + installPhase = '' + install -Dm755 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a + ''; + }; + coreScripts = fetchFromGitHub { owner = "TES3MP"; repo = "CoreScripts"; - rev = "1e9f69f98051b2639b18203f989ffbd0a4b427ea"; - sha256 = "03ysi7rh0k78kv4slvmkxpymxvdpr8b6hwr1lvjdgq7rq0ljy0lg"; + # usually latest master + rev = "71e15fa3b1d5131b6607ba1589f41c06672ce376"; + sha256 = "1kwii8rpsxjmz4dh06wb0qaix17hq5s1qsvysv6n6209vlclfxjg"; }; - - fakegit = writeScriptBin "git" '' - #! ${stdenv.shell} - ''; -in stdenv.mkDerivation rec { - inherit version; - name = "tes3mp-${version}"; +in openmw.overrideAttrs (oldAttrs: rec { + version = "2019-06-09"; + name = "openmw-tes3mp-${version}"; src = fetchFromGitHub { - owner = "GrimKriegor"; - repo = "TES3MP-deploy"; - rev = "1dd78a3e2cf9f4fe85bf7ca9c393251968a9c325"; - sha256 = "1bp9c4kds9q0xhbn4sxb7n0f6rvb45gzx7ljdgc56wz4j5rfi3xn"; + owner = "TES3MP"; + repo = "openmw-tes3mp"; + # usually latest in stable branch (e.g. 0.7.0) + rev = "01804af100785bc2c162d568258d9662012627a3"; + sha256 = "0j99v9vvmic0bqw3y4550k1dy058lwvs9s9qcjmxh1wkqkvrpdnp"; }; - dontUseCmakeConfigure = true; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; + buildInputs = oldAttrs.buildInputs ++ [ luajit ]; - nativeBuildInputs = [ cmake makeWrapper fakegit ]; - buildInputs = [ boost ffmpeg qtbase bullet mygui openscenegraph SDL2 unshield openal libXt - ncurses libGL luajit ]; + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DBUILD_OPENCS=OFF" + "-DRakNet_INCLUDES=${rakNet}/include" + "-DRakNet_LIBRARY_RELEASE=${rakNetLibrary}/lib/libRakNetLibStatic.a" + "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" + ]; - buildPhase = '' - mkdir dependencies keepers - cp --no-preserve=mode -r ${TES3MP} code - cp --no-preserve=mode -r ${CallFF} dependencies/callff - cp --no-preserve=mode -r ${CrabNet} dependencies/raknet - cp --no-preserve=mode -r ${CoreScripts} keepers/CoreScripts - - substituteInPlace tes3mp-deploy.sh \ - --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out" - patchShebangs tes3mp-deploy.sh - echo y | ./tes3mp-deploy.sh -i -c $NIX_BUILD_CORES + preConfigure = '' + substituteInPlace files/version.in \ + --subst-var-by OPENMW_VERSION_COMMITHASH ${compatHash} ''; - installPhase = '' - prefix=$out/opt/tes3mp - mkdir -p $prefix/build $out/etc/openmw $out/bin - for i in build/*; do - if [ -f "$i" ] && [ -x "$i" ]; then - mv "$i" $prefix/build - fi - done - mv build/resources $prefix/build - mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw - mv keepers $prefix - mv build/tes3mp-credits.md $prefix/build - mv -f $prefix/keepers/version $prefix/build/resources - - for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh - do - bin="$out/bin/''${i%.sh}" - mv $i $bin - substituteInPlace $bin \ - --replace build/ $prefix/build/ - chmod +x $bin - done - ln -s $prefix/keepers/*.cfg $out/etc/openmw/ - + postInstall = '' + # components/process/processinvoker.cpp: path.prepend(QLatin1String("./")) + wrapProgram $out/bin/tes3mp-browser \ + --run "cd $out/bin" wrapProgram $out/bin/tes3mp-server \ --run "mkdir -p ~/.config/openmw" \ --run "cd ~/.config/openmw" \ - --run "[ -d CoreScripts ] || cp --no-preserve=mode -r $prefix/keepers/CoreScripts ." \ - --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg" + --run "[ -d CoreScripts ] || cp --no-preserve=mode -r ${coreScripts} CoreScripts" \ + --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg" \ + --run "cd $out/bin" ''; meta = with stdenv.lib; { description = "Multiplayer for TES3:Morrowind based on OpenMW"; - homepage = "https://tes3mp.com/"; + homepage = https://tes3mp.com/; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; }; -} +}) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 926e360a1b4..e7636e8320e 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,20 +5,20 @@ let name = "openrct2-${version}"; - version = "0.2.2"; + version = "0.2.3"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1bfqmb6cbmsjcvj77vppy5lw1m4lkvxd1w3f218ah4788xnkysq2"; + sha256 = "01mj6jlbl2cn3wpk6sy34ldzdl0qykpn7fncznjykklj2nqzr4ig"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.9"; - sha256 = "1kng0mz8dsdbfd3g6qsk69ap2nq75aizw76j4a6lkfygnbcv8m3j"; + rev = "v1.0.11"; + sha256 = "1bh7mngpqnhzwnhhawq5y3a6hbvwxis2yagk4dcmc4w1fifq2y66"; }; title-sequences-src = fetchFromGitHub { diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix new file mode 100644 index 00000000000..ffcc46d66e3 --- /dev/null +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, fetchzip, dpkg, autoPatchelfHook, cups }: +let + debPlatform = + if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" + else if stdenv.hostPlatform.system == "i686-linux" then "i386" + else throw "Unsupported system: ${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation rec { + name = "fxlinuxprint-${version}"; + version = "1.1.2-1"; + + src = fetchzip { + url = "https://onlinesupport.fujixerox.com/driver_downloads/fxlinuxpdf112119031.zip"; + sha256 = "1mv07ch6ysk9bknfmjqsgxb803sj6vfin29s9knaqv17jvgyh0n3"; + curlOpts = "--user-agent Mozilla/5.0"; # HTTP 410 otherwise + }; + + nativeBuildInputs = [ dpkg autoPatchelfHook ]; + buildInputs = [ cups ]; + + sourceRoot = "."; + unpackCmd = "dpkg-deb -x $curSrc/fxlinuxprint_${version}_${debPlatform}.deb ."; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + mv etc $out + mv usr/lib $out + + mkdir -p $out/share/cups/model + mv usr/share/ppd/FujiXerox/* $out/share/cups/model + ''; + + meta = with stdenv.lib; { + description = "Fuji Xerox Linux Printer Driver"; + longDescription = '' + DocuPrint P365/368 d + DocuPrint CM315/318 z + DocuPrint CP315/318 dw + ApeosPort-VI C2271/C3370/C3371/C4471/C5571/C6671/C7771 + DocuCentre-VI C2271/C3370/C3371/C4471/C5571/C6671/C7771 + DocuPrint 3205 d/3208 d/3505 d/3508 d/4405 d/4408 d + ''; + homepage = https://onlinesupport.fujixerox.com; + license = licenses.unfree; + maintainers = with maintainers; [ delan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fa8fb3a6a9b..e1c7e5de08f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -171,12 +171,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2019-01-18"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "5954cef560ea19e077b1811a4bcbe831a33e2499"; - sha256 = "0gz55ql0dqmg3cd0y46adkj3s61ar6j1w17n7643y0rd7mndcnqa"; + rev = "cf9ddfe0eb36a4d57a1240735360385e3ed5534c"; + sha256 = "0504wl874fr0lzv48l8khfrx4l59c6bklndvrgmf5xj9ppz72hza"; }; }; @@ -292,12 +292,12 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-07-13"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "9cdc2b918bbbcadb580d9635ab6ee1accfc140dc"; - sha256 = "0nqv110n8ybh980yhxfcpzwg5bjzpiw9586bn700pw5xgnb9sf5r"; + rev = "9d61bbb9c5b25a61d57f72f94941cf1c1a531fa6"; + sha256 = "04igxs6g48vhj5rz3vy57amig18xfxdi4s06ap2fimds5d9904s0"; }; }; @@ -347,12 +347,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2019-07-08"; + version = "2019-07-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "8d1fe4278e4cfada080f023d71b9233dbfdfc41e"; - sha256 = "0h26x35gnrjhd3dqbza98317jjwsc70fv1sd99xhcshxfszal6vd"; + rev = "50343bf5e965e311444aade22599f9d247902852"; + sha256 = "08crsdw2cgn30j6mbkm74zsgi92khb1xdkx53gk1r33qcgbzi47y"; }; }; @@ -380,12 +380,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-07-14"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "5f8666ce03218f16e92d813767c2c6dd86dae175"; - sha256 = "1azxjdb75han6b3mvaqczzwxhaxr6qax4vy6zw7zqwqcskrakwzq"; + rev = "f7d3c25fbefdf53cd5458904209d066545dbddc0"; + sha256 = "1x3al8km0d61p2k42p5q2xkd1xx80hmhbv8l22wj6knrr9mpjmp2"; }; }; @@ -402,12 +402,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-07-04"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "79d02d8d3834c2a5fa44dde77b800de0b2d9746e"; - sha256 = "00d97qx4fvnwsh82j33p5jm0lxqadns4104jx9gzha7rmx1z62al"; + rev = "101d61e571389c427bb8f1bc3a81f446144be82f"; + sha256 = "1d7f1p2cy2kf0l2diyzz9z4zblis1iad9nnjy9cpjdcv1qfcvalg"; }; }; @@ -457,23 +457,23 @@ let coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; - version = "2019-07-14"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-smartf"; - rev = "340fc45a48a70b3f150fb385e9d6d10979132a78"; - sha256 = "1srnicdvm0l50qjx108vw8rkylp9yl29pbz890mfnp9ryz64qk06"; + rev = "12e76fcadda3f0bb16c64b2db2a1f8cd8025c47a"; + sha256 = "0dfr7dcrnf40flcvdydywy5xmpxbrfswcq6vj12kjbwkcxlisj0s"; }; }; coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-07-14"; + version = "2019-07-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "d1619fa8c4bb0a1ef3bffadecccb7ec8fd332b90"; - sha256 = "04bfn9aws3kqkvd4q5r963jb1rqxpayf6qxa4yxwsnkcvma2zk7y"; + rev = "6c89beeb6d654a8777385f59cd579ef34e132daf"; + sha256 = "0jr87y66miarkxsmgh16si2nshi2flla96m2w8kjlyb0ksz96kv2"; }; }; @@ -501,12 +501,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-07-13"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "65d8c479cc31fb906c10fa2762f98db8826295e1"; - sha256 = "04a07v9cwbid32zzj4zxq8xmhhxjdbi627mk9dfyj024z0nyw801"; + rev = "0bfb17e090e1dd44ec159c31968e0b5b249430eb"; + sha256 = "1psn13bqj1yxanh45g72npjbv9mzgv2fjnib0fyzvw7460bvqn8r"; }; }; @@ -523,23 +523,23 @@ let coc-tslint-plugin = buildVimPluginFrom2Nix { pname = "coc-tslint-plugin"; - version = "2019-07-11"; + version = "2019-07-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tslint-plugin"; - rev = "9076fb5f1bb185110eb79189d17f03e82f2d0f9c"; - sha256 = "1mxnpgvi12dvbhf9l1zwdlbmvqq8j311z4rfcgsi1p9kxm2dv56r"; + rev = "acc1356253a5088f630d9910b5fc13dc5d108bbc"; + sha256 = "1cjgimqgd70x5zhw641z6g4hc54vrkg3r4sscg092gkrdpkq3969"; }; }; coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-07-09"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "ee7f86fdf9c21001a1b322f219ec7c150d64d337"; - sha256 = "06yzqd5m3bz8lnqhrxsxmbz9n587vqjafwdfs9jkb3974ry88r5b"; + rev = "ed538dc3b55bb94efe2bc511327d81a90c00e674"; + sha256 = "06anjgidbf04g0wnxkmdzgdszn22afr3sxbsx445cvwinm2q3i87"; }; }; @@ -788,12 +788,12 @@ let deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-07-07"; + version = "2019-07-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "4879e34f353cc8c2ac8cb5c14e3efebc15c05ab0"; - sha256 = "12r2770b78rm9xx0pb4qgfzlyjmhdji4q6iga2pflxik6rk0gw4c"; + rev = "53ff81bd27dc86dafe209687df9ed8f3c205601c"; + sha256 = "1dq3457rd6jda4w4ajlq2gdiaz5nhcnfg4b4v47xzdcd63bcssir"; }; }; @@ -890,12 +890,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-07-15"; + version = "2019-07-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "7d28b9230e8db9ce9e6be566402a92612e0732e7"; - sha256 = "01krxg7va2x39bqs8mh0c7mdy56nzj84avmj4nn6xf5pz1ycdiv1"; + rev = "6e9f26a0cf5d7d60ddf04ce126e4adebe5a01cf2"; + sha256 = "10r7c2jjy2q3wq30rsv7bml0cxjs19hzrfmba4g407yckync92bi"; }; }; @@ -1212,12 +1212,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-06-13"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "e8316001e1130a042f8b4c8f49d78ed87b624f53"; - sha256 = "0p228laa5na7izink982ahksqhzwlxj8knb2wh5440z7chixmycc"; + rev = "c94e82ab8c62c2b6f09c00752199692e4af1c836"; + sha256 = "00vpwcq0ap4ss60v57gbhbdp4vx632qlfxdbc7jh0iawdpm1bdsq"; }; }; @@ -1411,12 +1411,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-07-12"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "08465b99774fe43d832492d7c354a317fc81f9bf"; - sha256 = "1gi10wnsqk6a58yy27qdn7hsy1gz2qrib5g59h8hchahdkmhgl2d"; + rev = "0add378423b813b15ff281a1b8176e95f444f301"; + sha256 = "1fjlp7h0fd6dbw32m056sy9z7745py9f091jmcspfvqj5mfpkg8f"; }; }; @@ -1433,12 +1433,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-07-15"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "284d3ee0dbdfe7b07a6a927a742d203851215ca4"; - sha256 = "05cmwnfky66p0i6jk7rc2qs5l6n0d89is3kwymg9qag2v6k8cz80"; + rev = "bc82a1c7b6d8517d4e9224a254968e0f0b334fdf"; + sha256 = "06irpk314qkpym8v0g3w6jdz9md5jawwck718zmlmh40f9gyjcz3"; }; }; @@ -1653,12 +1653,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-07-09"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "bc68b453e2e28bcaa5fa1bf841c78a0a4b0cc5ec"; - sha256 = "0y6qjj1czk2wiax60zsnjbixa3lp10y9777ll7r65jdrhjrysd7v"; + rev = "9c0dfbfc90c50ebbfbe53aa5a6094e1b1c806459"; + sha256 = "1rbfhmf1vnvn4p63q3pbdcyqnagb9kvckr0m6dp4hx9pc4d393xd"; }; }; @@ -2236,12 +2236,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-05-28"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "11aa21edef1627139d1cb39f5efd568942985dfc"; - sha256 = "10y0fhpcvb7hhqn5dw1bh8s9y6pmcgqn82hh7axkk7hydr715yfa"; + rev = "0336c35c0b10b46d85cdd9c3df721f978429e82c"; + sha256 = "1ylg8qlndz9981k48alhfh0m2cl8wxwmgfv0pqkvhpyqypd5rk2c"; }; }; @@ -2401,12 +2401,12 @@ let tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2019-03-03"; + version = "2019-07-17"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "2a3dcbc9085975c3b1c49c382f6c87c69d199a44"; - sha256 = "0w1x8gmssk28q730ij439qci0xwp4msdxwi6cdq3rndw14gabkgi"; + rev = "61e16ab1d1cb621385bc9c6a0c5e7744494ec9f5"; + sha256 = "1w6m69695f4gx7d5fg3bnabhjx1680fvrz44f65jhdh2y2njm68h"; }; }; @@ -2566,12 +2566,12 @@ let vim-addon-errorformats = buildVimPluginFrom2Nix { pname = "vim-addon-errorformats"; - version = "2019-02-09"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-errorformats"; - rev = "a95199208700cb8e274c03c711e35411d6ecbe60"; - sha256 = "1676s0m2xg3i8hmxi353iw39v3fh0gf787z09vi17nsqf8i6fdi8"; + rev = "bb83675cb0b8cc377fb0a79ba492ba2445674ba6"; + sha256 = "09cds33lb5gm69wv5plgidprm8nf52vvg9qdzpq9mihvinvj5qv7"; }; }; @@ -2852,12 +2852,12 @@ let vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; - version = "2018-06-11"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "t9md"; repo = "vim-choosewin"; - rev = "4ac141a9bb7188ebbbff90bb0a0bccd52eaa83f8"; - sha256 = "08glj4fk4jlcdqbyd77dwy3rbn3vc0fqz077fwvkxym47hfg9rqk"; + rev = "ee5690220fa712a448577522b9508e79a07830c6"; + sha256 = "1w42lm1rg6002030rigs5pvqf98wdpljm1pyzzikl6hgarv3c8q1"; }; }; @@ -3028,12 +3028,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-07-01"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "5b58b6dc290ece1c37e806e46ee117f5722a535a"; - sha256 = "17lzf60lm7z4r5cmfdb5di1c1rabczsjq5i0qck4l6j3xlv449xj"; + rev = "0722f74ec551b0526c9f136f3aeae8db9726db6a"; + sha256 = "0b699g537v2sja6qj12sndhas5fxiwhyn443w9ylrfn0b8vs9a93"; }; }; @@ -3149,12 +3149,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-07-12"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "e289d119906796550beedc133419109820b05bda"; - sha256 = "18963xg6cv3wkrx044lxsvwdc08sw3jg2r0ns5si61hh35rq065j"; + rev = "5aed1bc834456a5517221ba82f57d2577e8c932c"; + sha256 = "0gdghfpxkxx4hfsr5liqjqb8sg1qjhaadb9vqh30rhl08q47zdlk"; }; }; @@ -3215,12 +3215,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-13"; + version = "2019-07-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4da9fb8f43869125f6e1bb1ff8dd27f315623835"; - sha256 = "001jl2cvdwszhhjfjmb4mkvffkq28mqc72bgy12119zprc8z3kaa"; + rev = "adba9c6345af58b31bcba8599b5bb162575d5755"; + sha256 = "1x7rjh45npsvylcbhfyxcxpa8lhb5l8jal6x6cx4rbc6csw65nb2"; }; }; @@ -3292,12 +3292,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-07-15"; + version = "2019-07-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d42c9586ce9fe170baa62fe22ea3ecf66417f908"; - sha256 = "15x6wh8yvysrryj18dpzr6l0x06jnc6llh0shg3mcgb1vlfwl8v2"; + rev = "043984a5117262c74f8b9c85f1e15dc1a7e51872"; + sha256 = "18clcqa0dz49kkp678k0x5sx7w8salk7j25gmcws66alr2lrb4fs"; }; }; @@ -3942,12 +3942,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-07-09"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "fddbcb8f1a37e216504b3d14859a0a992a81cd5d"; - sha256 = "1ijdmp081r9dpn4ryr6j36s56ahz3lnn9g72akby4hj6da1bj4mb"; + rev = "226d6abeb2f02bcd8f5b11288543259fa2e02962"; + sha256 = "1iy0qj7wjbhp7byann4qyww5cyqrb9hsb1wm1j4ihzgrv1yw1qx3"; }; }; @@ -3986,12 +3986,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-06-19"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "92ff29c0c0085ac922cad1a24cf0b0bf69751b4d"; - sha256 = "0dj8806k7dnm0y22a6c3mdv61sa4rz8vi1y6sfawa7y58nh50az4"; + rev = "e07013ac9ed5ff998c62f5fe12800eb31b083f12"; + sha256 = "1bmcw4pawniwn01gvcxd98wp7pksd9ncqmiajvxb2pgnanpl5dk8"; }; }; @@ -4129,12 +4129,12 @@ let vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2018-12-19"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "386f19cd92f7b30cd830784ae22ebbe7033564aa"; - sha256 = "122bnx9j1pdgpkfph48l4zngak1hjlijbksim05iypi7sd0bvix9"; + rev = "71195d60792fbfcd30edb25fdfc89eadf3e400a5"; + sha256 = "084vz719af6vhlrgzv0bvl9qg53p1mz1942lqj1pfc3p99w22v47"; }; }; @@ -4228,12 +4228,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-07-13"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "d693695ae9375794a3a0b572fd65e86bfb56ed61"; - sha256 = "0xlhkmaxssifqjq6cgi35iwrckasqszpn54ji8rjmhi9wm9w4p57"; + rev = "84ab7e118ca5fee5a67ce4c884c0c1d5c9308e21"; + sha256 = "1ya7y9alzqqy8cpz1sljaqmh8f8pnd5pap9fmg99awr7bpn431rc"; }; }; @@ -4657,12 +4657,12 @@ let vimshell-vim = buildVimPluginFrom2Nix { pname = "vimshell-vim"; - version = "2019-07-07"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimshell.vim"; - rev = "8aa928d4652286ad3106f6ef2cbbbf7eadec5a52"; - sha256 = "1qwccpsfjsap8lggq8k9cmvdzq1mgn1ss4bsdplk1pj7prlj9pxb"; + rev = "ee683538f57aaf5094db9860f67f4957a763ffb4"; + sha256 = "0inf9xx6ni1scxkn0b78qq0234r0ybrwpphyzcafw7i8kzisbn26"; }; }; @@ -4823,12 +4823,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-07-05"; + version = "2019-07-15"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "04c3505129cd80b92f1b6177dca8aecc55cb0760"; - sha256 = "09ws8m6s7lzs2174xanrcz8jd6sfczisv3zb5czskizkgph6vkkj"; + rev = "fa92f40d0209469a037196fdc3d949ae29d0c30a"; + sha256 = "01zmslcd0mmws0s67555i3xay4xyv0km7lfwlydi3zmalvjfn8dd"; fetchSubmodules = true; }; }; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 880b620d87c..82b0bb2f356 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "17"; + version = "21"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "19q5f1c658jdxvr2k2rb2xsnspybqjii4rifnlkzi1qzh0r152md"; + sha256 = "14lgjv0gxvfa1h5hsarh9nwpxns6jb2861nd7mcanpkm2jlxh5vm"; fetchSubmodules = true; }; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; postInstall = '' install -Dm644 $src/README.md $out/share/doc/dbus-broker/README diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index a1a15bab0fe..c251e3963e7 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2019-04-16"; + version = "2019-07-17"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "20190416"; - sha256 = "1grsxch5x65piqm8zswa7za3zccwxk0sxdm5qpgidmmq729xq3py"; + rev = "20190717"; + sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1fh6gwdx4paswhpyx8z43kf41l9svicp6ji06pdfhsnbx2l859zi"; + outputHash = "1q3zqa3xxg4679p893xzwpa43afvdnnkg5xb0qs6mac75sizngid"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d3d2e2728a2..448c36a481c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.133"; + version = "4.14.134"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "005pg4f8l2qz8g6hd71pj567z91hwjwdwb37h4dbb3fj6kjl965y"; + sha256 = "0b9xj1rwr5fpw2giirfghzxxc0wp1hwf4nqvalx314pxxysyf88b"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index b244f48f24c..6891b6ce2c2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.59"; + version = "4.19.60"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0nxkr196q0b1hs3a3zavpsjp0jgbqmcwdf0y0f3hbpirshjiid5q"; + sha256 = "0ibayrvrnw2lw7si78vdqnr20mm1d3z0g6a0ykndvgn5vdax5x9a"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 1e3da908519..366bf1ad265 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.185"; + version = "4.4.186"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ll694m5193dmwn8ys4sf2p6a6njd5pm38v862ih1iw7l3vj0l3s"; + sha256 = "113rjf8842glzi23y1g1yrwncihv2saah6wz0r726r06bk9p64hb"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d611e4cf71e..8fe5d3dfcb2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.185"; + version = "4.9.186"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16z3ijfzffpkp4mj42j3j8zbnpba1a67kd5cdqwb28spf32a66vc"; + sha256 = "0sjbp7m6d625rw06wv34a0805d1lgldii4pxiqfpja871m1q8914"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 958aca39048..1f4663452dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.18"; + version = "5.1.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0spkk3pqp5fhvchgjhcm53zl1qqwsvdy7p4filb1nz4xypfff4v0"; + sha256 = "1hk8dhp402vr74wq22j66yqr7iik0mcrahpmmq3dcl657vw1n8qf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 512fb351200..0b44c6adfe9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.1"; + version = "5.2.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "01k5v3kdwk65cfx6bw4cl32jbfvf976jbya7q4a8lab3km7fi09m"; + sha256 = "173da67d51qcjwrczqsfd6g9phzazqzr11xfxwlf54ckd6117ng5"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/http/showoff/default.nix b/pkgs/servers/http/showoff/default.nix index 79b92bdd7c5..136fcb3e07c 100644 --- a/pkgs/servers/http/showoff/default.nix +++ b/pkgs/servers/http/showoff/default.nix @@ -1,16 +1,18 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "showoff"; gemdir = ./.; exes = [ "showoff" ]; + passthru.updateScript = bundlerUpdateScript "showoff"; + meta = with lib; { description = "A slideshow presentation tool with a twist"; longDescription = "It runs as a web application, with audience interactivity features. This means that your audience can follow along in their own browsers, can download supplemental materials, can participate in quizzes or polls, post questions for the presenter, etc. By default, their slideshows will synchronize with the presenter, but they can switch to self-navigation mode"; homepage = https://puppetlabs.github.io/showoff/; license = with licenses; mit; platforms = platforms.unix; - maintainers = with maintainers; [ mwilsoninsight ]; + maintainers = with maintainers; [ mwilsoninsight nicknovitski ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 77bc187e357..52620478339 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,21 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "11yrry8fzalcigqsx1wx371w543gdcsx48fd7dacbrsfl2dk2azp"; + sha256 = "1vgwsg81xcxh7pcdc667mfviwwpzsm4lpllykf78vfahi9qmwffn"; }; - cargoSha256 = "1wnk39p144zjsdhnyjk6y41xs448bxnbbxkqk53r6i2f2wzrsk2m"; + cargoSha256 = "06s9194lvwd7lynxnsrjfbjfj87ngvjbqjhx3idf7d1w9mgi4ysw"; buildInputs = lib.optional stdenv.isDarwin Security; - doCheck = false; - meta = with lib; { description = "A Prometheus exporter for WireGuard, written in Rust."; license = licenses.mit; diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/servers/monitoring/riemann-dash/default.nix index 6e0e97c7cc6..943fa0af63f 100644 --- a/pkgs/servers/monitoring/riemann-dash/default.nix +++ b/pkgs/servers/monitoring/riemann-dash/default.nix @@ -1,15 +1,17 @@ -{ bundlerApp, lib }: +{ bundlerApp, lib, bundlerUpdateScript }: bundlerApp { pname = "riemann-dash"; gemdir = ./.; exes = [ "riemann-dash" ]; + passthru.updateScript = bundlerUpdateScript "riemann-dash"; + meta = with lib; { description = "A javascript, websockets-powered dashboard for Riemann"; homepage = https://github.com/riemann/riemann-dash; license = licenses.mit; - maintainers = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index f1a6a08267d..82c52b18d40 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "sensu"; @@ -42,11 +42,13 @@ bundlerApp { "check-systemd.rb" ]; + passthru.updateScript = bundlerUpdateScript "sensu"; + meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; homepage = https://sensuapp.org/; license = licenses.mit; - maintainers = with maintainers; [ theuni peterhoeg manveru ]; + maintainers = with maintainers; [ theuni peterhoeg manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index f69b3637f95..2d9f6b11b27 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "An open-source fulltext search engine and column store"; license = licenses.lgpl21; maintainers = [ maintainers.ericsagnes ]; - platforms = platforms.linux; + platforms = platforms.unix; longDescription = '' Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search. diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 440ee15a518..6e2c928837c 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -6,6 +6,9 @@ let , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid , pkgconfig, libxml2, tzdata + # This is important to obtain a version of `libpq` that does not depend on systemd. + , enableSystemd ? (lib.versionAtLeast "9.6" version && !stdenv.isDarwin) + # for postgreql.pkgs , this, self, newScope, buildEnv @@ -31,7 +34,7 @@ let buildInputs = [ zlib readline openssl libxml2 makeWrapper ] ++ lib.optionals icuEnabled [ icu ] - ++ lib.optionals (atLeast "9.6" && !stdenv.isDarwin) [ systemd ] + ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ]; @@ -51,7 +54,7 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" - (lib.optionalString (atLeast "9.6" && !stdenv.isDarwin) "--with-systemd") + (lib.optionalString enableSystemd "--with-systemd") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals icuEnabled [ "--with-icu" ]; @@ -151,6 +154,9 @@ let # below. See #22653 pathsToLink = ["/" "/bin"]; + # Note: the duplication of executables is about 4MB size. + # So a nicer solution was patching postgresql to allow setting the + # libdir explicitely. postBuild = '' mkdir -p $out/bin rm $out/bin/{pg_config,postgres,pg_ctl} diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 469d5fb73f9..a65bf5bd916 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.7.10"; + version = "1.7.12"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1bfnwrwr27hywlv09a4z8ma70af6p6l3jcdpf8wg3aw5brznv9cq"; + sha256 = "1nrr0a0ibrd346i6jdxzvbgj5frcrwwm2rk3c6fpck42a6mw6plz"; }; buildInputs = [ go-bindata bash ]; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 44eb3731d37..f8a68bc6f64 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -2,6 +2,7 @@ , python , groff , less +, fetchpatch }: let @@ -27,6 +28,11 @@ let inherit version; sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; }; + # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 + patches = lib.singleton (fetchpatch { + url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; + sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; + }); }); }; }; diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index 8aba7524008..3dbc8eea87b 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, makeWrapper }: +{ stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { --set FASTLANE_SKIP_UPDATE_CHECK 1 ''; + passthru.updateScript = bundlerUpdateScript "fastlane"; + meta = with stdenv.lib; { description = "A tool to automate building and releasing iOS and Android apps"; longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; @@ -28,6 +30,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ peterromfeldhk + nicknovitski ]; }; } diff --git a/pkgs/tools/admin/fastlane/update b/pkgs/tools/admin/fastlane/update deleted file mode 100755 index 22d1e52e297..00000000000 --- a/pkgs/tools/admin/fastlane/update +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p bash ruby bundler bundix - -rm Gemfile.lock -bundler install -bundix - -if [ "clean" == "$1" ]; then - rm -r ~/.gem -fi diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index 25b8bdb6585..e49d3957659 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -1,4 +1,4 @@ -{ lib, ruby, bundlerApp }: +{ lib, ruby, bundlerApp, bundlerUpdateScript }: bundlerApp rec { pname = "oxidized"; @@ -8,11 +8,13 @@ bundlerApp rec { exes = [ "oxidized" "oxidized-web" "oxidized-script" ]; + passthru.updateScript = bundlerUpdateScript "oxidized"; + meta = with lib; { description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!"; homepage = https://github.com/ytti/oxidized; license = licenses.asl20; - maintainers = [ maintainers.willibutz ]; + maintainers = with maintainers; [ willibutz nicknovitski ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index 4452aea280a..1ed5e48077b 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchFromGitHub, python2Packages, opencv3 }: +{ stdenv, fetchFromGitHub, pythonPackages, opencv3 }: let - opencv3_ = python2Packages.toPythonModule (opencv3.override { + opencv3_ = pythonPackages.toPythonModule (opencv3.override { + inherit pythonPackages; enablePython = true; - pythonPackages = python2Packages; enableFfmpeg = true; }); -in stdenv.mkDerivation rec { +in pythonPackages.buildPythonApplication rec { pname = "video2midi"; - version = "0.3.7"; + version = "0.3.9.1"; + + format = "other"; src = fetchFromGitHub { owner = "svsdval"; repo = pname; rev = version; - sha256 = "00ms9iqam3ml6fxf8djki3gyifn8sfzfkkfrdgrvs0sq47wrkc39"; + sha256 = "1ndzhfng8z5080n1xkcavw21dm6rjz0x1954v9llifsdmf4cpn8y"; }; - pythonPath = with python2Packages; [ opencv3_ midiutil pygame pyopengl ]; - nativeBuildInputs = with python2Packages; [ python wrapPython ]; + propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; installPhase = '' install -Dm755 v2m.py $out/bin/v2m.py - wrapPythonPrograms ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 196e15a0133..ac01dc6022b 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.4"; + version = "2.6.5"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "10djjpdv27kzjaa1saf1gq1g1yy4gj8qzjscyjh63r1kycflwnw5"; + sha256 = "1x2zr5nw3qq1vmbs4bva6mx1cx0180dri5i2971ynzcxybn75znd"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index dc589316a58..0ed70ade829 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, makeWrapper }: +{ stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: let @@ -26,12 +26,14 @@ in stdenv.mkDerivation rec { makeWrapper ${env}/bin/lvmsync $out/bin/lvmsync ''; + passthru.updateScript = bundlerUpdateScript "lvmsync"; + meta = with stdenv.lib; { description = "Optimised synchronisation of LVM snapshots over a network"; homepage = http://theshed.hezmatt.org/lvmsync/; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; + maintainers = with maintainers; [ jluttine nicknovitski ]; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 033db7c18c2..8fb002b2d7f 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "s3backer-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { - sha256 = "0rfbylahnhv8sy9a8zkkfpyavf07dq3sdq060wrxnxbpad6qf91q"; + sha256 = "1axxnhhf335xckwn43csqmvf1454izbk9dglc3r7isrk0lz1ricc"; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 3b9e4a02108..61fd5f26e30 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,7 +4,7 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "1hxsizk3hm1465wkxwdbbcffgi3r64y3r0zsfzsvhvnzx4y5dadm"; + sha256 = "14bpc5ddhxvgfxkxhj5q9z443s7z4nn1zf4k1hxj7rbf13rcpg00"; } else { arch = "i386"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.1010"; + version = "0.1.5.1039"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/tools/inputmethods/fusuma/default.nix index 2630ab0fc81..b410a21cd6b 100644 --- a/pkgs/tools/inputmethods/fusuma/default.nix +++ b/pkgs/tools/inputmethods/fusuma/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, makeWrapper, libinput }: +{ lib, bundlerApp, bundlerUpdateScript, makeWrapper, libinput }: bundlerApp { pname = "fusuma"; @@ -12,11 +12,13 @@ bundlerApp { --prefix PATH : ${lib.makeBinPath [ libinput ]} ''; + passthru.updateScript = bundlerUpdateScript "fusuma"; + meta = with lib; { description = "Multitouch gestures with libinput driver on X11, Linux"; homepage = https://github.com/iberianpig/fusuma; license = licenses.mit; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ jfrankenau nicknovitski ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/docker-sync/default.nix b/pkgs/tools/misc/docker-sync/default.nix index e541fc0f0d4..e75b8347568 100644 --- a/pkgs/tools/misc/docker-sync/default.nix +++ b/pkgs/tools/misc/docker-sync/default.nix @@ -1,4 +1,4 @@ -{ lib, ruby, bundlerApp }: +{ lib, ruby, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "docker-sync"; @@ -8,11 +8,13 @@ bundlerApp { exes = ["docker-sync"]; + passthru.updateScript = bundlerUpdateScript "docker-sync"; + meta = with lib; { description = "Run your application at full speed while syncing your code for development"; homepage = http://docker-sync.io; license = licenses.gpl3; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index c9ee511ff83..18d03982f37 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; @@ -6,11 +6,13 @@ bundlerEnv { pname = "fluentd"; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "fluentd"; + meta = with lib; { description = "A data collector"; homepage = https://www.fluentd.org/; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix new file mode 100644 index 00000000000..7965b591afb --- /dev/null +++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, fetchzip, substituteAll, dpkg, autoPatchelfHook, cups, tcl, tk, xorg, makeWrapper }: +let + debPlatform = + if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" + else if stdenv.hostPlatform.system == "i686-linux" then "i386" + else throw "Unsupported system: ${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation rec { + pname = "fxlinuxprintutil"; + version = "1.1.1-1"; + + src = fetchzip { + url = "https://onlinesupport.fujixerox.com/driver_downloads/fxlinuxpdf112119031.zip"; + sha256 = "1mv07ch6ysk9bknfmjqsgxb803sj6vfin29s9knaqv17jvgyh0n3"; + curlOpts = "--user-agent Mozilla/5.0"; # HTTP 410 otherwise + }; + + patches = [ + # replaces references to “path/to/fxlputil” via $0 that are broken by our wrapProgram + # with /nix/store/fxlinuxprintutil/bin/fxlputil + ./fxlputil.patch + + # replaces the code that looks for Tcl packages in the working directory and /usr/lib + # or /usr/lib64 with /nix/store/fxlinuxprintutil/lib + ./fxlputil.tcl.patch + + # replaces the code that looks for X11’s locale.alias in /usr/share/X11/locale or + # /usr/lib/X11/locale with /nix/store/libX11/share/X11/locale + (substituteAll { + src = ./fxlocalechk.tcl.patch; + inherit (xorg) libX11; + }) + ]; + + nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ]; + buildInputs = [ cups tcl tk ]; + + sourceRoot = "."; + unpackCmd = "dpkg-deb -x $curSrc/${pname}_${version}_${debPlatform}.deb ."; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + mv usr/bin $out + mv usr/lib $out + + wrapProgram $out/bin/fxlputil --prefix PATH : ${lib.makeBinPath [ tcl tk ]} + ''; + + meta = with stdenv.lib; { + description = "Optional configuration tool for fxlinuxprint"; + homepage = https://onlinesupport.fujixerox.com; + license = licenses.unfree; + maintainers = with maintainers; [ delan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch b/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch new file mode 100644 index 00000000000..fbf211065e9 --- /dev/null +++ b/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch @@ -0,0 +1,18 @@ +diff --git a/usr/bin/fxlocalechk.tcl b/usr/bin/fxlocalechk.tcl +index f0ebc6c..c3486fe 100755 +--- a/usr/bin/fxlocalechk.tcl ++++ b/usr/bin/fxlocalechk.tcl +@@ -12,12 +12,7 @@ + #THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #i18N +-#---- check locale with environment variable +-set locale_alias_path /usr/share/X11/locale +- +-if {[file exists $locale_alias_path/locale.alias] != 1} { +- set locale_alias_path /usr/lib/X11/locale +-} ++set locale_alias_path @libX11@/share/X11/locale + + proc conv_locale {alias} { + global env envL locale_alias_path diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch b/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch new file mode 100644 index 00000000000..972152b2cc3 --- /dev/null +++ b/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch @@ -0,0 +1,28 @@ +diff --git a/usr/bin/fxlputil b/usr/bin/fxlputil +index cdac66d..aa86d02 100755 +--- a/usr/bin/fxlputil ++++ b/usr/bin/fxlputil +@@ -7,17 +7,19 @@ + # TCL=`which fxlputil` + #fi + ++wrapper=$(dirname $0)/fxlputil ++ + #set LC_ALL +-locale=`tclsh $0lo.tcl` ++locale=`tclsh ${wrapper}lo.tcl` + + case $locale in + "ja") +- env LC_ALL=ja_JP.UTF-8 wish $0.tcl $1 ++ env LC_ALL=ja_JP.UTF-8 wish ${wrapper}.tcl $1 + ;; + "en") +- env LC_ALL=en_US.ISO8859-1 wish $0.tcl $1 ++ env LC_ALL=en_US.ISO8859-1 wish ${wrapper}.tcl $1 + ;; + *) +- env LC_ALL=C wish $0.tcl $1 ++ env LC_ALL=C wish ${wrapper}.tcl $1 + ;; + esac diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch b/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch new file mode 100644 index 00000000000..2bfbab450cb --- /dev/null +++ b/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch @@ -0,0 +1,21 @@ +diff --git a/usr/bin/fxlputil.tcl b/usr/bin/fxlputil.tcl +index 02eeaf6..788ed5a 100755 +--- a/usr/bin/fxlputil.tcl ++++ b/usr/bin/fxlputil.tcl +@@ -25,14 +25,8 @@ catch {namespace import combobox::*} + + + +-lappend auto_path $cwd +- +-if {[lsearch $auto_path /usr/lib] == -1} { +- lappend auto_path /usr/lib +-} +-if {[lsearch $auto_path /usr/lib64] == -1} { +- lappend auto_path /usr/lib64 +-} ++# https://stackoverflow.com/a/23287132 ++lappend auto_path [file join [file dirname [file dirname [info script]]] lib] + + package require fxlputil + diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index d35267fae27..00a9bf85650 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -1,6 +1,6 @@ -{ lib, bundlerEnv, git}: +{ lib, bundlerEnv, bundlerUpdateScript, git }: bundlerEnv { - name = "homesick-1.1.6"; + pname = "homesick"; gemdir = ./.; @@ -10,6 +10,8 @@ bundlerEnv { sed 1a'ENV["PATH"] = "${git}/bin:#{ENV["PATH"] ? ":#{ENV["PATH"]}" : "" }"' -i $out/bin/homesick ''; + passthru.updateScript = bundlerUpdateScript "homesick"; + meta = with lib; { description = "Your home directory is your castle. Don't leave your dotfiles behind"; longDescription = @@ -20,7 +22,7 @@ bundlerEnv { ''; homepage = https://github.com/technicalpickles/homesick; license = licenses.mit; - maintainers = with maintainers; [ aaronschif ]; + maintainers = with maintainers; [ aaronschif nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix index 5b9466426bd..25efcdf3461 100644 --- a/pkgs/tools/misc/lolcat/default.nix +++ b/pkgs/tools/misc/lolcat/default.nix @@ -1,14 +1,16 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "lolcat"; gemdir = ./.; exes = [ "lolcat" ]; + passthru.updateScript = bundlerUpdateScript "lolcat"; + meta = with lib; { description = "A rainbow version of cat"; homepage = https://github.com/busyloop/lolcat; license = licenses.bsd3; - maintainers = with maintainers; [ StillerHarpo manveru ]; + maintainers = with maintainers; [ StillerHarpo manveru nicknovitski ]; }; } diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 03f9354445b..ea596a94213 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2019.3"; + version = "2019.7"; src = fetchurl { url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "1ry9f08584vngznbja76z53as12q2i06ncfnf52dxyidfgw5mx65"; + sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r"; }; buildInputs = [ file desktop-file-utils ]; diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 7294c61da8f..d5f2fd4afd4 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, bundlerEnv, ruby, xsel, makeWrapper }: +{ stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript, xsel, makeWrapper }: stdenv.mkDerivation rec { - name = "pws-1.0.6"; + name = "pws-${(import ./gemset.nix).pws.version}"; env = bundlerEnv { name = "${name}-gems"; @@ -21,11 +21,13 @@ stdenv.mkDerivation rec { --set PATH '"${xsel}/bin/:$PATH"' ''; + passthru.updateScript = bundlerUpdateScript "pws"; + meta = with lib; { description = "Command-line password safe"; homepage = https://github.com/janlelis/pws; license = licenses.mit; - maintainers = [ maintainers.swistak35 ]; + maintainers = with maintainers; [ swistak35 nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/tools/misc/riemann-tools/default.nix index 6a3e1f3deb1..a9977aefd66 100644 --- a/pkgs/tools/misc/riemann-tools/default.nix +++ b/pkgs/tools/misc/riemann-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "riemann-tools"; @@ -26,10 +26,12 @@ bundlerApp { "riemann-zookeeper" ]; + passthru.updateScript = bundlerUpdateScript "riemann-tools"; + meta = with lib; { description = "Tools to submit data to Riemann"; homepage = "https://riemann.io"; - maintainers = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; license = licenses.mit; }; } diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 2ea93319935..8365a47830a 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -2,11 +2,11 @@ , tcl-8_5, darwin }: stdenv.mkDerivation rec { - name = "rrdtool-1.7.1"; + name = "rrdtool-1.7.2"; src = fetchurl { url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "1bhsg119j94xwykp2sbp01hhxcg78gzblfn7j98slrv9va77g6wq"; + sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index 53e8471fb53..aa34b98bbe2 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "t"; gemdir = ./.; exes = [ "t" ]; + passthru.updateScript = bundlerUpdateScript "t"; + meta = with lib; { description = "A command-line power tool for Twitter"; homepage = http://sferik.github.io/t/; license = licenses.asl20; - maintainers = with maintainers; [ offline manveru ]; + maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/td/default.nix b/pkgs/tools/misc/td/default.nix index 121eff450b5..437bdb0373f 100644 --- a/pkgs/tools/misc/td/default.nix +++ b/pkgs/tools/misc/td/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "td"; gemdir = ./.; exes = [ "td" ]; + passthru.updateScript = bundlerUpdateScript "td"; + meta = with lib; { description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing."; homepage = https://github.com/treasure-data/td; license = licenses.asl20; - maintainers = with maintainers; [ groodt ]; + maintainers = with maintainers; [ groodt nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix index 2215e4d4fee..82aba612699 100644 --- a/pkgs/tools/misc/teamocil/default.nix +++ b/pkgs/tools/misc/teamocil/default.nix @@ -1,10 +1,12 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv rec { inherit ruby; pname = "teamocil"; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "teamocil"; + meta = with lib; { description = "A simple tool used to automatically create windows and panes in tmux with YAML files"; homepage = https://github.com/remiprev/teamocil; @@ -12,6 +14,7 @@ bundlerEnv rec { platforms = platforms.all; maintainers = with maintainers; [ zachcoyle + nicknovitski ]; }; } diff --git a/pkgs/tools/misc/teamocil/update b/pkgs/tools/misc/teamocil/update deleted file mode 100755 index 58a7bd4a453..00000000000 --- a/pkgs/tools/misc/teamocil/update +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p bash ruby bundler bundix - -rm Gemfile.lock -bundler install -bundix - -if [ "clean" == "$1" ]; then - rm -rf ~/.gem -fi diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix index ae51bb69bda..b9b4a8eac9d 100644 --- a/pkgs/tools/networking/hue-cli/default.nix +++ b/pkgs/tools/networking/hue-cli/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "hue-cli"; gemdir = ./.; exes = [ "hue" ]; + passthru.updateScript = bundlerUpdateScript "hue-cli"; + meta = with lib; { description = "Command line interface for controlling Philips Hue system's lights and bridge"; homepage = https://github.com/birkirb/hue-cli; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; }; } diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 3a48814928e..e54a2b21d9f 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript }: stdenv.mkDerivation rec { name = "maphosts-${env.gems.maphosts.version}"; @@ -16,11 +16,13 @@ stdenv.mkDerivation rec { ln -s "${env}/bin/maphosts" "$out/bin/maphosts" ''; + passthru.updateScript = bundlerUpdateScript "maphosts"; + meta = with lib; { description = "Small command line application for keeping your project hostnames in sync with /etc/hosts"; homepage = https://github.com/mpscholten/maphosts; license = licenses.mit; - maintainers = with maintainers; [ mpscholten ]; + maintainers = with maintainers; [ mpscholten nicknovitski ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 9c6f5eec11b..524b75d5582 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -5,14 +5,14 @@ , openssl, libsigcxx, zlib }: stdenv.mkDerivation rec { - name = "libtorrent-${version}"; - version = "0.13.7"; + pname = "libtorrent"; + version = "0.13.8"; src = fetchFromGitHub { owner = "rakshasa"; - repo = "libtorrent"; + repo = pname; rev = "v${version}"; - sha256 = "027qanwcisxhx0bq8dn8cpg8563q0k2pm8ls278f04n7jqvvwkp0"; + sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/rakshasa/libtorrent"; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 63652557efa..2ca31a6a1e7 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "rtorrent-${version}"; - version = "0.9.7"; + pname = "rtorrent"; + version = "0.9.8"; src = fetchFromGitHub { owner = "rakshasa"; - repo = "rtorrent"; + repo = pname; rev = "v${version}"; - sha256 = "0a9dk3cz56f7gad8ghsma79iy900rwdvzngs6k6x08nlwaqid8ga"; + sha256 = "0hcaf1brk402caa7hhlb2r1c93mjzxkm8gb19xfl33gkp3jpf372"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 71dd7861808..92d0e254312 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -6,11 +6,12 @@ , buildFHSUserEnv , libselinux , libarchive +, libGL , xorg # Conda installs its packages and environments under this directory , installationPath ? "~/.conda" # Conda manages most pkgs itself, but expects a few to be on the system. -, condaDeps ? [ stdenv.cc xorg.libSM xorg.libICE xorg.libXrender libselinux ] +, condaDeps ? [ stdenv.cc xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ] # Any extra nixpkgs you'd like available in the FHS env for Conda to use , extraPkgs ? [ ] }: diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/tools/package-management/elm-github-install/default.nix index 1f70dc1c8c8..5703a13745b 100644 --- a/pkgs/tools/package-management/elm-github-install/default.nix +++ b/pkgs/tools/package-management/elm-github-install/default.nix @@ -1,17 +1,21 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv rec { + pname = "elm_install"; name = "elm-github-install-${version}"; version = (import ./gemset.nix).elm_install.version; + inherit ruby; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "elm-github-install"; + meta = with lib; { description = "Install Elm packages from git repositories."; homepage = https://github.com/gdotdesign/elm-github-install; license = licenses.unfree; - maintainers = [ maintainers.roberth ]; + maintainers = with maintainers; [ roberth nicknovitski ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix index 905c686fede..ccb50717acc 100644 --- a/pkgs/tools/package-management/fpm/default.nix +++ b/pkgs/tools/package-management/fpm/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "fpm"; gemdir = ./.; exes = [ "fpm" ]; + passthru.updateScript = bundlerUpdateScript "fpm"; + meta = with lib; { description = "Tool to build packages for multiple platforms with ease"; homepage = https://github.com/jordansissel/fpm; license = licenses.mit; - maintainers = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/fpm/update b/pkgs/tools/package-management/fpm/update deleted file mode 100755 index 22d1e52e297..00000000000 --- a/pkgs/tools/package-management/fpm/update +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p bash ruby bundler bundix - -rm Gemfile.lock -bundler install -bundix - -if [ "clean" == "$1" ]; then - rm -r ~/.gem -fi diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix new file mode 100644 index 00000000000..ae8dfc59075 --- /dev/null +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, buildPythonApplication, fetchFromGitHub +, vdf, wine, winetricks, zenity +}: + +buildPythonApplication rec { + pname = "protontricks"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "Matoking"; + repo = pname; + rev = version; + sha256 = "1v7bgr1rkm8j99s5bv45cslw01qcx8i8zb6ysfrb53qz86zgkgsn"; + }; + + propagatedBuildInputs = [ vdf ]; + + # The wine install shipped with Proton must run under steam's + # chrootenv, but winetricks and zenity break when running under + # it. See https://github.com/NixOS/nix/issues/902. + # + # The current workaround is to use wine from nixpkgs + makeWrapperArgs = [ + "--set STEAM_RUNTIME 0" + "--set-default WINE ${wine}/bin/wine" + "--set-default WINESERVER ${wine}/bin/wineserver" + "--prefix PATH : ${lib.makeBinPath [ + (winetricks.override { inherit wine; }) + zenity + ]}" + ]; + + meta = with stdenv.lib; { + description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; + homepage = https://github.com/Matoking/protontricks; + license = licenses.gpl3; + platforms = with platforms; linux; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/pkgs/tools/security/bundler-audit/default.nix b/pkgs/tools/security/bundler-audit/default.nix index 8b19b6103d4..3712c129cf6 100644 --- a/pkgs/tools/security/bundler-audit/default.nix +++ b/pkgs/tools/security/bundler-audit/default.nix @@ -1,4 +1,4 @@ -{ bundlerEnv, ruby, lib }: +{ bundlerEnv, ruby, lib, bundlerUpdateScript }: bundlerEnv rec { name = "${pname}-${version}"; @@ -8,6 +8,8 @@ bundlerEnv rec { inherit ruby; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "bundler-audit"; + meta = with lib; { description = "Patch-level verification for Bundler"; longDescription = '' @@ -20,7 +22,7 @@ bundlerEnv rec { ''; homepage = https://github.com/rubysec/bundler-audit; license = licenses.gpl3Plus; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/tools/system/colorls/default.nix index 45c3bdf1f40..62670fa11a0 100644 --- a/pkgs/tools/system/colorls/default.nix +++ b/pkgs/tools/system/colorls/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, ruby, ... }: +{ lib, bundlerApp, ruby, bundlerUpdateScript }: bundlerApp rec { pname = "colorls"; @@ -6,11 +6,13 @@ bundlerApp rec { gemdir = ./.; exes = [ "colorls" ]; + passthru.updateScript = bundlerUpdateScript "colorls"; + meta = with lib; { description = "Prettified LS"; homepage = https://github.com/athityakumar/colorls; license = with licenses; mit; - maintainers = with maintainers; [ lukebfox ]; + maintainers = with maintainers; [ lukebfox nicknovitski ]; platforms = ruby.meta.platforms; }; } diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/pkgs/tools/system/hiera-eyaml/default.nix index e0ff7d5ca8b..33d97aa7d6b 100644 --- a/pkgs/tools/system/hiera-eyaml/default.nix +++ b/pkgs/tools/system/hiera-eyaml/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; pname = "hiera-eyaml"; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "hiera-eyaml"; + meta = with lib; { description = "Per-value asymmetric encryption of sensitive data for Hiera"; homepage = https://github.com/TomPoulton/hiera-eyaml; license = licenses.mit; - maintainers = [ maintainers.benley ]; + maintainers = with maintainers; [ benley nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix index 22dc59a9e8e..3ae80a312ed 100644 --- a/pkgs/tools/system/procodile/default.nix +++ b/pkgs/tools/system/procodile/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "procodile"; gemdir = ./.; exes = [ "procodile" ]; + passthru.updateScript = bundlerUpdateScript "procodile"; + meta = with lib; { description = "Run processes in the background (and foreground) on Mac & Linux from a Procfile (for production and/or development environments)"; homepage = https://adam.ac/procodile; license = with licenses; mit; - maintainers = with maintainers; [ ravloony manveru ]; + maintainers = with maintainers; [ ravloony manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 43d35410760..56e4e4f94fa 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, makeWrapper, git, gnutar, gzip }: +{ lib, bundlerApp, bundlerUpdateScript, makeWrapper, git, gnutar, gzip }: bundlerApp { pname = "r10k"; @@ -11,11 +11,13 @@ bundlerApp { wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} ''; + passthru.updateScript = bundlerUpdateScript "r10k"; + meta = with lib; { description = "Puppet environment and module deployment"; homepage = https://github.com/puppetlabs/r10k; license = licenses.asl20; - maintainers = with maintainers; [ zimbatm manveru ]; + maintainers = with maintainers; [ zimbatm manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 08f7f3039fb..5d5d3b1939d 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.09.59.1"; + version = "0.10.00"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0f3a6ki9v8lw4m9cwzlxsy7ykzmckgydnj2vypvwlr7rxcs19hxl"; + sha256 = "0x602d9alilxxx2v59ryyg6s81l9nf8bxyavk5wf8jd5mshx57fh"; }; # All platforms inputs then Linux-only ones diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 7230f55d309..2219d623a03 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "SystemdJournal2Gelf-${version}"; - version = "20170413"; - - goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; +buildGoModule rec { + pname = "SystemdJournal2Gelf-unstable"; + version = "20190702"; src = fetchFromGitHub { - rev = "862b1d60d2ba12cd8480304ca95041066cc8bdd0"; + rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "0xvvc7w2sxkhb33nkq5v626l673d5j2z0yc75wvmqzncwfkkv94v"; + sha256 = "0i2pv817fjm2xazxb01dk2gg1xb4d9b6743gqrbsyghbkm7krx29"; }; - goDeps = ./deps.nix; + modSha256 = "0f66bjij3bkjs09xhhp26arivlqrd66z1j5ziy4lq4krg82krsdp"; meta = with stdenv.lib; { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; diff --git a/pkgs/tools/system/systemd-journal2gelf/deps.nix b/pkgs/tools/system/systemd-journal2gelf/deps.nix deleted file mode 100644 index 2e0988e8105..00000000000 --- a/pkgs/tools/system/systemd-journal2gelf/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ -{ - goPackagePath = "github.com/DECK36/go-gelf"; - fetch = { - type = "git"; - url = "https://github.com/DECK36/go-gelf"; - rev = "4bc6123df0946a1c23fd54e0c1d0ed68b44fd99f"; - sha256 = "071zdwcl8ld05gv88yym1p7xq72igd6jj05n5d7v01hn6rvj48ay"; - }; -} -] diff --git a/pkgs/tools/text/bcat/default.nix b/pkgs/tools/text/bcat/default.nix index 72fb8aa8e2e..e8000f17cde 100644 --- a/pkgs/tools/text/bcat/default.nix +++ b/pkgs/tools/text/bcat/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "bcat"; gemdir = ./.; exes = [ "bcat" "btee" "a2h" ]; + passthru.updateScript = bundlerUpdateScript "bcat"; + meta = with lib; { description = "Pipe to browser utility"; homepage = http://rtomayko.github.com/bcat/; license = licenses.mit; - maintainers = [ maintainers.jraygauthier ]; + maintainers = with maintainers; [ jraygauthier nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index eb537c67a63..7254660cb1a 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc-O3.patch ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + meta = with stdenv.lib; { homepage = http://www.phontron.com/kytea/; description = "General toolkit developed for analyzing text"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ericsagnes ndowens ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index a02ca1cd3dd..05213ff1a87 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -1,7 +1,6 @@ -{ stdenv, bundlerEnv, ruby}: +{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: let - # To update, just run `nix-shell` in this directory. papertrail-env = bundlerEnv rec { name = "papertrail-env"; inherit ruby; @@ -18,4 +17,14 @@ in stdenv.mkDerivation { mkdir -p $out/bin ln -s ${papertrail-env}/bin/papertrail $out/bin/papertrail ''; + + passthru.updateScript = bundlerUpdateScript "papertrail"; + + meta = with stdenv.lib; { + description = "Command-line client for Papertrail log management service"; + homepage = http://github.com/papertrail/papertrail-cli/; + license = licenses.mit; + maintainers = with maintainers; [ nicknovitski ]; + platforms = ruby.meta.platforms; + }; } diff --git a/pkgs/tools/text/papertrail/shell.nix b/pkgs/tools/text/papertrail/shell.nix deleted file mode 100644 index 55a7a18f57b..00000000000 --- a/pkgs/tools/text/papertrail/shell.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs ? import {} }: - -pkgs.stdenv.mkDerivation { - name = "papertrail"; - src = ./.; - - buildInputs = with pkgs; [ - bundix - bundler - ruby - ]; - - shellHook = '' - truncate --size 0 Gemfile.lock - bundle install --path=vendor/bundle - rm -rf vendor .bundle - bundix - ''; -} diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index b97ffc7c58a..9e3e4d5b41d 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, bundlerEnv, makeWrapper }: +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { name = "reckon-${version}"; - version = "0.4.4"; + version = (import ./gemset.nix).reckon.version; env = bundlerEnv { name = "${name}-gems"; @@ -19,9 +19,12 @@ stdenv.mkDerivation rec { makeWrapper ${env}/bin/reckon $out/bin/reckon ''; + passthru.updateScript = bundlerUpdateScript "reckon"; + meta = with lib; { description = "Flexibly import bank account CSV files into Ledger for command line accounting"; license = licenses.mit; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 1563fe744ef..311767a786f 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt , Security -, withPCRE2 ? false, pcre2 ? null +, withPCRE2 ? true, pcre2 ? null }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix index b939e1500e4..c3953840836 100644 --- a/pkgs/tools/text/ruby-zoom/default.nix +++ b/pkgs/tools/text/ruby-zoom/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby, stdenv }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { pname = "ruby-zoom"; @@ -6,11 +6,13 @@ bundlerEnv { inherit ruby; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "ruby-zoom"; + meta = with lib; { description = "Quickly open CLI search results in your favorite editor!"; homepage = https://gitlab.com/mjwhitta/zoom; license = with licenses; gpl3; - maintainers = with stdenv.lib.maintainers; [ vmandela ]; + maintainers = with maintainers; [ vmandela nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 2f1c7e46154..20bbe782d91 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,8 +1,7 @@ { lib, bundlerApp, makeWrapper, # Optional dependencies, can be null epubcheck, kindlegen, - # For the update shell - mkShell, bundix + bundlerUpdateScript }: let @@ -26,21 +25,16 @@ let ''; passthru = { - inherit updateShell; + updateScript = bundlerUpdateScript "asciidoctor"; }; meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; homepage = https://asciidoctor.org/; license = licenses.mit; - maintainers = with maintainers; [ gpyh ]; + maintainers = with maintainers; [ gpyh nicknovitski ]; platforms = platforms.unix; }; }; - - updateShell = mkShell { - inputsFrom = lib.attrValues app.gems; - buildInputs = [ bundix ]; - }; in app diff --git a/pkgs/tools/typesetting/asciidoctor/update.sh b/pkgs/tools/typesetting/asciidoctor/update.sh deleted file mode 100755 index 1f7e5541cee..00000000000 --- a/pkgs/tools/typesetting/asciidoctor/update.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -nix-shell ../../../.. -A asciidoctor.updateShell --run ' - rm gemset.nix Gemfile.lock - bundix -m --bundle-pack-path $TMPDIR/asciidoctor-ruby-bundle - rm -r .bundle -' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adede620956..f7a160d14e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,6 +553,8 @@ in ansifilter = callPackage ../tools/text/ansifilter {}; + antora = nodePackages_10_x."@antora/cli"; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -780,6 +782,8 @@ in ezstream = callPackage ../tools/audio/ezstream { }; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; + genymotion = callPackage ../development/mobile/genymotion { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1944,9 +1948,9 @@ in enableExtraPlugins = true; }); - asciidoctor = callPackage ../tools/typesetting/asciidoctor { + asciidoctor = callPackage ../tools/typesetting/asciidoctor { # kindlegen is unfree, don't enable by default - kindlegen = null; + kindlegen = null; # epubcheck pulls in Java, which is problematic on some platforms epubcheck = null; }; @@ -3280,6 +3284,8 @@ in gitea = callPackage ../applications/version-management/gitea { }; + gl2ps = callPackage ../development/libraries/gl2ps { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -5493,6 +5499,10 @@ in pythonSexy = pythonPackages.libsexy; + pyditz = callPackage ../applications/misc/pyditz { + pythonPackages = python27Packages; + }; + pytrainer = callPackage ../applications/misc/pytrainer { }; pywal = with python3Packages; toPythonApplication pywal; @@ -6514,7 +6524,9 @@ in vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; - video2midi = callPackage ../tools/audio/video2midi { }; + video2midi = callPackage ../tools/audio/video2midi { + pythonPackages = python3Packages; + }; vifm = callPackage ../applications/misc/vifm { }; @@ -8102,6 +8114,9 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-raze = callPackage ../development/tools/rust/cargo-raze { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; @@ -8306,6 +8321,10 @@ in duktape = callPackage ../development/interpreters/duktape { }; + evcxr = callPackage ../development/interpreters/evcxr { + inherit (darwin.apple_sdk.frameworks) Security; + }; + beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) @@ -8654,6 +8673,7 @@ in bundler = callPackage ../development/ruby-modules/bundler { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; + bundlerUpdateScript = callPackage ../development/ruby-modules/bundler-update-script { }; bundler-audit = callPackage ../tools/security/bundler-audit { }; @@ -16626,7 +16646,9 @@ in plano-theme = callPackage ../data/themes/plano { }; - plata-theme = callPackage ../data/themes/plata {}; + plata-theme = callPackage ../data/themes/plata { + inherit (mate) marco; + }; poly = callPackage ../data/fonts/poly { }; @@ -21815,6 +21837,8 @@ in newtonwars = callPackage ../games/newtonwars { }; + nxengine-evo = callPackage ../games/nxengine-evo { }; + odamex = callPackage ../games/odamex { }; oilrush = callPackage ../games/oilrush { }; @@ -22030,6 +22054,12 @@ in gtk = pkgs.gtk3; }; + protontricks = callPackage ../tools/package-management/protontricks { + inherit (python3Packages) buildPythonApplication vdf; + inherit (gnome3) zenity; + wine = wineWowPackages.minimal; + }; + stepmania = callPackage ../games/stepmania { ffmpeg = ffmpeg_2; }; @@ -23886,6 +23916,8 @@ in brlaser = callPackage ../misc/cups/drivers/brlaser { }; + fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { }; + brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { }; dsseries = callPackage ../applications/graphics/sane/backends/dsseries { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 080754b4b1f..3b7bb5692a2 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -189,11 +189,11 @@ let buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - mailparse = assert !isPhp73; buildPecl rec { - version = "3.0.2"; + mailparse = buildPecl rec { + version = "3.0.3"; pname = "mailparse"; - sha256 = "0fw447ralqihsjnn0fm2hkaj8343cvb90v0d1wfclgz49256y6nq"; + sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz"; }; memcached = buildPecl rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 226fed92f7e..51a98994069 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1170,6 +1170,8 @@ in { pyunifi = callPackage ../development/python-modules/pyunifi { }; + vdf = callPackage ../development/python-modules/vdf { }; + vidstab = callPackage ../development/python-modules/vidstab { }; webapp2 = callPackage ../development/python-modules/webapp2 { }; @@ -1673,6 +1675,8 @@ in { cerberus = callPackage ../development/python-modules/cerberus { }; + cerberus11 = callPackage ../development/python-modules/cerberus11 { }; + certifi = callPackage ../development/python-modules/certifi { }; characteristic = callPackage ../development/python-modules/characteristic { }; @@ -2781,6 +2785,8 @@ in { django-sr = callPackage ../development/python-modules/django-sr { }; + django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; + django_tagging = callPackage ../development/python-modules/django_tagging { }; django_tagging_0_4_3 = if @@ -3814,6 +3820,8 @@ in { numba = callPackage ../development/python-modules/numba { }; + numcodecs = callPackage ../development/python-modules/numcodecs { }; + numexpr = callPackage ../development/python-modules/numexpr { }; Nuitka = callPackage ../development/python-modules/nuitka { }; @@ -3896,6 +3904,8 @@ in { zake = callPackage ../development/python-modules/zake { }; + zarr = callPackage ../development/python-modules/zarr { }; + kazoo = callPackage ../development/python-modules/kazoo { }; FormEncode = callPackage ../development/python-modules/FormEncode { };