From ed6a60de1e085c2de945b76e5f9aa907b322d747 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sun, 13 May 2018 16:52:00 +0200 Subject: [PATCH 001/221] nixos/matomo: add automatic archive processing --- nixos/doc/manual/release-notes/rl-1903.xml | 17 +++++++ .../modules/services/web-apps/matomo-doc.xml | 32 +++++++++++-- nixos/modules/services/web-apps/matomo.nix | 48 ++++++++++++++++++- 3 files changed, 91 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 65cc166c9a07..565f0cb68d5b 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -276,6 +276,23 @@ which determines the used Matomo version. + + The Matomo module now also comes with the systemd service matomo-archive-processing.service + and a timer that automatically triggers archive processing every hour. + This means that you can safely + + disable browser triggers for Matomo archiving + at Administration > System > General Settings. + + + Additionally, you can enable to + + delete old visitor logs + at Administration > System > Privacy, + but make sure that you run systemctl start matomo-archive-processing.service + at least once without errors if you have already collected data before, + so that the reports get archived before the source data gets deleted. + diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml index 510a335edc3b..c71c22e810ee 100644 --- a/nixos/modules/services/web-apps/matomo-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -12,15 +12,15 @@ An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup. +
Database Setup - You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands: - + # For MariaDB INSTALL PLUGIN unix_socket SONAME 'auth_socket'; CREATE DATABASE matomo; @@ -32,7 +32,7 @@ CREATE DATABASE matomo; CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - + Then fill in matomo as database user and database name, and leave the password field blank. This authentication works by allowing only the matomo unix user to authenticate as the @@ -46,9 +46,30 @@ database is not on the same host.
+ +
+ Archive Processing + + This module comes with the systemd service matomo-archive-processing.service + and a timer that automatically triggers archive processing every hour. + This means that you can safely + + disable browser triggers for Matomo archiving + at Administration > System > General Settings. + + + With automatic archive processing, you can now also enable to + + delete old visitor logs + at Administration > System > Privacy, + but make sure that you run systemctl start matomo-archive-processing.service + at least once without errors if you have already collected data before, + so that the reports get archived before the source data gets deleted. + +
+
Backup - You only need to take backups of your MySQL database and the /var/lib/matomo/config/config.ini.php file. Use a user @@ -57,9 +78,9 @@ .
+
Issues - @@ -76,6 +97,7 @@
+
Using other Web Servers than nginx diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 9fddf8320748..34ca5c2a72b1 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -54,6 +54,20 @@ in { ''; }; + periodicArchiveProcessing = mkOption { + type = types.bool; + default = true; + description = '' + Enable periodic archive processing, which generates aggregated reports from the visits. + + This means that you can safely disable browser triggers for Matomo archiving, + and safely enable to delete old visitor logs. + Before deleting visitor logs, + make sure though that you run systemctl start matomo-archive-processing.service + at least once without errors if you have already collected data before. + ''; + }; + phpfpmProcessManagerConfig = mkOption { type = types.str; default = '' @@ -132,16 +146,17 @@ in { requires = [ databaseService ]; after = [ databaseService ]; path = [ cfg.package ]; + environment.PIWIK_USER_PATH = dataDir; serviceConfig = { Type = "oneshot"; User = user; # hide especially config.ini.php from other UMask = "0007"; # TODO: might get renamed to MATOMO_USER_PATH in future versions - Environment = "PIWIK_USER_PATH=${dataDir}"; # chown + chmod in preStart needs root PermissionsStartOnly = true; }; + # correct ownership and permissions in case they're not correct anymore, # e.g. after restoring from backup or moving from another system. # Note that ${dataDir}/config/config.ini.php might contain the MySQL password. @@ -169,6 +184,37 @@ in { ''; }; + # If this is run regularly via the timer, + # 'Browser trigger archiving' can be disabled in Matomo UI > Settings > General Settings. + systemd.services.matomo-archive-processing = { + description = "Archive Matomo reports"; + # the archiving can only work if the database is already up and running + requires = [ databaseService ]; + after = [ databaseService ]; + + # TODO: might get renamed to MATOMO_USER_PATH in future versions + environment.PIWIK_USER_PATH = dataDir; + serviceConfig = { + Type = "oneshot"; + User = user; + UMask = "0007"; + CPUSchedulingPolicy = "idle"; + IOSchedulingClass = "idle"; + ExecStart = "${cfg.package}/bin/matomo-console core:archive --url=https://${user}.${fqdn}"; + }; + }; + + systemd.timers.matomo-archive-processing = mkIf cfg.periodicArchiveProcessing { + description = "Automatically archive Matomo reports every hour"; + + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = "hourly"; + Persistent = "yes"; + AccuracySec = "10m"; + }; + }; + systemd.services.${phpExecutionUnit} = { # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart restartTriggers = [ cfg.package ]; From 959ba6f05537551ff0937858aa46f72fb9eb063a Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sun, 13 May 2018 16:52:37 +0200 Subject: [PATCH 002/221] nixos/matomo: rename matomo_setup_update to matomo-setup-update to make it consistent with other NixOS systemd services and `matomo-archive-processing.service`. Also, consistently spell Matomo with capital M. --- nixos/modules/services/web-apps/matomo.nix | 34 ++++++++++++---------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 34ca5c2a72b1..e5427c7a5640 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -23,20 +23,24 @@ in { options = { services.matomo = { # NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963 - # matomo issue for automatic matomo setup: https://github.com/matomo-org/matomo/issues/10257 - # TODO: find a nice way to do this when more NixOS MySQL and / or matomo automatic setup stuff is implemented. + # Matomo issue for automatic Matomo setup: https://github.com/matomo-org/matomo/issues/10257 + # TODO: find a nice way to do this when more NixOS MySQL and / or Matomo automatic setup stuff is implemented. enable = mkOption { type = types.bool; default = false; description = '' - Enable matomo web analytics with php-fpm backend. + Enable Matomo web analytics with php-fpm backend. Either the nginx option or the webServerUser option is mandatory. ''; }; package = mkOption { type = types.package; - description = "Matomo package to use"; + description = '' + Matomo package for the service to use. + This can be used to point to newer releases from nixos-unstable, + as they don't get backported if they are not security-relevant. + ''; default = pkgs.matomo; defaultText = "pkgs.matomo"; }; @@ -47,7 +51,7 @@ in { example = "lighttpd"; # TODO: piwik.php might get renamed to matomo.php in future releases description = '' - Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for matomo if the nginx + Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for Matomo if the nginx option is not used. Either this option or the nginx option is mandatory. If you want to use another webserver than nginx, you need to set this to that server's user and pass fastcgi requests to `index.php` and `piwik.php` to this socket. @@ -83,7 +87,7 @@ in { catch_workers_output = yes ''; description = '' - Settings for phpfpm's process manager. You might need to change this depending on the load for matomo. + Settings for phpfpm's process manager. You might need to change this depending on the load for Matomo. ''; }; @@ -93,7 +97,7 @@ in { (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { # enable encryption by default, - # as sensitive login and matomo data should not be transmitted in clear text. + # as sensitive login and Matomo data should not be transmitted in clear text. options.forceSSL.default = true; options.enableACME.default = true; } @@ -108,7 +112,7 @@ in { enableACME = false; }; description = '' - With this option, you can customize an nginx virtualHost which already has sensible defaults for matomo. + With this option, you can customize an nginx virtualHost which already has sensible defaults for Matomo. Either this option or the webServerUser option is mandatory. Set this to {} to just enable the virtualHost if you don't need any customization. If enabled, then by default, the is @@ -138,8 +142,8 @@ in { }; users.groups.${user} = {}; - systemd.services.matomo_setup_update = { - # everything needs to set up and up to date before matomo php files are executed + systemd.services.matomo-setup-update = { + # everything needs to set up and up to date before Matomo php files are executed requiredBy = [ "${phpExecutionUnit}.service" ]; before = [ "${phpExecutionUnit}.service" ]; # the update part of the script can only work if the database is already up and running @@ -161,7 +165,7 @@ in { # e.g. after restoring from backup or moving from another system. # Note that ${dataDir}/config/config.ini.php might contain the MySQL password. preStart = '' - # migrate data from piwik to matomo folder + # migrate data from piwik to Matomo folder if [ -d ${deprecatedDataDir} ]; then echo "Migrating from ${deprecatedDataDir} to ${dataDir}" mv -T ${deprecatedDataDir} ${dataDir} @@ -170,7 +174,7 @@ in { chmod -R ug+rwX,o-rwx ${dataDir} ''; script = '' - # Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group + # Use User-Private Group scheme to protect Matomo data, but allow administration / backup via 'matomo' group # Copy config folder chmod g+s "${dataDir}" cp -r "${cfg.package}/config" "${dataDir}/" @@ -216,7 +220,7 @@ in { }; systemd.services.${phpExecutionUnit} = { - # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart + # stop phpfpm on package upgrade, do database upgrade via matomo-setup-update, and then restart restartTriggers = [ cfg.package ]; # stop config.ini.php from getting written with read permission for others serviceConfig.UMask = "0007"; @@ -246,13 +250,13 @@ in { # https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html # https://github.com/perusio/piwik-nginx "${user}.${fqdn}" = mkMerge [ cfg.nginx { - # don't allow to override the root easily, as it will almost certainly break matomo. + # don't allow to override the root easily, as it will almost certainly break Matomo. # disadvantage: not shown as default in docs. root = mkForce "${cfg.package}/share"; # define locations here instead of as the submodule option's default # so that they can easily be extended with additional locations if required - # without needing to redefine the matomo ones. + # without needing to redefine the Matomo ones. # disadvantage: not shown as default in docs. locations."/" = { index = "index.php"; From a73398d08236ab7796e0ed69efd0abb0974a400f Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 28 Jan 2019 15:10:22 +0100 Subject: [PATCH 003/221] consul: 1.3.0 -> 1.4.1 Signed-off-by: Vincent Demeester --- pkgs/servers/consul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index d1dcd78667f0..38d79eb2ba4c 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "1.3.0"; + version = "1.4.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "1zv84snvrjm74w3v3rr27linsbxj00m73xd047sb78a4766xs2h0"; + sha256 = "1xd2chx69jdbq2r82d4cgyc8pf1cmmxqvbfz29bf3nvvi6bgq7d5"; }; preBuild = '' From 24ccaf65dff3b918c194a4e9282675da16458103 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 29 Jan 2019 16:26:29 -0500 Subject: [PATCH 004/221] shellFor: Don't suck in src to compare to deps. [Fixes #51079] --- pkgs/development/haskell-modules/make-package-set.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b4cd7fee311b..e33ac7c5f852 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -272,7 +272,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # bash$ nix-shell --run "cabal new-build all" shellFor = { packages, withHoogle ? false, ... } @ args: let - selected = packages self; + nullSrc = p: overrideCabal p (_: { src = null; }); + + # Make sure we *never* accidentally suck in src. + selected = map nullSrc (packages self); packageInputs = map getBuildInputs selected; @@ -284,7 +287,8 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # because cabal will end up ignoring that built version, assuming # new-style commands. haskellInputs = pkgs.lib.filter - (input: pkgs.lib.all (p: input.outPath != p.outPath) selected) + # nullSrc in case a dep is one of the selected packages. + (input: pkgs.lib.all (p: (nullSrc input).outPath != p.outPath) selected) (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs); systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs; From 1ad836b326e36700f9e9cefe8f7933ad87d165d6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:10 +0000 Subject: [PATCH 005/221] dwm: cleanup whitespace --- pkgs/applications/window-managers/dwm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index f18afb935278..e8b8fe0eb95e 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -5,21 +5,21 @@ let in stdenv.mkDerivation { inherit name; - + src = fetchurl { url = "https://dl.suckless.org/dwm/${name}.tar.gz"; sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2"; }; - + buildInputs = [ libX11 libXinerama libXft ]; - + prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; # Allow users set their own list of patches inherit patches; buildPhase = " make "; - + meta = { homepage = https://suckless.org/; description = "Dynamic window manager for X"; From d35c199422325a1a125096cd45a79241819d1c84 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:11 +0000 Subject: [PATCH 006/221] dysnomia: cleanup whitespace --- pkgs/tools/package-management/disnix/dysnomia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index ab0ce5d75216..14c07df6ffa8 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - + configureFlags = [ (if enableApacheWebApplication then "--with-apache" else "--without-apache") (if enableAxis2WebService then "--with-axis2" else "--without-axis2") @@ -39,7 +39,7 @@ stdenv.mkDerivation { (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") "--with-job-template=${jobTemplate}" ]; - + buildInputs = [ getopt ] ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql.out From 735d2877ccb3c02be0e1f508a7aad02705da92bf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:12 +0000 Subject: [PATCH 007/221] pulseaudioFull, libpulseaudio-vanilla: cleanup These are already inherited in the parent derivation. --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dace0f0ceb75..f35da853602b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13734,13 +13734,11 @@ in bluetoothSupport = true; remoteControlSupport = true; zeroconfSupport = true; - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; # libpulse implementations libpulseaudio-vanilla = pulseaudio.override { libOnly = true; - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; apulse = callPackage ../misc/apulse { }; From 849b10a41949cf510db02adaa20d615a2014ba10 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:13 +0000 Subject: [PATCH 008/221] top-level: fix a typo --- pkgs/top-level/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index dcd443a1c29e..f2de6d6f81d4 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -73,7 +73,7 @@ in let # whatever arguments it doesn't explicitly provide. This way, # `all-packages.nix` doesn't know more than it needs too. # - # It's OK that `args` doesn't include default arguemtns from this file: + # It's OK that `args` doesn't include default arguments from this file: # they'll be deterministically inferred. In fact we must *not* include them, # because it's important that if some parameter which affects the default is # substituted with a different argument, the default is re-inferred. From 107f0fc9e712996674ce7f67ac4d2e6163f88822 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:14 +0000 Subject: [PATCH 009/221] top-level: cleanup whitespace --- pkgs/top-level/impure.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index dafa351c4e41..b0532ceb5db4 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -52,22 +52,22 @@ in map (n: import (path + ("/" + n))) (builtins.filter (n: builtins.match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (attrNames content)) - else + else # it's a file, so the result is the contents of the file itself import path; in if pathOverlays != "" && pathExists pathOverlays then overlays pathOverlays - else if pathExists homeOverlaysFile && pathExists homeOverlaysDir then + else if pathExists homeOverlaysFile && pathExists homeOverlaysDir then throw '' Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both. Please remove one of them and try again. '' - else if pathExists homeOverlaysFile then - if isDir homeOverlaysFile then + else if pathExists homeOverlaysFile then + if isDir homeOverlaysFile then throw (homeOverlaysFile + " should be a file") else overlays homeOverlaysFile else if pathExists homeOverlaysDir then - if !(isDir homeOverlaysDir) then + if !(isDir homeOverlaysDir) then throw (homeOverlaysDir + " should be a directory") else overlays homeOverlaysDir else [] From 51687d9a7fdce50d46d75f16e2dffac148141305 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:15 +0000 Subject: [PATCH 010/221] lib: tiny cleanup --- lib/customisation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 68062dd0daf0..1f5eb0d11e8b 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -121,7 +121,7 @@ rec { auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; origArgs = auto // args; pkgs = f origArgs; - mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs; + mkAttrOverridable = name: _: makeOverridable (newArgs: (f newArgs).${name}) origArgs; in lib.mapAttrs mkAttrOverridable pkgs; From 6832a42b7fbc1ef33ef464b7876e3853a2247074 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:16 +0000 Subject: [PATCH 011/221] avahi: move defaults to the package file --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f35da853602b..51436f8690a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -822,9 +822,7 @@ in autorandr = callPackage ../tools/misc/autorandr {}; - avahi = callPackage ../development/libraries/avahi { - qt4Support = config.avahi.qt4Support or false; - }; + avahi = callPackage ../development/libraries/avahi (config.avahi or {}); avro-c = callPackage ../development/libraries/avro-c { }; From 6cb5666bdb5711a6cea4c9a604e5d45b74d621f7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:17 +0000 Subject: [PATCH 012/221] profanity: move defaults to package file --- .../networking/instant-messengers/profanity/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index cf852ada369f..ae2f6f103049 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -2,9 +2,9 @@ , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid , cmocka, libmicrohttpd, stabber, expat, libmesode -, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null -, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null -, traySupport ? false, gnome2 ? null +, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null +, notifySupport ? true, libnotify ? null, gdk_pixbuf ? null +, traySupport ? true, gnome2 ? null , pgpSupport ? true, gpgme ? null , pythonPluginSupport ? true, python ? null }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51436f8690a9..0e600648f69a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18865,12 +18865,9 @@ in # And I don't want to rewrite all rules procmail = callPackage ../applications/misc/procmail { }; - profanity = callPackage ../applications/networking/instant-messengers/profanity { - notifySupport = config.profanity.notifySupport or true; - traySupport = config.profanity.traySupport or true; - autoAwaySupport = config.profanity.autoAwaySupport or true; + profanity = callPackage ../applications/networking/instant-messengers/profanity ({ python = python3; - }; + } // (config.profanity or {})); protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { }; From 5da88a18c9fc30d3926c1ff10acfa1082abaddcc Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:18 +0000 Subject: [PATCH 013/221] rsync: move defaults to package file --- pkgs/applications/networking/sync/rsync/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 0b4d580cd209..4045c1f0fc51 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, libiconv, zlib, popt -, enableACLs ? true, acl ? null +, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null , enableCopyDevicesPatch ? false }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e600648f69a..db91b61ac35b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19117,10 +19117,7 @@ in llvmPackages = llvmPackages_7; }; - rsync = callPackage ../applications/networking/sync/rsync { - enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); - enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); - }; + rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; rtl_433 = callPackage ../applications/misc/rtl_433 { }; From d064592f368a26fb4860edeaa870d6b769597bba Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:19 +0000 Subject: [PATCH 014/221] ghostscript: move defaults to package file --- pkgs/misc/ghostscript/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 722f5344905f..cd944a6788f3 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,12 +1,13 @@ -{ stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf +{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libiconv, ijs -, x11Support ? false, xlibsWrapper ? null -, cupsSupport ? false, cups ? null +, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null +, x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little }: assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; + let version = "9.${ver_min}"; ver_min = "26"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db91b61ac35b..98d98e9e524e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22347,10 +22347,7 @@ in gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; - ghostscript = callPackage ../misc/ghostscript rec { - cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); - x11Support = cupsSupport; # with CUPS, X11 only adds very little - }; + ghostscript = callPackage ../misc/ghostscript { }; ghostscriptX = appendToName "with-X" (ghostscript.override { cupsSupport = true; From 35a09f9923b3130a5f62a83af6bef17064053099 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:20 +0000 Subject: [PATCH 015/221] evilvte: move defaults to package file --- pkgs/applications/misc/evilvte/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index f088016938aa..c7fcf18e4e3d 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, makeWrapper, pkgconfig, gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, - configH + configH ? "" }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98d98e9e524e..387cb6fda80b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16920,9 +16920,7 @@ in etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilvte = callPackage ../applications/misc/evilvte { - configH = config.evilvte.config or ""; - }; + evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); evopedia = callPackage ../applications/misc/evopedia { }; From 7706253e5942eb85f4af957b58d31a3efba8efd4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:21 +0000 Subject: [PATCH 016/221] libspotify: move defaults to package file --- pkgs/development/libraries/libspotify/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index e472fe014ee7..5bae04a88f94 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }: +{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey ? null, unzip, gnused }: let version = "12.1.51"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 387cb6fda80b..645a80c6b4bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19395,9 +19395,7 @@ in }; }; - libspotify = callPackage ../development/libraries/libspotify { - apiKey = config.libspotify.apiKey or null; - }; + libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); sourcetrail = callPackage ../development/tools/sourcetrail { }; From 679bf2a2b205df0f849a8973c592c6bef8dc69fe Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:22 +0000 Subject: [PATCH 017/221] flashplayer: move defaults to package file --- pkgs/top-level/all-packages.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 645a80c6b4bc..03dce713e7ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17236,13 +17236,9 @@ in flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { - debug = config.flashplayer.debug or false; - }; + flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); - flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix { - debug = config.flashplayer.debug or false; - }; + flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix (config.flashplayer or {}); flashplayer-standalone-debugger = flashplayer-standalone.override { debug = true; From 25709dfe50ff8322604f995814425131fb0e06b3 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:23 +0000 Subject: [PATCH 018/221] tomahawk: move defaults to package file --- pkgs/top-level/all-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03dce713e7ea..0d899a78ac62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19627,14 +19627,11 @@ in toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; - tomahawk = callPackage ../applications/audio/tomahawk { + tomahawk = callPackage ../applications/audio/tomahawk ({ taglib = taglib_1_9; - enableXMPP = config.tomahawk.enableXMPP or true; - enableKDE = config.tomahawk.enableKDE or false; - enableTelepathy = config.tomahawk.enableTelepathy or false; quazip = quazip_qt4; boost = boost155; - }; + } // (config.tomahawk or {})); topydo = callPackage ../applications/misc/topydo {}; From 8cbe72a9234f30ad4866c88e8678d9d1c37312b6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:24 +0000 Subject: [PATCH 019/221] w3m: move defaults to package file --- pkgs/applications/networking/browsers/w3m/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 75998662f7f2..c1fa364a2d23 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib , sslSupport ? true, openssl ? null -, graphicsSupport ? true, imlib2 ? null +, graphicsSupport ? !stdenv.isDarwin, imlib2 ? null , x11Support ? graphicsSupport, libX11 ? null , mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null , perl, man, pkgconfig, buildPackages, w3m diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d899a78ac62..27b1242a6bd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19896,9 +19896,7 @@ in vym = qt5.callPackage ../applications/misc/vym { }; - w3m = callPackage ../applications/networking/browsers/w3m { - graphicsSupport = !stdenv.isDarwin; - }; + w3m = callPackage ../applications/networking/browsers/w3m { }; # Should always be the version with the most features w3m-full = w3m; From ec122ccfb8a52ea31cbd583b74cc92d59f895995 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:25 +0000 Subject: [PATCH 020/221] dysnomia: move defaults to package file --- pkgs/top-level/all-packages.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27b1242a6bd9..fe03d940973c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22638,15 +22638,7 @@ in disnix = callPackage ../tools/package-management/disnix { }; - dysnomia = callPackage ../tools/package-management/disnix/dysnomia { - enableApacheWebApplication = config.disnix.enableApacheWebApplication or false; - enableAxis2WebService = config.disnix.enableAxis2WebService or false; - enableEjabberdDump = config.disnix.enableEjabberdDump or false; - enableMySQLDatabase = config.disnix.enableMySQLDatabase or false; - enablePostgreSQLDatabase = config.disnix.enablePostgreSQLDatabase or false; - enableSubversionRepository = config.disnix.enableSubversionRepository or false; - enableTomcatWebApplication = config.disnix.enableTomcatWebApplication or false; - }; + dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {}); disnixos = callPackage ../tools/package-management/disnix/disnixos { }; From bdd69a9b0c99757a9dc6eccc66177a38d91dad4a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:26 +0000 Subject: [PATCH 021/221] sane-backends, sane-backends-git: move defaults to package file --- pkgs/top-level/all-packages.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe03d940973c..5d0eede6ba30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22780,15 +22780,9 @@ in samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; - sane-backends = callPackage ../applications/graphics/sane/backends { - gt68xxFirmware = config.sane.gt68xxFirmware or null; - snapscanFirmware = config.sane.snapscanFirmware or null; - }; + sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); - sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix { - gt68xxFirmware = config.sane.gt68xxFirmware or null; - snapscanFirmware = config.sane.snapscanFirmware or null; - }; + sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {}); brlaser = callPackage ../misc/cups/drivers/brlaser { }; From a4f20976fbd8b118f02e2a897de186e59054ba71 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:27 +0000 Subject: [PATCH 022/221] fetchsvnssh: move defaults to package file --- pkgs/build-support/fetchsvnssh/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index f76bd10247ba..fbd74efd750a 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, subversion, sshSupport ? false, openssh ? null, expect}: +{stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d0eede6ba30..31220caacc00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -230,9 +230,7 @@ in fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; - fetchsvnssh = callPackage ../build-support/fetchsvnssh { - sshSupport = true; - }; + fetchsvnssh = callPackage ../build-support/fetchsvnssh { }; fetchhg = callPackage ../build-support/fetchhg { }; From 4bc9404b158a3b10417e955b482a5c84008f4843 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:28 +0000 Subject: [PATCH 023/221] grub: move defaults to package file --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31220caacc00..9fdb03560d0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3066,10 +3066,9 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; - grub = pkgsi686Linux.callPackage ../tools/misc/grub { - buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv pkgsi686Linux.gcc6; - }; + } // (config.grub or {})); trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; From 546c8ffef81ebd375252bb31c15620a0801eadeb Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:29 +0000 Subject: [PATCH 024/221] ssmtp: move defaults to package file --- pkgs/tools/networking/ssmtp/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 22f60bfcee55..ebe31dc8b5a9 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tlsSupport ? false, openssl ? null}: +{stdenv, fetchurl, tlsSupport ? true, openssl ? null}: assert tlsSupport -> openssl != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fdb03560d0a..bee9676158bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5551,9 +5551,7 @@ in sslmate = callPackage ../development/tools/sslmate { }; - ssmtp = callPackage ../tools/networking/ssmtp { - tlsSupport = true; - }; + ssmtp = callPackage ../tools/networking/ssmtp { }; ssocr = callPackage ../applications/misc/ssocr { }; From 6e1e0bb21317df8d063c51fe1c2e9233b62b981f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:30 +0000 Subject: [PATCH 025/221] urjtag: move defaults to package file --- pkgs/tools/misc/urjtag/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 60a1ab325b13..545d7c554acc 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,10 +1,10 @@ { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison , flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline , python3 -, svfSupport ? false -, bsdlSupport ? false -, staplSupport ? false -, jedecSupport ? false +, svfSupport ? true +, bsdlSupport ? true +, staplSupport ? true +, jedecSupport ? true }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee9676158bc..b26c7634ad71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6197,12 +6197,7 @@ in uptimed = callPackage ../tools/system/uptimed { }; - urjtag = callPackage ../tools/misc/urjtag { - svfSupport = true; - bsdlSupport = true; - staplSupport = true; - jedecSupport = true; - }; + urjtag = callPackage ../tools/misc/urjtag { }; urlwatch = callPackage ../tools/networking/urlwatch { }; From c1ee0a4980f7b7a5e532a784a619f0b1f5a4b87e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:31 +0000 Subject: [PATCH 026/221] aprutil: move defaults to package file --- pkgs/development/libraries/apr-util/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index fe159afe6854..87563d6a9cbf 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl -, bdbSupport ? false, db +, bdbSupport ? true, db , ldapSupport ? !stdenv.isCygwin, openldap , libiconv , cyrus_sasl, autoreconfHook diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b26c7634ad71..c45ba40ba286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9272,7 +9272,6 @@ in apr = callPackage ../development/libraries/apr { }; aprutil = callPackage ../development/libraries/apr-util { - bdbSupport = true; db = if stdenv.isFreeBSD then db4 else db; # XXX: only the db_185 interface was available through # apr with db58 on freebsd (nov 2015), for unknown reasons From 4ec5cbc77a07532366321f5f339866e73b879c5e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:32 +0000 Subject: [PATCH 027/221] libgpod: move defaults to package file --- pkgs/development/libraries/libgpod/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index f178af349088..7126d027c7a0 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib, libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib, libimobiledevice, pythonPackages, mutagen, - monoSupport ? true, mono, gtk-sharp-2_0 + monoSupport ? false, mono, gtk-sharp-2_0 }: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c45ba40ba286..62fa902778d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10895,7 +10895,6 @@ in libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; - monoSupport = false; }; libgssglue = callPackage ../development/libraries/libgssglue { }; From 866944ff52322989ff751147a3eced64ea87547e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:33 +0000 Subject: [PATCH 028/221] mpd: move defaults to package file --- pkgs/top-level/all-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62fa902778d3..41af1c17d675 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13601,13 +13601,7 @@ in mod_python = pkgs.apacheHttpdPackages.mod_python; mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; - mpd = callPackage ../servers/mpd { - aacSupport = config.mpd.aacSupport or true; - clientSupport = config.mpd.clientSupport or true; - ffmpegSupport = config.mpd.ffmpegSupport or true; - opusSupport = config.mpd.opusSupport or true; - - }; + mpd = callPackage ../servers/mpd (config.mpd or {}); mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; From a4cebde4f6caf5f298dad1aac049dba442aaef18 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:34 +0000 Subject: [PATCH 029/221] mercurial: move defaults to package file --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41af1c17d675..d88d1abf2da4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18128,7 +18128,6 @@ in mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; - guiSupport = false; # use mercurialFull to get hgk GUI }; mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); From b5e511db7c45a55da1d4dc2c00b441d17e36146f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:35 +0000 Subject: [PATCH 030/221] rxvt_unicode: move defaults to package file --- pkgs/applications/misc/rxvt_unicode/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 2ae33a1eaa51..d198c5951359 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeDesktopItem, perlSupport, libX11, libXt, libXft, +{ stdenv, fetchurl, makeDesktopItem, perlSupport ? true, libX11, libXt, libXft, ncurses, perl, fontconfig, freetype, pkgconfig, libXrender, - gdkPixbufSupport, gdk_pixbuf, unicode3Support }: + gdkPixbufSupport ? true, gdk_pixbuf, unicode3Support ? true }: let pname = "rxvt-unicode"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d88d1abf2da4..ab21195a7948 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19108,11 +19108,7 @@ in rxvt = callPackage ../applications/misc/rxvt { }; # urxvt - rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { - perlSupport = true; - gdkPixbufSupport = true; - unicode3Support = true; - }; + rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { }; rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { plugins = [ From 1b784e5f6f82efba3f7ff593ae642b8b59398da7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:36 +0000 Subject: [PATCH 031/221] subversion: move defaults to package file --- .../version-management/subversion/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index a7f51713994e..64e8e5d2d253 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -1,6 +1,6 @@ -{ bdbSupport ? false # build support for Berkeley DB repositories +{ bdbSupport ? true # build support for Berkeley DB repositories , httpServer ? false # build Apache DAV module -, httpSupport ? false # client must support http +, httpSupport ? true # client must support http , pythonBindings ? false , perlBindings ? false , javahlBindings ? false diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab21195a7948..736d5cdd9009 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19411,16 +19411,7 @@ in sublime3-dev = sublime3Packages.sublime3-dev; - inherit (callPackages ../applications/version-management/subversion { - bdbSupport = true; - httpServer = false; - httpSupport = true; - pythonBindings = false; - perlBindings = false; - javahlBindings = false; - saslSupport = false; - sasl = cyrus_sasl; - }) + inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) subversion18 subversion19 subversion_1_10 subversion_1_11; subversion = subversion_1_11; From 2cf14077f46cd52d4d98ab191af4de27c7e47a23 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:37 +0000 Subject: [PATCH 032/221] residualvm: move defaults to package file --- pkgs/games/residualvm/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index d0f1d500eaf5..f6969af30c2c 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, openglSupport ? false, libGLU_combined ? null +, libGLSupported +, openglSupport ? libGLSupported, libGLU_combined ? null }: assert openglSupport -> libGLU_combined != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 736d5cdd9009..9f1686ffe64d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20851,9 +20851,7 @@ in racer = callPackage ../games/racer { }; - residualvm = callPackage ../games/residualvm { - openglSupport = libGLSupported; - }; + residualvm = callPackage ../games/residualvm { }; rftg = callPackage ../games/rftg { }; From 50153afe8ed3b37d02f2ffab6aeed33a33414074 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:38 +0000 Subject: [PATCH 033/221] arduino-core: move defaults to package file --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f1686ffe64d..d992f5d382e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -500,10 +500,7 @@ in arduino = arduino-core.override { withGui = true; }; - arduino-core = callPackage ../development/arduino/arduino-core { - jdk = jdk; - withGui = false; - }; + arduino-core = callPackage ../development/arduino/arduino-core { }; apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; From 58a2757aaa10b22076496f42ba28f505b82400c8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:39 +0000 Subject: [PATCH 034/221] ibus-with-plugins: move defaults to package file --- pkgs/tools/inputmethods/ibus/wrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 2b93274b79a2..3196c5b4e8ac 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, makeWrapper, lndir -, dconf, hicolor-icon-theme, ibus, librsvg, plugins +, dconf, hicolor-icon-theme, ibus, librsvg, plugins ? [] }: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d992f5d382e3..a8b96feeb5d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2006,7 +2006,6 @@ in ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { inherit (gnome3) dconf; - plugins = [ ]; }; interception-tools = callPackage ../tools/inputmethods/interception-tools { }; From caff8b7f4ca90d8f33196df7f3bb6779ba0b4ae9 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:40 +0000 Subject: [PATCH 035/221] mjpegtools: move defaults to package file --- pkgs/tools/video/mjpegtools/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 197caca0d86c..31d26a6c72a3 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx -, withMinimal ? false +, withMinimal ? true }: # TODO: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8b96feeb5d2..6e181cc8f5c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4181,9 +4181,7 @@ in mitmproxy = callPackage ../tools/networking/mitmproxy { }; - mjpegtools = callPackage ../tools/video/mjpegtools { - withMinimal = true; - }; + mjpegtools = callPackage ../tools/video/mjpegtools { }; mjpegtoolsFull = mjpegtools.override { withMinimal = false; From ce753447923a12e3fb9bda021df717c143de6923 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:41 +0000 Subject: [PATCH 036/221] stoken: move defaults to package file --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e181cc8f5c9..b9e1b3c61fb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5557,9 +5557,7 @@ in stress-ng = callPackage ../tools/system/stress-ng { }; - stoken = callPackage ../tools/security/stoken { - withGTK3 = config.stoken.withGTK3 or true; - }; + stoken = callPackage ../tools/security/stoken (config.stoken or {}); storeBackup = callPackage ../tools/backup/store-backup { }; From f56be70f3f4549c9dac929cc34b308dc78e6d40c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:42 +0000 Subject: [PATCH 037/221] uwsgi: move defaults to package file --- pkgs/servers/uwsgi/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 91053019ac12..99eac2760dd1 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, pkgconfig, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] -, plugins -, pam, withPAM ? false -, systemd, withSystemd ? false +, plugins ? [] +, pam, withPAM ? stdenv.isLinux +, systemd, withSystemd ? stdenv.isLinux , python2, python3, ncurses , ruby, php-embed, mysql }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9e1b3c61fb6..d1f0749075a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5916,11 +5916,7 @@ in usync = callPackage ../applications/misc/usync { }; - uwsgi = callPackage ../servers/uwsgi { - plugins = []; - withPAM = stdenv.isLinux; - withSystemd = stdenv.isLinux; - }; + uwsgi = callPackage ../servers/uwsgi { }; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; From 56ee5bca693b8e845ca9008edc12f06165d7af75 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:43 +0000 Subject: [PATCH 038/221] wireshark: move defaults to package file --- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 99e442698988..db093310ca1a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -2,7 +2,7 @@ , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null -, withQt ? false, qt5 ? null +, withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1f0749075a6..d2cb636f91d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17107,9 +17107,7 @@ in welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { - withQt = true; qt5 = qt59; - withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; wireshark-qt = wireshark; From 4f066da1de2f443bcc606b75f781d5da0d3ab987 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:44 +0000 Subject: [PATCH 039/221] quassel: move defaults to package file --- pkgs/applications/networking/irc/quassel/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index ce6215908ae2..75645fdb33aa 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,14 +1,14 @@ { monolithic ? true # build monolithic Quassel , daemon ? false # build Quassel daemon , client ? false # build Quassel client -, tag ? "" # tag added to the package name +, tag ? "-kf5" # tag added to the package name , static ? false # link statically , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf , qtbase, qtscript , phonon, libdbusmenu, qca-qt5 -, withKDE ? stdenv.isLinux # enable KDE integration +, withKDE ? true # enable KDE integration , extra-cmake-modules , kconfigwidgets , kcoreaddons diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2cb636f91d6..9b241008a760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18932,12 +18932,7 @@ in quantomatic = callPackage ../applications/science/physics/quantomatic { }; quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { - monolithic = true; - daemon = false; - client = false; - withKDE = true; - dconf = gnome3.dconf; - tag = "-kf5"; + inherit (gnome3) dconf; }; quasselClient = quassel.override { @@ -18949,8 +18944,8 @@ in quasselDaemon = quassel.override { monolithic = false; daemon = true; - tag = "-daemon-qt5"; withKDE = false; + tag = "-daemon-qt5"; }; quirc = callPackage ../tools/graphics/quirc {}; From ec2452dac17d492e09f65b8f8eca6366fb6858a2 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:45 +0000 Subject: [PATCH 040/221] scilab: move defaults to package file --- pkgs/applications/science/math/scilab/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 96b7dec19c21..01fb58403cad 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -2,13 +2,13 @@ , ncurses , withXaw3d ? false #, withPVMlib ? false -, tcl, tk, withTk ? false +, tcl, tk, withTk ? true , gtk2, withGtk ? false # working ? #, withF2c ? false -, ocaml, withOCaml ? false +, ocaml, withOCaml ? true #, withJava ? false #, atlasMath, withAtlas ? false -, xlibsWrapper, withX ? false +, xlibsWrapper, withX ? true }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b241008a760..22efa454676c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21969,13 +21969,7 @@ in singular = callPackage ../applications/science/math/singular { }; - scilab = callPackage ../applications/science/math/scilab { - withXaw3d = false; - withTk = true; - withGtk = false; - withOCaml = true; - withX = true; - }; + scilab = callPackage ../applications/science/math/scilab { }; scilab-bin = callPackage ../applications/science/math/scilab-bin {}; From f37effbc998e1fe81547c48b7d7382f9f66261a5 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:46 +0000 Subject: [PATCH 041/221] gams: move defaults to package file --- pkgs/tools/misc/gams/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 990282b2d584..011231692f3a 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, file, licenseFile, optgamsFile}: +{ stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}: assert licenseFile != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22efa454676c..73112b71d1fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -674,10 +674,7 @@ in gamecube-tools = callPackage ../development/tools/gamecube-tools { }; - gams = callPackage ../tools/misc/gams { - licenseFile = config.gams.licenseFile or null; - optgamsFile = config.gams.optgamsFile or null; - }; + gams = callPackage ../tools/misc/gams (config.gams or {}); git-fire = callPackage ../tools/misc/git-fire { }; From 88ca6dd78a320d8eb8ee99a074e7ffceedeabc1e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:47 +0000 Subject: [PATCH 042/221] cplex: move defaults to package file --- pkgs/applications/science/math/cplex/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index fe3913648f87..dae5e1b76d35 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath }: +{ stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: # To use this package, you need to download your own cplex installer from IBM # and override the releasePath attribute to point to the location of the file. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73112b71d1fd..a9c07edc2c87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1156,7 +1156,7 @@ in coprthr = callPackage ../development/libraries/coprthr { }; - cplex = callPackage ../applications/science/math/cplex { releasePath = config.cplex.releasePath or null; }; + cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); cpulimit = callPackage ../tools/misc/cpulimit { }; From 67223e3c8a3d601ca53747a5a564211467dc4736 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 19:57:56 +0000 Subject: [PATCH 043/221] openhmd: init at 0.3.0-rc1-20181218 --- .../development/libraries/openhmd/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/openhmd/default.nix diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/development/libraries/openhmd/default.nix new file mode 100644 index 000000000000..66656a142342 --- /dev/null +++ b/pkgs/development/libraries/openhmd/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, hidapi +, withExamples ? true, SDL2 ? null, libGL ? null, glew ? null +}: + +with lib; + +let onoff = if withExamples then "ON" else "OFF"; in + +stdenv.mkDerivation { + pname = "openhmd"; + version = "0.3.0-rc1-20181218"; + + src = fetchFromGitHub { + owner = "OpenHMD"; + repo = "OpenHMD"; + rev = "80d51bea575a5bf71bb3a0b9683b80ac3146596a"; + sha256 = "09011vnlsn238r5vbb1ab57x888ljaa34xibrnfbm5bl9417ii4z"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ + hidapi + ] ++ optionals withExamples [ + SDL2 libGL glew + ]; + + cmakeFlags = [ + "-DBUILD_BOTH_STATIC_SHARED_LIBS=ON" + "-DOPENHMD_EXAMPLE_SIMPLE=${onoff}" + "-DOPENHMD_EXAMPLE_SDL=${onoff}" + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + + postInstall = optionalString withExamples '' + mkdir -p $out/bin + install -D examples/simple/simple $out/bin/openhmd-example-simple + install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl + ''; + + meta = { + homepage = "http://www.openhmd.net"; + description = "Library API and drivers immersive technology"; + longDescription = '' + OpenHMD is a very simple FLOSS C library and a set of drivers + for interfacing with Virtual Reality (VR) Headsets aka + Head-mounted Displays (HMDs), controllers and trackers like + Oculus Rift, HTC Vive, Windows Mixed Reality, and etc. + ''; + license = licenses.boost; + maintainers = [ maintainers.oxij ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dace0f0ceb75..dee33ea3aa96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11914,6 +11914,8 @@ in ortp = callPackage ../development/libraries/ortp { }; + openhmd = callPackage ../development/libraries/openhmd { }; + openrct2 = callPackage ../games/openrct2 { }; osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; From 65f24643a8ec6b3e3c615fd001e1099ef4204647 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 20:10:10 +0000 Subject: [PATCH 044/221] doc: fix some indent --- doc/languages-frameworks/haskell.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 74b7a9f961ee..81f662f1a17d 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -352,9 +352,9 @@ you want them to come from. Add the following to `configuration.nix`. ```nix services.hoogle = { -enable = true; -packages = (hpkgs: with hpkgs; [text cryptonite]); -haskellPackages = pkgs.haskellPackages; + enable = true; + packages = (hpkgs: with hpkgs; [text cryptonite]); + haskellPackages = pkgs.haskellPackages; }; ``` From 08cabdf4a9d113269d40fadba28d52e0d5b5688a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 20:10:11 +0000 Subject: [PATCH 045/221] nixos: rippled: fix indent --- nixos/modules/services/misc/rippled.nix | 334 ++++++++++++------------ 1 file changed, 167 insertions(+), 167 deletions(-) diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 9d9a0ba44da5..04df376dc51f 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -85,70 +85,70 @@ let portOptions = { name, ...}: { options = { name = mkOption { - internal = true; - default = name; + internal = true; + default = name; }; ip = mkOption { - default = "127.0.0.1"; - description = "Ip where rippled listens."; - type = types.str; + default = "127.0.0.1"; + description = "Ip where rippled listens."; + type = types.str; }; port = mkOption { - description = "Port where rippled listens."; - type = types.int; + description = "Port where rippled listens."; + type = types.int; }; protocol = mkOption { - description = "Protocols expose by rippled."; - type = types.listOf (types.enum ["http" "https" "ws" "wss" "peer"]); + description = "Protocols expose by rippled."; + type = types.listOf (types.enum ["http" "https" "ws" "wss" "peer"]); }; user = mkOption { - description = "When set, these credentials will be required on HTTP/S requests."; - type = types.str; - default = ""; + description = "When set, these credentials will be required on HTTP/S requests."; + type = types.str; + default = ""; }; password = mkOption { - description = "When set, these credentials will be required on HTTP/S requests."; - type = types.str; - default = ""; + description = "When set, these credentials will be required on HTTP/S requests."; + type = types.str; + default = ""; }; admin = mkOption { - description = "A comma-separated list of admin IP addresses."; - type = types.listOf types.str; - default = ["127.0.0.1"]; + description = "A comma-separated list of admin IP addresses."; + type = types.listOf types.str; + default = ["127.0.0.1"]; }; ssl = { - key = mkOption { - description = '' - Specifies the filename holding the SSL key in PEM format. - ''; - default = null; - type = types.nullOr types.path; - }; + key = mkOption { + description = '' + Specifies the filename holding the SSL key in PEM format. + ''; + default = null; + type = types.nullOr types.path; + }; - cert = mkOption { - description = '' - Specifies the path to the SSL certificate file in PEM format. - This is not needed if the chain includes it. - ''; - default = null; - type = types.nullOr types.path; - }; + cert = mkOption { + description = '' + Specifies the path to the SSL certificate file in PEM format. + This is not needed if the chain includes it. + ''; + default = null; + type = types.nullOr types.path; + }; - chain = mkOption { - description = '' - If you need a certificate chain, specify the path to the - certificate chain here. The chain may include the end certificate. - ''; - default = null; - type = types.nullOr types.path; - }; + chain = mkOption { + description = '' + If you need a certificate chain, specify the path to the + certificate chain here. The chain may include the end certificate. + ''; + default = null; + type = types.nullOr types.path; + }; }; }; }; @@ -181,8 +181,8 @@ let advisoryDelete = mkOption { description = '' - If set, then require administrative RPC call "can_delete" - to enable online deletion of ledger records. + If set, then require administrative RPC call "can_delete" + to enable online deletion of ledger records. ''; type = types.nullOr types.bool; default = null; @@ -207,168 +207,168 @@ in enable = mkEnableOption "rippled"; package = mkOption { - description = "Which rippled package to use."; - type = types.package; - default = pkgs.rippled; - defaultText = "pkgs.rippled"; + description = "Which rippled package to use."; + type = types.package; + default = pkgs.rippled; + defaultText = "pkgs.rippled"; }; ports = mkOption { - description = "Ports exposed by rippled"; - type = with types; attrsOf (submodule portOptions); - default = { - rpc = { - port = 5005; - admin = ["127.0.0.1"]; - protocol = ["http"]; - }; + description = "Ports exposed by rippled"; + type = with types; attrsOf (submodule portOptions); + default = { + rpc = { + port = 5005; + admin = ["127.0.0.1"]; + protocol = ["http"]; + }; - peer = { - port = 51235; - ip = "0.0.0.0"; - protocol = ["peer"]; - }; + peer = { + port = 51235; + ip = "0.0.0.0"; + protocol = ["peer"]; + }; - ws_public = { - port = 5006; - ip = "0.0.0.0"; - protocol = ["ws" "wss"]; - }; - }; + ws_public = { + port = 5006; + ip = "0.0.0.0"; + protocol = ["ws" "wss"]; + }; + }; }; nodeDb = mkOption { - description = "Rippled main database options."; - type = with types; nullOr (submodule dbOptions); - default = { - type = "rocksdb"; - extraOpts = '' - open_files=2000 - filter_bits=12 - cache_mb=256 - file_size_pb=8 - file_size_mult=2; - ''; - }; + description = "Rippled main database options."; + type = with types; nullOr (submodule dbOptions); + default = { + type = "rocksdb"; + extraOpts = '' + open_files=2000 + filter_bits=12 + cache_mb=256 + file_size_pb=8 + file_size_mult=2; + ''; + }; }; tempDb = mkOption { - description = "Rippled temporary database options."; - type = with types; nullOr (submodule dbOptions); - default = null; + description = "Rippled temporary database options."; + type = with types; nullOr (submodule dbOptions); + default = null; }; importDb = mkOption { - description = "Settings for performing a one-time import."; - type = with types; nullOr (submodule dbOptions); - default = null; + description = "Settings for performing a one-time import."; + type = with types; nullOr (submodule dbOptions); + default = null; }; nodeSize = mkOption { - description = '' - Rippled size of the node you are running. - "tiny", "small", "medium", "large", and "huge" - ''; - type = types.enum ["tiny" "small" "medium" "large" "huge"]; - default = "small"; + description = '' + Rippled size of the node you are running. + "tiny", "small", "medium", "large", and "huge" + ''; + type = types.enum ["tiny" "small" "medium" "large" "huge"]; + default = "small"; }; ips = mkOption { - description = '' - List of hostnames or ips where the Ripple protocol is served. - For a starter list, you can either copy entries from: - https://ripple.com/ripple.txt or if you prefer you can let it - default to r.ripple.com 51235 + description = '' + List of hostnames or ips where the Ripple protocol is served. + For a starter list, you can either copy entries from: + https://ripple.com/ripple.txt or if you prefer you can let it + default to r.ripple.com 51235 - A port may optionally be specified after adding a space to the - address. By convention, if known, IPs are listed in from most - to least trusted. - ''; - type = types.listOf types.str; - default = ["r.ripple.com 51235"]; + A port may optionally be specified after adding a space to the + address. By convention, if known, IPs are listed in from most + to least trusted. + ''; + type = types.listOf types.str; + default = ["r.ripple.com 51235"]; }; ipsFixed = mkOption { - description = '' - List of IP addresses or hostnames to which rippled should always - attempt to maintain peer connections with. This is useful for - manually forming private networks, for example to configure a - validation server that connects to the Ripple network through a - public-facing server, or for building a set of cluster peers. + description = '' + List of IP addresses or hostnames to which rippled should always + attempt to maintain peer connections with. This is useful for + manually forming private networks, for example to configure a + validation server that connects to the Ripple network through a + public-facing server, or for building a set of cluster peers. - A port may optionally be specified after adding a space to the address - ''; - type = types.listOf types.str; - default = []; + A port may optionally be specified after adding a space to the address + ''; + type = types.listOf types.str; + default = []; }; validators = mkOption { - description = '' - List of nodes to always accept as validators. Nodes are specified by domain - or public key. - ''; - type = types.listOf types.str; - default = [ - "n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1" - "n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2" - "n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C RL3" - "n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS RL4" - "n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA RL5" - ]; + description = '' + List of nodes to always accept as validators. Nodes are specified by domain + or public key. + ''; + type = types.listOf types.str; + default = [ + "n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1" + "n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2" + "n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C RL3" + "n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS RL4" + "n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA RL5" + ]; }; databasePath = mkOption { - description = '' - Path to the ripple database. - ''; - type = types.path; - default = "/var/lib/rippled"; + description = '' + Path to the ripple database. + ''; + type = types.path; + default = "/var/lib/rippled"; }; validationQuorum = mkOption { - description = '' - The minimum number of trusted validations a ledger must have before - the server considers it fully validated. - ''; - type = types.int; - default = 3; + description = '' + The minimum number of trusted validations a ledger must have before + the server considers it fully validated. + ''; + type = types.int; + default = 3; }; ledgerHistory = mkOption { - description = '' - The number of past ledgers to acquire on server startup and the minimum - to maintain while running. - ''; - type = types.either types.int (types.enum ["full"]); - default = 1296000; # 1 month + description = '' + The number of past ledgers to acquire on server startup and the minimum + to maintain while running. + ''; + type = types.either types.int (types.enum ["full"]); + default = 1296000; # 1 month }; fetchDepth = mkOption { - description = '' - The number of past ledgers to serve to other peers that request historical - ledger data (or "full" for no limit). - ''; - type = types.either types.int (types.enum ["full"]); - default = "full"; + description = '' + The number of past ledgers to serve to other peers that request historical + ledger data (or "full" for no limit). + ''; + type = types.either types.int (types.enum ["full"]); + default = "full"; }; sntpServers = mkOption { - description = '' - IP address or domain of NTP servers to use for time synchronization.; - ''; - type = types.listOf types.str; - default = [ - "time.windows.com" - "time.apple.com" - "time.nist.gov" - "pool.ntp.org" - ]; + description = '' + IP address or domain of NTP servers to use for time synchronization.; + ''; + type = types.listOf types.str; + default = [ + "time.windows.com" + "time.apple.com" + "time.nist.gov" + "pool.ntp.org" + ]; }; logLevel = mkOption { description = "Logging verbosity."; - type = types.enum ["debug" "error" "info"]; - default = "error"; + type = types.enum ["debug" "error" "info"]; + default = "error"; }; statsd = { @@ -389,14 +389,14 @@ in extraConfig = mkOption { default = ""; - description = '' - Extra lines to be added verbatim to the rippled.cfg configuration file. - ''; + description = '' + Extra lines to be added verbatim to the rippled.cfg configuration file. + ''; }; config = mkOption { - internal = true; - default = pkgs.writeText "rippled.conf" rippledCfg; + internal = true; + default = pkgs.writeText "rippled.conf" rippledCfg; }; }; }; @@ -410,8 +410,8 @@ in { name = "rippled"; description = "Ripple server user"; uid = config.ids.uids.rippled; - home = cfg.databasePath; - createHome = true; + home = cfg.databasePath; + createHome = true; }; systemd.services.rippled = { @@ -421,8 +421,8 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/rippled --fg --conf ${cfg.config}"; User = "rippled"; - Restart = "on-failure"; - LimitNOFILE=10000; + Restart = "on-failure"; + LimitNOFILE=10000; }; }; From 234ba7446c76141b9a81464a2e03dcf6ce6da0f1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 20:10:12 +0000 Subject: [PATCH 046/221] nixos: version: cleanup a bit --- nixos/modules/misc/version.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 001505320c00..c576cf4cb925 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -36,14 +36,14 @@ in nixos.revision = mkOption { internal = true; type = types.str; - default = lib.trivial.revisionWithDefault "master"; + default = trivial.revisionWithDefault "master"; description = "The Git revision from which this NixOS configuration was built."; }; nixos.codeName = mkOption { readOnly = true; type = types.str; - default = lib.trivial.codeName; + default = trivial.codeName; description = "The NixOS release code name (e.g. Emu)."; }; From cefbe6910520b2525df28a1dcc6b3ef1a845708f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 20:10:13 +0000 Subject: [PATCH 047/221] nixos: rippled: fix type The old state is clearly a bug. --- nixos/modules/services/misc/rippled.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 04df376dc51f..cdf61730de33 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -175,7 +175,7 @@ let onlineDelete = mkOption { description = "Enable automatic purging of older ledger information."; - type = types.addCheck (types.nullOr types.int) (v: v > 256); + type = types.nullOr (types.addCheck types.int (v: v > 256)); default = cfg.ledgerHistory; }; From c9a28dcaa6191507bbff712b061f725bdad86bc9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 14:59:21 -0800 Subject: [PATCH 048/221] ocamlPackages.utop: 2.2.0 -> 2.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/utop/versions --- pkgs/development/tools/ocaml/utop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 434f8b3af2ea..be6bb73aab81 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -7,12 +7,12 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.2.0"; + version = "2.3.0"; name = "utop-${version}"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "1414snwmqaxs1x8wbpjf6fn3jsl01hq0phrr7639xmb5vh15mgd4"; + sha256 = "1g1xf19fhzwsikp33pv1wf6wb2qdc5y7dzqi46h8c4l850cwscjh"; }; nativeBuildInputs = [ makeWrapper ]; From d842a78c1d0c4f898e1d759bcad6d595a9178264 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 21:46:44 -0800 Subject: [PATCH 049/221] i3-gaps: 4.16 -> 4.16.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/i3-gaps/versions --- pkgs/applications/window-managers/i3/gaps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 01a89b49e715..dc54f671e3c5 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.16"; + version = "4.16.1"; releaseDate = "2018-03-13"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "16d215y9g27b75rifm1cgznxg73fmg5ksigi0gbj7pfd6x6bqcy9"; + sha256 = "1jvyd8p8dfsidfy2yy7adydynzvaf72lx67x71r13hrk8w77hp0k"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; From eab69d998bf728551b525c00c4f771018da00f1f Mon Sep 17 00:00:00 2001 From: Robert Irelan Date: Tue, 5 Feb 2019 20:44:48 -0800 Subject: [PATCH 050/221] Remove option config.services.tt-rss.checkForUpdates (forced to false) Force this option to false. Leaving this as true (currently the default) is dangerous. If the TT-RSS installation upgrades itself to a newer version requiring a schema update, the installation will break the next time the TT-RSS systemd service is restarted. Ideally, the installation itself should be immutable (see https://github.com/NixOS/nixpkgs/issues/55300). --- nixos/modules/services/web-apps/tt-rss.nix | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 90b35d19ea11..6070182a092a 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -46,7 +46,17 @@ let define('SINGLE_USER_MODE', ${boolToString cfg.singleUserMode}); define('SIMPLE_UPDATE_MODE', ${boolToString cfg.simpleUpdateMode}); - define('CHECK_FOR_UPDATES', ${boolToString cfg.checkForUpdates}); + + // Never check for updates - the running version of the code should be + // controlled entirely by the version of TT-RSS active in the current Nix + // profile. If TT-RSS updates itself to a version requiring a database + // schema upgrade, and then the SystemD tt-rss.service is restarted, the + // old code copied from the Nix store will overwrite the updated version, + // causing the code to detect the need for a schema "upgrade" (since the + // schema version in the database is different than in the code), but the + // update schema operation in TT-RSS will do nothing because the schema + // version in the database is newer than that in the code. + define('CHECK_FOR_UPDATES', false); define('FORCE_ARTICLE_PURGE', ${toString cfg.forceArticlePurge}); define('SESSION_COOKIE_LIFETIME', ${toString cfg.sessionCookieLifetime}); @@ -399,14 +409,6 @@ let ''; }; - checkForUpdates = mkOption { - type = types.bool; - default = true; - description = '' - Check for updates automatically if running Git version - ''; - }; - enableGZipOutput = mkOption { type = types.bool; default = true; @@ -474,6 +476,14 @@ let }; }; + imports = [ + (mkRemovedOptionModule ["services" "tt-rss" "checkForUpdates"] '' + This option was removed because setting this to true will cause TT-RSS + to be unable to start if an automatic update of the code in + services.tt-rss.root leads to a database schema upgrade that is not + supported by the code active in the Nix store. + '') + ]; ###### implementation From fe1d31480c0a754c8a2c460e60005cc707c23204 Mon Sep 17 00:00:00 2001 From: tobias pflug Date: Wed, 6 Feb 2019 10:51:00 +0100 Subject: [PATCH 051/221] kind: 0.0.1 -> 0.1.0 --- pkgs/development/tools/kind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index bf73e436fa73..8cf08a93750b 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; buildGoPackage rec { name = "kind-${version}"; - version = "0.0.1"; + version = "0.1.0"; src = fetchFromGitHub { rev = "${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "1jldj864ip8hrk3zhkjifr4gzgc8kxmxxwvklxglymhv8cxc179f"; + sha256 = "01ifmnv3jid4ls6qw9d6j9vldjbbnrwclzv8spnh6fnzb2wprln2"; }; goPackagePath = "sigs.k8s.io/kind"; From b331161df295a79d70e685d6ef2e011dc9465983 Mon Sep 17 00:00:00 2001 From: tilpner Date: Fri, 8 Feb 2019 16:02:08 +0100 Subject: [PATCH 052/221] fuse-overlayfs: 0.2 -> 0.3 --- .../filesystems/fuse-overlayfs/default.nix | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 515fdd4e2608..c4d52462906e 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,27 +1,25 @@ -{ pkgs, lib, autoreconfHook, pkgconfig, fuse3 }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, fuse3 }: -let - version = "0.2"; -in - pkgs.stdenv.mkDerivation { - name = "fuse-overlayfs-${version}"; +stdenv.mkDerivation rec { + name = "fuse-overlayfs-${version}"; + version = "0.3"; - src = pkgs.fetchFromGitHub { - owner = "containers"; - repo = "fuse-overlayfs"; - rev = "1e2b65baa2f75eea0e4bab90b5ac81dd8471256c"; - sha256 = "0a9ix8rqjs5r28jsriyiv4yq7iilmv69x05kf23s1ihzrvrfkl08"; - }; + src = fetchFromGitHub { + owner = "containers"; + repo = "fuse-overlayfs"; + rev = "v${version}"; + sha256 = "1cch2j397hydrhh62faqa663vas75qbmylqd06fk6nafasa3ri0l"; + }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ fuse3 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fuse3 ]; - meta = with lib; { - homepage = https://github.com/containers/fuse-overlayfs; - description = "FUSE implementation for overlayfs"; - longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = [ maintainers.ma9e ]; - }; - } + meta = with lib; { + homepage = https://github.com/containers/fuse-overlayfs; + description = "FUSE implementation for overlayfs"; + longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.ma9e ]; + }; +} From 8092ca8312c543f24df7b7485a932cfd0fdba05e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Feb 2019 00:45:10 +0100 Subject: [PATCH 053/221] nix1: fix `perl-bindings` build Nix 1.11 builds perl-bindings by default, `nix1.perl-bindings` fails with the following error: ``` building no Makefile, doing nothing installing install flags: install make: *** No rule to make target 'install'. Stop. ``` This is probably due to #47316. Previously the `perl-bindings` were referenced to `nix1` instead of the `perl-bindings` function as Nix 1.11 built those during its build process. --- pkgs/tools/package-management/nix/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d86dfa316193..76d11a03fc44 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -13,7 +13,7 @@ let sh = busybox-sandbox-shell; - common = { name, suffix ? "", src, fromGit ? false }: + common = { name, suffix ? "", src, includesPerl ? false, fromGit ? false }: let nix = stdenv.mkDerivation rec { inherit name src; version = lib.getVersion name; @@ -113,7 +113,7 @@ let passthru = { inherit fromGit; - perl-bindings = stdenv.mkDerivation { + perl-bindings = if includesPerl then nix else stdenv.mkDerivation { name = "nix-perl-${version}"; inherit src; @@ -150,6 +150,9 @@ in rec { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; + + # Nix1 has the perl bindings by default, so no need to build the manually. + includesPerl = true; }; nixStable = common rec { From 14a5c277432d467db95d10716cd10e1d4d5b7461 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 9 Feb 2019 21:11:12 -0500 Subject: [PATCH 054/221] linux_testing_bcachefs: 4.20.2019.01.23 -> 4.20.2019.02.09 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index a3275786b338..82326a2ee73f 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.20.2019.01.23"; + version = "4.20.2019.02.09"; modDirVersion = "4.20.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "99750eab4d583132cf61f071082c7cf21f5295c0"; - sha256 = "05wg9w5f68qg02yrciir9h1wx448869763hg3w7j23wc2qywhwqb"; + rev = "09a546543006b60d44c4c51e7b40cd3ec7837a5e"; + sha256 = "0p187vp9df0nnhawql0f2bj2sdim0f2b424106d41yxc8ayhz0d9"; }; extraConfig = "BCACHEFS_FS m"; From 09c194a3526b3a344d92c7396bd722ab73e1a58f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 9 Feb 2019 21:11:29 -0500 Subject: [PATCH 055/221] bcachefs-tools: 2019-01-23 -> 2019-02-09 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index eefc0beb1fcc..fc55352fa126 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-01-23"; + version = "2019-02-09"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "35fca2f044d375b1590f499cfd34bef38ca0f8f1"; - sha256 = "1mmpwksszdi4n7zv3fm7qnmfk94m56d65lfw30553bnfm3yaz3k7"; + rev = "17c5215c1c542dd7b6b4f891a0da16d8c98e0591"; + sha256 = "1zm2lnvijfmz483m2nhxz1rhk7ghgh0c450nyiwi6wa7lc1y3339"; }; enableParallelBuilding = true; From 13b0c17932ae03b1ed04a93f1ca06c8baeb24530 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 9 Feb 2019 23:20:56 -0500 Subject: [PATCH 056/221] syslinux: Adds @samueldr as maintainer --- pkgs/os-specific/linux/syslinux/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index f02f1baafe63..cb3259643139 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { homepage = http://www.syslinux.org/; description = "A lightweight bootloader"; license = licenses.gpl2; + maintainers = [ maintainers.samueldr ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 0b49d5dd687a540c259400c1082ea660b9b9961a Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 9 Feb 2019 22:34:11 -0500 Subject: [PATCH 057/221] syslinux: 2015-11-09 -> 2019-02-07 --- pkgs/os-specific/linux/syslinux/default.nix | 26 ++---- .../linux/syslinux/perl-deps.patch | 81 ------------------- 2 files changed, 7 insertions(+), 100 deletions(-) delete mode 100644 pkgs/os-specific/linux/syslinux/perl-deps.patch diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index cb3259643139..2562bb7e260b 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,31 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: +{ stdenv, fetchFromRepoOrCz, fetchpatch, nasm, perl, python, libuuid, mtools, makeWrapper }: stdenv.mkDerivation rec { - name = "syslinux-2015-11-09"; + # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. + # Same issue here https://www.syslinux.org/archives/2019-February/026330.html + name = "syslinux-2019-02-07"; - src = fetchFromGitHub { - owner = "geneC"; + src = fetchFromRepoOrCz { repo = "syslinux"; - rev = "0cc9a99e560a2f52bcf052fd85b1efae35ee812f"; - sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; + rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; + sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w"; }; - patches = [ - ./perl-deps.patch - (fetchurl { - # ldlinux.elf: Not enough room for program headers, try linking with -N - name = "not-enough-room.patch"; - url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/" - + "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7"; - sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw"; - }) - ]; - postPatch = '' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) - substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) - substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ diff --git a/pkgs/os-specific/linux/syslinux/perl-deps.patch b/pkgs/os-specific/linux/syslinux/perl-deps.patch deleted file mode 100644 index 82c9820809e1..000000000000 --- a/pkgs/os-specific/linux/syslinux/perl-deps.patch +++ /dev/null @@ -1,81 +0,0 @@ -http://git.ipxe.org/ipxe.git/commitdiff/719b498 - -diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios ---- syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios 2010-07-21 21:33:13.000000000 +0200 -+++ syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios 2010-08-06 23:32:57.000000000 +0200 -@@ -24,11 +24,11 @@ - - # Padding rules - # --PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@ -+PAD_rom = $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@ - PAD_hrom = $(PAD_rom) - PAD_xrom = $(PAD_rom) --PAD_dsk = $(PADIMG) --blksize=512 $@ --PAD_hd = $(PADIMG) --blksize=32768 $@ -+PAD_dsk = $(PERL) $(PADIMG) --blksize=512 $@ -+PAD_hd = $(PERL) $(PADIMG) --blksize=32768 $@ - - # rule to make a non-emulation ISO boot image - NON_AUTO_MEDIA += iso -diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile syslinux-4.02/gpxe/src/Makefile ---- syslinux-4.02-orig/gpxe/src/Makefile 2010-07-21 21:33:13.000000000 +0200 -+++ syslinux-4.02/gpxe/src/Makefile 2010-08-06 23:31:15.000000000 +0200 -@@ -31,12 +31,12 @@ - OBJCOPY := $(CROSS_COMPILE)objcopy - NM := $(CROSS_COMPILE)nm - OBJDUMP := $(CROSS_COMPILE)objdump --PARSEROM := $(PERL) ./util/parserom.pl --MAKEROM := $(PERL) ./util/makerom.pl --SYMCHECK := $(PERL) ./util/symcheck.pl --SORTOBJDUMP := $(PERL) ./util/sortobjdump.pl --PADIMG := $(PERL) ./util/padimg.pl --LICENCE := $(PERL) ./util/licence.pl -+PARSEROM := ./util/parserom.pl -+MAKEROM := ./util/makerom.pl -+SYMCHECK := ./util/symcheck.pl -+SORTOBJDUMP := ./util/sortobjdump.pl -+PADIMG := ./util/padimg.pl -+LICENCE := ./util/licence.pl - NRV2B := ./util/nrv2b - ZBIN := ./util/zbin - ELF2EFI32 := ./util/elf2efi32 -diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile.housekeeping syslinux-4.02/gpxe/src/Makefile.housekeeping ---- syslinux-4.02-orig/gpxe/src/Makefile.housekeeping 2010-07-21 21:33:13.000000000 +0200 -+++ syslinux-4.02/gpxe/src/Makefile.housekeeping 2010-08-06 23:31:49.000000000 +0200 -@@ -456,7 +456,7 @@ - '\n$(2) : $$($(4)_DEPS)\n' \ - '\nTAGS : $$($(4)_DEPS)\n' \ - >> $(2) -- @$(PARSEROM) $(1) >> $(2) -+ @$(PERL) $(PARSEROM) $(1) >> $(2) - - endef - -@@ -657,7 +657,7 @@ - $(QM)$(ECHO) " [LD] $@" - $(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \ - -Map $(BIN)/$*.tmp.map -- $(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map -+ $(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map - - # Keep intermediate object file (useful for debugging) - .PRECIOUS : $(BIN)/%.tmp -@@ -714,7 +714,7 @@ - echo "files are missing a licence declaration:" ;\ - echo $(call unlicensed_deps_list,$<);\ - exit 1,\ -- $(LICENCE) $(call licence_list,$<)) -+ $(PERL) $(LICENCE) $(call licence_list,$<)) - - # Extract compression information from intermediate object file - # -@@ -941,7 +941,7 @@ - CLEANUP += $(BIN)/symtab - - symcheck : $(SYMTAB) -- $(SYMCHECK) $< -+ $(PERL) $(SYMCHECK) $< - - endif # defined(BIN) - From 1540ab34befecf78f7ab8209100ebde317cd33e0 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 10 Feb 2019 10:55:33 +0100 Subject: [PATCH 058/221] tqsl: Move from misc to radio --- pkgs/applications/{misc => radio}/tqsl/cmake_lib_path.patch | 0 pkgs/applications/{misc => radio}/tqsl/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => radio}/tqsl/cmake_lib_path.patch (100%) rename pkgs/applications/{misc => radio}/tqsl/default.nix (100%) diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/radio/tqsl/cmake_lib_path.patch similarity index 100% rename from pkgs/applications/misc/tqsl/cmake_lib_path.patch rename to pkgs/applications/radio/tqsl/cmake_lib_path.patch diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix similarity index 100% rename from pkgs/applications/misc/tqsl/default.nix rename to pkgs/applications/radio/tqsl/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b33dfd77d7a8..02311bd7b393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19727,7 +19727,7 @@ in toxiproxy = callPackage ../development/tools/toxiproxy { }; - tqsl = callPackage ../applications/misc/tqsl { }; + tqsl = callPackage ../applications/radio/tqsl { }; transcode = callPackage ../applications/audio/transcode { }; From d3390e50822460f3d23270b2c6eb2a44a8e7a33d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 10 Feb 2019 11:01:03 +0100 Subject: [PATCH 059/221] tqsl: 2.3.1 -> 2.4.3 Changelog: https://www.arrl.org/files/file/LoTW%20Instructions/TrustedQSL-2-4-3-release.pdf --- pkgs/applications/radio/tqsl/cmake_lib_path.patch | 12 ------------ pkgs/applications/radio/tqsl/default.nix | 12 +++++------- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/radio/tqsl/cmake_lib_path.patch diff --git a/pkgs/applications/radio/tqsl/cmake_lib_path.patch b/pkgs/applications/radio/tqsl/cmake_lib_path.patch deleted file mode 100644 index 5eed93834632..000000000000 --- a/pkgs/applications/radio/tqsl/cmake_lib_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt ---- tqsl-2.3.1/src/CMakeLists.txt 2017-04-17 20:53:22.000000000 -0400 -+++ tqsl-2.3.1b/src/CMakeLists.txt 2017-10-05 21:14:39.048329343 -0400 -@@ -54,7 +54,7 @@ - if(NOT APPLE AND NOT WIN32) - set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/") - set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h) --install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX)) -+install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX}) - install(FILES config.xml DESTINATION share/TrustedQSL) - install(FILES ${HEADERS_TO_INSTALL} DESTINATION include) - endif() diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index f001cbcaab92..ce0fbf0e16dc 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: stdenv.mkDerivation rec { - name = "tqsl-${version}"; - version = "2.3.1"; + pname = "tqsl"; + version = "2.4.3"; src = fetchurl { - url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; - sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv"; + url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; + sha256 = "0f8pa5wnp0x0mjjr5kanka9hirgmp5wf6jsb95dc6hjlzlvy6kz9"; }; nativeBuildInputs = [ makeWrapper ]; @@ -20,11 +20,9 @@ stdenv.mkDerivation rec { wxGTK ]; - patches = [ ./cmake_lib_path.patch ]; - meta = with stdenv.lib; { description = "Software for using the ARRL Logbook of the World"; - homepage = https://lotw.arrl.org/; + homepage = https://www.arrl.org/tqsl-download; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.dpflug ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02311bd7b393..64a7f847cd9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19728,6 +19728,7 @@ in toxiproxy = callPackage ../development/tools/toxiproxy { }; tqsl = callPackage ../applications/radio/tqsl { }; + trustedqsl = tqsl; # Alias added 2019-02-10 transcode = callPackage ../applications/audio/transcode { }; From 488a3f09cd4c30a3833c9209a6e489fa33771d91 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 10 Feb 2019 13:08:54 +0100 Subject: [PATCH 060/221] nixos/wpa_supplicant: use `` Fixes #55505 --- nixos/doc/manual/configuration/wireless.xml | 5 ++++- .../services/networking/wpa_supplicant.nix | 21 ++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 999447234ad1..f7e99ff0e35c 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -29,7 +29,10 @@ networks are set, it will default to using a configuration file at /etc/wpa_supplicant.conf. You should edit this file yourself to define wireless networks, WPA keys and so on (see - wpa_supplicant.conf(5)). + + wpa_supplicant.conf + 5 + ). diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 8622212f0856..cdfe98aa0341 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -86,7 +86,12 @@ in { ''; description = '' Use this option to configure advanced authentication methods like EAP. - See wpa_supplicant.conf(5) for example configurations. + See + + wpa_supplicant.conf + 5 + + for example configurations. Mutually exclusive with psk and pskRaw. ''; @@ -122,7 +127,12 @@ in { ''; description = '' Extra configuration lines appended to the network block. - See wpa_supplicant.conf(5) for available options. + See + + wpa_supplicant.conf + 5 + + for available options. ''; }; @@ -174,7 +184,12 @@ in { ''; description = '' Extra lines appended to the configuration file. - See wpa_supplicant.conf(5) for available options. + See + + wpa_supplicant.conf + 5 + + for available options. ''; }; }; From daee1d7a58ee7c6da8a02f6d3e9895106eadfacc Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 10 Feb 2019 17:27:51 +0100 Subject: [PATCH 061/221] ebook2cw: Move from misc to radio and do some cleanups --- .../{misc => radio}/ebook2cw/configfile.patch | 0 pkgs/applications/{misc => radio}/ebook2cw/default.nix | 10 ++-------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) rename pkgs/applications/{misc => radio}/ebook2cw/configfile.patch (100%) rename pkgs/applications/{misc => radio}/ebook2cw/default.nix (77%) diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/radio/ebook2cw/configfile.patch similarity index 100% rename from pkgs/applications/misc/ebook2cw/configfile.patch rename to pkgs/applications/radio/ebook2cw/configfile.patch diff --git a/pkgs/applications/misc/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix similarity index 77% rename from pkgs/applications/misc/ebook2cw/default.nix rename to pkgs/applications/radio/ebook2cw/default.nix index cce10258cf3b..915d0ba84db3 100644 --- a/pkgs/applications/misc/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchsvn, lame, libvorbis }: stdenv.mkDerivation rec { - - name = "ebook2cw-${version}"; + pname = "ebook2cw"; version = "0.8.2"; src = fetchsvn { - url = "svn://svn.fkurz.net/ebook2cw/tags/${name}"; + url = "svn://svn.fkurz.net/ebook2cw/tags/${pname}-${version}"; sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw"; }; @@ -14,10 +13,6 @@ stdenv.mkDerivation rec { patches = [ ./configfile.patch ]; - postPatch = '' - substituteInPlace Makefile --replace gcc cc - ''; - makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { @@ -27,5 +22,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ earldouglas ]; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8c6b4f1706c..867b3a60a0bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -173,7 +173,7 @@ in dump1090 = callPackage ../applications/misc/dump1090 { }; - ebook2cw = callPackage ../applications/misc/ebook2cw { }; + ebook2cw = callPackage ../applications/radio/ebook2cw { }; etBook = callPackage ../data/fonts/et-book { }; From 46b7effd00b1111b1078e5b7597b1710d78493f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20=60shd=60=20Gliwi=C5=84ski?= Date: Mon, 11 Feb 2019 17:00:13 +0100 Subject: [PATCH 062/221] terraform-providers.libvirt: 0.4 -> 0.5.1 --- .../cluster/terraform-providers/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index d24a5780315d..96b5c8a0fa1f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { name = "terraform-provider-libvirt-${version}"; - version = "0.4"; + version = "0.5.1"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "05jkjp1kis4ncryv34pkb9cz2yhzbwg62x9qmlqsqlxwz9hqny3r"; + sha256 = "0shnj5byqj3qzyqniiy1dcygd8xw1h2bx9z6mgcydw8k64fkm4bw"; }; buildInputs = [ libvirt pkgconfig makeWrapper ]; From 2f059806ef77b87e49590048a6f46a4e3fc16514 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sun, 10 Feb 2019 23:28:42 +0100 Subject: [PATCH 063/221] matomo: 3.7.0 -> 3.8.1 security update --- pkgs/servers/web-apps/matomo/default.nix | 4 ++-- .../make-localhost-default-database-host.patch | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 9c1180ffb494..89de25008113 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matomo-${version}"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again # url = "https://builds.matomo.org/${name}.tar.gz"; url = "https://builds.matomo.org/piwik-${version}.tar.gz"; - sha256 = "17ihsmwdfrx1c1v8cp5pc3swx3h0i0l9pjrc8jyww08kavfbfly6"; + sha256 = "0ca4fkg2jpkfg0r9hxl45ad5xzz0gxhf404i96j059bn3c41kfi0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch index 48808ac2ccca..5af8ef860b2f 100644 --- a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch +++ b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch @@ -1,13 +1,13 @@ diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php -index 9364f49870..2625cbb91b 100644 +index 74de2535b4..bc172ad0eb 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2 - // default values - $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array( -- 'host' => '127.0.0.1', -+ 'host' => 'localhost', - 'type' => $defaultDatabaseType, - 'tables_prefix' => 'matomo_', - ))); + + $defaults = array( +- 'host' => '127.0.0.1', ++ 'host' => 'localhost', + 'type' => $defaultDatabaseType, + 'tables_prefix' => 'matomo_', + ); From faac33bc77d4f6c2c010991302954ee6638a10d9 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sun, 10 Feb 2019 23:29:48 +0100 Subject: [PATCH 064/221] nixos/matomo: 3.8.0 introduces matomo.{php,js} files --- nixos/modules/services/web-apps/matomo.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 9fddf8320748..2415880b62a6 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -45,12 +45,11 @@ in { type = types.nullOr types.str; default = null; example = "lighttpd"; - # TODO: piwik.php might get renamed to matomo.php in future releases description = '' Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for matomo if the nginx option is not used. Either this option or the nginx option is mandatory. If you want to use another webserver than nginx, you need to set this to that server's user - and pass fastcgi requests to `index.php` and `piwik.php` to this socket. + and pass fastcgi requests to `index.php`, `matomo.php` and `piwik.php` (legacy name) to this socket. ''; }; @@ -215,8 +214,11 @@ in { locations."= /index.php".extraConfig = '' fastcgi_pass unix:${phpSocket}; ''; - # TODO: might get renamed to matomo.php in future versions - # allow piwik.php for tracking + # allow matomo.php for tracking + locations."= /matomo.php".extraConfig = '' + fastcgi_pass unix:${phpSocket}; + ''; + # allow piwik.php for tracking (deprecated name) locations."= /piwik.php".extraConfig = '' fastcgi_pass unix:${phpSocket}; ''; @@ -237,8 +239,11 @@ in { locations."= /robots.txt".extraConfig = '' return 200 "User-agent: *\nDisallow: /\n"; ''; - # TODO: might get renamed to matomo.js in future versions - # let browsers cache piwik.js + # let browsers cache matomo.js + locations."= /matomo.js".extraConfig = '' + expires 1M; + ''; + # let browsers cache piwik.js (deprecated name) locations."= /piwik.js".extraConfig = '' expires 1M; ''; From ad30ed66ae188ada6d7581816f39f8f31c257715 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 11 Feb 2019 23:17:34 +0100 Subject: [PATCH 065/221] maintainers: add cbley --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8ccffd9139b3..3558a50ba17d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -788,6 +788,11 @@ github = "caugner"; name = "Claas Augner"; }; + cbley = { + email = "claudio.bley@gmail.com"; + github = "avdv"; + name = "Claudio Bley"; + }; cdepillabout = { email = "cdep.illabout@gmail.com"; github = "cdepillabout"; From 41287824646d1bd178596a7aa793a34ce2829189 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 11 Feb 2019 23:21:53 +0100 Subject: [PATCH 066/221] yubikey-manager-qt: init at 1.1.0 --- .../tools/misc/yubikey-manager-qt/default.nix | 81 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/tools/misc/yubikey-manager-qt/default.nix diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix new file mode 100644 index 000000000000..a69ab50c7c15 --- /dev/null +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -0,0 +1,81 @@ +{ stdenv +, fetchurl +, makeWrapper +, pyotherside +, pythonPackages +, python3 +, qmake +, qt5 +, yubikey-manager +, yubikey-personalization +}: + +with import {}; + +let + qmlPath = qmlLib: "${qmlLib}/${qt5.qtbase.qtQmlPrefix}"; + + qml2ImportPath = lib.concatMapStringsSep ";" qmlPath [ + qt5.qtbase.bin qt5.qtdeclarative.bin pyotherside qt5.qtquickcontrols qt5.qtquickcontrols2.bin qt5.qtgraphicaleffects + ]; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "yubikey-manager-qt"; + version = "1.1.0"; + + src = fetchurl { + url = "https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-${version}.tar.gz"; + sha256 = "8049a233a8cca07543d745a9f619c0fc3afb324f5d0030b93f037b34ac1c5e66"; + }; + + nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython qmake ]; + + sourceRoot = "."; + + postPatch = '' + substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" + ''; + + buildInputs = [ pythonPackages.python stdenv qt5.qtbase qt5.qtgraphicaleffects qt5.qtquickcontrols qt5.qtquickcontrols2 pyotherside ]; + + buildPhase = '' + qmake + make + ''; + + enableParallelBuilding = true; + + pythonPath = [ yubikey-manager ]; + + # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary + # support that the yubicommon library uses to load libykpers + postInstall = '' + buildPythonPath "$pythonPath" + + wrapProgram $out/bin/ykman-gui \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ + --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ + --set QML2_IMPORT_PATH "${qml2ImportPath}" \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ + --prefix QT_PLUGIN_PATH : "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" + + mkdir -p $out/share/applications + cp resources/ykman-gui.desktop $out/share/applications/ykman-gui.desktop + mkdir -p $out/share/ykman-gui/icons + cp resources/icons/*.{icns,ico,png,xpm} $out/share/ykman-gui/icons + substituteInPlace $out/share/applications/ykman-gui.desktop \ + --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" \ + ''; + + meta = with stdenv.lib; { + inherit version; + description = ''Cross-platform application for configuring any YubiKey over all USB interfaces.''; + homepage = https://developers.yubico.com/yubikey-manager-qt/; + license = licenses.bsd2; + maintainers = [ maintainers.cbley ]; + platforms = platforms.linux; + homepage = "https://github.com/Yubico"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2a008b7c7ee..8fc26657bfe3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13099,6 +13099,10 @@ in yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; + yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { + pythonPackages = python3Packages; + }; + yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { From 97fdd971219a3251dc89c7264d6c84f4a5fc762a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Feb 2019 16:04:15 -0600 Subject: [PATCH 067/221] networkmanager-openvpn: 1.8.8 -> 1.8.10 --- pkgs/tools/networking/network-manager/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 952bbf4999e3..afffedac9eeb 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -3,13 +3,13 @@ let pname = "NetworkManager-openvpn"; - version = "1.8.8"; + version = "1.8.10"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19qdl7x5x7f9mj8vm25mck6gg8ljbixi0dw2rqngwl2nzpcxwg52"; + sha256 = "1vri49yff4lj13dnzkpq9nx3a4z1bmbrv807r151plj8m1mwhg5g"; }; patches = [ From 8611d2e632d363d3679cca7afd1df1dd2bb81318 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 5 Feb 2019 15:39:58 -0600 Subject: [PATCH 068/221] common-update-scripts: fixup for current/latest nix hash output Courtesy of @jtojnar, thanks! See https://github.com/NixOS/nixpkgs/issues/54962#issuecomment-459429698 --- pkgs/common-updater/scripts/update-source-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 57b52553c2be..117e8724cd82 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -96,7 +96,7 @@ fi if [ -z "$newHash" ]; then nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed - newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'~\1\2~" | head -n1) + newHash=$(egrep -v "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1) fi if [ -z "$newHash" ]; then From 4e7f87b4d0400e0b96103d9af0f6926daaaaf0df Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 5 Feb 2019 15:04:58 -0600 Subject: [PATCH 069/221] gexiv2: 0.10.9 -> 0.10.10 --- pkgs/development/libraries/gexiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 74311525f1e2..350f38d87030 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.10.9"; + version = "0.10.10"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vf0zv92p9hybdhn7zx53h3ia53ph97a21xz8rfk877xlr5261l8"; + sha256 = "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx"; }; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; From 210175a50ff0d1a9f766e11ab6f8ee3bf447a3c3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 5 Feb 2019 15:04:13 -0600 Subject: [PATCH 070/221] evolution-data-server: 3.30.4 -> 3.30.5 --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index d244dc08ebee..bbe848a3b82a 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.30.4"; + version = "3.30.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1j8lwl04zz59sg7k3hpkzp829z8xyd1isz8xavm9vzxfvw5w776y"; + sha256 = "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli"; }; patches = [ From 60d96bcaf01649e86e23aa4c9271561cfc7e9c5b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 5 Feb 2019 15:03:14 -0600 Subject: [PATCH 071/221] evolution: 3.30.4 -> 3.30.5 --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index dc598267c4b4..310f8ccb63b9 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.30.4"; + version = "3.30.5"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "10dy08xpizvvj7r8xgs3lr6migm3ipr199yryqz7wgkycq6nf53b"; + sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; From e64a9f006f0bde879bc0ab7570005c546986a428 Mon Sep 17 00:00:00 2001 From: Zach Coyle Date: Mon, 11 Feb 2019 22:55:07 -0500 Subject: [PATCH 072/221] gnu-cobol: enable on darwin --- pkgs/development/compilers/gnu-cobol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index 3ac14565946c..ae27964ae8f0 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/open-cobol/; license = licenses.gpl3; maintainers = with maintainers; [ ericsagnes the-kenny ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } From d89634ad55f96316ae0b8d6b7f6a1db929dce975 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 12 Feb 2019 07:17:59 +0100 Subject: [PATCH 073/221] fixup! yubikey-manager-qt: init at 1.1.0 --- pkgs/tools/misc/yubikey-manager-qt/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index a69ab50c7c15..a463faa43503 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , makeWrapper +, pcsclite , pyotherside , pythonPackages , python3 @@ -10,22 +11,21 @@ , yubikey-personalization }: -with import {}; +with stdenv; let qmlPath = qmlLib: "${qmlLib}/${qt5.qtbase.qtQmlPrefix}"; - qml2ImportPath = lib.concatMapStringsSep ";" qmlPath [ + qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [ qt5.qtbase.bin qt5.qtdeclarative.bin pyotherside qt5.qtquickcontrols qt5.qtquickcontrols2.bin qt5.qtgraphicaleffects ]; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "yubikey-manager-qt"; version = "1.1.0"; src = fetchurl { - url = "https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-${version}.tar.gz"; + url = "https://developers.yubico.com/yubikey-manager-qt/Releases/${pname}-${version}.tar.gz"; sha256 = "8049a233a8cca07543d745a9f619c0fc3afb324f5d0030b93f037b34ac1c5e66"; }; @@ -37,12 +37,7 @@ in stdenv.mkDerivation rec { substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" ''; - buildInputs = [ pythonPackages.python stdenv qt5.qtbase qt5.qtgraphicaleffects qt5.qtquickcontrols qt5.qtquickcontrols2 pyotherside ]; - - buildPhase = '' - qmake - make - ''; + buildInputs = [ pythonPackages.python qt5.qtbase qt5.qtgraphicaleffects qt5.qtquickcontrols qt5.qtquickcontrols2 pyotherside ]; enableParallelBuilding = true; @@ -71,11 +66,10 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - description = ''Cross-platform application for configuring any YubiKey over all USB interfaces.''; + description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; homepage = https://developers.yubico.com/yubikey-manager-qt/; license = licenses.bsd2; maintainers = [ maintainers.cbley ]; platforms = platforms.linux; - homepage = "https://github.com/Yubico"; }; } From 1b71c5f5dba626b1b731f48cefeab2b01016383a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 00:35:34 -0600 Subject: [PATCH 074/221] xapian: 1.4.9 -> 1.4.10 https://xapian.org/docs/xapian-core-1.4.10/NEWS --- pkgs/development/libraries/xapian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 2d7289ca6647..cf331f014567 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -36,5 +36,5 @@ let in { # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4 = generic "1.4.9" "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd"; + xapian_1_4 = generic "1.4.10" "1f4vf1w1yvsn9mn462q6snc8wkmfpifp8wrlzs4aqi45w0kr6rk8"; } From ce1eb1ea797a95f307ea388e8ad04b16d9e85473 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Tue, 12 Feb 2019 19:03:06 +1000 Subject: [PATCH 075/221] Update and rename maps.nix to maps-replays.nix --- .../machine-learning/sc2-headless/default.nix | 3 +- .../machine-learning/sc2-headless/maps.nix | 37 ++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index 7f5145d977c3..cd9cf6dafd19 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -33,7 +33,8 @@ in stdenv.mkDerivation rec { cp -r . "$out" rm -r $out/Libs - cp -r "${maps.minigames}"/* "$out"/Maps/ + cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ + "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/ ''; preFixup = '' diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 4300a0a1b385..8e47bf239a18 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -7,5 +7,40 @@ sha256 = "19f873ilcdsf50g2v0s2zzmxil1bqncsk8nq99bzy87h0i7khkla"; stripRoot = false; }; - + + melee = (fetchzip { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; + sha256 = "0w050yah5rybx3m5zvpr09jv01r0xsazpyrc76338b2sd8pdxv3y"; + stripRoot = false; + }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); + ladder2017season1 = (fetchzip { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip"; + sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh"; + stripRoot = false; + }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); + ladder2017season2 = (fetchzip { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip"; + sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39"; + stripRoot = false; + }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); + ladder2017season3 = (fetchzip { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip"; + sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a"; + stripRoot = false; + }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); + ladder2017season4 = (fetchzip { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip"; + sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g"; + stripRoot = false; + }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); + ladder2018season1 = (fetchzip { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip"; + sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f"; + stripRoot = false; + }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); + ladder2018season2 = (fetchzip { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip"; + sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx"; + stripRoot = false; + }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); } From b1a6d391556c0a01b2de4cc4d7fed76659271f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:10 -0200 Subject: [PATCH 076/221] libqtxdg: 3.2.0 -> 3.3.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 0b23fb2d04f5..96a912e568e8 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg }: stdenv.mkDerivation rec { name = "libqtxdg-${version}"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libqtxdg"; rev = version; - sha256 = "0lkmwnqk314mlr811rdb96p6i7zg67slxdvd4cdkiwakgbzzaa4m"; + sha256 = " got: sha256:0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt5.qtbase qt5.qtsvg ]; + buildInputs = [ qtbase qtsvg ]; preConfigure = '' cmakeFlagsArray+=( From b0b03df748cbe36f5cc7a212efa0faffa3b52314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:14 -0200 Subject: [PATCH 077/221] libsysstat: 0.4.1 -> 0.4.2 --- pkgs/desktops/lxqt/libsysstat/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 2e6b79f9769a..74fa1b03fa6b 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: +{ stdenv, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }: stdenv.mkDerivation rec { - name = "libsysstat-${version}"; - version = "0.4.1"; + pname = "libsysstat"; + version = "0.4.2"; src = fetchFromGitHub { owner = "lxqt"; - repo = "libsysstat"; + repo = pname; rev = version; - sha256 = "0ad5pcr5lq1hvrfijvddvz2fvsmh1phb54wb0f756av0kyiwq0gb"; + sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz"; }; - nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; + nativeBuildInputs = [ cmake lxqt-build-tools ]; - buildInputs = [ qt5.qtbase ]; + buildInputs = [ qtbase ]; meta = with stdenv.lib; { description = "Library used to query system info and statistics"; From c4a6b73972b06e024eff344656f5a26932402bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:17 -0200 Subject: [PATCH 078/221] lxqt-build-tools: 0.5.0 -> 0.6.0 --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 46f904d0ec7f..f55fa579ff45 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, glib }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }: stdenv.mkDerivation rec { - name = "lxqt-build-tools-${version}"; - version = "0.5.0"; + pname = "lxqt-build-tools"; + version = "0.6.0"; src = fetchFromGitHub { owner = "lxqt"; - repo = "lxqt-build-tools"; + repo = pname; rev = version; - sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz"; + sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt5.qtbase glib pcre ]; + buildInputs = [ qtbase glib pcre ]; preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"''; From def579b42b78fd47addebc1cca90f21018500efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:21 -0200 Subject: [PATCH 079/221] liblxqt: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 10 +++++----- pkgs/desktops/lxqt/libqtxdg/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 0762dbad3f87..1b19275ece92 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -2,15 +2,14 @@ qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "liblxqt"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1lbvnx6gg15k7fy1bnv5sjji659f603glblcl8c9psh0m1cjdbll"; + sha256 = "1cpl6sd2fifpflahm8fvrrscrv03sinfm03m7yc1k59y6nsbwi36"; }; nativeBuildInputs = [ @@ -29,13 +28,14 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DPULL_TRANSLATIONS=NO" "-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg" ]; - patchPhase = '' + postPatch = '' sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 96a912e568e8..852c4bddec83 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, qtbase, qtsvg }: stdenv.mkDerivation rec { - name = "libqtxdg-${version}"; + pname = "libqtxdg"; version = "3.3.0"; src = fetchFromGitHub { owner = "lxqt"; - repo = "libqtxdg"; + repo = pname; rev = version; - sha256 = " got: sha256:0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b"; + sha256 = "0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b"; }; nativeBuildInputs = [ cmake ]; From 13fab662204ab1456cd4dca74bdde24416da8754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:25 -0200 Subject: [PATCH 080/221] lxqt-about: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index e109a4f0944c..013be8eea4f9 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-about"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "03f53rnn4rkd1xc2q9abnw37aq4sgvpbwhmcnckqyzc87lj6ici0"; + sha256 = "14b13v1r5ncz4ycg25ac9ppafiifc37qws8kcw078if72rp9n121"; }; nativeBuildInputs = [ @@ -26,7 +25,10 @@ stdenv.mkDerivation rec { libqtxdg ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + ''; meta = with stdenv.lib; { description = "Dialogue window providing information about LXQt and the system it's running on"; From 308376a32aa190954b8ff6fcd193f712dde9fdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:28 -0200 Subject: [PATCH 081/221] lxqt-admin: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index a92c352087e8..528f9a390f92 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-admin"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nsf8sbgmfanvcxw67drhz1wrizkcd0p87jwr1za5rcgd50bi2yy"; + sha256 = "0sdb514hgha5yvmbzi6nm1yx1rmbkh5fam09ybidjwpdwl2l4pxx"; }; nativeBuildInputs = [ @@ -27,12 +26,15 @@ stdenv.mkDerivation rec { polkit-qt ]; - patchPhase = '' + postPatch = '' sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \ -i lxqt-admin-user/CMakeLists.txt - ''; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + for f in lxqt-admin-{user,time}/CMakeLists.txt; do + substituteInPlace $f \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + done + ''; meta = with stdenv.lib; { description = "LXQt system administration tool"; From db249577039748a2887f91bf1640aaed589c7f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:32 -0200 Subject: [PATCH 082/221] lxqt-config: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 29 +++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 3a167996ddb2..d2c583b53fa9 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, xorg }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, + qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, + libqtxdg, xorg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-config"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0r5vwkyz0c9b9py3wni4yzkmsvgs6psk9dp1fhfzvbjbknb21bfa"; + sha256 = "1pp2pw43zh8kwi2cxk909wn6bw7kba95b6bv96l2gmzhdqpfw2a7"; }; nativeBuildInputs = [ @@ -32,13 +33,29 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver xorg.libxcb xorg.libXcursor + xorg.xf86inputlibinput + xorg.xf86inputlibinput.dev ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + + for f in \ + lxqt-config-file-associations/CMakeLists.txt \ + lxqt-config-brightness/CMakeLists.txt \ + lxqt-config-appearance/CMakeLists.txt \ + lxqt-config-locale/CMakeLists.txt \ + lxqt-config-monitor/CMakeLists.txt \ + lxqt-config-input/CMakeLists.txt \ + liblxqt-config-cursor/CMakeLists.txt \ + src/CMakeLists.txt + do + substituteInPlace $f \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + done + + sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt ''; meta = with stdenv.lib; { From 9e5b3d5368eeb853114bbfee4f0f2d730a225e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:36 -0200 Subject: [PATCH 083/221] lxqt-globalkeys: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 1877236bcddc..5382be304ae3 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-globalkeys"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1fmi0n5chnrpbgf7zwzc3hi55r85hkxaq5jylbwaahmxhnb5hdid"; + sha256 = "14bfkh54mn3jyq8g9ipy3xmc3n9lmlqpvm26kpqig7567hbncv7n"; }; nativeBuildInputs = [ @@ -27,13 +26,14 @@ stdenv.mkDerivation rec { libqtxdg ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = '' for dir in autostart xdg; do substituteInPlace $dir/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" done + + substituteInPlace config/CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" ''; meta = with stdenv.lib; { From d4514a83d8932058f3da3040393b6a442d1dd945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:39 -0200 Subject: [PATCH 084/221] lxqt-notificationd: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 32a3c408258c..53826f62bccf 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-notificationd"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0vjpl3ipc0hrz255snkp99h6xrlid490ml8jb588rdpfina66sp1"; + sha256 = "1nawcxy2qnrngcxvwjwmmh4fn7mhnfgy1g77rn90243jvy29wv5f"; }; nativeBuildInputs = [ @@ -20,6 +19,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + + for f in {config,src}/CMakeLists.txt; do + substituteInPlace $f \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + done ''; buildInputs = [ @@ -32,8 +36,6 @@ stdenv.mkDerivation rec { qtx11extras ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - meta = with stdenv.lib; { description = "The LXQt notification daemon"; homepage = https://github.com/lxqt/lxqt-notificationd; From b011cf7fad5946fa24634abd57d6d2bf94958222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:42 -0200 Subject: [PATCH 085/221] lxqt-openssh-askpass: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 56ea7ec72418..f880aed63f8a 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-openssh-askpass"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "19djmqwk4kj3rxs4h7a471ydcz87j5z4yv8a6pgblvqdkkn0ylk9"; + sha256 = "19xcc6i7jg35780r4dfg4vwfp9x4pz5sqzagxnpzspz61jaj5ibv"; }; nativeBuildInputs = [ @@ -27,7 +26,10 @@ stdenv.mkDerivation rec { libqtxdg ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + ''; meta = with stdenv.lib; { description = "GUI to query passwords on behalf of SSH agents"; From f0fa0322dbd5a478af2547b918c30e2e1c8ff6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:47 -0200 Subject: [PATCH 086/221] lxqt-panel: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 8cdbf9f9365a..f691357f25f6 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -8,15 +8,14 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-panel"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "056khr3smyrdi26zpclwv1qrmk0zxr9cnk65ad9c0xavzk6ya3xz"; + sha256 = "0jr7ylf6d35m0ckn884arjk4armknnw8iyph00gcphn5bqycbn8l"; }; nativeBuildInputs = [ @@ -50,8 +49,6 @@ stdenv.mkDerivation rec { libXdamage ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = '' for dir in autostart menu; do substituteInPlace $dir/CMakeLists.txt \ @@ -59,6 +56,11 @@ stdenv.mkDerivation rec { done substituteInPlace panel/CMakeLists.txt \ --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" + + for f in cmake/BuildPlugin.cmake panel/CMakeLists.txt; do + substituteInPlace $f \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + done ''; meta = with stdenv.lib; { From a558f99b2044d37303cc5db67439c0c526574a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:50 -0200 Subject: [PATCH 087/221] lxqt-policykit: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index dcf46d09b732..862e0c08cedf 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -5,15 +5,14 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-policykit"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1m9v4hl1hyd8rmlh6z2zy6287qfnavsm9khl526jf8f7bjgpifvd"; + sha256 = "05k39819nsdyg2pp1vk6g2hdpxqp78h6bhb0hp5rclf9ap5fpvvc"; }; nativeBuildInputs = [ @@ -34,11 +33,12 @@ stdenv.mkDerivation rec { pcre ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + + substituteInPlace CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" ''; meta = with stdenv.lib; { From 6eb447037614aff08c1dadcaf625470863cd96d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:53 -0200 Subject: [PATCH 088/221] lxqt-powermanagement: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 3b56a489bee5..9ebff5d4de58 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-powermanagement"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "04mx1nxqqqjg3wsql4ch4j1a4cbqfvpq0iwi6b9yhaf04n0dwrvn"; + sha256 = "08xdnb54lji09izzzfip8fw0gp17qkx66jm6i04zby4whx4mqniv"; }; nativeBuildInputs = [ @@ -29,11 +28,14 @@ stdenv.mkDerivation rec { libqtxdg ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + + for f in {config,src}/CMakeLists.txt; do + substituteInPlace $f \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + done ''; meta = with stdenv.lib; { From eb866930e79f5f3cc36df02cb121d3635f4d99f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:13:56 -0200 Subject: [PATCH 089/221] lxqt-qtplugin: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 972d0a3cb379..82f393cf8d52 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -5,15 +5,14 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-qtplugin"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "19y5dvbj7gwyh8glc6vi6hb5snvkd3jwvss6j0sn2sy2gp9g9ryb"; + sha256 = "16n50lxnya03zcviw65sy5dyg9dsrn64k91mrqfvraf6d90md4al"; }; nativeBuildInputs = [ From c12474b676519d5b1042e573a4a21a59b2e8ef65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:01 -0200 Subject: [PATCH 090/221] lxqt-runner: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index c0ce6321f6e9..dc2d8c58cafe 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -2,15 +2,14 @@ menu-cache, muparser, pcre }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-runner"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0w6r9lby35p0lf5klasa5l2lscx6dmv16kzfhl4lc6w2qfwjb9vi"; + sha256 = "1qyacig9ksnjrhws8cpk6arlaxn7kl0z39l3c62ql3m89mibsm88"; }; nativeBuildInputs = [ @@ -33,11 +32,12 @@ stdenv.mkDerivation rec { pcre ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + + substituteInPlace CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" ''; meta = with stdenv.lib; { From 39e826c2922f25d5d702e53cf7540e0dd7bce76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:05 -0200 Subject: [PATCH 091/221] lxqt-session: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index e369880b2b4e..5b4d7b606c75 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-session"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0ngcrkmfpahii4yibsh03b8v8af93hhqm42kk1nnhczc8dg49mhs"; + sha256 = "0nla1ki23p1bwzw5hbmh9l8yg3b0f55kflgnvyfakmvpivjbz3k6"; }; nativeBuildInputs = [ @@ -31,13 +30,16 @@ stdenv.mkDerivation rec { xdg-user-dirs ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = '' for dir in autostart config; do substituteInPlace $dir/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" done + + for f in lxqt-{config-session,leave,session}/CMakeLists.txt; do + substituteInPlace $f \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + done ''; meta = with stdenv.lib; { From 06a706dd38a1653c1835ab186f988b0944c08916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:08 -0200 Subject: [PATCH 092/221] lxqt-sudo: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 4dddd7de09bc..7e3ca84109fd 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-sudo"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1gpn3dhmzabx0jrqxq63549sah03kf6bmdc9d9kmg6hyr5xg3i1h"; + sha256 = "0l8fq06kfsrmvg2fr8lqdsxr6fwxmxsa9zwaa3fs9inzaylm0jkh"; }; nativeBuildInputs = [ @@ -28,7 +27,10 @@ stdenv.mkDerivation rec { sudo ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" + ''; meta = with stdenv.lib; { description = "GUI frontend for sudo/su"; From 8242ee68faa0772f8d43c2c451930f72fd96d47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:14 -0200 Subject: [PATCH 093/221] lxqt-themes: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 1d2301d4a3bf..02591b9eb86e 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-themes"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "026hbblxdbq48n9691b1z1xiak99khsk3wf09vn4iaj5zi7dwhw5"; + sha256 = "09dkcgnf3lmfly8v90p6wjlj5rin83pbailvvpx2jr8a48a8zb9f"; }; nativeBuildInputs = [ cmake - lxqt.lxqt-build-tools + lxqt-build-tools ]; postPatch = '' From adb8201fcbeef4d7ee2f234ae2a41bb37aab2a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:19 -0200 Subject: [PATCH 094/221] libfm-qt: 0.13.1 -> 0.14.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 4c187f1a07c5..70675e1408cf 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -5,15 +5,14 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libfm-qt"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1g8j1lw74qvagqhqsx45b290fjwh3jfl3i0366m0w4la03v0rw5j"; + sha256 = "1siqqn4waglymfi7c7lrmlxkylddw8qz0qfwqxr1hnmx3dsj9c36"; }; nativeBuildInputs = [ @@ -34,8 +33,6 @@ stdenv.mkDerivation rec { menu-cache ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - meta = with stdenv.lib; { description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = https://github.com/lxqt/libfm-qt; From f9346ff3d25aee82a1bf54e75ee2bd328a4b6b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:23 -0200 Subject: [PATCH 095/221] pcmanfm-qt: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 99dace0e42e6..aa7479b02f83 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qt5, libfm-qt, menu-cache, lxmenu-data }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools, + qtx11extras, libfm-qt, menu-cache, lxmenu-data }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pcmanfm-qt"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0xnhdxx45fmbi5dqic3j2f7yq01s0xysimafj5zqs0a29zw3i4m0"; + sha256 = "0hf4qyn12mpr6rrla9mf6ka5gb4y36amk7d14ayr7yka1r16p8lz"; }; nativeBuildInputs = [ cmake pkgconfig - lxqt-build-tools + lxqt.lxqt-build-tools ]; buildInputs = [ - qt5.qtbase - qt5.qttools - qt5.qtx11extras + qtbase + qttools + qtx11extras libfm-qt libfm-qt menu-cache lxmenu-data ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = '' for dir in autostart config; do substituteInPlace $dir/CMakeLists.txt \ From a7b500487ee7b3bde401cd17579ad7e2784cdc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:27 -0200 Subject: [PATCH 096/221] lximage-qt: 0.7.0 -> 0.14.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 7f80e56bc7d2..a0a83ad3469a 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt-build-tools, libfm-qt, libexif }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, + qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lximage-qt"; - version = "0.7.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1slmaic9cmj5lqa5kwc1qfbbycwh8840wnkg0nxc99ls0aazlpzi"; + sha256 = "0zx9903ym5a9zk4m9khr22fj5sy57mg2v8wnk177wjm11lhic5v8"; }; nativeBuildInputs = [ @@ -19,18 +19,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt5.qtbase - qt5.qttools - qt5.qtx11extras - qt5.qtsvg + qtbase + qttools + qtx11extras + qtsvg libfm-qt xorg.libpthreadstubs xorg.libXdmcp libexif ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - meta = with stdenv.lib; { description = "The image viewer and screenshot tool for lxqt"; homepage = https://github.com/lxqt/lximage-qt; From df02bb01fe7234845e704282cb4c3572d926edc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:31 -0200 Subject: [PATCH 097/221] compton-conf: 0.4.0 -> 0.14.0 --- pkgs/desktops/lxqt/compton-conf/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index 9c36b523207f..479491b35d80 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, libconfig }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, + libconfig }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "compton-conf"; - version = "0.4.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1r187fx1vivzq1gcwwawax36mnlmfig5j1ba4s4wfdi3q2wcq7mw"; + sha256 = "1vxbh0vr7wknr7rbmdbmy5md1fdkw3zwlgpbv16cwdplbv9m97xi"; }; nativeBuildInputs = [ @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { libconfig ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - preConfigure = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ From 40b1f7f16dd8bb710a3a3f7202ab6330a6c339a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:34 -0200 Subject: [PATCH 098/221] obconf-qt: 0.13.0 -> 0.14.0 --- pkgs/desktops/lxqt/obconf-qt/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 5ddb87ab55db..a0d0a973ad7e 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools, + qtx11extras, xorg, lxqt-build-tools, openbox, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "obconf-qt"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0mixf35p7b563f77vnikk9b1wqhbdawp723sd30rfql76gkjwjcn"; + sha256 = "00v5w8qr3vs0k91flij9lz7y1cpp2g8ivgnmmm43ymjfiz5j6l27"; }; nativeBuildInputs = [ cmake pkgconfig - lxqt.lxqt-build-tools + lxqt-build-tools ]; buildInputs = [ pcre - qt5.qtbase - qt5.qttools - qt5.qtx11extras + qtbase + qttools + qtx11extras xorg.libpthreadstubs xorg.libXdmcp xorg.libSM @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - meta = with stdenv.lib; { description = "The Qt port of obconf, the Openbox configuration tool"; homepage = https://github.com/lxqt/obconf-qt; From 92379c6fd584e7783179fdc150064c9c263adfda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:38 -0200 Subject: [PATCH 099/221] pavucontrol-qt: 0.4.0 -> 0.14.0 --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index efd5fde16661..dcc3ead31bfd 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, + pcre, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pavucontrol-qt"; - version = "0.4.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1bxqpasfvaagbq8azl7536z2zk2725xg7jkvad5xh95zq1gb4hgk"; + sha256 = "1vyjm6phgbxglk65c889bd73b0p2ffb5bsc89dmb07qzllyrjb4h"; }; nativeBuildInputs = [ @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { pcre ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - meta = with stdenv.lib; { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = https://github.com/lxqt/pavucontrol-qt; From 99b8c1b84310991f2e1905ff03ec476be7c66fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:41 -0200 Subject: [PATCH 100/221] qterminal: 0.9.0 -> 0.14.0 --- pkgs/desktops/lxqt/qterminal/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 3d5a25634d7c..f9a2e5ff0a14 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, qt5 }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, + qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "qterminal"; - version = "0.9.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1z9wlyj5i192jfq3dcxjf8wzx9x332f19c9ll7zv69cq21kyy9wn"; + sha256 = "071qz248j9gcqzchnrz8xamm07g4r2xyrmnb0a2vjkjd63pk2r8f"; }; nativeBuildInputs = [ @@ -18,14 +18,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt5.qtbase - qt5.qttools - qt5.qtx11extras + qtbase + qttools + qtx11extras qtermwidget ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - meta = with stdenv.lib; { description = "A lightweight Qt-based terminal emulator"; homepage = https://github.com/lxqt/qterminal; From f45affe83862afcccabf25728f8eba5fcfaf5aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:45 -0200 Subject: [PATCH 101/221] qtermwidget: 0.9.0 -> 0.14.0 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index eae53cefc58b..9e0798ecb52a 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: +{ stdenv, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "qtermwidget"; - version = "0.9.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "05gbdjzgmcr3ljs9ba3qvh7a3v6yn6vakwfy8avld9gy5bdd76rg"; + sha256 = "0wv8fssbc2w7kkpq9ngsa8wyjraggdhsbz36gyxyv8fy5m78jq0n"; }; - nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; + nativeBuildInputs = [ cmake lxqt-build-tools ]; - buildInputs = [ qt5.qtbase qt5.qttools]; - - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + buildInputs = [ qtbase qttools]; meta = with stdenv.lib; { description = "A terminal emulator widget for Qt 5"; From 5c26986b581bc9e272af5801e7952777bd10edd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:50 -0200 Subject: [PATCH 102/221] qps: 1.10.18 -> 1.10.19 --- pkgs/desktops/lxqt/qps/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index a8ee18daf3c1..d46b7e14e33b 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools, + lxqt-build-tools }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "qps"; - version = "1.10.18"; + version = "1.10.19"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1cq5z4w2n119z2bq0njn508g5582jljdx2n38cv5b3cf35k91a49"; + sha256 = "1vyi1vw4z5j2sp9yhhv91wl2sbg4fh0djqslg1ssc7fww2ka6dx3"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake lxqt-build-tools ]; - buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ]; + buildInputs = [ qtbase qtx11extras qttools ]; meta = with stdenv.lib; { description = "The Qt process manager"; From 96185ab3f0648e7d459c079439311ba78e5fd28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 21:14:54 -0200 Subject: [PATCH 103/221] screengrab: 1.98 -> 1.100 --- pkgs/desktops/lxqt/screengrab/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 8890d3f47808..cc7f113b7d19 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }: stdenv.mkDerivation rec { - name = "screengrab-${version}"; - version = "1.98"; + pname = "screengrab"; + version = "1.100"; src = fetchFromGitHub { owner = "lxqt"; - repo = "screengrab"; + repo = pname; rev = version; - sha256 = "1y3r29220z6y457cajpad3pjnr883smbvh0kai8hc5hh4k4kxs6v"; + sha256 = "1iqrmf581x9ab6zzjxm2509gg6fkn7hwril4v0aki7n7dgxw1c4g"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + autoPatchelfHook # fix libuploader.so and libextedit.so not found + ]; buildInputs = [ qtbase From 1fa2405cbd3e7e491f90655beb3904679b1188fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 6 Feb 2019 20:36:15 -0200 Subject: [PATCH 104/221] lxqt.update.sh: update to version 0.14.0 --- pkgs/desktops/lxqt/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/update.sh b/pkgs/desktops/lxqt/update.sh index bad78f7c1fff..f3dfc4d59758 100755 --- a/pkgs/desktops/lxqt/update.sh +++ b/pkgs/desktops/lxqt/update.sh @@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" root=../../.. export NIXPKGS_ALLOW_UNFREE=1 -lxqt_version=0.13.0 +lxqt_version=0.14.0 lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html version() { @@ -28,7 +28,7 @@ update_lxqt() { local pfile=$(EDITOR=echo nix edit -f. lxqt.$pname 2>/dev/null) update-source-version lxqt.$pname "$pversion" git add $pfile - git commit -m "$pname: $pversionold -> $pversion" + git commit -m "lxqt.$pname: $pversionold -> $pversion" ) fi echo From 9306341a0b483bb11b3fe3862fd16c268b7f3af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 6 Feb 2019 20:39:35 -0200 Subject: [PATCH 105/221] lxqt: lxqt-l10n has been removed in version 0.14.0 --- pkgs/desktops/lxqt/default.nix | 2 -- pkgs/desktops/lxqt/lxqt-l10n/default.nix | 32 ------------------------ 2 files changed, 34 deletions(-) delete mode 100644 pkgs/desktops/lxqt/lxqt-l10n/default.nix diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 62b8aaf25abe..909ef549e81f 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -18,7 +18,6 @@ let lxqt-admin = callPackage ./lxqt-admin { }; lxqt-config = callPackage ./lxqt-config { }; lxqt-globalkeys = callPackage ./lxqt-globalkeys { }; - lxqt-l10n = callPackage ./lxqt-l10n { }; lxqt-notificationd = callPackage ./lxqt-notificationd { }; lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { }; lxqt-policykit = callPackage ./lxqt-policykit { }; @@ -70,7 +69,6 @@ let lxqt-admin lxqt-config lxqt-globalkeys - lxqt-l10n lxqt-notificationd lxqt-openssh-askpass lxqt-policykit diff --git a/pkgs/desktops/lxqt/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/lxqt-l10n/default.nix deleted file mode 100644 index 9a79ec16df09..000000000000 --- a/pkgs/desktops/lxqt/lxqt-l10n/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: - -stdenv.mkDerivation rec { - name = "lxqt-l10n-${version}"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "lxqt"; - repo = "lxqt-l10n"; - rev = version; - sha256 = "0q1hzj6sa4wc8sgqqqsqfldjpnvihacfq73agvc2li3q6qi5rr0k"; - }; - - nativeBuildInputs = [ - cmake - qt5.qttools - lxqt.lxqt-build-tools - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "$out"/share/lxqt/translations - ''; - - meta = with stdenv.lib; { - description = "Translations of LXQt"; - homepage = https://github.com/lxqt/lxqt-l10n; - license = licenses.lgpl21Plus; - platforms = with platforms; unix; - maintainers = with maintainers; [ romildo ]; - }; -} From d5c017eef8b8932e98a0329b38b0e2c7f819faca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 12 Feb 2019 09:12:09 -0200 Subject: [PATCH 106/221] qlipper: do not use qt5 directly --- pkgs/desktops/lxqt/qlipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index e09c8bc09d50..f5bdcf064fd8 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qtbase, qttools }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ qt5.qtbase qt5.qttools ]; + buildInputs = [ qtbase qttools ]; meta = with stdenv.lib; { description = "Cross-platform clipboard history applet"; From f0c7f54bd252887954ccca3b16a8a18a516a8cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 12 Feb 2019 09:28:42 -0200 Subject: [PATCH 107/221] qtermwidget: remove version 0.7.1 --- pkgs/desktops/lxqt/default.nix | 2 -- pkgs/desktops/lxqt/qtermwidget/0.7.1.nix | 26 ------------------------ 2 files changed, 28 deletions(-) delete mode 100644 pkgs/desktops/lxqt/qtermwidget/0.7.1.nix diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 909ef549e81f..db21a72cb9b1 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -28,8 +28,6 @@ let lxqt-themes = callPackage ./lxqt-themes { }; pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { }; qtermwidget = callPackage ./qtermwidget { }; - # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0 - qtermwidget_0_7_1 = callPackage ./qtermwidget/0.7.1.nix { }; ### CORE 2 lxqt-panel = callPackage ./lxqt-panel { }; diff --git a/pkgs/desktops/lxqt/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/qtermwidget/0.7.1.nix deleted file mode 100644 index 93c93d2c6ba1..000000000000 --- a/pkgs/desktops/lxqt/qtermwidget/0.7.1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: - -stdenv.mkDerivation rec { - name = "${pname}_0_7_1-${version}"; - pname = "qtermwidget"; - version = "0.7.1"; - - srcs = fetchFromGitHub { - owner = "lxqt"; - repo = pname; - rev = version; - sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qt5.qtbase ]; - - meta = with stdenv.lib; { - description = "A terminal emulator widget for Qt 5"; - homepage = https://github.com/lxqt/qtermwidget; - license = licenses.gpl2; - platforms = with platforms; unix; - maintainers = with maintainers; [ romildo ]; - }; -} From 28bcdbf1ddba91df78e2c07022f59336053a33a7 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 12 Feb 2019 21:13:38 +0900 Subject: [PATCH 108/221] flashplayer: 32.0.0.114 -> 32.0.0.142 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 814a5117ae0e..a097b9fac4ec 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "32.0.0.114"; + version = "32.0.0.142"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "11b47w14hgvp7lpis39a9vkncla7lvqrgc717v4mwj6p741z7v78"; + sha256 = "1mifgrfcvz1mc5w9s0df498z2dma50yq3vqw3pz82wxynmk28gq9"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 663c38466ff1..c48c36ad7a06 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "32.0.0.114"; + version = "32.0.0.142"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "199dd2fkjfcavfzfd2d38y21155yxvj9yl838i8y63v9i5j5nhfj" + "1g3c0hzpf6lwfvlh8h3fl1vwfxc909nkpvrymwlc3vi3zpqwv4r7" else - "1b7g92ywwxrzfdj8acqx2r8k19y84ci2nhwwghjc7276q95gpzj8" + "14pyhynmjb88n5r9ds7v59vsrlzxfkr8zqnzgf6bj0h0x9grzhdv" else if arch == "x86_64" then - "17nzchmacyqnb184d23caz52w7sy5sr7d081iwc46wic0px78m3m" + "102ixxh2sq7bmasnifm9arvlqqvmmm4bazzdppib3pz2yh4yy7m2" else - "16slvhyqq0i7rlh2s5kpy78whkh57r129kva14wradx9yv8bqr7h"; + "1hg03fb4xc7h7lbx57wn1xvkhq096aijaxkb4b60wna04p62bdim"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index b6ea06fc113f..dd7b931b9405 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "32.0.0.114"; + version = "32.0.0.142"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0wlzqdnl8lhbc428gcahld842bhia4aygy1k5vyyg27fwmskxhy7" + "1vp1nfys9pjmh3fmyp95yymmyvwrbmwjsmjhl5rnpwv5a0xn9nc6" else - "01a1dwrgw7lc098vp4ifkf5bj2qvv0pmdyibjhzzrx3387d1pd2l"; + "05r1z87zpllyb2hvj0fbps39hvkx5jzsqafyg62am8qm9khzs2qh"; }; nativeBuildInputs = [ unzip ]; From 347fa8611fc74ac51003193fa1944627bba8a1db Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 07:09:13 -0600 Subject: [PATCH 109/221] intel-media-driver: 18.4.0 -> 18.4.1 Minor bump, adds various missing id's apparently. --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index c15a42e3f404..b1c9f59b019e 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "intel-media-driver-${version}"; - version = "18.4.0"; + version = "18.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0mvb1dq2014gc60lz22dag230flqw859dcqi08hdmmci30qgw88x"; + sha256 = "192rfv6dk9jagx0q92jq6n1slc1pllgcc7rm85fgachq9rjl7szh"; }; cmakeFlags = [ From 3cf8394daf3c50630e00744d7a83b274d6a95114 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 12 Feb 2019 17:49:05 +0100 Subject: [PATCH 110/221] phpPackages.phpstan: 0.11.1 -> 0.11.2 Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.2 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index da301df65cb0..52018b439918 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -411,11 +411,11 @@ let phpstan = pkgs.stdenv.mkDerivation rec { name = "phpstan-${version}"; - version = "0.11.1"; + version = "0.11.2"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0iivfp9945gv6pqhp01720rlwzfd260hbfq31a3mmimly721mnsa"; + sha256 = "0pkcak51vfrqlwivxbb5pdvc34pxia8pdraii97wmcg4z0d4i1rx"; }; phases = [ "installPhase" ]; From 9522ca5ce98af6a5b227adaa5164697385150366 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 11 Feb 2019 13:47:45 +0100 Subject: [PATCH 111/221] nixos/flannel: add options to configure kubernetes as config backend for flannel --- nixos/modules/services/networking/flannel.nix | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index b93e28e34efd..cb39a53b5f96 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -73,11 +73,26 @@ in { }; }; + kubeconfig = mkOption { + description = '' + Path to kubeconfig to use for storing flannel config using the + Kubernetes API + ''; + type = types.nullOr types.path; + default = null; + }; + network = mkOption { description = " IPv4 network in CIDR format to use for the entire flannel network."; type = types.str; }; + storageBackend = mkOption { + description = "Determines where flannel stores its configuration at runtime"; + type = types.enum ["etcd" "kubernetes"]; + default = "etcd"; + }; + subnetLen = mkOption { description = '' The size of the subnet allocated to each host. Defaults to 24 (i.e. /24) @@ -122,17 +137,21 @@ in { after = [ "network.target" ]; environment = { FLANNELD_PUBLIC_IP = cfg.publicIp; + FLANNELD_IFACE = cfg.iface; + } // optionalAttrs (cfg.storageBackend == "etcd") { FLANNELD_ETCD_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints; FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile; FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile; FLANNELD_ETCD_CAFILE = cfg.etcd.caFile; - FLANNELD_IFACE = cfg.iface; ETCDCTL_CERT_FILE = cfg.etcd.certFile; ETCDCTL_KEY_FILE = cfg.etcd.keyFile; ETCDCTL_CA_FILE = cfg.etcd.caFile; ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints; + } // optionalAttrs (cfg.storageBackend == "kubernetes") { + FLANNELD_KUBE_SUBNET_MGR = "true"; + FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; }; - preStart = '' + preStart = mkIf (cfg.storageBackend == "etcd") '' echo "setting network configuration" until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' do @@ -149,6 +168,12 @@ in { serviceConfig.ExecStart = "${cfg.package}/bin/flannel"; }; - services.etcd.enable = mkDefault (cfg.etcd.endpoints == ["http://127.0.0.1:2379"]); + services.etcd.enable = mkDefault (cfg.storageBackend == "etcd" && cfg.etcd.endpoints == ["http://127.0.0.1:2379"]); + + # for some reason, flannel doesn't let you configure this path + # see: https://github.com/coreos/flannel/blob/master/Documentation/configuration.md#configuration + environment.etc."kube-flannel/net-conf.json" = mkIf (cfg.storageBackend == "kubernetes") { + source = pkgs.writeText "net-conf.json" (builtins.toJSON networkConfig); + }; }; } From adc9da617884b240f3799875b8e3b1ae3ae3185e Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Tue, 12 Feb 2019 18:26:08 +0100 Subject: [PATCH 112/221] nixos/flannel: fix flannel nixos test, add test to all-tests.nix --- nixos/tests/all-tests.nix | 1 + nixos/tests/flannel.nix | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7e207fa419f8..229f2c3abf7b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -73,6 +73,7 @@ in ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix {}; firewall = handleTest ./firewall.nix {}; + flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; flatpak = handleTest ./flatpak.nix {}; fsck = handleTest ./fsck.nix {}; fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64 diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix index fb66fe282090..0b261a684772 100644 --- a/nixos/tests/flannel.nix +++ b/nixos/tests/flannel.nix @@ -21,8 +21,9 @@ import ./make-test.nix ({ pkgs, ...} : rec { services = { etcd = { enable = true; - listenClientUrls = ["http://etcd:2379"]; - listenPeerUrls = ["http://etcd:2380"]; + listenClientUrls = ["http://0.0.0.0:2379"]; # requires ip-address for binding + listenPeerUrls = ["http://0.0.0.0:2380"]; # requires ip-address for binding + advertiseClientUrls = ["http://etcd:2379"]; initialAdvertisePeerUrls = ["http://etcd:2379"]; initialCluster = ["etcd=http://etcd:2379"]; }; From 11c1fc40858776360ddd2366db0571831181df26 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 12 Feb 2019 19:25:05 +0100 Subject: [PATCH 113/221] perlPackages.IOTty: fix darwin sandbox build 2 of the tests fail when sandboxing is enabled, we might want to allow this case in the profile if there are more cases but for now just disable the tests on darwin. warning: TIOCSCTTY failed, slave might not be set as controlling terminal: Operation not permitted at /private/tmp/nix-build-perl5.28.1-IO-Tty-1.12.drv-0/IO-Tty-1.12/blib/lib/IO/Pty.pm line 121. Error: could not connect pty as controlling terminal! no controlling terminal at t/test.t line 68. sysread() failed: at t/test.t line 91. # Looks like your test exited with 255 just after 2. --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46c45d1d8d8a..b4e93345581f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7682,6 +7682,7 @@ let url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; sha256 = "0399anjy3bc0w8xzsc3qx5vcyqryc9gc52lc7wh7i49hsdq8gvx2"; }; + doCheck = !stdenv.isDarwin; # openpty fails in the sandbox }; IPCountry = buildPerlPackage rec { From b93ea9c26f5630716b435bbf52f7559f9853d76e Mon Sep 17 00:00:00 2001 From: Alexandre Mazari Date: Tue, 12 Feb 2019 22:32:11 +0100 Subject: [PATCH 114/221] zoneminder: fix build issue when using createLocally database --- nixos/modules/services/misc/zoneminder.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index a40e9e846137..ae7de7850d9f 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -205,15 +205,13 @@ in { mysql = lib.mkIf cfg.database.createLocally { ensureDatabases = [ cfg.database.name ]; - ensureUsers = { + ensureUsers = [{ name = cfg.database.username; - ensurePermissions = [ - { "${cfg.database.name}.*" = "ALL PRIVILEGES"; } - ]; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; initialDatabases = [ { inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql"; } ]; - }; + }]; }; nginx = lib.mkIf useNginx { From 355d9a63782567f5f748601f970d0ff6c3898fef Mon Sep 17 00:00:00 2001 From: Marcus Geiger Date: Tue, 12 Feb 2019 22:52:28 +0100 Subject: [PATCH 115/221] qemu: Add support for the Hypervisor framework on Darwin This provides macOS native hardware acceleration to Qemu. --- pkgs/applications/virtualization/qemu/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 301a9211cf65..67a863b6fb7c 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -3,7 +3,7 @@ , bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper , attr, libcap, libcap_ng -, CoreServices, Cocoa, rez, setfile +, CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { vde2 texinfo flex bison makeWrapper lzo snappy gnutls nettle curl ] - ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] + ++ optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] ++ optionals seccompSupport [ libseccomp ] ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] @@ -116,6 +116,7 @@ stdenv.mkDerivation rec { ++ optional usbredirSupport "--enable-usb-redir" ++ optional (hostCpuTargets != null) "--target-list=${stdenv.lib.concatStringsSep "," hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" + ++ optional stdenv.isDarwin "--enable-hvf" ++ optional stdenv.isLinux "--enable-linux-aio" ++ optional gtkSupport "--enable-gtk" ++ optional xenSupport "--enable-xen" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df5884d610b..6017b0a86c05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18991,7 +18991,7 @@ in qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; qemu = callPackage ../applications/virtualization/qemu { - inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa; + inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; inherit (darwin.stubs) rez setfile; }; From a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 12 Feb 2019 23:38:13 +0100 Subject: [PATCH 116/221] aws-sdk-cpp: fix darwin sandbox build The tests use localhost networking, which is disallowed by default in the darwin sandbox. --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 0825cdcfc098..a5517a2522dc 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib +, CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. customMemoryManagement ? true -, darwin }: let @@ -34,10 +34,10 @@ in stdenv.mkDerivation rec { ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) - (with darwin.apple_sdk.frameworks; [ CoreAudio AudioToolbox ]); + [ CoreAudio AudioToolbox ]; cmakeFlags = - lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" + lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; @@ -60,6 +60,8 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=noexcept-type" ]; + __darwinAllowLocalNetworking = true; + meta = { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df5884d610b..825d87f9354d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9369,7 +9369,9 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; - aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { + inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; + }; babl = callPackage ../development/libraries/babl { }; @@ -21533,7 +21535,7 @@ in bftools = callPackage ../applications/science/biology/bftools { }; - cmtk = callPackage ../applications/science/biology/cmtk { }; + cmtk = callPackage ../applications/science/biology/cmtk { }; conglomerate = callPackage ../applications/science/biology/conglomerate { }; From aa21b4b3d361ca8ebebae9ab771dade993afbd2a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 12 Feb 2019 23:44:07 +0100 Subject: [PATCH 117/221] lldpd: fix build The build missed `openssl` as input and failed with an error like this: ``` /nix/store/7n1h80xkbjhcijzp0iylk0nc7w05vy8k-net-snmp-5.8/include/net-snmp/library/scapi.h:14:10: fatal error: openssl/ossl_typ.h: No such file or directory #include /* EVP_MD */ ^~~~~~~~~~~~~~~~~~~~ compilation terminated. ``` This also unbreaks `osquery` (https://hydra.nixos.org/build/88547811). See also https://hydra.nixos.org/build/88562937 --- pkgs/tools/networking/lldpd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 193f44a62e21..d4ded1142d83 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, pkgconfig, removeReferencesTo -, libevent, readline, net_snmp }: +, libevent, readline, net_snmp, openssl +}: stdenv.mkDerivation rec { name = "lldpd-${version}"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ]; - buildInputs = [ libevent readline net_snmp ]; + buildInputs = [ libevent readline net_snmp openssl ]; enableParallelBuilding = true; From 744e344171c394a8cce2228ff56c1b1bbce35d82 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Wed, 13 Feb 2019 08:53:32 +1000 Subject: [PATCH 118/221] Update maps.nix --- .../machine-learning/sc2-headless/maps.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 8e47bf239a18..228bafe3f7c5 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -1,6 +1,8 @@ { fetchzip }: - +let + fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; }); +in { minigames = fetchzip { url = "https://github.com/deepmind/pysc2/releases/download/v1.2/mini_games.zip"; @@ -8,39 +10,39 @@ stripRoot = false; }; - melee = (fetchzip { + melee = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; sha256 = "0w050yah5rybx3m5zvpr09jv01r0xsazpyrc76338b2sd8pdxv3y"; stripRoot = false; - }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); - ladder2017season1 = (fetchzip { + }; + ladder2017season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip"; sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh"; stripRoot = false; - }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); - ladder2017season2 = (fetchzip { + }; + ladder2017season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip"; sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39"; stripRoot = false; - }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); - ladder2017season3 = (fetchzip { + }; + ladder2017season3 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip"; sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a"; stripRoot = false; - }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); - ladder2017season4 = (fetchzip { + }; + ladder2017season4 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip"; sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g"; stripRoot = false; - }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); - ladder2018season1 = (fetchzip { + }; + ladder2018season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip"; sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f"; stripRoot = false; - }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); - ladder2018season2 = (fetchzip { + }; + ladder2018season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip"; sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx"; stripRoot = false; - }).overrideAttrs(o: { UNZIP = "-P iagreetotheeula";}); + }; } From cfc7cdac452170ee07363d2a707d36dcb4441083 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Wed, 13 Feb 2019 00:56:15 +0100 Subject: [PATCH 119/221] nextcloud-client: fix crash --- pkgs/applications/networking/nextcloud-client/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 624c5472ddcd..a131355963ce 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -13,13 +13,18 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - # Patch contained in next (>2.5.1) release + # Patches contained in next (>2.5.1) release patches = [ (fetchpatch { name = "fix-qt-5.12-build"; url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch"; sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n"; }) + (fetchpatch { + name = "fix-qtwebengine-crash"; + url = "https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/959.patch"; + sha256 = "00qx976az2rb1gwl1rxapm8gqj42yzqp8k2fasn3h7b30lnxdyr0"; + }) ]; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; From 421110ae36d8aa6456b9f9cb63d1ca26102d2ab6 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 01:29:07 +0900 Subject: [PATCH 120/221] luaPackages.luaevent: 0.4.4 -> 0.4.6 generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 ++++++++++++ pkgs/development/lua-modules/overrides.nix | 11 +++++++ pkgs/top-level/lua-packages.nix | 31 ------------------- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 1144bc723254..df403296ccd2 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -13,6 +13,7 @@ ltermbox, lua-cmsgpack, lua_cliargs, lua-term, +luaevent, luaffi,http://luarocks.org/dev, luuid, penlight, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index b7224aa334db..494a0e34a386 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -326,6 +326,26 @@ lua-term = buildLuarocksPackage { }; }; }; +luaevent = buildLuarocksPackage { + pname = "luaevent"; + version = "0.4.6-1"; + + src = fetchurl { + url = https://luarocks.org/luaevent-0.4.6-1.src.rock; + sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/harningt/luaevent"; + description="libevent binding for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; luaffi = buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 1fcc49bf5468..4d2178906c72 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -45,6 +45,17 @@ with super; lrexlib-gnu = super.lrexlib-gnu.override({ buildInputs = [ pkgs.gnulib ]; }); + luaevent = super.luaevent.override({ + buildInputs = with pkgs; [ libevent.dev libevent ]; + propagatedBuildInputs = [ luasocket ]; + extraConfig = '' + variables={ + EVENT_INCDIR="${pkgs.libevent.dev}/include"; + EVENT_LIBDIR="${pkgs.libevent}/lib"; + } + ''; + disabled= luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; + }); luv = super.luv.overrideAttrs(oa: { propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ]; }); diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 7a1738b0f3ee..347393511e6a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -295,37 +295,6 @@ with self; { }; }; - luaevent = buildLuaPackage rec { - version = "0.4.4"; - name = "luaevent-${version}"; - - src = fetchFromGitHub { - owner = "harningt"; - repo = "luaevent"; - rev = "v${version}"; - sha256 = "1krzxr0jkv3gmhpckp02byhdd9s5dd0hpyqc8irc8i79dd8x0p53"; - }; - - preBuild = '' - makeFlagsArray=( - INSTALL_DIR_LUA="$out/share/lua/${lua.luaversion}" - INSTALL_DIR_BIN="$out/lib/lua/${lua.luaversion}" - LUA_INC_DIR="${lua}/include" - ); - ''; - - buildInputs = [ libevent ]; - - propagatedBuildInputs = [ luasocket ]; - - meta = with stdenv.lib; { - homepage = http://luaforge.net/projects/luaevent/; - description = "Binding of libevent to Lua"; - license = licenses.mit; - maintainers = with maintainers; [ koral ]; - }; - }; - luaexpat = buildLuaPackage rec { version = "1.3.0"; name = "expat-${version}"; From c789b88cdd2ade47fbdcb94f43c09dfe66b81c0b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 01:17:09 +0900 Subject: [PATCH 121/221] luaPackages.luacheck: 0.20 -> 0.23 generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 +++++++++++++ pkgs/top-level/lua-packages.nix | 30 ------------------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index df403296ccd2..fbd358e1b2db 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -14,6 +14,7 @@ lua-cmsgpack, lua_cliargs, lua-term, luaevent, +luacheck luaffi,http://luarocks.org/dev, luuid, penlight, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 494a0e34a386..defff849a2be 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -346,6 +346,26 @@ luaevent = buildLuarocksPackage { }; }; }; +luacheck = buildLuarocksPackage { + pname = "luacheck"; + version = "0.23.0-1"; + + src = fetchurl { + url = https://luarocks.org/luacheck-0.23.0-1.src.rock; + sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua argparse luafilesystem ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/mpeterv/luacheck"; + description="A static analyzer and a linter for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; luaffi = buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 347393511e6a..4e890662477a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -236,36 +236,6 @@ with self; { }; }; - luacheck = buildLuaPackage rec { - pname = "luacheck"; - version = "0.20.0"; - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "mpeterv"; - repo = "luacheck"; - rev = "${version}"; - sha256 = "0ahfkmqcjhlb7r99bswy1sly6d7p4pyw5f4x4fxnxzjhbq0c5qcs"; - }; - - propagatedBuildInputs = [ lua ]; - - # No Makefile. - dontBuild = true; - - installPhase = '' - ${lua}/bin/lua install.lua $out - ''; - - meta = with stdenv.lib; { - description = "A tool for linting and static analysis of Lua code"; - homepage = https://github.com/mpeterv/luacheck; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.unix; - }; - }; - luacyrussasl = buildLuaPackage rec { version = "1.1.0"; name = "lua-cyrussasl-${version}"; From ce63fd43818e7296b632844f2e2e1156837ff314 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 01:30:52 +0900 Subject: [PATCH 122/221] luaPackages.luabitop: generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 30 +++++++++++++++ pkgs/top-level/lua-packages.nix | 37 ------------------- 3 files changed, 31 insertions(+), 37 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index fbd358e1b2db..c257eae10d37 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -13,6 +13,7 @@ ltermbox, lua-cmsgpack, lua_cliargs, lua-term, +luabitop, luaevent, luacheck luaffi,http://luarocks.org/dev, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index defff849a2be..5ce21c36f52c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -346,6 +346,36 @@ luaevent = buildLuarocksPackage { }; }; }; +luabitop = buildLuarocksPackage { + pname = "luabitop"; + version = "1.0.2-3"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luabitop-1.0.2-3.rockspec; + sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/LuaDist/luabitop.git", + "rev": "81bb23b0e737805442033535de8e6d204d0e5381", + "date": "2013-02-18T16:36:42+01:00", + "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.3"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://bitop.luajit.org/"; + description="Lua Bit Operations Module"; + license = { + fullName = "MIT/X license"; + }; + }; +}; luacheck = buildLuarocksPackage { pname = "luacheck"; version = "0.23.0-1"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 4e890662477a..81c07c5d15ca 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -167,43 +167,6 @@ with self; { }; }; - luabitop = buildLuaPackage rec { - version = "1.0.2"; - name = "bitop-${version}"; - - src = fetchurl { - url = "http://bitop.luajit.org/download/LuaBitOp-${version}.tar.gz"; - sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj"; - }; - - buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx"; - - disabled = isLua53; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace 10.4 10.5 - ''; - - preBuild = '' - makeFlagsArray=( - ${stdenv.lib.optionalString stdenv.cc.isClang "CC=$CC"} - INCLUDES="-I${lua}/include" - LUA="${lua}/bin/lua"); - ''; - - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion} - install -p bit.so $out/lib/lua/${lua.luaversion} - ''; - - meta = with stdenv.lib; { - description = "C extension module for Lua which adds bitwise operations on numbers"; - homepage = "http://bitop.luajit.org"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - }; - http = buildLuaPackage rec { version = "0.2"; name = "http-${version}"; From c84a431624b68f25df07586ca6414103091cc97f Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 01:01:14 +0900 Subject: [PATCH 123/221] luaPackages.lpty: 1.2.1 -> 1.2.2 generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 +++++++++++++ pkgs/top-level/lua-packages.nix | 28 ------------------- 3 files changed, 21 insertions(+), 28 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index c257eae10d37..a70595ef3eb3 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -7,6 +7,7 @@ fifo inspect lgi lpeg_patterns +lpty lrexlib-gnu, lrexlib-posix, ltermbox, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 5ce21c36f52c..4025f83ce2e1 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -190,6 +190,26 @@ lpeg_patterns = buildLuarocksPackage { }; }; }; +lpty = buildLuarocksPackage { + pname = "lpty"; + version = "1.2.2-1"; + + src = fetchurl { + url = https://luarocks.org/lpty-1.2.2-1.src.rock; + sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="make"; + + meta = { + homepage = "http://www.tset.de/lpty/"; + description="A simple facility for lua to control other programs via PTYs."; + license = { + fullName = "MIT"; + }; + }; +}; lrexlib-gnu = buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.0-1"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 81c07c5d15ca..a25ea3283df0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -384,34 +384,6 @@ with self; { }; }; - lpty = buildLuaPackage rec { - version = "1.2.1"; - name = "lpty-${version}"; - - src = fetchurl { - url = "http://www.tset.de/downloads/lpty-${version}-1.tar.gz"; - sha256 = "0rgvbpymcgdkzdwfag607xfscs9xyqxg0dj0qr5fv906mi183gs6"; - }; - - preBuild = '' - makeFlagsArray=( - INST_LIBDIR="$out/lib/lua/${lua.luaversion}" - INST_LUADIR="$out/share/lua/${lua.luaversion}" - LUA_BINDIR="${lua}/bin" - LUA_INCDIR="-I${lua}/include" - LUA_LIBDIR="-L${lua}/lib" - ); - ''; - - meta = with stdenv.lib; { - description = "PTY control for Lua"; - homepage = "http://www.tset.de/lpty"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; - }; - }; - lua-iconv = buildLuaPackage rec { name = "lua-iconv-${version}"; version = "7"; From 0cb3ee3bdeb333b7e157fc950e8c1163fffcf3a8 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 01:11:54 +0900 Subject: [PATCH 124/221] luaPackages.lua-iconv: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 ++++++++++++++ pkgs/development/lua-modules/overrides.nix | 3 +++ pkgs/top-level/lua-packages.nix | 26 ------------------- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a70595ef3eb3..0f3db834fc29 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -13,6 +13,7 @@ lrexlib-posix, ltermbox, lua-cmsgpack, lua_cliargs, +lua-iconv, lua-term, luabitop, luaevent, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 4025f83ce2e1..7da4a9eeddf3 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -320,6 +320,26 @@ lua_cliargs = buildLuarocksPackage { }; }; }; +lua-iconv = buildLuarocksPackage { + pname = "lua-iconv"; + version = "7-3"; + + src = fetchurl { + url = https://luarocks.org/lua-iconv-7-3.src.rock; + sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://ittner.github.com/lua-iconv/"; + description="Lua binding to the iconv"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 4d2178906c72..b78f7f9c0079 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -56,6 +56,9 @@ with super; ''; disabled= luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; }); + lua-iconv = super.lua-iconv.override({ + buildInputs = [ pkgs.libiconv ]; + }); luv = super.luv.overrideAttrs(oa: { propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ]; }); diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index a25ea3283df0..ed0b919fd690 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -384,32 +384,6 @@ with self; { }; }; - lua-iconv = buildLuaPackage rec { - name = "lua-iconv-${version}"; - version = "7"; - - src = fetchFromGitHub { - owner = "ittner"; - repo = "lua-iconv"; - rev = name; - sha256 = "0rd76966qlxfp8ypkyrbif76nxnm1acclqwfs45wz3972jsk654i"; - }; - - preBuild = '' - makeFlagsArray=( - INSTALL_PATH="$out/lib/lua/${lua.luaversion}" - ); - ''; - - meta = with stdenv.lib; { - description = "Lua bindings for POSIX iconv"; - homepage = "https://ittner.github.io/lua-iconv/"; - license = licenses.mit; - maintainers = with maintainers; [ richardipsum ]; - platforms = platforms.unix; - }; - }; - luasec = buildLuaPackage rec { name = "sec-0.6"; From 12984854c6ea9419f190f55b4a2b5626d8b81c8c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 13 Feb 2019 03:44:02 -0600 Subject: [PATCH 125/221] tor-browser-bundle-bin: 8.0.5 -> 8.0.6 https://blog.torproject.org/new-release-tor-browser-806 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 74ee7c302e62..cdee8111b549 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.5"; + version = "8.0.6"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0afrq5vy6rxj4p2dm7kaiq3d3iv4g8ivn7nfqx0z8h1wikyaf5di"; + sha256 = "14i32r8pw749ghigqblnbr5622jh5wp1ivnwi71vycbgp9pds4f7"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "113vn2fyw9sjxz24b2m6z4kw46rqgxglrna1lg9ji6zhkfb044vv"; + sha256 = "0g9sd104b6xnbl2j3gbq1ga6j2h0x3jccays0gpbd235bxpjs39a"; }; }; in From 7a961cf06f8b0c7aaf8af693123ce3f926a295d7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Feb 2019 10:50:28 +0100 Subject: [PATCH 126/221] osquery: fix build We use `dpkg` 1.19.2 since 23661254e45d6eb47acad16a174637803637917a. This version dropped pkg_db_reset` in `` which broke compilation with the following errors: ``` /build/source/osquery/tables/system/linux/deb_packages.cpp: In function 'void osquery::tables::dpkg_setup(pkg_array*)': /build/source/osquery/tables/system/linux/deb_packages.cpp:83:3: error: 'pkg_array_init_from_db' was not declared in this scope pkg_array_init_from_db(packages); ^~~~~~~~~~~~~~~~~~~~~~ /build/source/osquery/tables/system/linux/deb_packages.cpp:83:3: note: suggested alternative: 'pkg_array_init_from_hash' pkg_array_init_from_db(packages); ^~~~~~~~~~~~~~~~~~~~~~ pkg_array_init_from_hash /build/source/osquery/tables/system/linux/deb_packages.cpp: In function 'void osquery::tables::dpkg_teardown(pkg_array*)': /build/source/osquery/tables/system/linux/deb_packages.cpp:93:3: error: 'pkg_db_reset' was not declared in this scope pkg_db_reset(); ^~~~~~~~~~~~ /build/source/osquery/tables/system/linux/deb_packages.cpp:93:3: note: suggested alternative: 'pkg_hash_reset' pkg_db_reset(); ^~~~~~~~~~~~ pkg_hash_reset make[2]: *** [osquery/tables/CMakeFiles/osquery_system_tables.dir/build.make:115: osquery/tables/CMakeFiles/osquery_system_tables.dir/system/linux/deb_packages.cpp.o] Error 1 ``` As there's currently no upstream fix, it's better to use an older version of `dpkg` for now. --- pkgs/tools/system/osquery/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 32c085e2ec5f..1e2882e1f1fe 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -4,7 +4,7 @@ , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl }: let @@ -61,6 +61,16 @@ stdenv.mkDerivation rec { sha256 = "1ny3srcsxd6kj59zq1cman5myj8kzw010wbyc6mrpk4kp823r5nx"; }; }); + + # dpkg 1.19.2 dropped api in `` which breaks compilation. + dpkg' = dpkg.overrideAttrs (old: rec { + name = "dpkg-${version}"; + version = "1.19.0.5"; + src = fetchurl { + url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; + sha256 = "1dc5kp3fqy1k66fly6jfxkkg7w6d0jy8szddpfyc2xvzga94d041"; + }; + }); in [ udev audit @@ -69,7 +79,7 @@ stdenv.mkDerivation rec { customMemoryManagement = false; }) - lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg + lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg' lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit yara lldpd gflags' thrift boost glog gbenchmark snappy openssl From 385b97e9cf2c727da9f30dd67f8685386392dc93 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Wed, 13 Feb 2019 10:29:56 +0100 Subject: [PATCH 127/221] pythonPackages.cassandra-driver: 3.15.1 -> 3.16.0 - fix build cassandra-driver requires an older version of cython than the one present in nixpkgs. Next cassandra-driver version will support cython 0.29 https://github.com/datastax/python-driver/commit/82c84255ff463998f31e11f0db81e18aad0f08df --- .../cassandra-driver/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index c445c21478b0..9a89fff08f8a 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -20,14 +20,26 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.15.1"; + version = "3.16.0"; src = fetchPypi { inherit pname version; - sha256 = "1xcirbvlj00id8269akhk8gy2sv0mlnbgy3nagi32648jwsrcadg"; + sha256 = "1gjs2lqy0ba6zhh13a1dhirk59i7lc4zcbl7h50619hdm5kv3g22"; }; - buildInputs = [ pkgs.libev cython ]; + buildInputs = [ + pkgs.libev + # NOTE: next version will work with cython 0.29 + # Requires 'Cython!=0.25,<0.29,>=0.20' + (cython.overridePythonAttrs(old: rec { + pname = "Cython"; + version = "0.28.3"; + src = fetchPypi { + inherit pname version; + sha256 = "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526"; + }; + })) + ]; propagatedBuildInputs = [ six ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ futures ]; From 2da868d81ec4f93646a8842b597e1b65e8197aa8 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 13 Feb 2019 13:08:57 +0100 Subject: [PATCH 128/221] Add shim for clock_gettime until macos >= 10.12 --- .../llvm/7/compiler-rt-clock_gettime.patch | 74 +++++++++++++++++++ .../compilers/llvm/7/compiler-rt.nix | 4 +- 2 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch b/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch new file mode 100644 index 000000000000..f9323ed95c05 --- /dev/null +++ b/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch @@ -0,0 +1,74 @@ +commit f00c7bccf7955b7dfbb4859fd9019e9eb3349f2d +Author: Tobias Mayer +Date: Wed Feb 13 12:44:17 2019 +0100 + + Provide clock_gettime for xray on macos < 10.12 + +diff --git a/lib/xray/xray_basic_logging.cc b/lib/xray/xray_basic_logging.cc +index a46c151af..38aea6932 100644 +--- a/lib/xray/xray_basic_logging.cc ++++ b/lib/xray/xray_basic_logging.cc +@@ -36,6 +36,29 @@ + #include "xray_tsc.h" + #include "xray_utils.h" + ++#if __MACH__ ++#include ++#include ++enum clockid_t { ++ CLOCK_MONOTONIC = REALTIME_CLOCK, ++ CLOCK_REALTIME = REALTIME_CLOCK ++}; ++ ++int clock_gettime(clockid_t clock_id, struct timespec *ts) { ++ if (ts != NULL) { ++ clock_serv_t cclock; ++ mach_timespec_t mts; ++ host_get_clock_service(mach_host_self(), clock_id, &cclock); ++ clock_get_time(cclock, &mts); ++ mach_port_deallocate(mach_task_self(), cclock); ++ ts->tv_sec = mts.tv_sec; ++ ts->tv_nsec = mts.tv_nsec; ++ return 0; ++ } ++ return -1; ++} ++#endif ++ + namespace __xray { + + SpinMutex LogMutex; +diff --git a/lib/xray/xray_fdr_logging.cc b/lib/xray/xray_fdr_logging.cc +index 4b308b27f..1d044c8fd 100644 +--- a/lib/xray/xray_fdr_logging.cc ++++ b/lib/xray/xray_fdr_logging.cc +@@ -38,6 +38,29 @@ + #include "xray_tsc.h" + #include "xray_utils.h" + ++#if __MACH__ ++#include ++#include ++enum clockid_t { ++ CLOCK_MONOTONIC = REALTIME_CLOCK, ++ CLOCK_REALTIME = REALTIME_CLOCK ++}; ++ ++int clock_gettime(clockid_t clock_id, struct timespec *ts) { ++ if (ts != NULL) { ++ clock_serv_t cclock; ++ mach_timespec_t mts; ++ host_get_clock_service(mach_host_self(), clock_id, &cclock); ++ clock_get_time(cclock, &mts); ++ mach_port_deallocate(mach_task_self(), cclock); ++ ts->tv_sec = mts.tv_sec; ++ ts->tv_nsec = mts.tv_nsec; ++ return 0; ++ } ++ return -1; ++} ++#endif ++ + namespace __xray { + + atomic_sint32_t LoggingStatus = {XRayLogInitStatus::XRAY_LOG_UNINITIALIZED}; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 25c38db470d9..dff9cb9c49c0 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,5 +1,4 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: -with stdenv.lib; stdenv.mkDerivation rec { name = "compiler-rt-${version}"; inherit version; @@ -16,7 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra From 24c966545aadb033839436c18db225638df41e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 Feb 2019 09:43:00 -0200 Subject: [PATCH 129/221] vivaldi: 2.2.1388.37-1 -> 2.3.1440.41-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index a89932be2e08..ad145583d49c 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.2.1388.37-1"; + version = "2.3.1440.41-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "07q04lvwnjn5kprlwyndv9h2s25637ngchch26ka8lry1lxkdv55"; + sha256 = "0wrq7c0sw1b41bshwgzji4pwl0raj0l5h2r7gkcg952rcn0wl9bs"; }; unpackPhase = '' From c00b84adfc1f63f859a9f3042291a1409601f091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 Feb 2019 09:44:15 -0200 Subject: [PATCH 130/221] vivaldi-ffmpeg-codecs: 71.0.3578.98 -> 72.0.3626.96 --- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 88587d74d252..b303bf2188bd 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "71.0.3578.98"; + version = "72.0.3626.96"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "3baldqqdm8jzrs37w756ijgzwpmvma73rqbpnfkf0j41rmikrjdl6w7ycll98jch8rhzpgz3yfb9nk0gmsgxs233wn441bcdkhr1syv"; + sha512 = "2hawkyydcd0b6ipfigkf5n6c1ha1vknaqd4mgw381pi0ayq8skxbjazqabfcg9gcj84cnksi8j4dylfcrbgrmlnmc479fix0m0xx7cl"; }; buildInputs = [ ]; From 776350de0ae382803202bc37485b9011468813c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 13 Feb 2019 14:33:36 +0100 Subject: [PATCH 131/221] getmail: 5.8 -> 5.10 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index db1f383ac026..7a133a0a0cb1 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { pname = "getmail"; - version = "5.8"; + version = "5.10"; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz"; - sha256 = "0vl4cc733pd9d21y4pr4jc1ly657d0akxj1bdh1xfjggx33l3541"; + sha256 = "0qc4gp66mhaxyjj7pfz9v69kxnw76my4zw07hvc4f3kj3balkygx"; }; doCheck = false; From 54568a7cafb8538220fa04b93e9a038a314b65df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 13 Feb 2019 21:10:00 +0700 Subject: [PATCH 132/221] nodePackages_10_x: add markdown-link-check --- .../node-packages/node-packages-v10.json | 1 + .../node-packages/node-packages-v10.nix | 4558 +++++++++-------- .../node-packages/node-packages-v6.nix | 68 +- .../node-packages/node-packages-v8.nix | 177 +- 4 files changed, 2475 insertions(+), 2329 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 995981d18edc..b7297e3209e0 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -63,6 +63,7 @@ , "livedown" , { "lumo-build-deps": "../interpreters/clojurescript/lumo" } , "madoko" +, "markdown-link-check" , "mathjax" , "meat" , "meguca" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 3384ccf854e6..a8ed30e10f31 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,13 +13,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@apollographql/apollo-tools-0.2.9" = { + "@apollographql/apollo-tools-0.3.3" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.2.9"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.2.9.tgz"; - sha512 = "AEIQwPkS0QLbkpb6WyRhV4aOMxuErasp47ABv5niDKOasQH8mrD8JSGKJAHuQxVe4kB8DE9sLRoc5qeQ0KFCHA=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.3.3.tgz"; + sha512 = "/vLzZjloWB4xzgw2MRs9TUDIdCzS+No1hEClkEKqcnH86c2EgE/W0Dv2nkCTH9WxDrfryziJWbNMurYYkm61Zw=="; }; }; "@apollographql/graphql-playground-html-1.6.6" = { @@ -76,13 +76,13 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; - "@babel/generator-7.2.2" = { + "@babel/generator-7.3.2" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.2.2"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.2.2.tgz"; - sha512 = "I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.3.2.tgz"; + sha512 = "f3QCuPppXxtZOEm5GWPra/uYUjmNQlu9pbAD8D/9jze4pTY83rTtB1igTBSwvkeNlC5gR24zFFkz+2WHLFQhqQ=="; }; }; "@babel/helper-annotate-as-pure-7.0.0" = { @@ -103,13 +103,13 @@ let sha512 = "qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w=="; }; }; - "@babel/helper-builder-react-jsx-7.0.0" = { + "@babel/helper-builder-react-jsx-7.3.0" = { name = "_at_babel_slash_helper-builder-react-jsx"; packageName = "@babel/helper-builder-react-jsx"; - version = "7.0.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0.tgz"; - sha512 = "ebJ2JM6NAKW0fQEqN8hOLxK84RbRz9OkUhGS/Xd5u56ejMfVbayJ4+LykERZCOUM6faa6Fp3SZNX3fcT16MKHw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; + sha512 = "MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw=="; }; }; "@babel/helper-call-delegate-7.1.0" = { @@ -121,13 +121,13 @@ let sha512 = "YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.2.3" = { + "@babel/helper-create-class-features-plugin-7.3.2" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.2.3"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.2.3.tgz"; - sha512 = "xO/3Gn+2C7/eOUeb0VRnSP1+yvWHNxlpAot1eMhtoKDCN7POsyQP5excuT5UsV5daHxMWBeIIOeI5cmB8vMRgQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.2.tgz"; + sha512 = "tdW8+V8ceh2US4GsYdNVNoohq5uVwOf9k6krjwW4E1lINcHgttnWcNqgdoessn12dAy8QkbezlbQh2nXISNY+A=="; }; }; "@babel/helper-define-map-7.1.0" = { @@ -274,13 +274,13 @@ let sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; }; }; - "@babel/helpers-7.2.0" = { + "@babel/helpers-7.3.1" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.2.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.2.0.tgz"; - sha512 = "Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.3.1.tgz"; + sha512 = "Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA=="; }; }; "@babel/highlight-7.0.0" = { @@ -292,13 +292,13 @@ let sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; }; }; - "@babel/parser-7.2.3" = { + "@babel/parser-7.3.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.2.3"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz"; - sha512 = "0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.3.2.tgz"; + sha512 = "QzNUC2RO1gadg+fs21fi0Uu0OuGNzRKEmgCxoLNzbCdoprLwjfmZwzUrpUNfJPaVRwBpDY47A17yYEGWyRelnQ=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -319,13 +319,13 @@ let sha512 = "+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.2.3" = { + "@babel/plugin-proposal-class-properties-7.3.0" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.2.3"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.2.3.tgz"; - sha512 = "FVuQngLoN2iDrpW7LmhPZ2sO4DJxf35FOcwidwB9Ru9tMvI5URthnkVHuG14IStV+TzkMTyLMoOUlSTtrdVwqw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz"; + sha512 = "wNHxLkEKTQ2ay0tnsam2z7fGZUi+05ziDJflEt3AZTP3oXLKHJp9HqhfroB/vdMvt3sda9fAbq7FsG8QPDrZBg=="; }; }; "@babel/plugin-proposal-json-strings-7.2.0" = { @@ -337,13 +337,13 @@ let sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.2.0" = { + "@babel/plugin-proposal-object-rest-spread-7.3.2" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.2.0"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.2.0.tgz"; - sha512 = "1L5mWLSvR76XYUQJXkd/EEQgjq8HHRP6lQuZTTg0VA4tTGPpGemmCdAfQIz1rzEuWAm+ecP8PyyEm30jC1eQCg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz"; + sha512 = "DjeMS+J2+lpANkYLLO+m6GjoTMygYglKmRe6cDTbFv3L9i6mmiE8fe6B8MtCSLZpVXscD5kn7s6SgtHrDoBWoA=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.2.0" = { @@ -472,13 +472,13 @@ let sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA=="; }; }; - "@babel/plugin-transform-destructuring-7.2.0" = { + "@babel/plugin-transform-destructuring-7.3.2" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.2.0"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz"; - sha512 = "coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz"; + sha512 = "Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw=="; }; }; "@babel/plugin-transform-dotall-regex-7.2.0" = { @@ -580,6 +580,15 @@ let sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw=="; }; }; + "@babel/plugin-transform-named-capturing-groups-regex-7.3.0" = { + name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; + packageName = "@babel/plugin-transform-named-capturing-groups-regex"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz"; + sha512 = "NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw=="; + }; + }; "@babel/plugin-transform-new-target-7.0.0" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; @@ -607,13 +616,13 @@ let sha512 = "kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA=="; }; }; - "@babel/plugin-transform-react-jsx-7.2.0" = { + "@babel/plugin-transform-react-jsx-7.3.0" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.2.0.tgz"; - sha512 = "h/fZRel5wAfCqcKgq3OhbmYaReo7KkoJBpt8XnvpS7wqaNMqtw5xhxutzcm35iMUWucfAdT/nvGTsWln0JTg2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; + sha512 = "a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg=="; }; }; "@babel/plugin-transform-regenerator-7.0.0" = { @@ -697,13 +706,13 @@ let sha512 = "dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q=="; }; }; - "@babel/preset-env-7.2.3" = { + "@babel/preset-env-7.3.1" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.2.3"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.2.3.tgz"; - sha512 = "AuHzW7a9rbv5WXmvGaPX7wADxFkZIqKlbBh1dmZUQp4iwiPpkE/Qnrji6SC4UQCQzvWY/cpHET29eUhXS9cLPw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.1.tgz"; + sha512 = "FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ=="; }; }; "@babel/preset-stage-2-7.0.0" = { @@ -724,13 +733,13 @@ let sha512 = "f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g=="; }; }; - "@babel/runtime-7.2.0" = { + "@babel/runtime-7.3.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.2.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz"; - sha512 = "oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz"; + sha512 = "7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA=="; }; }; "@babel/template-7.2.2" = { @@ -760,13 +769,13 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; - "@babel/types-7.2.2" = { + "@babel/types-7.3.2" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.2.2"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz"; - sha512 = "fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.3.2.tgz"; + sha512 = "3Y6H8xlUlpbGR+XvawiH0UXehqydTmNmEpozWcXymqwcrwYAl5KMvKtQ+TF6f6E08V6Jur7v/ykdDSF+WDEIXQ=="; }; }; "@calebboyd/semaphore-1.3.1" = { @@ -886,22 +895,22 @@ let sha512 = "I2EjI9TbEFJNLziNPFfpo64PNanOaK17iL2kTW/jGlGOa4bvHw4VEied83kOEB7NJjXf1KfvmsQ2aEjy3xjiGg=="; }; }; - "@ionic/cli-framework-1.5.3" = { + "@ionic/cli-framework-1.6.0" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.5.3.tgz"; - sha512 = "xNCluLemxUYz/8Vgmyuxb2VEd/KuK3jCK4Tbmwnp1yGMnM+iw+WHqmNYHGHLdU+Sir/lLWd/WNrm9cfgGobC0g=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz"; + sha512 = "9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw=="; }; }; - "@ionic/discover-1.0.10" = { + "@ionic/discover-1.0.11" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.10.tgz"; - sha512 = "xUpMIAKF/oJz4hdstjCXsD5wx5uFF5KYmKWaeRQxXwbGuRXoP6Nuth7P1pztg7w4pugirVS4UkUqZ1gLpjp7wA=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.11.tgz"; + sha512 = "E2CYZsR2noHtUjYceUNP6w1DMYnjPqITyC8Ewiz1iaNWgEntr7xvt1/XbkMlnswn9QKNSItNL6iWY0Q91N+k2A=="; }; }; "@ionic/utils-fs-1.0.0" = { @@ -931,49 +940,49 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.10.6" = { + "@lerna/add-3.11.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.10.6.tgz"; - sha512 = "FxQ5Bmyb5fF+3BQiNffM6cTeGCrl4uaAuGvxFIWF6Pgz6U14tUc1e16xgKDvVb1CurzJgIV5sLOT5xmCOqv1kA=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.11.0.tgz"; + sha512 = "A2u889e+GeZzL28jCpcN53iHq2cPWVnuy5tv5nvG/MIg0PxoAQOUvphexKsIbqzVd9Damdmv5W0u9kS8y8TTow=="; }; }; - "@lerna/batch-packages-3.10.6" = { + "@lerna/batch-packages-3.11.0" = { name = "_at_lerna_slash_batch-packages"; packageName = "@lerna/batch-packages"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.10.6.tgz"; - sha512 = "sInr3ZQJFMh9Zq+ZUoVjX8R67j9ViRkVy0uEMsOfG+jZlXj1lRPRMPRiRgU0jXSYEwCdwuAB5pTd9tTx0VCJUw=="; + url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.11.0.tgz"; + sha512 = "ETO3prVqDZs/cpZo00ij61JEZ8/ADJx1OG/d/KtTdHlyRfQsb09Xzf0w+boimqa8fIqhpM3o5FV9GKd6GQ3iFQ=="; }; }; - "@lerna/bootstrap-3.10.6" = { + "@lerna/bootstrap-3.11.0" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.10.6.tgz"; - sha512 = "qbGjAxRpV/eiI9CboUIpsPPGpSogs8mN2/iDaAUBTaWVFVz/YyU64nui84Gll0kbdaHOyPput+kk2S8NCSCCdg=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.11.0.tgz"; + sha512 = "MqwviGJTy86joqSX2A3fmu2wXLBXc23tHJp5Xu4bVhynPegDnRrA3d9UI80UM3JcuYIQsxT4t2q2LNsZ4VdZKQ=="; }; }; - "@lerna/changed-3.10.6" = { + "@lerna/changed-3.11.1" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.10.6"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.10.6.tgz"; - sha512 = "nZDVq/sKdhgoAg1BVnpqjqUUz5+zedG+AnU+6mjEN2f23YVtRCsW55N4I9eEdW2pxXUaCY85Hj/HPSA74BYaFg=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.11.1.tgz"; + sha512 = "A21h3DvMjDwhksmCmTQ1+3KPHg7gHVHFs3zC5lR9W+whYlm0JI2Yp70vYnqMv2hPAcJx+2tlCrqJkzCFkNQdqg=="; }; }; - "@lerna/check-working-tree-3.10.0" = { + "@lerna/check-working-tree-3.11.0" = { name = "_at_lerna_slash_check-working-tree"; packageName = "@lerna/check-working-tree"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.10.0.tgz"; - sha512 = "NdIPhDgEtGHfeGjB9F0oAoPLywgMpjnJhLLwTNQkelDHo2xNAVpG8kV+A2UJ+cU5UXCZA4RZFxKNmw86rO+Drw=="; + url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.11.0.tgz"; + sha512 = "uWKKmX4BKdK57MyX3rGNHNz4JmFP3tHnaIDDVeuSlgK5KwncPFyRXi3E9H0eiq6DUvDDLtztNOfWeGP2IY656Q=="; }; }; "@lerna/child-process-3.3.0" = { @@ -985,121 +994,121 @@ let sha512 = "q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g=="; }; }; - "@lerna/clean-3.10.6" = { + "@lerna/clean-3.11.0" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.10.6.tgz"; - sha512 = "MuL8HOwnyvVtr6GOiAN/Ofjbx+BJdCrtjrM1Uuh8FFnbnZTPVf+0MPxL2jVzPMo0PmoIrX3fvlwvzKNk/lH0Ug=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.11.0.tgz"; + sha512 = "sHyMYv56MIVMH79+5vcxHVdgmd8BcsihI+RL2byW+PeoNlyDeGMjTRmnzLmbSD7dkinHGoa5cghlXy9GGIqpRw=="; }; }; - "@lerna/cli-3.10.6" = { + "@lerna/cli-3.11.0" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.10.6.tgz"; - sha512 = "GtmzJztjrcb5k1Qi/GKNs8xbQBgRpEBoPpt1Udgo23GkepVrQQo45QjM9hyqOhJ6LrV/lfXAv111kDBN/43jLw=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.11.0.tgz"; + sha512 = "dn2m2PgUxcb2NyTvwfYOFZf8yN5CMf1uKxht3ajQYdDjRgFi5pUQt/DmdguOZ3CMJkENa0i3yPOmrxGPXLD2aw=="; }; }; - "@lerna/collect-updates-3.10.1" = { + "@lerna/collect-updates-3.11.0" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "3.10.1"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.10.1.tgz"; - sha512 = "vb0wEJ8k63G+2CR/ud1WeVHNJ21Fs6Ew6lbdGZXnF4ZvaFWxWJZpoHeWwzjhMdJ75QdTzUaIhTG1hnH9faQNMw=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.11.0.tgz"; + sha512 = "O0Y18OC2P6j9/RFq+u5Kdq7YxsDd+up3ZRoW6+i0XHWktqxXA9P4JBQppkpYtJVK2yH8QyOzuVLQgtL0xtHdYA=="; }; }; - "@lerna/command-3.10.6" = { + "@lerna/command-3.11.0" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.10.6.tgz"; - sha512 = "jPZswMZXOpAaIuSF5hrz+eaWQzbDrvwbrkCoRJKfiAHx7URAkE6MQe9DeAnqrTKMqwfg0RciSrZLc8kWYfrzCQ=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.11.0.tgz"; + sha512 = "N+Z5kauVHSb2VhSIfQexG2VlCAAQ9xYKwVTxYh0JFOFUnZ/QPcoqx4VjynDXASFXXDgcXs4FLaGsJxq83Mf5Zg=="; }; }; - "@lerna/conventional-commits-3.10.0" = { + "@lerna/conventional-commits-3.11.0" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.10.0.tgz"; - sha512 = "8FvO0eR8g/tEgkb6eRVYaD39TsqMKsOXp17EV48jciciEqcrF/d1Ypu6ilK1GDp6R/1m2mbjt/b52a/qrO+xaw=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.11.0.tgz"; + sha512 = "ix1Ki5NiZdk2eMlCWNgLchWPKQTgkJdLeNjneep6OCF3ydSINizReGbFvCftRivun641cOHWswgWMsIxbqhMQw=="; }; }; - "@lerna/create-3.10.6" = { + "@lerna/create-3.11.0" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.10.6.tgz"; - sha512 = "OddQtGBHM2/eJONggLWoTE6275XGbnJ6dIVF+fLsKS93o4GC6g+qcc6Y7lUWHm5bfpeOwNOVKwj0tvqBZ6MgoA=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.11.0.tgz"; + sha512 = "1izS82QML+H/itwEu1GPrcoXyugFaP9z9r6KuIQRQq8RtmNCGEmK85aiOw6mukyRcRziq2akALgFDyrundznPQ=="; }; }; - "@lerna/create-symlink-3.6.0" = { + "@lerna/create-symlink-3.11.0" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "3.6.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.6.0.tgz"; - sha512 = "YG3lTb6zylvmGqKU+QYA3ylSnoLn+FyLH5XZmUsD0i85R884+EyJJeHx/zUk+yrL2ZwHS4RBUgJfC24fqzgPoA=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.11.0.tgz"; + sha512 = "UDR32uos8FIEc1keMKxXj5goZAHpCbpUd4u/btHXymUL9WqIym3cgz2iMr3ZNdZtjdMyUoHup5Dp0zjSgKCaEA=="; }; }; - "@lerna/describe-ref-3.10.0" = { + "@lerna/describe-ref-3.11.0" = { name = "_at_lerna_slash_describe-ref"; packageName = "@lerna/describe-ref"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.10.0.tgz"; - sha512 = "fouh3FQS07QxJJp/mW8LkGnH0xMRAzpBlejtZaiRwfDkW2kd6EuHaj8I/2/p21Wsprcvuu4dqmyia2YS1xFb/w=="; + url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.11.0.tgz"; + sha512 = "lX/NVMqeODg4q/igN06L/KjtVUpW1oawh6IgOINy2oqm4RUR+1yDpsdVu3JyZZ4nHB572mJfbW56dl8qoxEVvQ=="; }; }; - "@lerna/diff-3.10.6" = { + "@lerna/diff-3.11.0" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.10.6.tgz"; - sha512 = "0MqFhosjrqsIdXiKIu7t3CiJELqiU9mkjFBhYPB7JruAzpPwjMXJnC6/Ur5/7LXJYYVpqGQwZI9ZaZlOYJhhrw=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.11.0.tgz"; + sha512 = "r3WASQix31ApA0tlkZejXhS8Z3SEg6Jw9YnKDt9V6wLjEUXGLauUDMrgx1YWu3cs9KB8/hqheRyRI7XAXGJS1w=="; }; }; - "@lerna/exec-3.10.6" = { + "@lerna/exec-3.11.0" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.10.6.tgz"; - sha512 = "cdHqaRBMYceJu8rZLO8b4ZeR27O+xKPHgzi13OOOfBJQjrTuacjMWyHgmpy8jWc/0f7QnTl4VsHks7VJ3UK+vw=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.11.0.tgz"; + sha512 = "oIkI+Hj74kpsnHhw0qJj12H4XMPSlDbBsshLWY+f3BiwKhn6wkXoQZ1FC8/OVNHM67GtSRv4bkcOaM4ucHm9Hw=="; }; }; - "@lerna/filter-options-3.10.6" = { + "@lerna/filter-options-3.11.0" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.10.6.tgz"; - sha512 = "r/dQbqN+RGFKZNn+DyWehswFmAkny/fkdMB2sRM2YVe7zRTtSl95YxD9DtdYnpJTG/jbOVICS/L5QJakrI6SSw=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.11.0.tgz"; + sha512 = "z0krgC/YBqz7i6MGHBsPLvsQ++XEpPdGnIkSpcN0Cjp5J67K9vb5gJ2hWp1c1bitNh3xiwZ69voGqN+DYk1mUg=="; }; }; - "@lerna/filter-packages-3.10.0" = { + "@lerna/filter-packages-3.11.0" = { name = "_at_lerna_slash_filter-packages"; packageName = "@lerna/filter-packages"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.10.0.tgz"; - sha512 = "3Acdj+jbany6LnQSuImU4ttcK5ULHSVug8Gh/EvwTewKCDpHAuoI3eyuzZOnSBdMvDOjE03uIESQK0dNNsn6Ow=="; + url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.11.0.tgz"; + sha512 = "bnukkW1M0uMKWqM/m/IHou2PKRyk4fDAksAj3diHc1UVQkH2j8hXOfLl9+CgHA/cnTrf6/LARg8hKujqduqHyA=="; }; }; - "@lerna/get-npm-exec-opts-3.6.0" = { + "@lerna/get-npm-exec-opts-3.11.0" = { name = "_at_lerna_slash_get-npm-exec-opts"; packageName = "@lerna/get-npm-exec-opts"; - version = "3.6.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.6.0.tgz"; - sha512 = "ruH6KuLlt75aCObXfUIdVJqmfVq7sgWGq5mXa05vc1MEqxTIiU23YiJdWzofQOOUOACaZkzZ4K4Nu7wXEg4Xgg=="; + url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.11.0.tgz"; + sha512 = "EDxsbuq2AbB3LWwH/4SOcn4gWOnoIYrSHfITWo7xz/SbEKeHtiva99l424ZRWUJqLPGIpQiMTlmOET2ZEI8WZg=="; }; }; "@lerna/get-packed-3.7.0" = { @@ -1111,6 +1120,15 @@ let sha512 = "yuFtjsUZIHjeIvIYQ/QuytC+FQcHwo3peB+yGBST2uWCLUCR5rx6knoQcPzbxdFDCuUb5IFccFGd3B1fHFg3RQ=="; }; }; + "@lerna/github-client-3.11.0" = { + name = "_at_lerna_slash_github-client"; + packageName = "@lerna/github-client"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.11.0.tgz"; + sha512 = "yPMBhzShuth3uJo0kKu84RvgjSZgOYNT8fKfhZmzTeVGuPbYBKlK+UQ6jjpb6E9WW2BVdiUCrFhqIsbK5Lqe7A=="; + }; + }; "@lerna/global-options-3.10.6" = { name = "_at_lerna_slash_global-options"; packageName = "@lerna/global-options"; @@ -1129,58 +1147,58 @@ let sha512 = "N4RRYxGeivuaKgPDzrhkQOQs1Sg4tOnxnEe3akfqu1wDA4Ng5V6Y2uW3DbkAjFL3aNJhWF5Vbf7sBsGtfgDQ8w=="; }; }; - "@lerna/import-3.10.6" = { + "@lerna/import-3.11.0" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.10.6.tgz"; - sha512 = "LlGxhfDhovoNoBJLF3PYd3j/G2GFTnfLh0V38+hBQ6lomMNJbjkACfiLVomQxPWWpYLk0GTlpWYR8YGv6L7Ifw=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.11.0.tgz"; + sha512 = "WgF0We+4k/MrC1vetT8pt3/SSJPMvXhyPYmL2W9rcvch3zV0IgLyso4tEs8gNbwZorDVEG1KcM+x8TG4v1nV5Q=="; }; }; - "@lerna/init-3.10.6" = { + "@lerna/init-3.11.0" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.10.6.tgz"; - sha512 = "RIlEx+ofWLYRNjxCkkV3G0XQPM+/KA5RXRDb5wKQLYO1f+tZAaHoUh8fHDIvxGf/ohY/OIjYYGSsU+ysimfwiQ=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.11.0.tgz"; + sha512 = "JZC5jpCVJgK34grye52kGWjrYCyh4LB8c0WBLaS8MOUt6rxTtPqubwvCDKPOF2H0Se6awsgEfX4wWNuqiQVpRQ=="; }; }; - "@lerna/link-3.10.6" = { + "@lerna/link-3.11.0" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.10.6.tgz"; - sha512 = "dwD6qftRWitgLDYbqtDrgO7c8uF5C0fHVew5M6gU5m9tBJidqd7cDwHv/bXboLEI63U7tt5y6LY+wEpYUFsBRw=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.11.0.tgz"; + sha512 = "QN+kxRWb6P9jrKpE2t6K9sGnFpqy1KOEjf68NpGhmp+J9Yt6Kvz9kG43CWoqg4Zyqqgqgn3NVV2Z7zSDNhdH0g=="; }; }; - "@lerna/list-3.10.6" = { + "@lerna/list-3.11.0" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.10.6.tgz"; - sha512 = "3ElQBj2dOB4uUkpsjC1bxdeZwEzRBuV1pBBs5E1LncwsZf7D9D99Z32fuZsDaCHpEMgHAD4/j8juI3/7m5dkaQ=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.11.0.tgz"; + sha512 = "hBAwZzEzF1LQOOB2/5vQkal/nSriuJbLY39BitIGkUxifsmu7JK0k3LYrwe1sxXv5SMf2HDaTLr+Z23mUslhaQ=="; }; }; - "@lerna/listable-3.10.6" = { + "@lerna/listable-3.11.0" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.10.6.tgz"; - sha512 = "F7ZuvesSgeuMiJf99eOum5p1MQGQStykcmHH1ek+LQRMiGGF1o3PkBxPvHTZBADGOFarek8bFA5TVmRAMX7NIw=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.11.0.tgz"; + sha512 = "nCrtGSS3YiAlh5dU5mmTAU9aLRlmIUn2FnahqsksN2uQ5O4o+614tneDuO298/eWLZo00eGw69EFngaQEl8quw=="; }; }; - "@lerna/log-packed-3.6.0" = { + "@lerna/log-packed-3.11.0" = { name = "_at_lerna_slash_log-packed"; packageName = "@lerna/log-packed"; - version = "3.6.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.6.0.tgz"; - sha512 = "T/J41zMkzpWB5nbiTRS5PmYTFn74mJXe6RQA2qhkdLi0UqnTp97Pux1loz3jsJf2yJtiQUnyMM7KuKIAge0Vlw=="; + url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.11.0.tgz"; + sha512 = "TH//81TzSTMuNzJIQE7zqu+ymI5rH25jdEdmbYEWmaJ+T42GMQXKxP8cj2m+fWRaDML8ta0uzBOm5PKHdgoFYQ=="; }; }; "@lerna/npm-conf-3.7.0" = { @@ -1192,148 +1210,148 @@ let sha512 = "+WSMDfPKcKzMfqq283ydz9RRpOU6p9wfx0wy4hVSUY/6YUpsyuk8SShjcRtY8zTM5AOrxvFBuuV90H4YpZ5+Ng=="; }; }; - "@lerna/npm-dist-tag-3.8.5" = { + "@lerna/npm-dist-tag-3.11.0" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "3.8.5"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.8.5.tgz"; - sha512 = "VO57yKTB4NC2LZuTd4w0LmlRpoFm/gejQ1gqqLGzSJuSZaBXmieElFovzl21S07cqiy7FNVdz75x7/a6WCZ6XA=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.11.0.tgz"; + sha512 = "WqZcyDb+wiqAKRFcYEK6R8AQfspyro85zGGHyjYw6ZPNgJX3qhwtQ+MidDmOesi2p5/0GfeVSWega+W7fPzVpg=="; }; }; - "@lerna/npm-install-3.10.0" = { + "@lerna/npm-install-3.11.0" = { name = "_at_lerna_slash_npm-install"; packageName = "@lerna/npm-install"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.10.0.tgz"; - sha512 = "/6/XyLY9/4jaMPBOVYUr4wZxQURIfwoELY0qCQ8gZ5zv4cOiFiiCUxZ0i4fxqFtD7nJ084zq1DsZW0aH0CIWYw=="; + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.11.0.tgz"; + sha512 = "iNKEgFvFHMmBqn9AnFye2rv7CdUBlYciwWSTNtpfVqtOnoL/lg+4A774oL4PDoxTCGmougztyxMkqLVSBYXTpw=="; }; }; - "@lerna/npm-publish-3.10.5" = { + "@lerna/npm-publish-3.11.0" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.10.5"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.10.5.tgz"; - sha512 = "6wpgTfu5A5jJeB8RnH2n01HzfaB4Y9aKC0Tq0AAkw37PZ12LTgEL9I+ZZPqhUVFIFLB8/Ekpnj3AcKznJLG5xQ=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.11.0.tgz"; + sha512 = "wgbb55gUXRlP8uTe60oW6c06ZhquaJu9xbi2vWNpb5Fmjh/KbZ2iNm9Kj2ciZlvb8D+k4Oc3qV7slBGxyMm8wg=="; }; }; - "@lerna/npm-run-script-3.10.0" = { + "@lerna/npm-run-script-3.11.0" = { name = "_at_lerna_slash_npm-run-script"; packageName = "@lerna/npm-run-script"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.10.0.tgz"; - sha512 = "c21tBXLF1Wje4tx/Td9jKIMrlZo/8QQiyyadjdKpwyyo7orSMsVNXGyJwvZ4JVVDcwC3GPU6HQvkt63v7rcyaw=="; + url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.11.0.tgz"; + sha512 = "cLnTMrRQlK/N5bCr6joOFMBfRyW2EbMdk3imtjHk0LwZxsvQx3naAPUB/2RgNfC8fGf/yHF/0bmBrpb5sa2IlA=="; }; }; - "@lerna/output-3.6.0" = { + "@lerna/output-3.11.0" = { name = "_at_lerna_slash_output"; packageName = "@lerna/output"; - version = "3.6.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/output/-/output-3.6.0.tgz"; - sha512 = "9sjQouf6p7VQtVCRnzoTGlZyURd48i3ha3WBHC/UBJnHZFuXMqWVPKNuvnMf2kRXDyoQD+2mNywpmEJg5jOnRg=="; + url = "https://registry.npmjs.org/@lerna/output/-/output-3.11.0.tgz"; + sha512 = "xHYGcEaZZ4cR0Jw368QgUgFvV27a6ZO5360BMNGNsjCjuY0aOPQC5+lBhgfydJtJteKjDna853PSjBK3uMhEjw=="; }; }; - "@lerna/pack-directory-3.10.5" = { + "@lerna/pack-directory-3.11.0" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "3.10.5"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.10.5.tgz"; - sha512 = "Ulj24L9XdgjJIxBr6ZjRJEoBULVH3c10lqunUdW41bswXhzhirRtQIxv0+5shngNjDwgMmJfOBcuCVKPSez4tg=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.11.0.tgz"; + sha512 = "bgA3TxZx5AyZeqUadSPspktdecW7nIpg/ODq0o0gKFr7j+DC9Fqu8vQa2xmFSKsXDtOYkCV0jox6Ox9XSFSM3A=="; }; }; - "@lerna/package-3.7.2" = { + "@lerna/package-3.11.0" = { name = "_at_lerna_slash_package"; packageName = "@lerna/package"; - version = "3.7.2"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package/-/package-3.7.2.tgz"; - sha512 = "8A5hN2CekM1a0Ix4VUO/g+REo+MsnXb8lnQ0bGjr1YGWzSL5NxYJ0Z9+0pwTfDpvRDYlFYO0rMVwBUW44b4dUw=="; + url = "https://registry.npmjs.org/@lerna/package/-/package-3.11.0.tgz"; + sha512 = "hMzBhFEubhg+Tis5C8skwIfgOk+GTl0qudvzfPU9gQqLV8u4/Hs6mka6N0rKgbUb4VFVc5MJVe1eZ6Rv+kJAWw=="; }; }; - "@lerna/package-graph-3.10.6" = { + "@lerna/package-graph-3.11.0" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.10.6.tgz"; - sha512 = "mpIOJbhi+xLqT9BcUrLVD4We8WUdousQf/QndbEWl8DWAW1ethtRHVsCm9ufdBB3F9nj4PH/hqnDWWwqE+rS4w=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.11.0.tgz"; + sha512 = "ICYiOZvCfcmeH1qfzOkFYh0t0QA56OddQfI3ydxCiWi5G+UupJXnCIWSTh3edTAtw/kyxhCOWny/PJsG4CQfjA=="; }; }; - "@lerna/project-3.10.0" = { + "@lerna/project-3.11.0" = { name = "_at_lerna_slash_project"; packageName = "@lerna/project"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-3.10.0.tgz"; - sha512 = "9QRl8aGHuyU4zVEELQmNPnJTlS7XHqX7w9I9isCXdnilKc2R0MyvUs21lj6Yyt6xTuQnqD158TR9tbS4QufYQQ=="; + url = "https://registry.npmjs.org/@lerna/project/-/project-3.11.0.tgz"; + sha512 = "j3DGds+q/q2YNpoBImaEsMpkWgu5gP0IGKz1o1Ju39NZKrTPza+ARIzEByL4Jqu87tcoOj7RbZzhhrBP8JBbTg=="; }; }; - "@lerna/prompt-3.6.0" = { + "@lerna/prompt-3.11.0" = { name = "_at_lerna_slash_prompt"; packageName = "@lerna/prompt"; - version = "3.6.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.6.0.tgz"; - sha512 = "nyAjPMolJ/ZRAAVcXrUH89C4n1SiWvLh4xWNvWYKLcf3PI5yges35sDFP/HYrM4+cEbkNFuJCRq6CxaET4PRsg=="; + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.11.0.tgz"; + sha512 = "SB/wvyDPQASze9txd+8/t24p6GiJuhhL30zxuRwvVwER5lIJR7kaXy1KhQ7kUAKPlNTVfCBm3GXReIMl4jhGhw=="; }; }; - "@lerna/publish-3.10.6" = { + "@lerna/publish-3.11.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.10.6"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.10.6.tgz"; - sha512 = "Wrmgf82rtZWdHSrTzZGOi1/QbkPJduUSmVMhZsdnLC814WHrNGYKbayvFBOo1RAAJ4EKggZ2ReOWXKhg/IZYUw=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.11.1.tgz"; + sha512 = "UOvmSivuqzWoiTqoYWk+liPDZvC6O7NrT8DwoG2peRvjIPs5RKYMubwXPOrBBVVE+yX/vR6V1Y3o6vf3av52dg=="; }; }; - "@lerna/pulse-till-done-3.7.1" = { + "@lerna/pulse-till-done-3.11.0" = { name = "_at_lerna_slash_pulse-till-done"; packageName = "@lerna/pulse-till-done"; - version = "3.7.1"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-3.7.1.tgz"; - sha512 = "MzpesZeW3Mc+CiAq4zUt9qTXI9uEBBKrubYHE36voQTSkHvu/Rox6YOvfUr+U7P6k8frFPeCgGpfMDTLhiqe6w=="; + url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-3.11.0.tgz"; + sha512 = "nMwBa6S4+VI/ketN92oj1xr8y74Fz4ul2R5jdbrRqLLEU/IMBWIqn6NRM2P+OQBoLpPZ2MdWENLJVFNN8X1Q+A=="; }; }; - "@lerna/resolve-symlink-3.6.0" = { + "@lerna/resolve-symlink-3.11.0" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; - version = "3.6.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.6.0.tgz"; - sha512 = "TVOAEqHJSQVhNDMFCwEUZPaOETqHDQV1TQWQfC8ZlOqyaUQ7veZUbg0yfG7RPNzlSpvF0ZaGFeR0YhYDAW03GA=="; + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.11.0.tgz"; + sha512 = "lDer8zPXS36iL4vJdZwOk6AnuUjDXswoTWdYkl+HdAKXp7cBlS+VeGmcFIJS4R3mSSZE20h1oEDuH8h8GGORIQ=="; }; }; - "@lerna/rimraf-dir-3.10.0" = { + "@lerna/rimraf-dir-3.11.0" = { name = "_at_lerna_slash_rimraf-dir"; packageName = "@lerna/rimraf-dir"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.10.0.tgz"; - sha512 = "RSKSfxPURc58ERCD/PuzorR86lWEvIWNclXYGvIYM76yNGrWiDF44pGHQvB4J+Lxa5M+52ZtZC/eOC7A7YCH4g=="; + url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.11.0.tgz"; + sha512 = "roy4lKel7BMNLfFvyzK0HI251mgI9EwbpOccR2Waz0V22d0gaqLKzfVrzovat9dVHXrKNxAhJ5iKkKeT93IunQ=="; }; }; - "@lerna/run-3.10.6" = { + "@lerna/run-3.11.0" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.10.6"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.10.6.tgz"; - sha512 = "KS2lWbu/8WUUscQPi9U8sPO6yYpzf/0GmODjpruR1nRi1u/tuncdjTiG+hjGAeFC1BD7YktT9Za6imIpE8RXmA=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.11.0.tgz"; + sha512 = "8c2yzbKJFzgO6VTOftWmB0fOLTL7G1GFAG5UTVDSk95Z2Gnjof3I/Xkvtbzq8L+DIOLpr+Tpj3fRBjZd8rONlA=="; }; }; - "@lerna/run-lifecycle-3.10.5" = { + "@lerna/run-lifecycle-3.11.0" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.10.5"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.10.5.tgz"; - sha512 = "YPmXviaxVlhcKM6IkDTIpTq24mxOuMCilo+MTr1RLoafgB9ZTmP2AHRiFt/sy14wOsq2Zqr0wJyj8KFlDYLTkA=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.11.0.tgz"; + sha512 = "3xeeVz9s3Dh2ljKqJI/Fl+gkZD9Y8JblAN62f4WNM76d/zFlgpCXDs62OpxNjEuXujA7YFix0sJ+oPKMm8mDrw=="; }; }; "@lerna/run-parallel-batches-3.0.0" = { @@ -1345,22 +1363,22 @@ let sha512 = "Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw=="; }; }; - "@lerna/symlink-binary-3.10.0" = { + "@lerna/symlink-binary-3.11.0" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.10.0.tgz"; - sha512 = "6mQsG+iVjBo8cD8s24O+YgFrwDyUGfUQbK4ryalAXFHI817Zd4xlI3tjg3W99whCt6rt6D0s1fpf8eslMN6dSw=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.11.0.tgz"; + sha512 = "5sOED+1O8jI+ckDS6DRUKtAtbKo7lbxFIJs6sWWEu5qKzM5e21O6E2wTWimJkad8nJ1SJAuyc8DC8M8ki4kT4w=="; }; }; - "@lerna/symlink-dependencies-3.10.0" = { + "@lerna/symlink-dependencies-3.11.0" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.10.0.tgz"; - sha512 = "vGpg5ydwGgQCuWNX5y7CRL38mGpuLhf1GRq9wMm7IGwnctEsdSNqvvE+LDgqtwEZASu5+vffYUkL0VlFXl8uWA=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.11.0.tgz"; + sha512 = "XKNX8oOgcOmiKHUn7qT5GvvmKP3w5otZPOjRixUDUILWTc3P8nO5I1VNILNF6IE5ajNw6yiXOWikSxc6KuFqBQ=="; }; }; "@lerna/timer-3.5.0" = { @@ -1372,31 +1390,31 @@ let sha512 = "TAb99hqQN6E3JBGtG9iyZNPq1/DbmqgBOeNrKtdJsGvIeX/NGLgUDWMrj2h04V4O+jpBFmSf6HIld6triKmxCA=="; }; }; - "@lerna/validation-error-3.6.0" = { + "@lerna/validation-error-3.11.0" = { name = "_at_lerna_slash_validation-error"; packageName = "@lerna/validation-error"; - version = "3.6.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.6.0.tgz"; - sha512 = "MWltncGO5VgMS0QedTlZCjFUMF/evRjDMMHrtVorkIB2Cp5xy0rkKa8iDBG43qpUWeG1giwi58yUlETBcWfILw=="; + url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.11.0.tgz"; + sha512 = "/mS4o6QYm4OXUqfPJnW1mKudGhvhLe9uiQ9eK2cgSxkCAVq9G2Sl/KVohpnqAgeRI3nXordGxHS745CdAhg7pA=="; }; }; - "@lerna/version-3.10.6" = { + "@lerna/version-3.11.1" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.10.6"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.10.6.tgz"; - sha512 = "77peW2ROlHHl1e/tHBUmhpb8tsO6CIdlx34XapZhUuIVykrkOuqVFFxqMecrGG8SJe0e3l1G+Fah7bJTQcG0kw=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.11.1.tgz"; + sha512 = "+lFq4D8BpchIslIz6jyUY6TZO1kuAgQ+G1LjaYwUBiP2SzXVWgPoPoq/9dnaSq38Hhhvlf7FF6i15d+q8gk1xQ=="; }; }; - "@lerna/write-log-file-3.6.0" = { + "@lerna/write-log-file-3.11.0" = { name = "_at_lerna_slash_write-log-file"; packageName = "@lerna/write-log-file"; - version = "3.6.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.6.0.tgz"; - sha512 = "OkLK99V6sYXsJsYg+O9wtiFS3z6eUPaiz2e6cXJt80mfIIdI1t2dnmyua0Ib5cZWExQvx2z6Y32Wlf0MnsoNsA=="; + url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.11.0.tgz"; + sha512 = "skpTDMDOkQAN4lCeAoI6/rPhbNE431eD0i6Ts3kExUOrYTr0m5CIwVtMZ31Flpky0Jfh4ET6rOl5SDNMLbf4VA=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -1417,6 +1435,42 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; + "@octokit/endpoint-3.1.2" = { + name = "_at_octokit_slash_endpoint"; + packageName = "@octokit/endpoint"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-3.1.2.tgz"; + sha512 = "iRx4kDYybAv9tOrHDBE6HwlgiFi8qmbZl8SHliZWtxbUFuXLZXh2yv8DxGIK9wzD9J0wLDMZneO8vNYJNUSJ9Q=="; + }; + }; + "@octokit/plugin-enterprise-rest-2.1.1" = { + name = "_at_octokit_slash_plugin-enterprise-rest"; + packageName = "@octokit/plugin-enterprise-rest"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.1.1.tgz"; + sha512 = "DJNXHH0LptKCLpJ8y3vCA/O+s+3/sDU4JNN2V0M04tsMN0hVGLPzoGgejPJgaxGP8Il5aw+jA5Nl5mTfdt9NrQ=="; + }; + }; + "@octokit/request-2.3.0" = { + name = "_at_octokit_slash_request"; + packageName = "@octokit/request"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/request/-/request-2.3.0.tgz"; + sha512 = "5YRqYNZOAaL7+nt7w3Scp6Sz4P2g7wKFP9npx1xdExMomk8/M/ICXVLYVam2wzxeY0cIc6wcKpjC5KI4jiNbGw=="; + }; + }; + "@octokit/rest-16.15.0" = { + name = "_at_octokit_slash_rest"; + packageName = "@octokit/rest"; + version = "16.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.15.0.tgz"; + sha512 = "Un+e7rgh38RtPOTe453pT/KPM/p2KZICimBmuZCd2wEo8PacDa4h6RqTPZs+f2DPazTTqdM7QU4LKlUjgiBwWw=="; + }; + }; "@parcel/fs-1.11.0" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; @@ -1624,31 +1678,31 @@ let sha512 = "vtD/LXZoUHx++ExUvnUZKvl76+6kFHlHl0XLnyP6ZQSVoXF9ElVdFvvRaptPrpXu8SZYqCN2Hcz5iamXZP0hLQ=="; }; }; - "@textlint/fixer-formatter-3.1.2" = { + "@textlint/fixer-formatter-3.1.3" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.2.tgz"; - sha512 = "Z+OHngp9dKN5zP5Yqerj//UYnhGPYjf6tYx/LcUT1eMZMk3JQMX6jENBVzO9cEVDbrARmV1zAtM0yO4x5UrpIQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.3.tgz"; + sha512 = "5EyO2+39bx8Tr4eDKxAFpoxXmzSvgGEXIIEDmiPg0+mJVkl33W1q79YAsOEqQDAP21DE9oKlBK2tPqljdTSDwQ=="; }; }; - "@textlint/kernel-3.1.2" = { + "@textlint/kernel-3.1.4" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.1.2"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.2.tgz"; - sha512 = "dTeYpVUqUX7CPaZKFEMZzHiDUrbMrJnwreLTML820t9/nAHq4CL+Gvh+3FutWLu8vs65ek1R86rBjmD5SjRdCA=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.1.4.tgz"; + sha512 = "BEK1dTrwKYX/RtM8oyBQbv4LBpXmMb9Uo/lOhHsYMhOC4bMF0zWktPiJ5bZNvvY7yyYJB42sAAthcBAdRxLhiw=="; }; }; - "@textlint/linter-formatter-3.1.2" = { + "@textlint/linter-formatter-3.1.3" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.2.tgz"; - sha512 = "yYMh8ZrMJpNS1wTc4fuYz/urfD/ooe1sHE8aLIJkYX6ND09oRWi3gsx/fsdsy6KIwscadzetudK61FmWPr6nSg=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.3.tgz"; + sha512 = "UXBRqeECcSwIyreXs926Ylc6FREMrhUyov13rrfReGwS8WSQL3yBtAhoFsNwz1jI8OCNeYGZnA6R9nh40VKkPg=="; }; }; "@textlint/markdown-to-ast-6.1.2" = { @@ -1669,31 +1723,31 @@ let sha512 = "ge8O9p3HYLy2vni0k4Qh12fRKsJySp/wiuJlvGqemA+hJvSC0164N8I61aHBqgTWTciHHhKBH4ofqCOdSbwKTg=="; }; }; - "@textlint/textlint-plugin-markdown-5.1.2" = { + "@textlint/textlint-plugin-markdown-5.1.4" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.1.2"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.2.tgz"; - sha512 = "J7lyu1FY17EyMna5ouioK3wxhly4D9CPKmsIZnKFYKKBPfb/Prmz7iONbR0h0RCf4GSiKwCuttl0BkOv1eWFXA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.4.tgz"; + sha512 = "e4/mcAZojiLw22zFhpul3v+ctsTRJGH0XkEy85vr03wN6f2IHZWE/9u7SHzaigwlCGm3umzmW379k7ewbwzfPg=="; }; }; - "@textlint/textlint-plugin-text-4.1.2" = { + "@textlint/textlint-plugin-text-4.1.4" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.1.2"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.2.tgz"; - sha512 = "jELCMWVWxxegeY5oy3GmP7eWT5G/6lfG1bpEFUGvcVz70l4GAtV9mvZ0SV4344w4qzk0fgahlS0ZJ/0EAsmEig=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.4.tgz"; + sha512 = "HdWvU+meeo5CHO4tmPcR3m/+AF3lJLuv0G/lCsGUVsoWGwsWLIKTKX4+ODobQkio0kaqU2+ZVCy7lxpfPAAP7A=="; }; }; - "@textlint/types-1.1.2" = { + "@textlint/types-1.1.3" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.1.2.tgz"; - sha512 = "XNsS9GTi3lrhKYbqrZZIaYOXxi1DUeMdNyg9bbcRG9yZUD6T6TVEFI0s2fCvPpUFk31JSsOyWpEBLcd/TwrsNQ=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.1.3.tgz"; + sha512 = "gU9wYNLKPf9wSX30XXcn+dj6vQSjS4Tudj+BCc1shtMj3u+wKUxDyt42OoCCJTerpF7pHViGQNxnPM9VkuXqyQ=="; }; }; "@types/accepts-1.3.5" = { @@ -1759,31 +1813,31 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/events-1.2.0" = { + "@types/events-3.0.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; - version = "1.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz"; - sha512 = "KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA=="; + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.16.0" = { + "@types/express-4.16.1" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.16.0"; + version = "4.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.16.0.tgz"; - sha512 = "TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz"; + sha512 = "V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg=="; }; }; - "@types/express-serve-static-core-4.16.0" = { + "@types/express-serve-static-core-4.16.1" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.0"; + version = "4.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz"; - sha512 = "lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz"; + sha512 = "QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA=="; }; }; "@types/long-4.0.0" = { @@ -1795,31 +1849,40 @@ let sha512 = "1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q=="; }; }; - "@types/mime-2.0.0" = { + "@types/mime-2.0.1" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz"; - sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz"; + sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/node-10.12.18" = { + "@types/node-10.12.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.12.18"; + version = "10.12.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz"; - sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.12.26.tgz"; + sha512 = "nMRqS+mL1TOnIJrL6LKJcNZPB8V3eTfRo9FQA2b5gDvrHurC8XbSA86KNe0dShlEL7ReWJv/OU9NL7Z0dnqWTg=="; }; }; - "@types/node-8.10.39" = { + "@types/node-11.9.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.39"; + version = "11.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz"; - sha512 = "rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.9.3.tgz"; + sha512 = "DMiqG51GwES/c4ScBY0u5bDlH44+oY8AeYHjY1SGCWidD7h08o1dfHue/TGK7REmif2KiJzaUskO+Q0eaeZ2fQ=="; + }; + }; + "@types/node-8.10.40" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.40"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.40.tgz"; + sha512 = "RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ=="; }; }; "@types/q-1.5.1" = { @@ -1885,40 +1948,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.3.0" = { + "@vue/cli-shared-utils-3.4.0" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.3.0.tgz"; - sha512 = "V/sU1jc7/jMCAbU8uA5f4j9Yd8lTqdi3I6FEHfLG1nstwhaNi4BU3WKWOAl72NYVWFYG8VuCrYWDn75kMimtuw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.4.0.tgz"; + sha512 = "w9j2qIroUUC2ym4Lb0lLMdlGmYThhwV0OizOEVigB5eZOEUEBV2Mv43K+nWJ6OyRBACnvhJTDi1gIwJo8zUvOw=="; }; }; - "@vue/cli-ui-3.3.0" = { + "@vue/cli-ui-3.4.0" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.3.0.tgz"; - sha512 = "+gtr2cKQTD1fqu6E2PXvQfV8V2NP4TQ/xM7QwM1ANRbZsxluaVkP1wftFe4NPLQliuDiwJJOE1qdK66d+U3Nxg=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.4.0.tgz"; + sha512 = "o3ZtY53qstqyHTcLpuL4dRBXZKNRUr/9lrypYD8Bj+nOKLk1hr2E8kwI+hV/bZc+QjgaFqjlG8GxPYhwtpOsfw=="; }; }; - "@vue/cli-ui-addon-webpack-3.3.0" = { + "@vue/cli-ui-addon-webpack-3.4.0" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.3.0.tgz"; - sha512 = "KrLEydjH1kFUVdfxxl2hNcPrjrcR6LBtg4gsK7JW9Y2m9Twjp1BVvxchS0e7YW+//rGiDjzD+aae5YynbpgPlQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.4.0.tgz"; + sha512 = "CobtNRoXLUgTLzLtTekG6y39qQKFV6ebuSkZ8l2aEWv7ISRlj/wluuN47X9TrViJexIFJeh28XW1/vefwt4RgQ=="; }; }; - "@vue/cli-ui-addon-widgets-3.3.0" = { + "@vue/cli-ui-addon-widgets-3.4.0" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.3.0.tgz"; - sha512 = "ZxMg4YAGNyOpRvCpgIzJXg9Qb+DbEZaQHXQI2ocRChXrksASz9dbMUL9TecfswxHpMCzGuYhpJkdgsxlRJiDOg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.4.0.tgz"; + sha512 = "9efXj/83sw9Cq0is52NusQRf0u810KhNo38sAyBd7wlh2DZqU84thse7FvK+npppYkOz244zR0SNtwR2n41kgg=="; }; }; "@webassemblyjs/ast-1.7.11" = { @@ -2389,15 +2452,6 @@ let sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; }; }; - "abstract-leveldown-4.0.3" = { - name = "abstract-leveldown"; - packageName = "abstract-leveldown"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-4.0.3.tgz"; - sha512 = "qsIHFQy0u17JqSY+3ZUT+ykqxYY17yOfvAsLkFkw8kSQqi05d1jyj0bCuSX6sjYlXuY9cKpgUt5EudQdP4aXyA=="; - }; - }; "abstract-leveldown-5.0.0" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -2488,22 +2542,13 @@ let sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; - "acorn-6.0.5" = { + "acorn-6.1.0" = { name = "acorn"; packageName = "acorn"; - version = "6.0.5"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.0.5.tgz"; - sha512 = "i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg=="; - }; - }; - "acorn-dynamic-import-3.0.0" = { - name = "acorn-dynamic-import"; - packageName = "acorn-dynamic-import"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; - sha512 = "zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz"; + sha512 = "MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw=="; }; }; "acorn-dynamic-import-4.0.0" = { @@ -2767,13 +2812,13 @@ let sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg=="; }; }; - "ajv-6.7.0" = { + "ajv-6.9.1" = { name = "ajv"; packageName = "ajv"; - version = "6.7.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz"; - sha512 = "RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; + sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; }; }; "ajv-errors-1.0.1" = { @@ -2794,13 +2839,13 @@ let sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; - "ajv-keywords-3.2.0" = { + "ajv-keywords-3.4.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz"; - sha1 = "e86b819c602cf8821ad637413698f1dec021847a"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz"; + sha512 = "aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw=="; }; }; "ajv-merge-patch-4.1.0" = { @@ -2830,13 +2875,13 @@ let sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; }; }; - "aligned-block-file-1.1.4" = { + "aligned-block-file-1.1.5" = { name = "aligned-block-file"; packageName = "aligned-block-file"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.4.tgz"; - sha512 = "KE27h781ueGONLqSBY2ik6LJRr9vo0L/i3GGhtQgJfCk0MO2QNSgrXZVCk2t7UeZKYTxcTfl+yBgcZWqBiAGPQ=="; + url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.5.tgz"; + sha512 = "is4MUrvNeD1NT6hs44n1GcHqTlm27oZJkgcrAeNytiGMKS/J2l72wtlLezdBzyQq7M6COZoBQR+P6lpaPyI12A=="; }; }; "almond-0.3.3" = { @@ -2929,13 +2974,13 @@ let sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; }; }; - "ansi-escapes-3.1.0" = { + "ansi-escapes-3.2.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; - sha512 = "UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; "ansi-gray-0.1.1" = { @@ -3046,13 +3091,13 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-to-html-0.6.9" = { + "ansi-to-html-0.6.10" = { name = "ansi-to-html"; packageName = "ansi-to-html"; - version = "0.6.9"; + version = "0.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.9.tgz"; - sha512 = "hwNdg2DNgCzsrvaNc+LDqSxJkpxf9oEt4R7KE0IeURXhEOlontEqNpXNiGeFBpSes8TZF+ZZ9sjB85QzjPsI6A=="; + url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.10.tgz"; + sha512 = "znsY3gvsk4CiApWu1yVYF8Nx5Vy0FEe8B0YwyxdbCdErJu5lfKlRHB2twtUjR+dxR4WewTk2OP8XqTmWYnImOg=="; }; }; "ansi-wrap-0.1.0" = { @@ -3136,13 +3181,13 @@ let sha512 = "9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA=="; }; }; - "apollo-cache-control-0.4.0" = { + "apollo-cache-control-0.5.0" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.4.0.tgz"; - sha512 = "WuriaNQIugTE8gYwfBWWCbbQTSKul/cV4JMi5UgqNIUvjHvnKZQLKbt5uYWow6QQNMkLT9hey8QPYkWpogkeSA=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.5.0.tgz"; + sha512 = "zu26CFj7CboxLB6cckZQEiSUGXIr8MViEGIC5Vesz2yd37sjtevMfRwQhxFuK0HinR0T/WC3dz2k5cj+33vQQQ=="; }; }; "apollo-cache-inmemory-1.4.2" = { @@ -3235,22 +3280,22 @@ let sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw=="; }; }; - "apollo-datasource-0.2.1" = { + "apollo-datasource-0.3.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.2.1.tgz"; - sha512 = "r185+JTa5KuF1INeTAk7AEP76zwMN6c8Ph1lmpzJMNwBUEzTGnLClrccCskCBx4SxfnkdKbuQdwn9JwCJUWrdg=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.3.0.tgz"; + sha512 = "+jWs3ezhx4lcAAPIHtlj0Zoiv2tvwfzn7feHuhxub3xFwkJm39T8hPjb3aMQCsuS7TukBD+F5ndgVob5hL/5Nw=="; }; }; - "apollo-engine-reporting-0.2.0" = { + "apollo-engine-reporting-1.0.1" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "0.2.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.2.0.tgz"; - sha512 = "Q6FfVb10v/nrv8FaFsPjIYlWh62jaYav3LuMgM9PsHWGK/zRQFXOEwLxcY2UCvG7O1moxF3XGmfBhMgo54py+Q=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.1.tgz"; + sha512 = "FZqlfo6s//AWlJzKu8Qn9vsCiTQizw4xf4ykptyo6jas3SZCT0tNK1cCSsSKIJwUOr5TY5/+wyzkcPWOmpX2xg=="; }; }; "apollo-engine-reporting-protobuf-0.2.0" = { @@ -3262,49 +3307,58 @@ let sha512 = "qI+GJKN78UMJ9Aq/ORdiM2qymZ5yswem+/VDdVFocq+/e1QqxjnpKjQWISkswci5+WtpJl9SpHBNxG98uHDKkA=="; }; }; - "apollo-env-0.2.5" = { + "apollo-env-0.3.3" = { name = "apollo-env"; packageName = "apollo-env"; - version = "0.2.5"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.2.5.tgz"; - sha512 = "Gc7TEbwCl7jJVutnn8TWfzNSkrrqyoo0DP92BQJFU9pZbJhpidoXf2Sw1YwOJl82rRKH3ujM3C8vdZLOgpFcFA=="; + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.3.3.tgz"; + sha512 = "VsUX14bfQCJpKmTyYNBTeLrdeFabjmpSPVQ2y4IKnwqaxVqZuRca3WFE8ercszO1tLwS6HMM7mFw+IIbtQXo/w=="; }; }; - "apollo-link-1.2.6" = { + "apollo-graphql-0.1.0" = { + name = "apollo-graphql"; + packageName = "apollo-graphql"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.1.0.tgz"; + sha512 = "Mi5GqZJz1A/0i8SEm9EVHWe/LkGbYzV5wzobUY+1Q0SI1NdFtRgqHZUdHU0hz1jDnL+dpRqK1huVmtOO/DGa/A=="; + }; + }; + "apollo-link-1.2.8" = { name = "apollo-link"; packageName = "apollo-link"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.6.tgz"; - sha512 = "sUNlA20nqIF3gG3F8eyMD+mO80fmf3dPZX+GUOs3MI9oZR8ug09H3F0UsWJMcpEg6h55Yy5wZ+BMmAjrbenF/Q=="; + url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz"; + sha512 = "lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA=="; }; }; - "apollo-link-context-1.0.12" = { + "apollo-link-context-1.0.14" = { name = "apollo-link-context"; packageName = "apollo-link-context"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.12.tgz"; - sha512 = "gb4UptV9O6Kp3i5b2TlDEfPSL2LG//mTSb3zyuR5U2cAzu/huw98f1CCxcjUKTrlIMsQuE6G/hbaThDxnoIThQ=="; + url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.14.tgz"; + sha512 = "l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ=="; }; }; - "apollo-link-dedup-1.0.13" = { + "apollo-link-dedup-1.0.15" = { name = "apollo-link-dedup"; packageName = "apollo-link-dedup"; - version = "1.0.13"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.13.tgz"; - sha512 = "i4NuqT3DSFczFcC7NMUzmnYjKX7NggLY+rqYVf+kE9JjqKOQhT6wqhaWsVIABfIUGE/N0DTgYJBCMu/18aXmYA=="; + url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz"; + sha512 = "14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w=="; }; }; - "apollo-link-http-common-0.2.8" = { + "apollo-link-http-common-0.2.10" = { name = "apollo-link-http-common"; packageName = "apollo-link-http-common"; - version = "0.2.8"; + version = "0.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.8.tgz"; - sha512 = "gGmXZN8mr7e9zjopzKQfZ7IKnh8H12NxBDzvp9nXI3U82aCVb72p+plgoYLcpMY8w6krvoYjgicFmf8LO20TCQ=="; + url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.10.tgz"; + sha512 = "KY9nhpAurw3z48OIYV0sCZFXrzWp/wjECsveK+Q9GUhhSe1kEbbUjFfmi+qigg+iELgdp5V8ioRJhinl1vPojw=="; }; }; "apollo-link-persisted-queries-0.2.2" = { @@ -3325,31 +3379,31 @@ let sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw=="; }; }; - "apollo-link-ws-1.0.12" = { + "apollo-link-ws-1.0.14" = { name = "apollo-link-ws"; packageName = "apollo-link-ws"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.12.tgz"; - sha512 = "BjbskhfuuIgk9e4XHdrqmjxkY+RkD1tuerrs4PLiPTkJYcQrvA8t27lGBSrDUKHWH4esCdhQF1UhKPwhlouEHw=="; + url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz"; + sha512 = "KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A=="; }; }; - "apollo-server-caching-0.2.1" = { + "apollo-server-caching-0.3.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.2.1.tgz"; - sha512 = "+U9F3X297LL8Gqy6ypfDNEv/DfV/tDht9Dr2z3AMaEkNW1bwO6rmdDL01zYxDuVDVq6Z3qSiNCSO2pXE2F0zmA=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.3.0.tgz"; + sha512 = "dHwWUsRZu7I1yUfzTwPJgOigMsftgp8w3X96Zdch1ICWN7cM6aNxks9tTnLd+liUSEzdYLlTmEy5VUturF2IAw=="; }; }; - "apollo-server-core-2.3.1" = { + "apollo-server-core-2.4.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.3.1"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.3.1.tgz"; - sha512 = "8jMWYOQIZi9mDJlHe2rXg8Cp4xKYogeRu23jkcNy+k5UjZL+eO+kHXbNFiTaP4HLYYEpe2XE3asxp6q5YUEQeQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.1.tgz"; + sha512 = "9T7M1tU3m6/kRWBT0bDZtcH6whLVIFGcs47i8EuveKR6jof7OYCe46xs4JS13iVHPo3ITGYXRW0pmsx2zVPuIg=="; }; }; "apollo-server-env-2.2.0" = { @@ -3370,40 +3424,40 @@ let sha512 = "gV9EZG2tovFtT1cLuCTavnJu2DaKxnXPRNGSTo+SDI6IAk6cdzyW0Gje5N2+3LybI0Wq5KAbW6VLei31S4MWmg=="; }; }; - "apollo-server-express-2.3.1" = { + "apollo-server-express-2.4.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.3.1"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.3.1.tgz"; - sha512 = "J+rObr4GdT/5j6qTByUJoSvZSjTAX/7VqIkr2t+GxwcVUFGet2MdOHuV6rtWKc8CRgvVKfKN6iBrb2EOFcp2LQ=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.1.tgz"; + sha512 = "0Bz8DMZ7nmrvhkCBt0gX9fyFMBKk+s9cz/BYjuCNnzMWtHkOQXdcQg454bEzSBLxlX6fOntMSPxCtv8uYHE6Og=="; }; }; - "apollo-server-plugin-base-0.2.1" = { + "apollo-server-plugin-base-0.3.1" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.2.1"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.2.1.tgz"; - sha512 = "497NIY9VWRYCrMSkgR11IrIUO4Fsy6aGgnpOJoTdLQAnkDD9SJDSRzwKj4gypUoTT2unfKDng4eMxXVZlHvjOw=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.1.tgz"; + sha512 = "ESrrsKfW1ONn+zHXkkINZSDf6Cb7+ohGfNVN8GDAJPfG8VowN18v34NEt0bsnDdT6YtqSMaQx/+385OdviiBuw=="; }; }; - "apollo-tracing-0.4.0" = { + "apollo-tracing-0.5.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.4.0.tgz"; - sha512 = "BlM8iQUQva4fm0xD/pLwkcz0degfB9a/aAn4k4cK36eLVD8XUkl7ptEB0c+cwcj7tOYpV1r5QX1XwdayBzlHSg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.5.0.tgz"; + sha512 = "j0icEhLYf0xS6Q/iCXA2j9KfpYw0a/XvLSUio7fm5yUwtXP2Pp11x5BtK1dI8sLMiaOqUrREz2XjV4PKLzQPuA=="; }; }; - "apollo-upload-client-9.1.0" = { + "apollo-upload-client-10.0.0" = { name = "apollo-upload-client"; packageName = "apollo-upload-client"; - version = "9.1.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-9.1.0.tgz"; - sha512 = "ZN5gsbBjImEZTWWTUHpCEGDasnoBGbaODpznQ5EawyNHceuFYSNJbbft+ZZ841vZAcj9XZdKUKoaLBlMZ/r7nw=="; + url = "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-10.0.0.tgz"; + sha512 = "N0SENiEkZXoY4nl9xxrXFcj/cL0AVkSNQ4aYXSaruCBWE0aKpK6aCe4DBmiEHrK3FAsMxZPEJxBRIWNbsXT8dw=="; }; }; "apollo-utilities-1.1.2" = { @@ -4027,22 +4081,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.11.5" = { + "ast-types-0.12.2" = { name = "ast-types"; packageName = "ast-types"; - version = "0.11.5"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.5.tgz"; - sha512 = "oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw=="; - }; - }; - "ast-types-0.12.1" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.1.tgz"; - sha512 = "H2izJAyT2xwew4TxShpmxe6f9R5hHgJQy1QloLiUC2yrJMtyraBWNJL7903rpeCY9keNUipORR/zIUC2XcYKng=="; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.2.tgz"; + sha512 = "8c83xDLJM/dLDyXNLiR6afRRm4dPKN6KAnKqytRK3DBJul9lA+atxdQkNDkSVPdTqea5HiRq3lnnOIZ0MBpvdg=="; }; }; "ast-types-0.9.6" = { @@ -4153,6 +4198,15 @@ let sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; }; }; + "async-2.6.2" = { + name = "async"; + packageName = "async"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; + sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; + }; + }; "async-done-1.3.1" = { name = "async-done"; packageName = "async-done"; @@ -4297,13 +4351,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.391.0" = { + "aws-sdk-2.401.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.391.0"; + version = "2.401.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.391.0.tgz"; - sha512 = "2xL59xW/bosjccZdrPwV9MfMJ7vkg2dn83m4LTgk+p+y8IOE4DdCP9dE+toz0frtVatriPDIXCA0dyOVYFt8EA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.401.0.tgz"; + sha512 = "mOI4gzKoP/g8Q0ToAaqTh7TijGG9PvGVVUkKmurXqBKy7GTPmy4JizfVkTrM+iBg7RAsx5H2lBxBFpdEFBa5fg=="; }; }; "aws-sign2-0.6.0" = { @@ -5161,6 +5215,15 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; + "before-after-hook-1.3.2" = { + name = "before-after-hook"; + packageName = "before-after-hook"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-1.3.2.tgz"; + sha512 = "zyPgY5dgbf99c0uGUjhY4w+mxqEGxPKg9RQDl34VvrVh2bM31lFN+mwR1ZHepq/KA3VCPk1gwJZL6IIJqjLy2w=="; + }; + }; "bencode-0.7.0" = { name = "bencode"; packageName = "bencode"; @@ -5188,13 +5251,13 @@ let sha512 = "N+VOSP5MkoX+xgnp6Y056iCY5TmCZg9rgPNPQe0bIiXchxYFP4vs/Tf0dTdQ+qQhP7HM2gvfFq+sUVjQsGy5Zw=="; }; }; - "bencode-2.0.0" = { + "bencode-2.0.1" = { name = "bencode"; packageName = "bencode"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; - sha512 = "wr2HwwrUpfB5c68zmAudOltC7rZ1G0+lQOcnuEcfIM3AWAVnB3rHI3nlgd/2CWTfQ3w3zagKt89zni/M+VLZ8g=="; + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.1.tgz"; + sha512 = "2uhEl8FdjSBUyb69qDTgOEeeqDTa+n3yMQzLW0cOzNf1Ow5bwcg3idf+qsWisIKRH8Bk8oC7UXL8irRcPA8ZEQ=="; }; }; "better-assert-1.0.2" = { @@ -5224,13 +5287,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.40" = { + "big-integer-1.6.41" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.40"; + version = "1.6.41"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.40.tgz"; - sha512 = "CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.41.tgz"; + sha512 = "d5AT9lMTYJ/ZE/4gzxb+5ttPcRWljVsvv7lF1w9KzkPhVUhBtHrjDo1J8swfZKepfLsliDhYa31zRYwcD0Yg9w=="; }; }; "big.js-5.2.2" = { @@ -5251,15 +5314,6 @@ let sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a"; }; }; - "bin-links-1.1.2" = { - name = "bin-links"; - packageName = "bin-links"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bin-links/-/bin-links-1.1.2.tgz"; - sha512 = "8eEHVgYP03nILphilltWjeIjMbKyJo3wvp9K816pHbhP301ismzw15mxAAEVQ/USUwcP++1uNrbERbp8lOA6Fg=="; - }; - }; "bin-version-2.0.0" = { name = "bin-version"; packageName = "bin-version"; @@ -5287,22 +5341,22 @@ let sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; }; }; - "binary-extensions-1.12.0" = { + "binary-extensions-1.13.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz"; - sha512 = "DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz"; + sha512 = "EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw=="; }; }; - "binary-search-1.3.4" = { + "binary-search-1.3.5" = { name = "binary-search"; packageName = "binary-search"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.4.tgz"; - sha512 = "dPxU/vZLnH0tEVjVPgi015oSwqu6oLfCeHywuFRhBE0yM0mYocvleTl8qsdM1YFhRzTRhM1+VzS8XLDVrHPopg=="; + url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.5.tgz"; + sha512 = "RHFP0AdU6KAB0CCZsRMU2CJTk2EpL8GLURT+4gilpjr1f/7M91FgUMnXuQLmf3OKLet34gjuNFwO7e4agdX5pw=="; }; }; "binaryheap-0.0.3" = { @@ -5332,6 +5386,15 @@ let sha512 = "i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew=="; }; }; + "bindings-1.4.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.4.0.tgz"; + sha512 = "7znEVX22Djn+nYjxCWKDne0RRloa9XfYa84yk3s+HkE3LpDYZmhArYr9O9huBoHY3/oXispx5LorIX7Sl2CgSQ=="; + }; + }; "binwrap-0.2.0" = { name = "binwrap"; packageName = "binwrap"; @@ -5683,13 +5746,13 @@ let sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.7" = { + "bower-1.8.8" = { name = "bower"; packageName = "bower"; - version = "1.8.7"; + version = "1.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.7.tgz"; - sha512 = "M0yrA0IkpXP4v2taRkmowyUHTCFAvtfTVtRDAXBnhZM02xh8fP3wlrdOiXPs/5CYBCdj20WyGKZuYA0g3h3Y1w=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; + sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; }; }; "bower-endpoint-parser-0.2.1" = { @@ -5998,13 +6061,13 @@ let sha512 = "pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A=="; }; }; - "buffer-3.6.0" = { - name = "buffer"; - packageName = "buffer"; - version = "3.6.0"; + "btoa-lite-1.0.0" = { + name = "btoa-lite"; + packageName = "btoa-lite"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; - sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; + url = "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz"; + sha1 = "337766da15801210fdd956c22e9c6891ab9d0337"; }; }; "buffer-4.9.1" = { @@ -6214,15 +6277,6 @@ let sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece"; }; }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; "builtin-modules-2.0.0" = { name = "builtin-modules"; packageName = "builtin-modules"; @@ -6376,6 +6430,15 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; "bytewise-1.1.0" = { name = "bytewise"; packageName = "bytewise"; @@ -6619,22 +6682,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-db-1.0.30000929" = { + "caniuse-db-1.0.30000936" = { name = "caniuse-db"; packageName = "caniuse-db"; - version = "1.0.30000929"; + version = "1.0.30000936"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000929.tgz"; - sha512 = "bap0KDH7KJ2Hc4zWb1bBJwsyl+76jOukW6TH8uxaVI7BrzF2CnibTj53ro7VZAHB+ucMlIGBC1rhG2BQY0ekeg=="; + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000936.tgz"; + sha512 = "gOrcU8d+h5AdrO/Mhnj35vttNvAed2taqzrYDfhJE/qVnLxAaGb1doWlRF7iDex+EQPhkwAHc07RBwixnxpFDQ=="; }; }; - "caniuse-lite-1.0.30000929" = { + "caniuse-lite-1.0.30000936" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000929"; + version = "1.0.30000936"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz"; - sha512 = "n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000936.tgz"; + sha512 = "orX4IdpbFhdNO7bTBhSbahp1EBpqzBc+qrvTRVUFfZgA4zta7TdM6PN5ZxkEUgDnz36m+PfWGcdX7AVfFWItJw=="; }; }; "capture-stack-trace-1.0.1" = { @@ -6988,13 +7051,13 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chokidar-2.0.4" = { + "chokidar-2.1.1" = { name = "chokidar"; packageName = "chokidar"; - version = "2.0.4"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; - sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.1.tgz"; + sha512 = "gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ=="; }; }; "chownr-0.0.2" = { @@ -7258,6 +7321,15 @@ let sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; }; }; + "cli-table3-0.5.1" = { + name = "cli-table3"; + packageName = "cli-table3"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz"; + sha512 = "7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw=="; + }; + }; "cli-truncate-1.1.0" = { name = "cli-truncate"; packageName = "cli-truncate"; @@ -8626,6 +8698,15 @@ let sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; }; }; + "cookie-parser-1.4.4" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.4.tgz"; + sha512 = "lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw=="; + }; + }; "cookie-signature-1.0.1" = { name = "cookie-signature"; packageName = "cookie-signature"; @@ -8797,22 +8878,22 @@ let sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="; }; }; - "core-js-2.6.2" = { + "core-js-2.6.4" = { name = "core-js"; packageName = "core-js"; - version = "2.6.2"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz"; - sha512 = "NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.4.tgz"; + sha512 = "05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A=="; }; }; - "core-js-3.0.0-beta.9" = { + "core-js-3.0.0-beta.13" = { name = "core-js"; packageName = "core-js"; - version = "3.0.0-beta.9"; + version = "3.0.0-beta.13"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.9.tgz"; - sha512 = "OGLbGro2f0s8UXVyu2s9kIW42pcuRoNEqJsmn8a4rAOO9G5A2t96l++rf+4mHNw9GKrbdozZ9G5ieDKOBl68zQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.13.tgz"; + sha512 = "16Q43c/3LT9NyePUJKL8nRIQgYWjcBhjJSMWg96PVSxoS0PeE0NHitPI3opBrs9MGGHjte1KoEVr9W63YKlTXQ=="; }; }; "core-util-is-1.0.2" = { @@ -9013,6 +9094,15 @@ let sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA=="; }; }; + "creato-1.0.3" = { + name = "creato"; + packageName = "creato"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/creato/-/creato-1.0.3.tgz"; + sha512 = "i33ANluSZq742lqjQZRQJCOSuRvx8P9u5756sZheDcCqOvDsiTQd3eZx5GkPpQMhFrLIveslAKaK0M+OHgmu/g=="; + }; + }; "cron-1.5.0" = { name = "cron"; packageName = "cron"; @@ -9301,22 +9391,22 @@ let sha1 = "4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"; }; }; - "cssnano-4.1.8" = { + "cssnano-4.1.9" = { name = "cssnano"; packageName = "cssnano"; - version = "4.1.8"; + version = "4.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.8.tgz"; - sha512 = "5GIY0VzAHORpbKiL3rMXp4w4M1Ki+XlXgEXyuWXVd3h6hlASb+9Vo76dNP56/elLMVBBsUfusCo1q56uW0UWig=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.9.tgz"; + sha512 = "osEbYy4kzaNY3nkd92Uf3hy5Jqb5Aztuv+Ze3Z6DjRhyntZDlb3YljiYDdJ05k167U86CZpSR+rbuJYN7N3oBQ=="; }; }; - "cssnano-preset-default-4.0.6" = { + "cssnano-preset-default-4.0.7" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.6.tgz"; - sha512 = "UPboYbFaJFtDUhJ4fqctThWbbyF4q01/7UhsZbLzp35l+nUxtzh1SifoVlEfyLM3n3Z0htd8B1YlCxy9i+bQvg=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; + sha512 = "x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA=="; }; }; "cssnano-util-get-arguments-4.0.0" = { @@ -9373,13 +9463,13 @@ let sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg=="; }; }; - "cssom-0.3.4" = { + "cssom-0.3.6" = { name = "cssom"; packageName = "cssom"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz"; - sha512 = "+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="; + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz"; + sha512 = "DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="; }; }; "cssstyle-0.2.37" = { @@ -9589,22 +9679,22 @@ let sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; }; }; - "dat-dns-3.0.2" = { + "dat-dns-3.1.0" = { name = "dat-dns"; packageName = "dat-dns"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.2.tgz"; - sha512 = "TqkWQ03NvdLK9Rm9n11UCy59KnIsu82A0lPQYcMG02pYTU4xTxShzDryGO2orvmcT5063olmI1R9vKil0jw0Lw=="; + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.1.0.tgz"; + sha512 = "QDh1+cMFX6qw4sncReWamb7qM6jrztB9Wri5YcKNhtYXxayHfFG2MC6ny8KovKPvz+7whP1A9lYzeZY0L0fO8Q=="; }; }; - "dat-doctor-2.1.0" = { + "dat-doctor-2.1.1" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-2.1.0.tgz"; - sha512 = "Cetzl3lrV23cdIqH8zadQ+cMTpsAFjT7cAQa7EpqQTkV52rB/p6sp8EXXvPNxgTNHwm2Y8iR5o9163sHZxdtxA=="; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-2.1.1.tgz"; + sha512 = "f8ttD6oTzVrQgnDn4fYUvA0ocx+1Cg4aQ2fTX3jtEtClYiAh9Cv+KetPEWw+QZb1+tSStBfgMeFxl3pZhkhLew=="; }; }; "dat-encoding-4.0.2" = { @@ -9706,6 +9796,15 @@ let sha512 = "gz9RuhUxq3coYBrelzuFXCNyC579aO3Bm1Wlwa12/9tJr1NP0AAGxpHJYA1HZvt8X7ZdrtMzpFyNvs2Y9PFG6w=="; }; }; + "data-uri-to-buffer-1.2.0" = { + name = "data-uri-to-buffer"; + packageName = "data-uri-to-buffer"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz"; + sha512 = "vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="; + }; + }; "data-uri-to-buffer-2.0.0" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; @@ -10201,15 +10300,6 @@ let sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; }; }; - "deferred-leveldown-3.0.0" = { - name = "deferred-leveldown"; - packageName = "deferred-leveldown"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-3.0.0.tgz"; - sha512 = "ajbXqRPMXRlcdyt0TuWqknOJkp1JgQjGB7xOl2V+ebol7/U11E9h3/nCZAtN1M7djmAJEIhypCUc1tIWxdQAuQ=="; - }; - }; "deferred-leveldown-4.0.2" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; @@ -10480,13 +10570,13 @@ let sha512 = "H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig=="; }; }; - "detective-5.1.0" = { + "detective-5.2.0" = { name = "detective"; packageName = "detective"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; - sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ=="; + url = "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz"; + sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; "dezalgo-1.0.3" = { @@ -10615,6 +10705,15 @@ let sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag=="; }; }; + "dir-glob-2.2.2" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; + }; + }; "dir-glob-git://github.com/nexe/dir-glob.git#84f4381fe041b6afd425e8d5c14c33809430d8f1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -11093,22 +11192,22 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "duplexify-3.6.1" = { + "duplexify-3.7.1" = { name = "duplexify"; packageName = "duplexify"; - version = "3.6.1"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz"; - sha512 = "vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA=="; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; - "dynamic-dijkstra-1.0.1" = { + "dynamic-dijkstra-1.0.2" = { name = "dynamic-dijkstra"; packageName = "dynamic-dijkstra"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/dynamic-dijkstra/-/dynamic-dijkstra-1.0.1.tgz"; - sha512 = "VadGXbWmiFFFTzlUyS/ICPvMEIPTsiVyWNIRj5qXPOj/iuTw9TgOZLRPMjKcik7g0GKb2mT3UMyTfqRj0aArSA=="; + url = "https://registry.npmjs.org/dynamic-dijkstra/-/dynamic-dijkstra-1.0.2.tgz"; + sha512 = "1N+eCCrepIeK1+qtWrMEO1CV68Hn+TLbiR9c70VB3xnut3DmUxT+3T7sRHhb0mpK2F/74IfP+loQDriU2W9lkA=="; }; }; "each-async-1.1.1" = { @@ -11174,13 +11273,13 @@ let sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; }; }; - "ecstatic-3.3.0" = { + "ecstatic-3.3.1" = { name = "ecstatic"; packageName = "ecstatic"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.0.tgz"; - sha512 = "EblWYTd+wPIAMQ0U4oYJZ7QBypT9ZUIwpqli0bKDjeIIQnXDBK2dXtZ9yzRCOlkW1HkO8gn7/FxLK1yPIW17pw=="; + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.1.tgz"; + sha512 = "/rrctvxZ78HMI/tPIsqdvFKHHscxR3IJuKrZI2ZoUgkt2SiufyLFBmcco+aqQBIu6P1qBsUNG3drAAGLx80vTQ=="; }; }; "ed2curve-0.1.4" = { @@ -11255,13 +11354,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.103" = { + "electron-to-chromium-1.3.113" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.103"; + version = "1.3.113"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.103.tgz"; - sha512 = "tObPqGmY9X8MUM8i3MEimYmbnLLf05/QV5gPlkR8MQ3Uj8G8B2govE1U4cQcBYtv3ymck9Y8cIOu4waoiykMZQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz"; + sha512 = "De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g=="; }; }; "elegant-spinner-1.0.1" = { @@ -11418,15 +11517,6 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "encoding-down-4.0.1" = { - name = "encoding-down"; - packageName = "encoding-down"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding-down/-/encoding-down-4.0.1.tgz"; - sha512 = "AlSE+ugBIpLL0i9if2SlnOZ4oWj/XvBb8tw2Ie/pFB73vdYs5O/6plRyqIgjbZbz8onaL20AAuMP87LWbP56IQ=="; - }; - }; "encoding-down-5.0.4" = { name = "encoding-down"; packageName = "encoding-down"; @@ -11544,13 +11634,13 @@ let sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw=="; }; }; - "engine.io-client-3.3.1" = { + "engine.io-client-3.3.2" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.1.tgz"; - sha512 = "q66JBFuQcy7CSlfAz9L3jH+v7DTT3i6ZEadYcVj2pOs8/0uJHLxKX3WBkGTvULJMdz0tUCyJag0aKT/dpXL9BQ=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.2.tgz"; + sha512 = "y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ=="; }; }; "engine.io-parser-1.0.6" = { @@ -12003,13 +12093,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.12.1" = { + "eslint-5.13.0" = { name = "eslint"; packageName = "eslint"; - version = "5.12.1"; + version = "5.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz"; - sha512 = "54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.13.0.tgz"; + sha512 = "nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -12057,13 +12147,13 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; - "esm-3.1.0" = { + "esm-3.2.4" = { name = "esm"; packageName = "esm"; - version = "3.1.0"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.1.0.tgz"; - sha512 = "r4Go7Wh7Wh0WPinRXeeM9PIajRsUdt8SAyki5R1obVc0+BwtqvtjbngVSSdXg0jCe2xZkY8hyBMx6q/uymUkPw=="; + url = "https://registry.npmjs.org/esm/-/esm-3.2.4.tgz"; + sha512 = "wOuWtQCkkwD1WKQN/k3RsyGSSN+AmiUzdKftn8vaC+uV9JesYmQlODJxgXaaRz0LaaFIlUxZaUu5NPiUAjKAAA=="; }; }; "espree-3.5.4" = { @@ -12786,13 +12876,13 @@ let sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; - "extract-files-4.1.0" = { + "extract-files-5.0.1" = { name = "extract-files"; packageName = "extract-files"; - version = "4.1.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/extract-files/-/extract-files-4.1.0.tgz"; - sha512 = "2gjdb3dVzr1ie9+K8pupPTnsNkK4qmzbTFOIxghiWoh6nCTajGCGC72ZNYX0nBWy5IOq1FXfRVgvkkLqqE4sdw=="; + url = "https://registry.npmjs.org/extract-files/-/extract-files-5.0.1.tgz"; + sha512 = "qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w=="; }; }; "extract-opts-3.3.1" = { @@ -12975,13 +13065,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-1.4.2" = { + "fast-redact-1.4.3" = { name = "fast-redact"; packageName = "fast-redact"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.4.2.tgz"; - sha512 = "ttC8IgelNvYqb9RBC+rirgUCVPtPVonfdeRdsHBcBx3kzQat1DafbUKAEhLo5GnvuBqda+Xe1BvblecPpQkZ2Q=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.4.3.tgz"; + sha512 = "x4qQsA2zOcVuUBHv80EURely8MiAOTR3Z6T1Od82LzFbthhq7DXVUdxwfxtvP9hNCvd+rdcY9qMipK0YDTwWCw=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -13029,6 +13119,15 @@ let sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; }; }; + "fd-lock-1.0.2" = { + name = "fd-lock"; + packageName = "fd-lock"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-lock/-/fd-lock-1.0.2.tgz"; + sha512 = "8O4zSv6rlNNghVfzVkj/p7LUIeBm7Xxk6QnhfmR1WJm/W4kwS8IyShy4X1peRnFUYZUYLlcwEMKXF8QWxJCMvg=="; + }; + }; "fd-read-stream-1.1.0" = { name = "fd-read-stream"; packageName = "fd-read-stream"; @@ -13335,15 +13434,6 @@ let sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; }; }; - "find-npm-prefix-1.0.2" = { - name = "find-npm-prefix"; - packageName = "find-npm-prefix"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz"; - sha512 = "KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA=="; - }; - }; "find-parent-dir-0.3.0" = { name = "find-parent-dir"; packageName = "find-parent-dir"; @@ -13587,13 +13677,13 @@ let sha1 = "36ce06abe2e0e01c44dd69f2a165305a2320649b"; }; }; - "flumedb-1.0.4" = { + "flumedb-1.0.6" = { name = "flumedb"; packageName = "flumedb"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/flumedb/-/flumedb-1.0.4.tgz"; - sha512 = "zTB3OI8RxFe2AtDlEXZtvDCJkw02/MSdKMYYnr9bYWuwQ4fYcnInGkDwxQU5L7OQswzM/brhdl3XYNGWpMxF1w=="; + url = "https://registry.npmjs.org/flumedb/-/flumedb-1.0.6.tgz"; + sha512 = "XUAxCNnVdxuiUnswQ6bsYb/c4ObX0LupwDGI1GjowN5hQne0BTiB8p74dXr3nbx69WwE/4fNbFcLmuvWIcx6Tg=="; }; }; "flumelog-offset-3.3.2" = { @@ -13614,13 +13704,13 @@ let sha512 = "4L52hBelX7dYVAQQ9uPjksqxOCxLwI4NsfEG/+sTM423axT2Poq5cnfdvGm3HzmNowzwDIKtdy429r6PbfKEIw=="; }; }; - "flumeview-level-3.0.6" = { + "flumeview-level-3.0.8" = { name = "flumeview-level"; packageName = "flumeview-level"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.6.tgz"; - sha512 = "omfYDMixWGL8Xx/mFl7xoALZvvOePiN/7jzY/kUJz3TR4px55QV4tZMba63QPyKj7NZVAPE61wq//P5sdiqvQw=="; + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.8.tgz"; + sha512 = "XvHc5diz9PdtzLjLrLtbTw79+Kxm0LqiXkwwushnIBVVTBdREVupTgUQgfuIdZW/WdAr6p3heGPYlf0v89NBrw=="; }; }; "flumeview-query-6.3.0" = { @@ -13641,22 +13731,22 @@ let sha512 = "3HkgA4u5aIrUIFJ+uRfEpRy/xFwTresz05wf/Sg3NigWrw8JWaGMmHToJpoL8ec9EvYKgP3JNj5wHLw9WEocsA=="; }; }; - "flumeview-reduce-1.3.14" = { + "flumeview-reduce-1.3.15" = { name = "flumeview-reduce"; packageName = "flumeview-reduce"; - version = "1.3.14"; + version = "1.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.14.tgz"; - sha512 = "hMk9g42JrD92PCmNDiET6JGjur09wQrlAUQRPjmsk8LNqDz/tC5upvCfiynIgWUphe8dZMhUHIzOTh75xa1WKA=="; + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.15.tgz"; + sha512 = "zxDvjzRKA9uvit6Za7u2qTLyeziZIzeEPtJT9X7UcsOKxrjydkq6k6AlCq9hM7mZLS7msYqRyn4XfItC4cZtYQ=="; }; }; - "flush-write-stream-1.0.3" = { + "flush-write-stream-1.1.1" = { name = "flush-write-stream"; packageName = "flush-write-stream"; - version = "1.0.3"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz"; - sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw=="; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; "follow-redirects-1.6.1" = { @@ -14055,15 +14145,6 @@ let sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb"; }; }; - "fs-vacuum-1.2.10" = { - name = "fs-vacuum"; - packageName = "fs-vacuum"; - version = "1.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; - sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; - }; - }; "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; @@ -14280,15 +14361,6 @@ let sha512 = "KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA=="; }; }; - "gentle-fs-2.0.1" = { - name = "gentle-fs"; - packageName = "gentle-fs"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gentle-fs/-/gentle-fs-2.0.1.tgz"; - sha512 = "cEng5+3fuARewXktTEGbwsktcldA+YsnUEaXZwcK/3pjSE1X9ObnTs+/8rYf8s+RnIcQm2D5x3rwpN7Zom8Bew=="; - }; - }; "get-assigned-identifiers-1.2.0" = { name = "get-assigned-identifiers"; packageName = "get-assigned-identifiers"; @@ -14406,6 +14478,15 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; + "get-uri-2.0.2" = { + name = "get-uri"; + packageName = "get-uri"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz"; + sha512 = "ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw=="; + }; + }; "get-uri-2.0.3" = { name = "get-uri"; packageName = "get-uri"; @@ -14541,6 +14622,24 @@ let sha512 = "8mqO63M60lCiNR+6ROvXuX4VI6pVAru4wMn3uUfxq0xmpNwrZYC4Rkrt5rSGUPumJ43ZUJyeMXXq60v03PUY/g=="; }; }; + "git-up-4.0.1" = { + name = "git-up"; + packageName = "git-up"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-up/-/git-up-4.0.1.tgz"; + sha512 = "LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw=="; + }; + }; + "git-url-parse-11.1.2" = { + name = "git-url-parse"; + packageName = "git-url-parse"; + version = "11.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.2.tgz"; + sha512 = "gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ=="; + }; + }; "gitconfiglocal-1.0.0" = { name = "gitconfiglocal"; packageName = "gitconfiglocal"; @@ -14758,15 +14857,6 @@ let sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; }; }; - "global-modules-path-2.3.1" = { - name = "global-modules-path"; - packageName = "global-modules-path"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.1.tgz"; - sha512 = "y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg=="; - }; - }; "global-prefix-1.0.2" = { name = "global-prefix"; packageName = "global-prefix"; @@ -14785,13 +14875,13 @@ let sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; }; }; - "globals-11.10.0" = { + "globals-11.11.0" = { name = "globals"; packageName = "globals"; - version = "11.10.0"; + version = "11.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz"; - sha512 = "0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ=="; + url = "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz"; + sha512 = "WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw=="; }; }; "globals-9.18.0" = { @@ -14821,6 +14911,15 @@ let sha512 = "yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w=="; }; }; + "globby-9.0.0" = { + name = "globby"; + packageName = "globby"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-9.0.0.tgz"; + sha512 = "q0qiO/p1w/yJ0hk8V9x1UXlgsXUxlGd0AHUOXZVXBO6aznDtpx7M8D1kBrCAItoPm+4l8r6ATXV1JpjY2SBQOw=="; + }; + }; "globby-git://github.com/nexe/globby.git#de057b69c2bca74391bfd913ed0145ce4e42563a" = { name = "globby"; packageName = "globby"; @@ -15065,22 +15164,22 @@ let sha512 = "7Qh3TzZS3hwZpJbTNfTHXBM6UbzV7DMik9Mc95Rz76yTAs7Wr83xBFsH4Ap1NWlqBgANfO3cLLI4YomDJmO5SA=="; }; }; - "graphql-extensions-0.4.0" = { + "graphql-extensions-0.5.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.4.0.tgz"; - sha512 = "8TUgIIUVpXWOcqq9RdmTSHUrhc3a/s+saKv9cCl8TYWHK9vyJIdea7ZaSKHGDthZNcsN+C3LulZYRL3Ah8ukoA=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.0.tgz"; + sha512 = "2i0rpe4/D8jZj6XmxXGLFDAsGLhkFrSdpS5WfvTAzoXOc52hUAxNdsbgRQGeKMFhmanqA6FDXxO/s+BtPHChVA=="; }; }; - "graphql-extensions-0.4.1" = { + "graphql-extensions-0.5.1" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.4.1"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.4.1.tgz"; - sha512 = "Xei4rBxbsTHU6dYiq9y1xxbpRMU3+Os7yD3vXV5W4HbTaxRMizDmu6LAvV4oBEi0ttwICHARQjYTjDTDhHnxrQ=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.1.tgz"; + sha512 = "zuXdJ+zbtm05UNwgTPHP40qh0p7Eqf+vfWiZ+K6ZmYoQXwrWOebR5pwNSS3SVxv7LORtnzJA0CCMTjs+CbIxnA=="; }; }; "graphql-import-0.4.5" = { @@ -15101,22 +15200,22 @@ let sha512 = "YpwpaPjRUVlw2SN3OPljpWbVRWAhMAyfSba5U47qGMOSsPLi2gYeJtngGpymjm9nk57RFWEpjqwh4+dpYuFAPw=="; }; }; - "graphql-playground-html-1.6.6" = { + "graphql-playground-html-1.6.12" = { name = "graphql-playground-html"; packageName = "graphql-playground-html"; - version = "1.6.6"; + version = "1.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.6.tgz"; - sha512 = "VfCnMK24BwOAGhFzjknlboK0qs92d+1sHUDGQUgIAjOsTSNWmqfgNkDZsONZqUajfuVjOYRd0PxCDkCkaJs7Rw=="; + url = "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.12.tgz"; + sha512 = "yOYFwwSMBL0MwufeL8bkrNDgRE7eF/kTHiwrqn9FiR9KLcNIl1xw9l9a+6yIRZM56JReQOHpbQFXTZn1IuSKRg=="; }; }; - "graphql-playground-middleware-express-1.7.8" = { + "graphql-playground-middleware-express-1.7.11" = { name = "graphql-playground-middleware-express"; packageName = "graphql-playground-middleware-express"; - version = "1.7.8"; + version = "1.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.8.tgz"; - sha512 = "3wFOfsJGUtWJuGsA+jQhbVMYAI8x1f5noj4wyySPMhLOK13NiElmsNKrV1sUDb0DJaf5tfg72N0ULMfFQagy9A=="; + url = "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.11.tgz"; + sha512 = "sKItB4s3FxqlwCgXdMfwRAfssSoo31bcFsGAAg/HzaZLicY6CDlofKXP8G5iPDerB6NaoAcAaBLutLzl9sd4fQ=="; }; }; "graphql-request-1.8.2" = { @@ -15164,13 +15263,13 @@ let sha512 = "jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="; }; }; - "graphql-tools-4.0.3" = { + "graphql-tools-4.0.4" = { name = "graphql-tools"; packageName = "graphql-tools"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.3.tgz"; - sha512 = "NNZM0WSnVLX1zIMUxu7SjzLZ4prCp15N5L2T2ro02OVyydZ0fuCnZYRnx/yK9xjGWbZA0Q58yEO//Bv/psJWrg=="; + url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.4.tgz"; + sha512 = "chF12etTIGVVGy3fCTJ1ivJX2KB7OSG4c6UOJQuqOHCmBQwTyNgCDuejZKvpYxNZiEx7bwIjrodDgDe9RIkjlw=="; }; }; "graphql-type-json-0.2.1" = { @@ -15326,13 +15425,13 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "handlebars-4.0.12" = { + "handlebars-4.1.0" = { name = "handlebars"; packageName = "handlebars"; - version = "4.0.12"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz"; - sha512 = "RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.0.tgz"; + sha512 = "l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w=="; }; }; "har-schema-1.0.5" = { @@ -15758,13 +15857,13 @@ let sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; }; - "highlight.js-9.13.1" = { + "highlight.js-9.14.2" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.13.1"; + version = "9.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.13.1.tgz"; - sha512 = "Sc28JNQNDzaH6PORtRLMvif9RSn1mYuOoX3omVjnb0+HbpPygU2ALBI0R/wsiqCb4/fcp07Gdo8g+fhtFrQl6A=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.14.2.tgz"; + sha512 = "Nc6YNECYpxyJABGYJAyw7dBAYbXEuIzwzkqoJnwbc1nIpCiN+3ioYf0XrBnLiyyG0JLuJhpPtt2iTSbXiKLoyA=="; }; }; "hiredis-0.4.1" = { @@ -15965,13 +16064,13 @@ let sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; - "http-cache-semantics-4.0.2" = { + "http-cache-semantics-4.0.3" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz"; - sha512 = "laeSTWIkuFa6lUgZAt+ic9RwOSEwbi9VDQNcCvMFO4sZiDc2Ha8DaZVCJnfpLLQCcS8rvCnIWYmz0POLxt7Dew=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; + sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; }; }; "http-errors-1.3.1" = { @@ -16127,13 +16226,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.22.4" = { + "hypercore-6.25.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.22.4"; + version = "6.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.22.4.tgz"; - sha512 = "xzJXUzc27pfsWYV/dRd+P7RyLGDhSEEBJyodi5gpN8VT/kC8CpNJ0vRcYFpP+DxrfIHhylyvWVUj0lW1dVFiag=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.25.0.tgz"; + sha512 = "lUzqx3d0l+Ex7XryiUkNAM7wU7XVa9b4JcmulRqpdXLJGEV1VKTqn2IYnhAfKcoBjm5KjIgJZiiv5JBEdeEcQw=="; }; }; "hypercore-crypto-1.0.0" = { @@ -16298,13 +16397,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.0.4" = { + "ignore-5.0.5" = { name = "ignore"; packageName = "ignore"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.0.4.tgz"; - sha512 = "WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.0.5.tgz"; + sha512 = "kOC8IUb8HSDMVcYrDVezCxpJkzSQWTAzf3olpKM6o9rM5zpojx23O0Fl8Wr4+qJ6ZbPEHqf1fdwev/DS7v7pmA=="; }; }; "ignore-by-default-1.0.1" = { @@ -16676,13 +16775,13 @@ let sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; }; }; - "inquirer-6.2.1" = { + "inquirer-6.2.2" = { name = "inquirer"; packageName = "inquirer"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz"; - sha512 = "088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz"; + sha512 = "Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA=="; }; }; "inquirer-autocomplete-prompt-1.0.1" = { @@ -16901,13 +17000,13 @@ let sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; }; }; - "ipaddr.js-1.8.1" = { + "ipaddr.js-1.9.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.1.tgz"; - sha1 = "fa4b79fa47fd3def5e3b159825161c0a519c9427"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; }; }; "irc-replies-2.0.1" = { @@ -17045,15 +17144,6 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; @@ -17576,6 +17666,15 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; + "is-relative-url-2.0.0" = { + name = "is-relative-url"; + packageName = "is-relative-url"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative-url/-/is-relative-url-2.0.0.tgz"; + sha1 = "72902d7fe04b3d4792e7db15f9db84b7204c9cef"; + }; + }; "is-resolvable-1.1.0" = { name = "is-resolvable"; packageName = "is-resolvable"; @@ -17612,6 +17711,15 @@ let sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; }; }; + "is-ssh-1.3.1" = { + name = "is-ssh"; + packageName = "is-ssh"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.1.tgz"; + sha512 = "0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg=="; + }; + }; "is-stream-1.1.0" = { name = "is-stream"; packageName = "is-stream"; @@ -17981,13 +18089,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.13.0" = { + "jaeger-client-3.14.4" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.13.0"; + version = "3.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.13.0.tgz"; - sha512 = "ykrXLxcmSHSdDXqK6/DY+IObekfj4kbONC3QPu/ln7sbY5bsA+Yu4LYVlW9/vLm0lxLlsz52mSyC+sjiqM8xCw=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.14.4.tgz"; + sha512 = "+AEI0z3ppLkqOKxUvN6n+qmjDj7O8R+Qr3lO9AXRtuEKxX4p0bfMwqcFiTQPr80twVVdF3wCrZVkcpJysZUL5w=="; }; }; "javascript-stringify-1.6.0" = { @@ -18071,13 +18179,13 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; - "js-base64-2.5.0" = { + "js-base64-2.5.1" = { name = "js-base64"; packageName = "js-base64"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz"; - sha512 = "wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz"; + sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; "js-beautify-1.8.9" = { @@ -18233,13 +18341,13 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jshint-2.9.7" = { + "jshint-2.10.1" = { name = "jshint"; packageName = "jshint"; - version = "2.9.7"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz"; - sha512 = "Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.1.tgz"; + sha512 = "9GpPfKeffYBl7oBDX2lHPG16j0AM7D2bn3aLy9DaWTr6CWa0i/7UGhX8WLZ7V14QQnnr4hXbjauTLYg06F+HYw=="; }; }; "json-buffer-2.0.11" = { @@ -18639,22 +18747,22 @@ let sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; }; }; - "jwa-1.1.6" = { + "jwa-1.2.0" = { name = "jwa"; packageName = "jwa"; - version = "1.1.6"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz"; - sha512 = "tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"; + sha512 = "Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg=="; }; }; - "jws-3.1.5" = { + "jws-3.2.1" = { name = "jws"; packageName = "jws"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz"; - sha512 = "GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ=="; + url = "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz"; + sha512 = "bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g=="; }; }; "k-bucket-0.6.0" = { @@ -18738,15 +18846,6 @@ let sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg=="; }; }; - "keen.io-0.1.5" = { - name = "keen.io"; - packageName = "keen.io"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.5.tgz"; - sha512 = "THuLqGgrsqRiszyq7Mkasf4uKCtpIXjoptQJZQcvQ6WutSjf17ndJ/eHZCi7IbvulNq5NwJWBH1earF0duIzDw=="; - }; - }; "keep-alive-agent-0.0.1" = { name = "keep-alive-agent"; packageName = "keep-alive-agent"; @@ -19044,15 +19143,6 @@ let sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ=="; }; }; - "level-3.0.2" = { - name = "level"; - packageName = "level"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/level/-/level-3.0.2.tgz"; - sha512 = "2qYbbiptPsPWGUI+AgB1gTNXqIjPpALRqrQyNx1zWYNZxhhuzEj/IE4Unu9weEBnsUEocfYe56xOGlAceb8/Fg=="; - }; - }; "level-4.0.0" = { name = "level"; packageName = "level"; @@ -19071,15 +19161,6 @@ let sha1 = "a4b5244bb6a4c2f723d68a1d64e980c53627d9d4"; }; }; - "level-codec-8.0.0" = { - name = "level-codec"; - packageName = "level-codec"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz"; - sha512 = "gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q=="; - }; - }; "level-codec-9.0.0" = { name = "level-codec"; packageName = "level-codec"; @@ -19089,15 +19170,6 @@ let sha512 = "OIpVvjCcZNP5SdhcNupnsI1zo5Y9Vpm+k/F1gfG5kXrtctlrwanisakweJtE0uA0OpLukRfOQae+Fg0M5Debhg=="; }; }; - "level-errors-1.1.2" = { - name = "level-errors"; - packageName = "level-errors"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz"; - sha512 = "Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w=="; - }; - }; "level-errors-2.0.0" = { name = "level-errors"; packageName = "level-errors"; @@ -19107,15 +19179,6 @@ let sha512 = "AmY4HCp9h3OiU19uG+3YWkdELgy05OTP/r23aNHaQKWv8DO787yZgsEuGVkoph40uwN+YdUKnANlrxSsoOaaxg=="; }; }; - "level-iterator-stream-2.0.3" = { - name = "level-iterator-stream"; - packageName = "level-iterator-stream"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz"; - sha512 = "I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig=="; - }; - }; "level-iterator-stream-3.0.1" = { name = "level-iterator-stream"; packageName = "level-iterator-stream"; @@ -19125,15 +19188,6 @@ let sha512 = "nEIQvxEED9yRThxvOrq8Aqziy4EGzrxSZK+QzEFAVuJvQ8glfyZ96GB6BoI4sBbLfjMXm2w4vu3Tkcm9obcY0g=="; }; }; - "level-packager-2.1.1" = { - name = "level-packager"; - packageName = "level-packager"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/level-packager/-/level-packager-2.1.1.tgz"; - sha512 = "6l3G6dVkmdvHwOJrEA9d9hL6SSFrzwjQoLP8HsvohOgfY/8Z9LyTKNCM5Gc84wtsUWCuIHu6r+S6WrCtTWUJCw=="; - }; - }; "level-packager-3.1.0" = { name = "level-packager"; packageName = "level-packager"; @@ -19161,15 +19215,6 @@ let sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; }; }; - "leveldown-3.0.2" = { - name = "leveldown"; - packageName = "leveldown"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/leveldown/-/leveldown-3.0.2.tgz"; - sha512 = "+ANRScj1npQQzv6e4DYAKRjVQZZ+ahMoubKrNP68nIq+l9bYgb+WiXF+14oTcQTg2f7qE9WHGW7rBG9nGSsA+A=="; - }; - }; "leveldown-4.0.1" = { name = "leveldown"; packageName = "leveldown"; @@ -19188,15 +19233,6 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "levelup-2.0.2" = { - name = "levelup"; - packageName = "levelup"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-2.0.2.tgz"; - sha512 = "us+nTLUyd/eLnclYYddOCdAVw1hnymGx/9p4Jr5ThohStsjLqMVmbYiz6/SYFZEPXNF+AKQSvh6fA2e2KZpC8w=="; - }; - }; "levelup-3.1.1" = { name = "levelup"; packageName = "levelup"; @@ -19251,15 +19287,6 @@ let sha512 = "7fvNHrU8QTep71gIJuz7z6iBAQULEHJOcIA0MKUlwFrSnntvOvnke+/tnR7ZxyRAQQ303UJXNZBSRz3r0N5tqw=="; }; }; - "libnpm-2.0.1" = { - name = "libnpm"; - packageName = "libnpm"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpm/-/libnpm-2.0.1.tgz"; - sha512 = "qTKoxyJvpBxHZQB6k0AhSLajyXq9ZE/lUsZzuHAplr2Bpv9G+k4YuYlExYdUCeVRRGqcJt8hvkPh4tBwKoV98w=="; - }; - }; "libnpmaccess-3.0.1" = { name = "libnpmaccess"; packageName = "libnpmaccess"; @@ -19269,58 +19296,13 @@ let sha512 = "RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA=="; }; }; - "libnpmconfig-1.2.1" = { - name = "libnpmconfig"; - packageName = "libnpmconfig"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpmconfig/-/libnpmconfig-1.2.1.tgz"; - sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; - }; - }; - "libnpmhook-5.0.2" = { - name = "libnpmhook"; - packageName = "libnpmhook"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpmhook/-/libnpmhook-5.0.2.tgz"; - sha512 = "vLenmdFWhRfnnZiNFPNMog6CK7Ujofy2TWiM2CrpZUjBRIhHkJeDaAbJdYCT6W4lcHtyrJR8yXW8KFyq6UAp1g=="; - }; - }; - "libnpmorg-1.0.0" = { - name = "libnpmorg"; - packageName = "libnpmorg"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpmorg/-/libnpmorg-1.0.0.tgz"; - sha512 = "o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw=="; - }; - }; - "libnpmpublish-1.1.0" = { + "libnpmpublish-1.1.1" = { name = "libnpmpublish"; packageName = "libnpmpublish"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-1.1.0.tgz"; - sha512 = "mQ3LT2EWlpJ6Q8mgHTNqarQVCgcY32l6xadPVPMcjWLtVLz7II4WlWkzlbYg1nHGAf+xyABDwS+3aNUiRLkyaA=="; - }; - }; - "libnpmsearch-2.0.0" = { - name = "libnpmsearch"; - packageName = "libnpmsearch"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpmsearch/-/libnpmsearch-2.0.0.tgz"; - sha512 = "vd+JWbTGzOSfiOc+72MU6y7WqmBXn49egCCrIXp27iE/88bX8EpG64ST1blWQI1bSMUr9l1AKPMVsqa2tS5KWA=="; - }; - }; - "libnpmteam-1.0.1" = { - name = "libnpmteam"; - packageName = "libnpmteam"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpmteam/-/libnpmteam-1.0.1.tgz"; - sha512 = "gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg=="; + url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-1.1.1.tgz"; + sha512 = "nefbvJd/wY38zdt+b9SHL6171vqBrMtZ56Gsgfd0duEKb/pB8rDT4/ObUQLrHz1tOfht1flt2zM+UGaemzAG5g=="; }; }; "libqp-1.1.0" = { @@ -19368,15 +19350,6 @@ let sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; - "lightercollective-0.1.0" = { - name = "lightercollective"; - packageName = "lightercollective"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightercollective/-/lightercollective-0.1.0.tgz"; - sha512 = "J9tg5uraYoQKaWbmrzDDexbG6hHnMcWS1qLYgJSWE+mpA3U5OCSeMUhb+K55otgZJ34oFdR0ECvdIb3xuO5JOQ=="; - }; - }; "linewise-0.0.3" = { name = "linewise"; packageName = "linewise"; @@ -19386,6 +19359,15 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; + "link-check-4.4.4" = { + name = "link-check"; + packageName = "link-check"; + version = "4.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/link-check/-/link-check-4.4.4.tgz"; + sha512 = "yvowNBZEMOFH9nGLiJ5/YV68PBMVTo4opC2SzcACO8g4gSPTB9Rwa5GIziOX9Z5Er3Yf01DHoOyVV2LeApIw8w=="; + }; + }; "linkify-it-2.1.0" = { name = "linkify-it"; packageName = "linkify-it"; @@ -19476,15 +19458,6 @@ let sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; - "lock-verify-2.0.2" = { - name = "lock-verify"; - packageName = "lock-verify"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lock-verify/-/lock-verify-2.0.2.tgz"; - sha512 = "QNVwK0EGZBS4R3YQ7F1Ox8p41Po9VGl2QG/2GsuvTbkJZYSsPeWHKMbbH6iZMCHWSMww5nrJroZYnGzI4cePuw=="; - }; - }; "locks-0.2.2" = { name = "locks"; packageName = "locks"; @@ -20817,13 +20790,13 @@ let sha512 = "oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w=="; }; }; - "magic-string-0.25.1" = { + "magic-string-0.25.2" = { name = "magic-string"; packageName = "magic-string"; - version = "0.25.1"; + version = "0.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz"; - sha512 = "sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg=="; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz"; + sha512 = "iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg=="; }; }; "magnet-uri-2.0.1" = { @@ -21069,6 +21042,15 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; + "markdown-link-extractor-1.2.0" = { + name = "markdown-link-extractor"; + packageName = "markdown-link-extractor"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.0.tgz"; + sha512 = "1unDsoZSSiF5oGFu/2y8M3E2I2YhWT/jiKGTQxa1IAmkC1OcyHo9OYNu3qCuVSj5Ty87+mFtgQxJPUfc08WirA=="; + }; + }; "markdown-table-0.4.0" = { name = "markdown-table"; packageName = "markdown-table"; @@ -21087,6 +21069,15 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; + "marked-0.4.0" = { + name = "marked"; + packageName = "marked"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz"; + sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; + }; + }; "matchdep-2.0.0" = { name = "matchdep"; packageName = "matchdep"; @@ -21213,13 +21204,13 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; - "mem-4.0.0" = { + "mem-4.1.0" = { name = "mem"; packageName = "mem"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz"; - sha512 = "WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA=="; + url = "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz"; + sha512 = "I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg=="; }; }; "mem-fs-1.1.3" = { @@ -21600,6 +21591,15 @@ let sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="; }; }; + "mime-db-1.38.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.38.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + }; + }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -21924,13 +21924,13 @@ let sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; }; }; - "moment-2.23.0" = { + "moment-2.24.0" = { name = "moment"; packageName = "moment"; - version = "2.23.0"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz"; - sha512 = "3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA=="; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; "moment-2.7.0" = { @@ -22239,22 +22239,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-1.13.7" = { + "multiserver-3.1.2" = { name = "multiserver"; packageName = "multiserver"; - version = "1.13.7"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.7.tgz"; - sha512 = "nQKAe6+u7nWJY29pJjegltw0ROj2bDc2bCTm9Bnr4EQrp5H5Tav+ESUjgl3D4vuQgCeveb4h+CtLtjB8QnK1Dw=="; - }; - }; - "multiserver-3.1.1" = { - name = "multiserver"; - packageName = "multiserver"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.1.1.tgz"; - sha512 = "ty85regvqm8BZgDs+Lk2FLqNgagqeyg+r4kV+0QOINiiyKpHUb0BIvOVLrXuOLRYDNAmii6l8e0+18j/XJznCA=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.1.2.tgz"; + sha512 = "6jXoKH0vGfm5NxwaSkReuD+3VB9mq25WYsdMgB7YC43XboVCufhmFQ724DVz0Jx8Z8RNPKvjVfCiuXpsKgwV0Q=="; }; }; "multiserver-address-1.0.1" = { @@ -22518,6 +22509,15 @@ let sha512 = "l3lC7v/PfOuRWQa8vV29Jo6TG10wHtnthLElFXs4Te4Aas57Fo4n1Q8LH9n+NDh9riOzTVvb2QNBhTS4JUKNjw=="; }; }; + "napi-macros-1.8.2" = { + name = "napi-macros"; + packageName = "napi-macros"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-macros/-/napi-macros-1.8.2.tgz"; + sha512 = "Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg=="; + }; + }; "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { name = "native-dns-cache"; packageName = "native-dns-cache"; @@ -22900,13 +22900,13 @@ let sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; }; }; - "node-abi-2.5.1" = { + "node-abi-2.7.1" = { name = "node-abi"; packageName = "node-abi"; - version = "2.5.1"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.5.1.tgz"; - sha512 = "oDbFc7vCFx0RWWCweTer3hFm1u+e60N5FtGnmRV6QqvgATGFH/XRR6vqWIeBVosCYCqt6YdIr2L0exLZuEdVcQ=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.7.1.tgz"; + sha512 = "OV8Bq1OrPh6z+Y4dqwo05HqrRL9YNF7QVMRfq1/pguwKLG+q9UB/Lk0x5qXjO23JjJg+/jqCHSTaG1P3tfKfuw=="; }; }; "node-addon-api-1.6.2" = { @@ -23008,6 +23008,15 @@ let sha512 = "L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="; }; }; + "node-gyp-build-3.8.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz"; + sha512 = "bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw=="; + }; + }; "node-int64-0.4.0" = { name = "node-int64"; packageName = "node-int64"; @@ -23053,13 +23062,13 @@ let sha512 = "MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg=="; }; }; - "node-notifier-5.3.0" = { + "node-notifier-5.4.0" = { name = "node-notifier"; packageName = "node-notifier"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.3.0.tgz"; - sha512 = "AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.0.tgz"; + sha512 = "SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ=="; }; }; "node-phantom-simple-2.2.4" = { @@ -23125,13 +23134,13 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; - "node-releases-1.1.3" = { + "node-releases-1.1.7" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.3"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.3.tgz"; - sha512 = "6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.7.tgz"; + sha512 = "bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -23251,13 +23260,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "nodemon-1.18.9" = { + "nodemon-1.18.10" = { name = "nodemon"; packageName = "nodemon"; - version = "1.18.9"; + version = "1.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.9.tgz"; - sha512 = "oj/eEVTEI47pzYAjGkpcNw0xYwTl4XSTUQv2NPQI6PpN3b75PhpuYk3Vb3U80xHCyM2Jm+1j68ULHXl4OR3Afw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.10.tgz"; + sha512 = "we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ=="; }; }; "nomnom-1.8.1" = { @@ -23332,13 +23341,13 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "normalize-package-data-2.4.0" = { + "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "normalize-path-2.1.1" = { @@ -23431,13 +23440,13 @@ let sha512 = "mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg=="; }; }; - "npm-bundled-1.0.5" = { + "npm-bundled-1.0.6" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz"; - sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; + sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; "npm-conf-1.1.3" = { @@ -23467,15 +23476,6 @@ let sha512 = "QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g=="; }; }; - "npm-logical-tree-1.2.1" = { - name = "npm-logical-tree"; - packageName = "npm-logical-tree"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz"; - sha512 = "AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg=="; - }; - }; "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -23485,13 +23485,13 @@ let sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; }; }; - "npm-packlist-1.2.0" = { + "npm-packlist-1.3.0" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz"; - sha512 = "7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; + sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; }; }; "npm-path-2.0.4" = { @@ -23530,15 +23530,6 @@ let sha1 = "e619455f7074ba54cc66d6d0d37dd9f1be6bcbc0"; }; }; - "npm-profile-4.0.1" = { - name = "npm-profile"; - packageName = "npm-profile"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-profile/-/npm-profile-4.0.1.tgz"; - sha512 = "NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA=="; - }; - }; "npm-registry-client-0.2.27" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -23566,13 +23557,13 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-3.8.0" = { + "npm-registry-fetch-3.9.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz"; - sha512 = "hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz"; + sha512 = "srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw=="; }; }; "npm-run-4.1.2" = { @@ -23864,13 +23855,13 @@ let sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; }; }; - "object-keys-1.0.12" = { + "object-keys-1.1.0" = { name = "object-keys"; packageName = "object-keys"; - version = "1.0.12"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz"; - sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="; + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; + sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; }; }; "object-path-0.11.4" = { @@ -23990,15 +23981,6 @@ let sha1 = "304e97c85adda70ecd7f08da450678ef90f0b707"; }; }; - "obv-0.0.0" = { - name = "obv"; - packageName = "obv"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/obv/-/obv-0.0.0.tgz"; - sha1 = "edeab8468f91d4193362ed7f91d0b96dd39a79c1"; - }; - }; "obv-0.0.1" = { name = "obv"; packageName = "obv"; @@ -24017,6 +23999,15 @@ let sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; }; }; + "octokit-pagination-methods-1.1.0" = { + name = "octokit-pagination-methods"; + packageName = "octokit-pagination-methods"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz"; + sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; + }; + }; "on-change-network-0.0.2" = { name = "on-change-network"; packageName = "on-change-network"; @@ -24170,13 +24161,13 @@ let sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; }; }; - "opencollective-postinstall-2.0.1" = { + "opencollective-postinstall-2.0.2" = { name = "opencollective-postinstall"; packageName = "opencollective-postinstall"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.1.tgz"; - sha512 = "saQQ9hjLwu/oS0492eyYotoh+bra1819cfAT5rjY/e4REWwuc8IgZ844Oo44SiftWcJuBiqp0SA0BFVbmLX0IQ=="; + url = "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz"; + sha512 = "pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw=="; }; }; "opener-1.4.3" = { @@ -24341,6 +24332,15 @@ let sha512 = "LBS97LFe2RV6GJmXBi6OKcETKyklHNMV0xw7BtsVn2MlsgsydyZetSCbCANr+PFLmDyv4KV88nn0eCKza665Mg=="; }; }; + "ora-3.1.0" = { + name = "ora"; + packageName = "ora"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-3.1.0.tgz"; + sha512 = "vRBPaNCclUi8pUxRF/G8+5qEQkc6EgzKK1G2ZNJUIGu088Un5qIxFXeDgymvPRM9nmrcUOGzQgS1Vmtz+NtlMw=="; + }; + }; "orchestrator-0.3.8" = { name = "orchestrator"; packageName = "orchestrator"; @@ -24548,13 +24548,13 @@ let sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; }; }; - "p-event-2.1.0" = { + "p-event-2.3.1" = { name = "p-event"; packageName = "p-event"; - version = "2.1.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-event/-/p-event-2.1.0.tgz"; - sha512 = "sDEpDVnzLGlJj3k590uUdpfEUySP5yAYlvfTCu5hTDvSTXQVecYWKcEwdO49PrZlnJ5wkfAvtawnno/jyXeqvA=="; + url = "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz"; + sha512 = "NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA=="; }; }; "p-finally-1.0.0" = { @@ -24575,6 +24575,15 @@ let sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; }; }; + "p-is-promise-2.0.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz"; + sha512 = "pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="; + }; + }; "p-limit-1.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -24773,13 +24782,13 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-9.4.0" = { + "pacote-9.4.1" = { name = "pacote"; packageName = "pacote"; - version = "9.4.0"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz"; - sha512 = "WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w=="; + url = "https://registry.npmjs.org/pacote/-/pacote-9.4.1.tgz"; + sha512 = "YKSRsQqmeHxgra0KCdWA2FtVxDPUlBiCdmew+mSe44pzlx5t1ViRMWiQg18T+DREA+vSqYfKzynaToFR4hcKHw=="; }; }; "pad-0.0.5" = { @@ -24962,13 +24971,13 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; - "parse-node-version-1.0.0" = { + "parse-node-version-1.0.1" = { name = "parse-node-version"; packageName = "parse-node-version"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.0.tgz"; - sha512 = "02GTVHD1u0nWc20n2G7WX/PgdhNFG04j5fi1OkaJzPWLTcf6vh6229Lta1wTmXG/7Dg42tCssgkccVt7qvd8Kg=="; + url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"; + sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="; }; }; "parse-numeric-range-0.0.2" = { @@ -24989,6 +24998,15 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; + "parse-path-4.0.1" = { + name = "parse-path"; + packageName = "parse-path"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.1.tgz"; + sha512 = "d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA=="; + }; + }; "parse-torrent-4.1.0" = { name = "parse-torrent"; packageName = "parse-torrent"; @@ -25025,6 +25043,15 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; + "parse-url-5.0.1" = { + name = "parse-url"; + packageName = "parse-url"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.1.tgz"; + sha512 = "flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg=="; + }; + }; "parse5-1.5.1" = { name = "parse5"; packageName = "parse5"; @@ -25881,13 +25908,13 @@ let sha512 = "zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg=="; }; }; - "postcss-7.0.13" = { + "postcss-7.0.14" = { name = "postcss"; packageName = "postcss"; - version = "7.0.13"; + version = "7.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.13.tgz"; - sha512 = "h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz"; + sha512 = "NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg=="; }; }; "postcss-7.0.6" = { @@ -25926,13 +25953,13 @@ let sha1 = "6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"; }; }; - "postcss-colormin-4.0.2" = { + "postcss-colormin-4.0.3" = { name = "postcss-colormin"; packageName = "postcss-colormin"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.2.tgz"; - sha512 = "1QJc2coIehnVFsz0otges8kQLsryi4lo19WD+U5xCWvXd0uw/Z+KKYnbiNDCnO9GP+PvErPHCG0jNvWTngk9Rw=="; + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; + sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; }; "postcss-convert-values-2.6.1" = { @@ -25962,13 +25989,13 @@ let sha1 = "befe89fafd5b3dace5ccce51b76b81514be00e3d"; }; }; - "postcss-discard-comments-4.0.1" = { + "postcss-discard-comments-4.0.2" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.1.tgz"; - sha512 = "Ay+rZu1Sz6g8IdzRjUgG2NafSNpp2MSMOQUb+9kkzzzP+kh07fP0yNbhtFejURnyVXSX3FYy2nVNW1QTnNjgBQ=="; + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; + sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; }; "postcss-discard-duplicates-2.1.0" = { @@ -26061,13 +26088,13 @@ let sha1 = "23d90cd127b0a77994915332739034a1a4f3d658"; }; }; - "postcss-merge-longhand-4.0.10" = { + "postcss-merge-longhand-4.0.11" = { name = "postcss-merge-longhand"; packageName = "postcss-merge-longhand"; - version = "4.0.10"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.10.tgz"; - sha512 = "hME10s6CSjm9nlVIcO1ukR7Jr5RisTaaC1y83jWCivpuBtPohA3pZE7cGTIVSYjXvLnXozHTiVOkG4dnnl756g=="; + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; + sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; }; "postcss-merge-rules-2.1.2" = { @@ -26079,13 +26106,13 @@ let sha1 = "d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"; }; }; - "postcss-merge-rules-4.0.2" = { + "postcss-merge-rules-4.0.3" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.2.tgz"; - sha512 = "UiuXwCCJtQy9tAIxsnurfF0mrNHKc4NnNx6NxqmzNNjXpQwLSukUxELHTRF0Rg1pAmcoKLih8PwvZbiordchag=="; + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; + sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; }; "postcss-message-helpers-2.0.0" = { @@ -26124,13 +26151,13 @@ let sha1 = "5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"; }; }; - "postcss-minify-gradients-4.0.1" = { + "postcss-minify-gradients-4.0.2" = { name = "postcss-minify-gradients"; packageName = "postcss-minify-gradients"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.1.tgz"; - sha512 = "pySEW3E6Ly5mHm18rekbWiAjVi/Wj8KKt2vwSfVFAWdW6wOIekgqxKxLU7vJfb107o3FDNPkaYFCxGAJBFyogA=="; + url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; + sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; }; }; "postcss-minify-params-1.2.2" = { @@ -26142,13 +26169,13 @@ let sha1 = "ad2ce071373b943b3d930a3fa59a358c28d6f1f3"; }; }; - "postcss-minify-params-4.0.1" = { + "postcss-minify-params-4.0.2" = { name = "postcss-minify-params"; packageName = "postcss-minify-params"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.1.tgz"; - sha512 = "h4W0FEMEzBLxpxIVelRtMheskOKKp52ND6rJv+nBS33G1twu2tCyurYj/YtgU76+UDCvWeNs0hs8HFAWE2OUFg=="; + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; + sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; }; "postcss-minify-selectors-2.1.1" = { @@ -26160,13 +26187,13 @@ let sha1 = "b2c6a98c0072cf91b932d1a496508114311735bf"; }; }; - "postcss-minify-selectors-4.0.1" = { + "postcss-minify-selectors-4.0.2" = { name = "postcss-minify-selectors"; packageName = "postcss-minify-selectors"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.1.tgz"; - sha512 = "8+plQkomve3G+CodLCgbhAKrb5lekAnLYuL1d7Nz+/7RANpBEVdgBkPNwljfSKvZ9xkkZTZITd04KP+zeJTJqg=="; + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; + sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; "postcss-normalize-charset-1.1.1" = { @@ -26187,49 +26214,49 @@ let sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; }; }; - "postcss-normalize-display-values-4.0.1" = { + "postcss-normalize-display-values-4.0.2" = { name = "postcss-normalize-display-values"; packageName = "postcss-normalize-display-values"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.1.tgz"; - sha512 = "R5mC4vaDdvsrku96yXP7zak+O3Mm9Y8IslUobk7IMP+u/g+lXvcN4jngmHY5zeJnrQvE13dfAg5ViU05ZFDwdg=="; + url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; + sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; }; }; - "postcss-normalize-positions-4.0.1" = { + "postcss-normalize-positions-4.0.2" = { name = "postcss-normalize-positions"; packageName = "postcss-normalize-positions"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.1.tgz"; - sha512 = "GNoOaLRBM0gvH+ZRb2vKCIujzz4aclli64MBwDuYGU2EY53LwiP7MxOZGE46UGtotrSnmarPPZ69l2S/uxdaWA=="; + url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; + sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; }; }; - "postcss-normalize-repeat-style-4.0.1" = { + "postcss-normalize-repeat-style-4.0.2" = { name = "postcss-normalize-repeat-style"; packageName = "postcss-normalize-repeat-style"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.1.tgz"; - sha512 = "fFHPGIjBUyUiswY2rd9rsFcC0t3oRta4wxE1h3lpwfQZwFeFjXFSiDtdJ7APCmHQOnUZnqYBADNRPKPwFAONgA=="; + url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; + sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; }; }; - "postcss-normalize-string-4.0.1" = { + "postcss-normalize-string-4.0.2" = { name = "postcss-normalize-string"; packageName = "postcss-normalize-string"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.1.tgz"; - sha512 = "IJoexFTkAvAq5UZVxWXAGE0yLoNN/012v7TQh5nDo6imZJl2Fwgbhy3J2qnIoaDBrtUP0H7JrXlX1jjn2YcvCQ=="; + url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; + sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; }; }; - "postcss-normalize-timing-functions-4.0.1" = { + "postcss-normalize-timing-functions-4.0.2" = { name = "postcss-normalize-timing-functions"; packageName = "postcss-normalize-timing-functions"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.1.tgz"; - sha512 = "1nOtk7ze36+63ONWD8RCaRDYsnzorrj+Q6fxkQV+mlY5+471Qx9kspqv0O/qQNMeApg8KNrRf496zHwJ3tBZ7w=="; + url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; + sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; }; }; "postcss-normalize-unicode-4.0.1" = { @@ -26259,13 +26286,13 @@ let sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; }; }; - "postcss-normalize-whitespace-4.0.1" = { + "postcss-normalize-whitespace-4.0.2" = { name = "postcss-normalize-whitespace"; packageName = "postcss-normalize-whitespace"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.1.tgz"; - sha512 = "U8MBODMB2L+nStzOk6VvWWjZgi5kQNShCyjRhMT3s+W9Jw93yIjOnrEkKYD3Ul7ChWbEcjDWmXq0qOL9MIAnAw=="; + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; + sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; }; "postcss-ordered-values-2.2.3" = { @@ -26277,13 +26304,13 @@ let sha1 = "eec6c2a67b6c412a8db2042e77fe8da43f95c11d"; }; }; - "postcss-ordered-values-4.1.1" = { + "postcss-ordered-values-4.1.2" = { name = "postcss-ordered-values"; packageName = "postcss-ordered-values"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.1.tgz"; - sha512 = "PeJiLgJWPzkVF8JuKSBcylaU+hDJ/TX3zqAMIjlghgn1JBi6QwQaDZoDIlqWRcCAI8SxKrt3FCPSRmOgKRB97Q=="; + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; + sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; }; }; "postcss-reduce-idents-2.4.0" = { @@ -26304,13 +26331,13 @@ let sha1 = "68f80695f045d08263a879ad240df8dd64f644ea"; }; }; - "postcss-reduce-initial-4.0.2" = { + "postcss-reduce-initial-4.0.3" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.2.tgz"; - sha512 = "epUiC39NonKUKG+P3eAOKKZtm5OtAtQJL7Ye0CBN1f+UQTHzqotudp+hki7zxXm7tT0ZAKDMBj1uihpPjP25ug=="; + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; + sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; }; "postcss-reduce-transforms-1.0.4" = { @@ -26322,13 +26349,13 @@ let sha1 = "ff76f4d8212437b31c298a42d2e1444025771ae1"; }; }; - "postcss-reduce-transforms-4.0.1" = { + "postcss-reduce-transforms-4.0.2" = { name = "postcss-reduce-transforms"; packageName = "postcss-reduce-transforms"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.1.tgz"; - sha512 = "sZVr3QlGs0pjh6JAIe6DzWvBaqYw05V1t3d9Tp+VnFRT5j+rsqoWsysh/iSD7YNsULjq9IAylCznIwVd5oU/zA=="; + url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; + sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; "postcss-selector-parser-2.2.3" = { @@ -26367,13 +26394,13 @@ let sha1 = "b6df18aa613b666e133f08adb5219c2684ac108d"; }; }; - "postcss-svgo-4.0.1" = { + "postcss-svgo-4.0.2" = { name = "postcss-svgo"; packageName = "postcss-svgo"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.1.tgz"; - sha512 = "YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw=="; + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; + sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw=="; }; }; "postcss-unique-selectors-2.0.2" = { @@ -26763,13 +26790,13 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; - "prop-types-15.6.2" = { + "prop-types-15.7.1" = { name = "prop-types"; packageName = "prop-types"; - version = "15.6.2"; + version = "15.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz"; - sha512 = "3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ=="; + url = "https://registry.npmjs.org/prop-types/-/prop-types-15.7.1.tgz"; + sha512 = "f8Lku2z9kERjOCcnDOPm68EBJAO2K00Q5mSgPAUE/gJuBgsYLbVy6owSrtcHj90zt8PvW+z0qaIIgsIhHOa1Qw=="; }; }; "properties-1.2.1" = { @@ -26835,6 +26862,15 @@ let sha512 = "SmjEuAf3hc3h3rWZ6V1YaaQw2MNJWK848gLJgzx/sefOJdNLujKinJVXIS0q2cBQpQn2Q32TinawZyDZPzm4kQ=="; }; }; + "protocols-1.4.7" = { + name = "protocols"; + packageName = "protocols"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz"; + sha512 = "Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg=="; + }; + }; "protoduck-5.0.1" = { name = "protoduck"; packageName = "protoduck"; @@ -27042,15 +27078,6 @@ let sha512 = "wrKbmEYySNETxOYXDTCJ8L/rcAFMayOifne2a+X9C0wSm6ttIWHHXwMYQh6k8iDRvtMM8itYkBlP4leKBJTiKA=="; }; }; - "pull-cont-0.0.0" = { - name = "pull-cont"; - packageName = "pull-cont"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.0.0.tgz"; - sha1 = "3fac48b81ac97b75ba01332088b0ce7af8c1be0e"; - }; - }; "pull-cont-0.1.1" = { name = "pull-cont"; packageName = "pull-cont"; @@ -27771,13 +27798,13 @@ let sha512 = "sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg=="; }; }; - "quick-format-unescaped-3.0.1" = { + "quick-format-unescaped-3.0.2" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-3.0.1.tgz"; - sha512 = "Tnk4iJQ8x3V8ml3x9sLIf4tSDaVB9OJY/5gOrnxgK63CXKphhn8oYOPI4tqnXPQcZ3tCv7GFjeoYY5h6UAvuzg=="; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-3.0.2.tgz"; + sha512 = "FXTaCkwvpIlkdKeGDNgcq07SXWS383noQUuZjvdE1QcTt+eLuqof6/BDiEPqB59FWLie/l91+HtlJSw7iCViSA=="; }; }; "quick-lru-1.1.0" = { @@ -27834,13 +27861,13 @@ let sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; }; }; - "random-access-file-2.0.1" = { + "random-access-file-2.1.0" = { name = "random-access-file"; packageName = "random-access-file"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; - sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg=="; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.0.tgz"; + sha512 = "W2hY3DboLETMclybTVzyqCNVKx1MjqUwZPzkpkkMD2t9mbGEtkV2SKWPqAJ/FTrAtnWB7aGwl0NDUS82da0KdQ=="; }; }; "random-access-memory-3.1.1" = { @@ -28023,6 +28050,15 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; + "react-is-16.8.1" = { + name = "react-is"; + packageName = "react-is"; + version = "16.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-is/-/react-is-16.8.1.tgz"; + sha512 = "ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA=="; + }; + }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -28077,13 +28113,13 @@ let sha512 = "/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg=="; }; }; - "read-package-tree-5.2.1" = { + "read-package-tree-5.2.2" = { name = "read-package-tree"; packageName = "read-package-tree"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.2.1.tgz"; - sha512 = "2CNoRoh95LxY47LvqrehIAfUVda2JbuFE/HaGYs42bNrGG+ojbw1h3zOcPcQ+1GQ3+rkzNndZn85u1XyZ3UsIA=="; + url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.2.2.tgz"; + sha512 = "rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA=="; }; }; "read-pkg-1.1.0" = { @@ -28266,13 +28302,13 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "recast-0.15.5" = { + "recast-0.17.3" = { name = "recast"; packageName = "recast"; - version = "0.15.5"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.15.5.tgz"; - sha512 = "nkAYNqarh73cMWRKFiPQ8I9dOLFvFk6SnG8u/LUlOYfArDOD/EjsVRAs860TlBLrpxqAXHGET/AUAVjdEymL5w=="; + url = "https://registry.npmjs.org/recast/-/recast-0.17.3.tgz"; + sha512 = "NwQguXPwHqaVb6M7tsY11+8RDoAKHGRdymPGDxHJrsxOlNADQh0b08uz/MgYp1R1wmHuSBK4A4I5Oq+cE1J40g=="; }; }; "rechoir-0.6.2" = { @@ -28446,6 +28482,15 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; + "regexp-tree-0.1.1" = { + name = "regexp-tree"; + packageName = "regexp-tree"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.1.tgz"; + sha512 = "HwRjOquc9QOwKTgbxvZTcddS5mlNlwePMQ3NFL8broajMLD5CXDAqas8Y5yxJH5QtZp5iRor3YCILd5pz71Cgw=="; + }; + }; "regexp.prototype.flags-1.2.0" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; @@ -28878,6 +28923,15 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; + "resolve-1.10.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + }; + }; "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; @@ -28887,15 +28941,6 @@ let sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; }; }; - "resolve-1.9.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz"; - sha512 = "TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ=="; - }; - }; "resolve-cwd-2.0.0" = { name = "resolve-cwd"; packageName = "resolve-cwd"; @@ -29220,6 +29265,15 @@ let sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; }; }; + "rng-0.2.2" = { + name = "rng"; + packageName = "rng"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rng/-/rng-0.2.2.tgz"; + sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; + }; + }; "rollup-0.67.0" = { name = "rollup"; packageName = "rollup"; @@ -29436,13 +29490,13 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.3.3" = { + "rxjs-6.4.0" = { name = "rxjs"; packageName = "rxjs"; - version = "6.3.3"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; - sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz"; + sha512 = "Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw=="; }; }; "s3-stream-upload-2.0.2" = { @@ -29571,15 +29625,6 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; - "schema-utils-0.4.7" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz"; - sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ=="; - }; - }; "schema-utils-1.0.0" = { name = "schema-utils"; packageName = "schema-utils"; @@ -29940,13 +29985,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "serve-handler-5.0.7" = { + "serve-handler-5.0.8" = { name = "serve-handler"; packageName = "serve-handler"; - version = "5.0.7"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-5.0.7.tgz"; - sha512 = "PuLoJHAO2jj3p1fYWfXVHsEqNesx1+h+6qj0FIWrCe526ZtpDqeYuKA4knE5pjK9xoOVShoB+qGOP93EY46xEw=="; + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-5.0.8.tgz"; + sha512 = "pqk0SChbBLLHfMIxQ55czjdiW7tj2cFy53svvP8e5VqEN/uB/QpfiTJ8k1uIYeFTDVoi+FGi5aqXScuu88bymg=="; }; }; "serve-index-1.7.3" = { @@ -30309,13 +30354,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.2.0" = { + "simple-peer-9.2.1" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.2.0"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.2.0.tgz"; - sha512 = "BaNhpcMBEI7GjZo+6uKSJgihtpvcopzfhSbzyhSi67d8Ab9Rp5KsXQ8pB2Yx6km46PgjNUga+2fYnHnIPLl5gg=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.2.1.tgz"; + sha512 = "NDAQefJCcmpni/csZgBEBDyDglTMBJOoZSl3pUQTWud+jqy02CX8LMz8Ys9qVLmm1D4IW/NP24pM9vKK0MRgXQ=="; }; }; "simple-plist-0.2.1" = { @@ -30462,13 +30507,13 @@ let sha512 = "POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg=="; }; }; - "slice-ansi-2.0.0" = { + "slice-ansi-2.1.0" = { name = "slice-ansi"; packageName = "slice-ansi"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz"; - sha512 = "4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ=="; + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; }; }; "slide-1.1.6" = { @@ -30489,13 +30534,13 @@ let sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; }; }; - "smart-buffer-4.0.1" = { + "smart-buffer-4.0.2" = { name = "smart-buffer"; packageName = "smart-buffer"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.1.tgz"; - sha512 = "RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg=="; + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz"; + sha512 = "JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw=="; }; }; "smartdc-auth-2.3.1" = { @@ -30606,13 +30651,13 @@ let sha512 = "SQE4sudrscd48EoRJqy5h5S6c8YBiOw0r0Se3rfg1l6ElJGgCB9je6XEzfe+UmfES06D7ueFYepiQPxTwH4Qww=="; }; }; - "snyk-1.122.0" = { + "snyk-1.127.0" = { name = "snyk"; packageName = "snyk"; - version = "1.122.0"; + version = "1.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.122.0.tgz"; - sha512 = "esbJEF/HubMdQqjArOqHXWP4iyGXs99yk5gbcs/wwDys2RNEHTQZAYTfQSdNGMHo/Ynylfcyqrhgcg3IR7wtjQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.127.0.tgz"; + sha512 = "+Q5coBgxXa/4sapCc4QvledVGKb1j1g85793AcSY7uDVuNeSgYInPrDHv4t2Xe7boYMBXbNqjhuazQ0DwRcBzg=="; }; }; "snyk-config-2.2.0" = { @@ -30633,13 +30678,13 @@ let sha512 = "ZbvaFCPCd0wxhqxjzU/iyf39tKlq2nvI9nPW32uZV3RGdHrkQH55BzCtBCF9d0dapxX+PKgae/4u2BKNw8hd9Q=="; }; }; - "snyk-docker-plugin-1.17.0" = { + "snyk-docker-plugin-1.21.2" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.17.0"; + version = "1.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.17.0.tgz"; - sha512 = "bRY8v9nieRWke4i3/KCFnAE0OCUcvN+v4cyZxecdULBwug+KmF1eOzofgatIJT4O58fqIoa+GCAzXxO+d0H0/A=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.21.2.tgz"; + sha512 = "pOa+3Dj6pBbJSx8NvjT74qGFHr2faIPNPdZm8k6p1JxZgy27OyJdBPJdFgj2ucpPAHAnKJpcIIeiPz4h5zUahQ=="; }; }; "snyk-go-plugin-1.6.0" = { @@ -30705,13 +30750,13 @@ let sha512 = "TBrdcFXHdYuRYFCvpyUeFC+mCi6SOV3vdxgHrP7JRNnJwO8PYaKCObLJyhpRWa8IaHv/8CjJTmnEbWIh7BPHAA=="; }; }; - "snyk-nodejs-lockfile-parser-1.10.1" = { + "snyk-nodejs-lockfile-parser-1.11.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.10.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.10.1.tgz"; - sha512 = "0k0QWB4bgmIy81GQVEODwaSjkXldJStM6ooSNiTrwT7cjzJmpN9r6r1WXWTZpSuAyADvGwTfSyzdvl2xzQXAEA=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.11.0.tgz"; + sha512 = "eTdq5VcaHJwGoApejebTChi5hRcIDdNbO6lMwncS0zz9ZxXskoQ0C+VMdep8ELmJa0Gcz6es1sSkABPZs7frrg=="; }; }; "snyk-nodejs-lockfile-parser-1.7.1" = { @@ -30741,6 +30786,15 @@ let sha512 = "g5QSHBsRJ2O4cNxKC4zlWwnQYiSgQ77Y6QgGmo3ihPX3VLZrc1amaZIpPsNe1jwXirnGj2rvR5Xw+jDjbzvHFw=="; }; }; + "snyk-php-plugin-1.5.2" = { + name = "snyk-php-plugin"; + packageName = "snyk-php-plugin"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.2.tgz"; + sha512 = "s/s9s7mslHjLnzin2BNLGdy/s6tNBfJ4/T/d9JBjsjIwdJFaUKY/ciWwBLNaWt2Aqtyr3DiUcqg3j/pwTKhEDg=="; + }; + }; "snyk-policy-1.13.1" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -30984,22 +31038,22 @@ let sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; }; }; - "socks-2.2.1" = { + "socks-2.2.3" = { name = "socks"; packageName = "socks"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.2.1.tgz"; - sha512 = "0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w=="; + url = "https://registry.npmjs.org/socks/-/socks-2.2.3.tgz"; + sha512 = "+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA=="; }; }; - "socks-2.2.2" = { + "socks-2.3.1" = { name = "socks"; packageName = "socks"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.2.2.tgz"; - sha512 = "g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q=="; + url = "https://registry.npmjs.org/socks/-/socks-2.3.1.tgz"; + sha512 = "srMrPbfQnLOVRDv/sQvBeM4rvFvKT4ErhdcXejaLHLQFPmCMt5XPF0TeE9Uv3iVa+GpXDevs1VgqZgwykr78Yw=="; }; }; "socks-proxy-agent-3.0.1" = { @@ -31056,13 +31110,13 @@ let sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; }; }; - "sodium-native-2.2.4" = { + "sodium-native-2.2.6" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.2.4"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.4.tgz"; - sha512 = "zE3lJAEN9R/XzJmNUqfyqL3vAnES9rFuyeq5ouHmCOdkVcY5UKbCcl7eUyZ+LG4RcqVfx8CAcgwv9HRpgoNrlg=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.6.tgz"; + sha512 = "PgtGv6TdyoES2jmniigUWTHks4vzette0CNoOyn8LpTfSUoTDJGJv4X123zXrr/zdmUPij0IPAmWLwSp+U22ig=="; }; }; "sodium-universal-2.0.0" = { @@ -31470,22 +31524,22 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-blobs-1.1.9" = { + "ssb-blobs-1.1.12" = { name = "ssb-blobs"; packageName = "ssb-blobs"; - version = "1.1.9"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.9.tgz"; - sha512 = "CkI12tt5looI54X2dhsMNwoVqVcff471ZgEhew69g2EPByfejryuoOnAZUuQhgYDBLISQj5oID2R+7wCH6yOyQ=="; + url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.12.tgz"; + sha512 = "huR2ABWAbPZEyol5m9qkO29S+vnGx0epKXpxQkqbj7ATIC8abia7hLIISpQkNrCv2NtdPGJOERZPNbkaiCzGgg=="; }; }; - "ssb-client-4.6.0" = { + "ssb-client-4.6.3" = { name = "ssb-client"; packageName = "ssb-client"; - version = "4.6.0"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.6.0.tgz"; - sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA=="; + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.6.3.tgz"; + sha512 = "i9nfkSIBMI2FdRHRYqVoB2jEvnNDVE6KccYPK2EjGFSa2o7+7wyb1bJoCH9jPXtwoAUyp6xELin8VwO21+hsFA=="; }; }; "ssb-config-2.3.9" = { @@ -31506,22 +31560,22 @@ let sha512 = "/4nFP7yj1JD5jrwX9bHG2nipBefl++xXXbNWD14eL+Ohs3X8kdmJeBKnHgiIF7Je4HQOI31OmEIdyyLKum5niQ=="; }; }; - "ssb-ebt-5.3.7" = { + "ssb-ebt-5.3.11" = { name = "ssb-ebt"; packageName = "ssb-ebt"; - version = "5.3.7"; + version = "5.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.3.7.tgz"; - sha512 = "oaiCry/pgt5lQb6J5zdsnqiZcO5RgYAt9dcyP+mzhyxQxX1je2kA5FQ8HTXK8D7YuP1T5L8+z8cXmrhuEyr0WA=="; + url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.3.11.tgz"; + sha512 = "ivGANboEZHRwf/qD6g4+R3LoRYRBVITmGk0mHl/Y1e6VPGywtSJXi0Q270CQFTdcUc5inhAQ7PPnSVhbzFN+SQ=="; }; }; - "ssb-friends-3.1.12" = { + "ssb-friends-3.1.13" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-3.1.12.tgz"; - sha512 = "G8V8RtV0DLXY36rEpArd1zjSY88ErtaRaLuAtc6kIhUBBPlY0mb1wN5CdsuLWnlxis0Mwt5gK2rtjMG8jWC/jA=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-3.1.13.tgz"; + sha512 = "VsQzyhOc4k8JmnWTvwlmfb/Xv+CQZ02W6WQaPFx2BqCXHwLF6nKNFNXDZBZSUaKp5JSVBMbe39UkNjpOig2BJw=="; }; }; "ssb-git-0.5.0" = { @@ -31551,22 +31605,22 @@ let sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; }; }; - "ssb-keys-7.1.4" = { + "ssb-keys-7.1.5" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "7.1.4"; + version = "7.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.1.4.tgz"; - sha512 = "tRDoFAeTL4NVGE4WFgd4Jck7wmsz340iE3Z8KEpGyFkxo5LqH01Gl+8aCDKqNQoJpCByG7luSSTztS7zl6yk8w=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.1.5.tgz"; + sha512 = "GQ7cgTFROOrQpHjmZdeIrVO15+KImjTCCdM4IaJCAMgEybaXl53wEi2guPqYAskqBggWxYG0VNwXT45JI9nXiA=="; }; }; - "ssb-links-3.0.3" = { + "ssb-links-3.0.4" = { name = "ssb-links"; packageName = "ssb-links"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz"; - sha512 = "x09ShIMjwvdZI7aDZm8kc1v5YCGZa9ulCOoxrf/RYJ98s5gbTfO9CBCzeMBAeQ5kRwSuKjiOxJHdeEBkj4Y6hw=="; + url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.4.tgz"; + sha512 = "npTjUeg+qH8NgnZqKsRSe5kLCu2KYQs9vxtckBph8Z5/VJX+RAG5a5FlLEOLWv4h//BICe4L7Rpvbxol+39jhQ=="; }; }; "ssb-marked-0.5.4" = { @@ -31677,13 +31731,13 @@ let sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; }; }; - "sshpk-1.16.0" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz"; - sha512 = "Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "sshpk-1.7.1" = { @@ -31875,13 +31929,13 @@ let sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; }; }; - "stream-browserify-2.0.1" = { + "stream-browserify-2.0.2" = { name = "stream-browserify"; packageName = "stream-browserify"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; - sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; "stream-buffers-2.2.0" = { @@ -32289,15 +32343,6 @@ let sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A=="; }; }; - "stringify-package-1.0.0" = { - name = "stringify-package"; - packageName = "stringify-package"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.0.tgz"; - sha512 = "JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g=="; - }; - }; "stringstream-0.0.6" = { name = "stringstream"; packageName = "stringstream"; @@ -32532,13 +32577,13 @@ let sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; }; }; - "stylehacks-4.0.1" = { + "stylehacks-4.0.2" = { name = "stylehacks"; packageName = "stylehacks"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.1.tgz"; - sha512 = "TK5zEPeD9NyC1uPIdjikzsgWxdQQN/ry1X3d1iOz1UkYDCmcr928gWD1KHgyC27F50UnE0xCTrBOO1l6KR8M4w=="; + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.2.tgz"; + sha512 = "AZwvn2b3aNKK1yp+VgNPOuC2jIJOvh9PAiCq2gjDBW1WkQxQUksR1RugOJRIOhMYTGHZeoMcMQKp3/qaS3evNg=="; }; }; "subarg-1.0.0" = { @@ -32865,13 +32910,13 @@ let sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; }; }; - "table-5.2.1" = { + "table-5.2.3" = { name = "table"; packageName = "table"; - version = "5.2.1"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-5.2.1.tgz"; - sha512 = "qmhNs2GEHNqY5fd2Mo+8N1r2sw/rvTAAvBZTaTx+Y7PHLypqyrxr1MdIu0pLw6Xvl/Gi4ONu/sdceP8vvUjkyA=="; + url = "https://registry.npmjs.org/table/-/table-5.2.3.tgz"; + sha512 = "N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ=="; }; }; "tabtab-1.3.2" = { @@ -32947,13 +32992,13 @@ let sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; }; }; - "tape-4.9.2" = { + "tape-4.10.0" = { name = "tape"; packageName = "tape"; - version = "4.9.2"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.9.2.tgz"; - sha512 = "lPXKRKILZ1kZaUy5ynWKs8ATGSUO7HAFHCFnBam6FaGSqPdOwMWbxXHq4EXFLE8WRTleo/YOMXkaUTRmTB1Fiw=="; + url = "https://registry.npmjs.org/tape/-/tape-4.10.0.tgz"; + sha512 = "3PgdF0vcZ1t7HEYbpTXdo58KXi19QCGcZfj07A53M2DH14P2Fw3cB3f9pF7e/Br2z+PQm7xlvhjzHH3D8ti99g=="; }; }; "tar-0.1.17" = { @@ -33091,22 +33136,22 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "terser-3.14.1" = { + "terser-3.16.1" = { name = "terser"; packageName = "terser"; - version = "3.14.1"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-3.14.1.tgz"; - sha512 = "NSo3E99QDbYSMeJaEk9YW2lTg3qS9V0aKGlb+PlOrei1X02r1wSBHCNX/O+yeTRFSWPKPIGj6MqvvdqV4rnVGw=="; + url = "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz"; + sha512 = "JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow=="; }; }; - "terser-webpack-plugin-1.2.1" = { + "terser-webpack-plugin-1.2.2" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz"; - sha512 = "GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz"; + sha512 = "1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg=="; }; }; "test-exclude-4.2.3" = { @@ -33397,13 +33442,13 @@ let sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; }; }; - "tiny-emitter-2.0.2" = { + "tiny-emitter-2.1.0" = { name = "tiny-emitter"; packageName = "tiny-emitter"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz"; - sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="; + url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; + sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; }; }; "tiny-inflate-1.0.2" = { @@ -33658,13 +33703,13 @@ let sha512 = "FOinMMjECHmDt6PZkSmcbM8ir41kGwYCbVW7NczWkWNNeuX9/mQHz31oNSJKZrkvgfas692ZoZ+G1jdM43qVGA=="; }; }; - "toml-2.3.5" = { + "toml-2.3.6" = { name = "toml"; packageName = "toml"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/toml/-/toml-2.3.5.tgz"; - sha512 = "ulY/Z2yPWKl/3JvGJvnEe7mXqVt2+TtDoRxJNgTAwO+3lwXefeCHS697NN0KRy6q7U/b1MnSnj/UGF/4U0U2WQ=="; + url = "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz"; + sha512 = "gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ=="; }; }; "topo-3.0.3" = { @@ -34063,13 +34108,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.13.0" = { + "twig-1.13.2" = { name = "twig"; packageName = "twig"; - version = "1.13.0"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.13.0.tgz"; - sha512 = "kl7nq3Wuy5rsKP/HhbRiilTthsdlm+5ee9IFmnYpy/E7hU4IdEkWeaRtvp/brVSA3rOfNWN5Lvsdi6KusTB9Iw=="; + url = "https://registry.npmjs.org/twig/-/twig-1.13.2.tgz"; + sha512 = "F7o4sDD2DaIj2II8VrbmDXnompOO6ESNQSh97rtJuif00v5FoUWTlkJE1ZlfeFNAwSCU9rexWsB1+3oF8jmU/Q=="; }; }; "twitter-ng-0.6.2" = { @@ -34189,13 +34234,13 @@ let sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e"; }; }; - "uc.micro-1.0.5" = { + "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz"; - sha512 = "JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz"; + sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; "uglify-js-2.8.29" = { @@ -34342,13 +34387,13 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "unbzip2-stream-1.3.1" = { + "unbzip2-stream-1.3.3" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz"; - sha512 = "fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw=="; + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; + sha512 = "fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg=="; }; }; "unc-path-regex-0.1.2" = { @@ -34396,15 +34441,6 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "underscore-1.5.2" = { - name = "underscore"; - packageName = "underscore"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; - }; - }; "underscore-1.6.0" = { name = "underscore"; packageName = "underscore"; @@ -34684,6 +34720,15 @@ let sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA=="; }; }; + "universal-user-agent-2.0.3" = { + name = "universal-user-agent"; + packageName = "universal-user-agent"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.0.3.tgz"; + sha512 = "eRHEHhChCBHrZsA4WEhdgiOKgdvgrMIHwnwnqD0r5C6AO8kwKcG7qSku3iXdhvHL3YvsS9ZkSGN8h/hIpoFC8g=="; + }; + }; "universalify-0.1.2" = { name = "universalify"; packageName = "universalify"; @@ -34819,13 +34864,13 @@ let sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A=="; }; }; - "unzipper-0.9.2" = { + "unzipper-0.9.7" = { name = "unzipper"; packageName = "unzipper"; - version = "0.9.2"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/unzipper/-/unzipper-0.9.2.tgz"; - sha512 = "DPz9NINoFCBqE/VAorz82EoKYMo3piYm3YZ8guhcDEK/RxPGoe9wodFhfvEL7PBSxUObCmH4bIQJL0vsYM+WpA=="; + url = "https://registry.npmjs.org/unzipper/-/unzipper-0.9.7.tgz"; + sha512 = "icFtME1RD648v+cjfcUWoky4bHbMTi8nk06nGxH77EPYyEeKaTgT3nRHM/dQ3znGXLi3+OlhYo86zQzNBRdNhw=="; }; }; "upath-1.1.0" = { @@ -34999,6 +35044,15 @@ let sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; }; }; + "url-template-2.0.8" = { + name = "url-template"; + packageName = "url-template"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz"; + sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; + }; + }; "url-to-options-1.0.1" = { name = "url-to-options"; packageName = "url-to-options"; @@ -35818,13 +35872,13 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-cli-plugin-apollo-0.18.1" = { + "vue-cli-plugin-apollo-0.19.1" = { name = "vue-cli-plugin-apollo"; packageName = "vue-cli-plugin-apollo"; - version = "0.18.1"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.18.1.tgz"; - sha512 = "RfkBFGZKq9r8+DYwcT1Y5As7uzy3OjsIInSrhdCHKO4EeZ9pseb31rqtDmkT9/uNpd9BmRKPWti+hp3S64IUxg=="; + url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.19.1.tgz"; + sha512 = "GVXCamuTmT7EpTFJHUNR48Lbg1Y+ZnED1fQ6nveTqAf7VCSADswJyX75gYrJSjWUP4N3BJqzT/O/JVWJfB1G2Q=="; }; }; "walk-2.3.14" = { @@ -35908,22 +35962,22 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.28.4" = { + "webpack-4.29.3" = { name = "webpack"; packageName = "webpack"; - version = "4.28.4"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.28.4.tgz"; - sha512 = "NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.29.3.tgz"; + sha512 = "xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A=="; }; }; - "webpack-cli-3.2.1" = { + "webpack-cli-3.2.3" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.2.1"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.1.tgz"; - sha512 = "jeJveHwz/vwpJ3B8bxEL5a/rVKIpRNJDsKggfKnxuYeohNDW4Y/wB9N/XHJA093qZyS0r6mYL+/crLsIol4WKA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.3.tgz"; + sha512 = "Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q=="; }; }; "webpack-core-0.6.9" = { @@ -36358,13 +36412,13 @@ let sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; }; }; - "write-file-atomic-2.3.0" = { + "write-file-atomic-2.4.2" = { name = "write-file-atomic"; packageName = "write-file-atomic"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; - sha512 = "xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA=="; + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz"; + sha512 = "s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g=="; }; }; "write-json-file-2.3.0" = { @@ -36439,13 +36493,13 @@ let sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; - "ws-6.1.2" = { + "ws-6.1.3" = { name = "ws"; packageName = "ws"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz"; - sha512 = "rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw=="; + url = "https://registry.npmjs.org/ws/-/ws-6.1.3.tgz"; + sha512 = "tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg=="; }; }; "wtf-8-1.0.0" = { @@ -37016,13 +37070,13 @@ let sha512 = "avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA=="; }; }; - "z-schema-3.24.2" = { + "z-schema-3.25.1" = { name = "z-schema"; packageName = "z-schema"; - version = "3.24.2"; + version = "3.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/z-schema/-/z-schema-3.24.2.tgz"; - sha512 = "Zb2YLJ9g72MexBXKPRzoypd4OZfVkFghdy10eVbcMNLl9YQsPXtyMpiK7a3sG7IIERg1lEDjEMrG9Km9DPbWLw=="; + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.25.1.tgz"; + sha512 = "7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q=="; }; }; "zen-observable-0.5.2" = { @@ -37034,22 +37088,22 @@ let sha512 = "Dhp/R0pqSHj3vPs5O1gVd9kZx5Iew2lqVcfJQOBHx3llM/dLea8vl9wSa9FK8wLdSBQJ6mmgKi9+Rk2DRH3i9Q=="; }; }; - "zen-observable-0.8.11" = { + "zen-observable-0.8.13" = { name = "zen-observable"; packageName = "zen-observable"; - version = "0.8.11"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.11.tgz"; - sha512 = "N3xXQVr4L61rZvGMpWe8XoCGX8vhU35dPyQ4fm5CY/KDlG0F75un14hjbckPXTDuKUY6V0dqR2giT6xN8Y4GEQ=="; - }; - }; - "zen-observable-ts-0.8.13" = { - name = "zen-observable-ts"; - packageName = "zen-observable-ts"; version = "0.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.13.tgz"; - sha512 = "WDb8SM0tHCb6c0l1k60qXWlm1ok3zN9U4VkLdnBKQwIYwUoB9psH7LIFgR+JVCCMmBxUgOjskIid8/N02k/2Bg=="; + url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.13.tgz"; + sha512 = "fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g=="; + }; + }; + "zen-observable-ts-0.8.15" = { + name = "zen-observable-ts"; + packageName = "zen-observable-ts"; + version = "0.8.15"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz"; + sha512 = "sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w=="; }; }; "zerr-1.0.4" = { @@ -37101,7 +37155,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -37176,7 +37230,7 @@ in }) sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."string_decoder-0.10.31" sources."tmp-0.0.28" (sources."touch-0.0.3" // { @@ -37209,16 +37263,16 @@ in azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; packageName = "azure-functions-core-tools"; - version = "2.3.199"; + version = "2.4.317"; src = fetchurl { - url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.3.199.tgz"; - sha512 = "SomYaNoD6SLp+nKuqckGVhhKwvDvBT8mOXSzEh1IH7s/F7OLKQU9Oq/ZyVjkf2rVqAxW9mXSAmzzuxmd4ZAW3g=="; + url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.4.317.tgz"; + sha512 = "Q4CMahxN7AOLEIhmA+mm81V91VXKvTlcIgodMcBE4wnn/H61Kc3LUGJBu4ibHuC5ZPShmS3R8luavmm7UfgpUQ=="; }; dependencies = [ sources."agent-base-4.2.1" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.0" - sources."big-integer-1.6.40" + sources."big-integer-1.6.41" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -37263,7 +37317,7 @@ in sources."supports-color-5.5.0" sources."tmp-0.0.33" sources."traverse-0.3.9" - sources."unzipper-0.9.2" + sources."unzipper-0.9.7" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" ]; @@ -37279,10 +37333,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.7"; + version = "1.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.7.tgz"; - sha512 = "M0yrA0IkpXP4v2taRkmowyUHTCFAvtfTVtRDAXBnhZM02xh8fP3wlrdOiXPs/5CYBCdj20WyGKZuYA0g3h3Y1w=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; + sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; }; buildInputs = globalBuildInputs; meta = { @@ -37305,12 +37359,11 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.0" - sources."bower-1.8.7" + sources."bower-1.8.8" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" sources."brace-expansion-1.1.11" - sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."concat-map-0.0.1" @@ -37338,7 +37391,6 @@ in sources."inherits-2.0.3" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -37361,7 +37413,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.37.0" + sources."mime-db-1.38.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -37371,7 +37423,7 @@ in }) sources."ms-2.0.0" sources."natives-1.1.6" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -37379,6 +37431,7 @@ in sources."parse-json-2.2.0" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ sources."graceful-fs-4.1.15" @@ -37393,6 +37446,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" + sources."resolve-1.10.0" (sources."rimraf-2.6.3" // { dependencies = [ sources."glob-7.1.3" @@ -37437,7 +37491,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.0.5" + sources."acorn-6.1.0" sources."acorn-dynamic-import-4.0.0" sources."acorn-node-1.6.2" sources."acorn-walk-6.1.1" @@ -37489,7 +37543,7 @@ in sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" - (sources."detective-5.1.0" // { + (sources."detective-5.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -37555,7 +37609,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" @@ -37563,7 +37617,7 @@ in sources."shell-quote-1.6.1" sources."simple-concat-1.0.0" sources."source-map-0.5.7" - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" @@ -37613,7 +37667,7 @@ in dependencies = [ sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -37630,7 +37684,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" - sources."bencode-2.0.0" + sources."bencode-2.0.1" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -37653,7 +37707,6 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."bufferview-1.0.1" - sources."builtin-modules-1.1.1" sources."bytebuffer-3.5.5" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" @@ -37742,9 +37795,8 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.8.1" + sources."ipaddr.js-1.9.0" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -37793,7 +37845,7 @@ in sources."mutate.js-0.2.0" sources."mute-stream-0.0.4" sources."network-address-0.0.5" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."numeral-1.5.6" sources."oauth-sign-0.9.0" @@ -37821,6 +37873,7 @@ in }) sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" sources."path-type-1.1.0" (sources."peer-wire-protocol-0.7.1" // { dependencies = [ @@ -37857,7 +37910,7 @@ in sources."qap-3.3.1" sources."qs-6.5.2" sources."query-string-1.0.1" - (sources."random-access-file-2.0.1" // { + (sources."random-access-file-2.1.0" // { dependencies = [ sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -37891,6 +37944,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.0" + sources."resolve-1.10.0" sources."rimraf-2.6.3" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -37928,7 +37982,7 @@ in sources."spdx-license-ids-3.0.3" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."stream-transcoder-0.0.5" sources."string2compact-1.3.0" sources."string_decoder-0.10.31" @@ -38093,7 +38147,7 @@ in sha512 = "Agj3tsKjvXD53aSdy7rmEo35vYMSHm1MiW8NssH4+z+TpifPQwJxl0y72z+v4TbTg/K1xe5IUGrMfqZ00Z82zw=="; }; dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -38167,11 +38221,11 @@ in sources."acorn-dynamic-import-4.0.0" (sources."acorn-node-1.6.2" // { dependencies = [ - sources."acorn-6.0.5" + sources."acorn-6.1.0" ]; }) sources."acorn-walk-6.1.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."aliasify-2.1.0" sources."ansi-0.3.1" sources."ansi-align-2.0.0" @@ -38199,7 +38253,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.40" + sources."big-integer-1.6.41" sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.3" @@ -38235,7 +38289,6 @@ in sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" sources."bytes-3.0.0" @@ -38418,7 +38471,6 @@ in sources."interpret-1.2.0" sources."ipaddr.js-1.8.0" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-ci-1.2.1" sources."is-fullwidth-code-point-1.0.0" sources."is-git-url-1.0.0" @@ -38480,13 +38532,13 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.1" sources."nopt-4.0.1" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."npm-package-arg-6.1.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."once-1.4.0" @@ -38559,7 +38611,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."request-2.88.0" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."restore-cursor-1.0.1" (sources."rimraf-2.6.3" // { dependencies = [ @@ -38598,9 +38650,9 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."statuses-1.4.0" - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-buffers-2.2.0" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" @@ -38672,7 +38724,7 @@ in sources."widest-line-2.0.1" sources."win-release-1.1.1" sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xcode-1.1.0" sources."xdg-basedir-3.0.0" sources."xmlbuilder-8.2.2" @@ -38722,7 +38774,6 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -38825,7 +38876,6 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -38863,7 +38913,7 @@ in sources."ms-2.0.0" sources."nanomatch-1.2.13" sources."nested-error-stacks-2.1.0" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -38888,6 +38938,7 @@ in sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" sources."path-type-3.0.0" sources."pify-3.0.0" sources."posix-character-classes-0.1.1" @@ -38898,6 +38949,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" + sources."resolve-1.10.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-buffer-5.1.2" @@ -39023,9 +39075,9 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-10.12.18" + sources."@types/node-11.9.3" sources."@types/superagent-3.8.2" - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."asynckit-0.4.0" @@ -39154,10 +39206,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.1.3.tgz"; - sha512 = "bGx6vYVEZL39QZVP46u4HOh3gazqOcyW/dLWXFNRdmaiL7MBxObo0H3oxkK/YzBqFUvJ++EgncWarQr2PnEK+w=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.1.5.tgz"; + sha512 = "sTbhSYYT3lX6bAhI3NRt2qLYMy0z3BV+8GW9xfFqpNWKuji4DkJmlg+IfxQTvnA0l9BZTFK3r5GObA2NNAIy/w=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -39252,7 +39304,7 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."cross-spawn-5.1.0" sources."escape-string-regexp-1.0.5" sources."fs-extra-4.0.3" @@ -39315,7 +39367,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -39361,7 +39413,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."bulk-write-stream-1.1.4" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" @@ -39391,13 +39443,12 @@ in sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" - (sources."dat-dns-3.0.2" // { + (sources."dat-dns-3.1.0" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."debug-4.1.1" ]; }) - sources."dat-doctor-2.1.0" + sources."dat-doctor-2.1.1" sources."dat-encoding-5.0.1" sources."dat-ignore-2.1.1" (sources."dat-json-1.0.2" // { @@ -39455,7 +39506,7 @@ in sources."dom-walk-0.1.1" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" - sources."duplexify-3.6.1" + sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" @@ -39469,6 +39520,7 @@ in sources."fast-bitfield-1.2.2" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" + sources."fd-lock-1.0.2" sources."fd-read-stream-1.1.0" sources."figures-2.0.0" sources."filename-regex-2.0.1" @@ -39495,7 +39547,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.22.4" // { + (sources."hypercore-6.25.0" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -39559,7 +39611,7 @@ in }) (sources."k-rpc-socket-1.8.0" // { dependencies = [ - sources."bencode-2.0.0" + sources."bencode-2.0.1" ]; }) sources."keypress-0.2.1" @@ -39601,6 +39653,7 @@ in sources."nanobus-4.4.0" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" + sources."napi-macros-1.8.2" sources."ncp-1.0.1" sources."neat-input-1.10.0" sources."neat-log-3.1.0" @@ -39608,7 +39661,7 @@ in sources."neat-tasks-1.1.1" sources."nets-3.2.0" sources."network-address-1.1.2" - sources."node-gyp-build-3.7.0" + sources."node-gyp-build-3.8.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -39643,7 +39696,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."random-access-file-2.0.1" + sources."random-access-file-2.1.0" sources."random-access-memory-3.1.1" sources."random-access-storage-1.3.0" (sources."randomatic-3.1.1" // { @@ -39687,13 +39740,13 @@ in sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.2.4" + sources."sodium-native-2.2.6" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.1.0" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."stack-trace-0.0.10" sources."stream-collector-1.0.1" sources."stream-each-1.2.3" @@ -39764,7 +39817,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."xhr-2.5.0" sources."xsalsa20-1.0.2" @@ -39814,7 +39867,7 @@ in sources."async-0.9.2" sources."better-curry-1.6.0" sources."binaryheap-0.0.3" - sources."bindings-1.3.1" + sources."bindings-1.4.0" sources."bluebird-2.9.9" sources."bottleneck-1.5.3" sources."buffercursor-0.0.12" @@ -39844,6 +39897,7 @@ in sources."extsprintf-1.4.0" sources."eyes-0.1.8" sources."faye-websocket-0.11.1" + sources."file-uri-to-path-1.0.0" sources."finalhandler-0.3.3" sources."form-data-0.1.3" sources."formidable-1.0.14" @@ -39945,26 +39999,26 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.2.0.tgz"; - sha512 = "3oAyi6Ip+j37yMOXD2GnkwmMy4+YIkmUnx5DHc37Fs0Wl+VE24nUqPr/BdswxDUTucqGVufT5QULYUYS+evVbA=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.4.0.tgz"; + sha512 = "9LWHAlPqaGFuh9n6uEIHBBuQ2+G7R3y4MkqGiA7guTUDkCUPRcSfJEOL3P0RHEV6i8v4U1F9LYsTQB4FklHPrw=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.1" + sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.391.0" + sources."aws-sdk-2.401.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" sources."buffer-queue-1.0.0" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."caseless-0.12.0" sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" @@ -40016,7 +40070,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."through-2.3.8" (sources."tough-cookie-2.4.3" // { @@ -40075,7 +40129,7 @@ in sources."isobject-3.0.1" ]; }) - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."braces-1.8.5" (sources."cache-base-1.0.1" // { dependencies = [ @@ -40193,7 +40247,7 @@ in sources."inherits-2.0.3" sources."internal-ip-3.0.1" sources."ip-regex-2.1.0" - sources."ipaddr.js-1.8.1" + sources."ipaddr.js-1.9.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" @@ -40500,7 +40554,7 @@ in sha512 = "PWRg9rOc7R2W1lREG5ZaVDywORXO9TYCJzfkK3KEcyiqBr+NpBONp25VhPQKm5mfQvXEtiCWVvqn54/q0bKx9g=="; }; dependencies = [ - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."arr-diff-2.0.0" @@ -40524,7 +40578,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."binwrap-0.2.0" sources."block-stream-0.0.9" sources."bluebird-3.5.3" @@ -40861,7 +40915,7 @@ in sources."source-map-url-0.4.0" sources."split-1.0.1" sources."split-string-3.1.0" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -40951,7 +41005,7 @@ in sha512 = "f+jc5ZC+EAqRK84plziuC4sfKspUcnnxwZzxLFSFsH0MZn9VbU0iQh5qTONewYXsoRaacNioMOLxYV637MLBDQ=="; }; dependencies = [ - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-2.2.1" sources."arch-2.1.1" @@ -40977,7 +41031,6 @@ in sources."babylon-6.18.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."builtin-modules-1.1.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" @@ -40996,7 +41049,7 @@ in sources."concat-map-0.0.1" sources."conf-1.4.0" sources."convert-source-map-1.6.0" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" @@ -41035,7 +41088,6 @@ in sources."ink-text-input-1.1.1" sources."invariant-2.2.4" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" sources."is-obj-1.0.1" @@ -41078,7 +41130,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -41095,6 +41147,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" + sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -41106,8 +41159,9 @@ in sources."pkg-up-2.0.0" sources."prepend-http-1.0.4" sources."private-0.1.8" - sources."prop-types-15.6.2" + sources."prop-types-15.7.1" sources."pseudomap-1.0.2" + sources."react-is-16.8.1" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -41123,6 +41177,7 @@ in sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" sources."require-from-string-1.2.1" + sources."resolve-1.10.0" sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.1.2" @@ -41166,7 +41221,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -41181,18 +41236,18 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.12.1"; + version = "5.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz"; - sha512 = "54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.13.0.tgz"; + sha512 = "nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" sources."@babel/highlight-7.0.0" - sources."acorn-6.0.5" + sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.7.0" - sources."ansi-escapes-3.1.0" + sources."ajv-6.9.1" + sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -41212,6 +41267,7 @@ in sources."debug-4.1.1" sources."deep-is-0.1.3" sources."doctrine-2.1.0" + sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" @@ -41232,7 +41288,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.3" - sources."globals-11.10.0" + sources."globals-11.11.0" sources."graceful-fs-4.1.15" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -41241,7 +41297,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."inquirer-6.2.1" // { + (sources."inquirer-6.2.2" // { dependencies = [ sources."strip-ansi-5.0.0" ]; @@ -41272,7 +41328,6 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" sources."progress-2.0.3" sources."punycode-2.1.1" @@ -41281,13 +41336,13 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safer-buffer-2.1.2" sources."semver-5.6.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."slice-ansi-2.0.0" + sources."slice-ansi-2.1.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" (sources."strip-ansi-4.0.0" // { @@ -41297,7 +41352,12 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."table-5.2.1" + (sources."table-5.2.3" // { + dependencies = [ + sources."string-width-3.0.0" + sources."strip-ansi-5.0.0" + ]; + }) sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -41329,10 +41389,10 @@ in dependencies = [ sources."@babel/code-frame-7.0.0" sources."@babel/highlight-7.0.0" - sources."acorn-6.0.5" + sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.7.0" - sources."ansi-escapes-3.1.0" + sources."ajv-6.9.1" + sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -41352,8 +41412,9 @@ in sources."debug-4.1.1" sources."deep-is-0.1.3" sources."doctrine-2.1.0" + sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-5.12.1" + sources."eslint-5.13.0" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -41373,7 +41434,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.3" - sources."globals-11.10.0" + sources."globals-11.11.0" sources."graceful-fs-4.1.15" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -41382,7 +41443,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."inquirer-6.2.1" // { + (sources."inquirer-6.2.2" // { dependencies = [ sources."strip-ansi-5.0.0" ]; @@ -41415,23 +41476,22 @@ in sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-2.0.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-from-4.0.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safer-buffer-2.1.2" sources."semver-5.6.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."slice-ansi-2.0.0" + sources."slice-ansi-2.1.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" (sources."strip-ansi-4.0.0" // { @@ -41441,7 +41501,12 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."table-5.2.1" + (sources."table-5.2.3" // { + dependencies = [ + sources."string-width-3.0.0" + sources."strip-ansi-5.0.0" + ]; + }) sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -41487,7 +41552,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -41499,7 +41564,6 @@ in sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" @@ -41545,7 +41609,6 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.3" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -41585,7 +41648,7 @@ in sources."mkpath-1.0.0" sources."ms-2.0.0" sources."node-phantom-simple-2.2.4" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -41603,6 +41666,7 @@ in sources."os-tmpdir-1.0.2" sources."parse-json-2.2.0" sources."path-exists-2.1.0" + sources."path-parse-1.0.6" sources."path-type-1.1.0" sources."pend-1.2.0" sources."performance-now-2.1.0" @@ -41623,6 +41687,7 @@ in sources."repeating-2.0.1" sources."request-2.88.0" sources."request-progress-2.0.1" + sources."resolve-1.10.0" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -41632,7 +41697,7 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -41677,7 +41742,7 @@ in }; dependencies = [ sources."aggregate-error-1.0.0" - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."array-find-index-1.0.2" @@ -41686,7 +41751,6 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" sources."chalk-2.4.2" @@ -41726,7 +41790,7 @@ in sources."iconv-lite-0.4.24" sources."indent-string-3.2.0" sources."inherits-2.0.3" - (sources."inquirer-6.2.1" // { + (sources."inquirer-6.2.2" // { dependencies = [ sources."ansi-regex-4.0.0" sources."strip-ansi-5.0.0" @@ -41735,7 +41799,6 @@ in sources."inquirer-autocomplete-prompt-1.0.1" sources."into-stream-2.0.1" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.1.0" @@ -41763,7 +41826,7 @@ in ]; }) sources."nice-try-1.0.5" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."num-sort-1.0.0" sources."number-is-nan-1.0.1" @@ -41777,6 +41840,7 @@ in sources."parse-json-4.0.0" sources."path-exists-3.0.0" sources."path-key-2.0.1" + sources."path-parse-1.0.6" sources."path-type-3.0.0" (sources."pid-from-port-1.1.3" // { dependencies = [ @@ -41800,9 +41864,10 @@ in sources."read-pkg-up-3.0.0" sources."readable-stream-2.3.6" sources."redent-2.0.0" + sources."resolve-1.10.0" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sec-1.0.0" @@ -41879,7 +41944,7 @@ in sources."isobject-3.0.1" ]; }) - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" (sources."broadway-0.3.6" // { @@ -42280,7 +42345,7 @@ in sha512 = "76zCOpXUl/85CMk9aJwWbBy2vGYv+Yn17PcUMhksTtMJLAUujje3eP8v7FufC2pN9SbQx88Gtr4ARXGeVWwAJA=="; }; dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" sources."debug-4.1.1" sources."lodash-4.17.11" sources."lodash.groupby-4.6.0" @@ -42325,7 +42390,7 @@ in sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" sources."hashlru-2.3.0" - sources."highlight.js-9.13.1" + sources."highlight.js-9.14.2" sources."increment-buffer-1.0.1" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -42352,15 +42417,16 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.23.0" + sources."moment-2.24.0" sources."moo-0.4.3" sources."multicb-1.2.2" - sources."multiserver-1.13.7" + sources."multiserver-3.1.2" sources."multiserver-address-1.0.1" + sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" sources."nan-2.12.1" sources."nearley-2.16.0" - sources."node-gyp-build-3.7.0" + sources."node-gyp-build-3.8.0" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" @@ -42425,8 +42491,8 @@ in sources."semver-5.6.0" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" - sources."smart-buffer-4.0.1" - sources."socks-2.2.1" + sources."smart-buffer-4.0.2" + sources."socks-2.3.1" sources."sodium-browserify-1.2.4" (sources."sodium-browserify-tweetnacl-0.2.3" // { dependencies = [ @@ -42434,15 +42500,15 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.2.4" + sources."sodium-native-2.2.6" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" - sources."ssb-client-4.6.0" + sources."ssb-client-4.6.3" sources."ssb-config-2.3.9" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" - sources."ssb-keys-7.1.4" + sources."ssb-keys-7.1.5" sources."ssb-marked-0.6.0" (sources."ssb-mentions-0.1.2" // { dependencies = [ @@ -42499,10 +42565,10 @@ in graphql-cli = nodeEnv.buildNodePackage { name = "graphql-cli"; packageName = "graphql-cli"; - version = "3.0.5"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.5.tgz"; - sha512 = "VTcl2RxmZTbYv7GNwKDc0TTRjXv1e9ffdRt7JL0WariUE5JeFEvkw1M5UDiCwQUKlmGzojxe4Qxpvg8804m71g=="; + url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.9.tgz"; + sha512 = "V0lI0WlRk7U437NNT5WojjLxz8eYfKO/7cftQBPHU/feD1KjCevCQ5qLnDr/lL/sscBBcyk+YpNH8rBZ2CiHig=="; }; dependencies = [ sources."@babel/generator-7.0.0-beta.38" @@ -42518,11 +42584,10 @@ in ]; }) sources."accepts-1.3.5" - sources."adm-zip-0.4.13" sources."agent-base-4.2.1" - sources."ajv-5.5.2" + sources."ajv-6.9.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" (sources."apollo-codegen-0.20.2" // { @@ -42543,7 +42608,7 @@ in sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.1" + sources."async-2.6.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -42560,7 +42625,6 @@ in sources."brace-expansion-1.1.11" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."camel-case-3.0.0" @@ -42570,6 +42634,7 @@ in sources."chalk-2.4.2" sources."change-case-3.1.0" sources."chardet-0.7.0" + sources."chownr-1.1.1" sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" @@ -42598,10 +42663,11 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."core-util-is-1.0.2" sources."cosmiconfig-4.0.0" sources."create-error-class-3.0.2" + sources."creato-1.0.3" (sources."cross-fetch-2.2.2" // { dependencies = [ sources."node-fetch-2.1.2" @@ -42665,7 +42731,7 @@ in sources."extend-3.0.2" sources."external-editor-3.0.3" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" sources."finalhandler-1.1.1" @@ -42677,6 +42743,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-5.0.0" + sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -42690,9 +42757,12 @@ in sources."graphcool-json-schema-1.2.1" (sources."graphcool-yml-0.4.15" // { dependencies = [ + sources."ajv-5.5.2" sources."debug-3.2.6" sources."dotenv-4.0.0" + sources."fast-deep-equal-1.1.0" sources."fs-extra-4.0.3" + sources."json-schema-traverse-0.3.1" sources."ms-2.1.1" ]; }) @@ -42711,19 +42781,13 @@ in sources."graphql-config-extension-graphcool-1.0.11" sources."graphql-config-extension-prisma-0.2.5" sources."graphql-import-0.4.5" - sources."graphql-playground-html-1.6.6" - sources."graphql-playground-middleware-express-1.7.8" + sources."graphql-playground-html-1.6.12" + sources."graphql-playground-middleware-express-1.7.11" sources."graphql-request-1.8.2" sources."graphql-schema-linter-0.2.0" sources."graphql-static-binding-0.9.3" sources."har-schema-2.0.0" - (sources."har-validator-5.1.3" // { - dependencies = [ - sources."ajv-6.7.0" - sources."fast-deep-equal-2.0.1" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."har-validator-5.1.3" sources."has-flag-3.0.0" sources."header-case-1.0.1" sources."homedir-polyfill-1.0.1" @@ -42753,7 +42817,6 @@ in sources."ip-regex-1.0.3" sources."ipaddr.js-1.8.0" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-ci-1.2.1" sources."is-directory-0.3.1" sources."is-fullwidth-code-point-1.0.0" @@ -42780,7 +42843,7 @@ in }) sources."isstream-0.1.2" sources."iterall-1.2.2" - sources."js-base64-2.5.0" + sources."js-base64-2.5.1" sources."js-yaml-3.12.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" @@ -42792,7 +42855,7 @@ in sources."ms-2.1.1" ]; }) - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" @@ -42803,8 +42866,8 @@ in ]; }) sources."jsprim-1.4.1" - sources."jwa-1.1.6" - sources."jws-3.1.5" + sources."jwa-1.2.0" + sources."jws-3.2.1" sources."latest-version-3.1.0" sources."lcid-1.0.0" (sources."load-json-file-2.0.0" // { @@ -42844,6 +42907,12 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."minipass-2.3.5" // { + dependencies = [ + sources."yallist-3.0.3" + ]; + }) + sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" @@ -42852,7 +42921,7 @@ in sources."no-case-2.3.2" sources."node-fetch-2.3.0" sources."node-request-by-swagger-1.1.4" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."npm-path-2.0.4" sources."npm-paths-1.0.0" (sources."npm-run-4.1.2" // { @@ -42871,12 +42940,17 @@ in sources."ono-4.0.11" sources."open-0.0.5" sources."opn-5.4.0" - sources."ora-3.0.0" + (sources."ora-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.0.0" + sources."strip-ansi-5.0.0" + ]; + }) sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -42892,6 +42966,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" + sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."path-type-2.0.0" sources."performance-now-2.1.0" @@ -42900,9 +42975,12 @@ in sources."prisma-json-schema-0.1.3" (sources."prisma-yml-1.20.0-beta.18" // { dependencies = [ + sources."ajv-5.5.2" sources."debug-3.2.6" sources."dotenv-4.0.0" + sources."fast-deep-equal-1.1.0" sources."fs-extra-7.0.1" + sources."json-schema-traverse-0.3.1" sources."ms-2.1.1" ]; }) @@ -42943,12 +43021,13 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" + sources."resolve-1.10.0" sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" @@ -42976,7 +43055,7 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.3" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."statuses-1.4.0" sources."stealthy-require-1.1.1" (sources."string-width-2.1.1" // { @@ -42992,6 +43071,11 @@ in sources."supports-color-5.5.0" sources."swap-case-1.1.2" sources."sync-exec-0.6.2" + (sources."tar-4.4.8" // { + dependencies = [ + sources."yallist-3.0.3" + ]; + }) sources."term-size-1.2.0" sources."through-2.3.8" sources."through2-2.0.5" @@ -43042,7 +43126,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."xtend-4.0.1" sources."y18n-3.2.1" @@ -43057,7 +43141,7 @@ in sources."invert-kv-2.0.0" sources."lcid-2.0.0" sources."locate-path-3.0.0" - sources."mem-4.0.0" + sources."mem-4.1.0" sources."os-locale-3.1.0" sources."p-limit-2.1.0" sources."p-locate-3.0.0" @@ -43066,7 +43150,7 @@ in ]; }) sources."yargs-parser-8.1.0" - sources."z-schema-3.24.2" + sources."z-schema-3.25.1" ]; buildInputs = globalBuildInputs; meta = { @@ -43250,7 +43334,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -43398,7 +43482,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -43407,10 +43491,13 @@ in }) sources."buffer-equal-1.0.0" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" sources."camelcase-3.0.0" - sources."chokidar-2.0.4" + (sources."chokidar-2.1.1" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -43461,7 +43548,7 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."detect-file-1.0.0" - sources."duplexify-3.6.1" + sources."duplexify-3.7.1" sources."each-props-1.3.2" sources."end-of-stream-1.4.1" sources."error-ex-1.3.2" @@ -43514,7 +43601,7 @@ in }) sources."fined-1.1.1" sources."flagged-respawn-1.0.1" - sources."flush-write-stream-1.0.3" + sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" sources."for-own-1.0.0" sources."fragment-cache-0.2.1" @@ -43557,7 +43644,6 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -43588,7 +43674,6 @@ in sources."lead-1.0.0" sources."liftoff-2.5.0" sources."load-json-file-1.1.0" - sources."lodash.debounce-4.0.8" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -43605,7 +43690,7 @@ in sources."nan-2.12.1" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" sources."now-and-later-2.0.0" sources."number-is-nan-1.0.1" @@ -43622,7 +43707,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.defaults-1.1.0" @@ -43634,7 +43719,7 @@ in sources."os-locale-1.4.0" sources."parse-filepath-1.0.2" sources."parse-json-2.2.0" - sources."parse-node-version-1.0.0" + sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -43671,7 +43756,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -43843,7 +43928,6 @@ in ]; }) sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" sources."camelcase-3.0.0" (sources."class-utils-0.3.6" // { @@ -43939,7 +44023,6 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" @@ -43997,7 +44080,7 @@ in ]; }) sources."next-tick-1.0.0" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -44019,7 +44102,7 @@ in sources."os-locale-1.4.0" sources."parse-filepath-1.0.2" sources."parse-json-2.2.0" - sources."parse-node-version-1.0.0" + sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-2.1.0" @@ -44044,7 +44127,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -44160,13 +44243,12 @@ in dependencies = [ sources."@snyk/dep-graph-1.1.2" sources."@snyk/gemfile-1.1.0" - sources."@types/node-8.10.39" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.2.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" @@ -44175,7 +44257,7 @@ in sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."ast-types-0.12.1" + sources."ast-types-0.12.2" sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -44227,7 +44309,7 @@ in sources."crypto-random-string-1.0.0" sources."csslint-1.0.5" sources."dashdash-1.14.1" - sources."data-uri-to-buffer-2.0.0" + sources."data-uri-to-buffer-1.2.0" sources."date-now-0.1.4" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -44279,9 +44361,10 @@ in ]; }) sources."get-stream-3.0.0" - (sources."get-uri-2.0.3" // { + (sources."get-uri-2.0.2" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."getpass-0.1.7" @@ -44353,7 +44436,7 @@ in ]; }) sources."jsbn-0.1.1" - (sources."jshint-2.9.7" // { + (sources."jshint-2.10.1" // { dependencies = [ sources."strip-json-comments-1.0.4" ]; @@ -44366,6 +44449,7 @@ in dependencies = [ sources."es6-promise-3.0.2" sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" sources."readable-stream-2.0.6" ]; }) @@ -44428,7 +44512,6 @@ in sources."pako-1.0.8" sources."parse-glob-3.0.4" sources."parserlib-1.1.1" - sources."path-0.12.7" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -44437,8 +44520,7 @@ in sources."pify-3.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" - sources."process-0.11.10" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-7.3.1" sources."proxy-agent-2.3.1" sources."proxy-from-env-1.0.0" @@ -44452,9 +44534,10 @@ in ]; }) sources."rc-1.2.8" - (sources."readable-stream-3.1.1" // { + (sources."readable-stream-2.3.6" // { dependencies = [ - sources."string_decoder-1.2.0" + sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) sources."recursive-readdir-2.2.2" @@ -44482,20 +44565,16 @@ in sources."shelljs-0.3.0" sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" - sources."snyk-1.122.0" + sources."snyk-1.127.0" sources."snyk-config-2.2.0" - sources."snyk-docker-plugin-1.17.0" + sources."snyk-docker-plugin-1.21.2" sources."snyk-go-plugin-1.6.1" sources."snyk-gradle-plugin-2.1.3" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.1" - (sources."snyk-nodejs-lockfile-parser-1.10.1" // { - dependencies = [ - sources."lodash-4.17.10" - ]; - }) + sources."snyk-nodejs-lockfile-parser-1.11.0" sources."snyk-nuget-plugin-1.6.5" - sources."snyk-php-plugin-1.5.1" + sources."snyk-php-plugin-1.5.2" sources."snyk-policy-1.13.3" sources."snyk-python-plugin-1.9.1" sources."snyk-resolve-1.0.1" @@ -44508,7 +44587,7 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.10" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."string-width-2.1.1" sources."string_decoder-0.10.31" @@ -44524,7 +44603,7 @@ in sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" - sources."toml-2.3.5" + sources."toml-2.3.6" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -44546,7 +44625,6 @@ in sources."update-notifier-2.5.0" sources."uri-js-4.2.2" sources."url-parse-lax-1.0.0" - sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -44565,7 +44643,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."xml-1.0.1" sources."xml2js-0.4.19" @@ -44634,7 +44712,7 @@ in sources."colors-1.0.3" sources."corser-2.0.1" sources."debug-3.1.0" - sources."ecstatic-3.3.0" + sources."ecstatic-3.3.1" sources."eventemitter3-3.1.0" sources."follow-redirects-1.6.1" sources."he-1.2.0" @@ -44676,17 +44754,17 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "4.8.0"; + version = "4.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-4.8.0.tgz"; - sha512 = "N4ogYIoavTeROKCf5AX6NUxfXtTnhxeK0nxGUPSNdQZtdx+mG1hD6X1j9BVEMvvv6qmppIu2zu4AIg4wEdqn6w=="; + url = "https://registry.npmjs.org/ionic/-/ionic-4.10.2.tgz"; + sha512 = "z8fEKPB7barrSUzGnBsnsb1lzp8LB2otdQ7SE8OuTDgKCVY/VIXlJ9h6/SAxDE/vGKGGgkN9pMfb0ppeNXwYtw=="; }; dependencies = [ - sources."@ionic/cli-framework-1.5.3" - sources."@ionic/discover-1.0.10" + sources."@ionic/cli-framework-1.6.0" + sources."@ionic/discover-1.0.11" sources."@ionic/utils-fs-1.0.0" sources."@ionic/utils-network-0.0.6" - sources."@types/node-8.10.39" + sources."@types/node-8.10.40" sources."agent-base-4.2.1" (sources."ansi-align-2.0.0" // { dependencies = [ @@ -44694,10 +44772,10 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ast-types-0.12.1" + sources."ast-types-0.12.2" sources."astral-regex-1.0.0" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" @@ -44798,7 +44876,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."inquirer-6.2.1" // { + (sources."inquirer-6.2.2" // { dependencies = [ (sources."string-width-2.1.1" // { dependencies = [ @@ -44918,7 +44996,7 @@ in sources."rimraf-2.6.3" sources."rsvp-3.6.2" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -44928,9 +45006,9 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."slice-ansi-2.0.0" - sources."smart-buffer-4.0.1" - sources."socks-2.2.2" + sources."slice-ansi-2.1.0" + sources."smart-buffer-4.0.2" + sources."socks-2.2.3" sources."socks-proxy-agent-4.0.1" sources."source-map-0.6.1" (sources."split2-3.1.0" // { @@ -45005,8 +45083,8 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" - sources."ws-6.1.2" + sources."write-file-atomic-2.4.2" + sources."ws-6.1.3" sources."xdg-basedir-3.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.1" @@ -45070,7 +45148,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.23.0" + sources."moment-2.24.0" sources."mv-2.1.1" sources."nan-2.12.1" sources."ncp-2.0.0" @@ -45170,7 +45248,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."iterare-1.1.2" - (sources."jaeger-client-3.13.0" // { + (sources."jaeger-client-3.14.4" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -45262,10 +45340,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.7"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz"; - sha512 = "Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.1.tgz"; + sha512 = "9GpPfKeffYBl7oBDX2lHPG16j0AM7D2bn3aLy9DaWTr6CWa0i/7UGhX8WLZ7V14QQnnr4hXbjauTLYg06F+HYw=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -45336,7 +45414,7 @@ in sha512 = "MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA=="; }; dependencies = [ - sources."@types/node-10.12.18" + sources."@types/node-10.12.26" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" sources."balanced-match-1.0.0" @@ -45490,7 +45568,7 @@ in }; dependencies = [ sources."accepts-1.3.5" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -45621,7 +45699,7 @@ in sources."make-dir-1.3.0" sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" - sources."mem-4.0.0" + sources."mem-4.1.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { dependencies = [ @@ -45655,7 +45733,7 @@ in }) sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.0.0" sources."p-limit-2.1.0" sources."p-locate-3.0.0" sources."p-try-2.0.0" @@ -45701,7 +45779,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."steno-0.4.4" sources."string-width-2.1.1" @@ -45741,7 +45819,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."y18n-4.0.0" sources."yallist-2.1.2" @@ -45786,15 +45864,19 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "3.1.4"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-3.1.4.tgz"; - sha512 = "31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw=="; + url = "https://registry.npmjs.org/karma/-/karma-4.0.0.tgz"; + sha512 = "EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g=="; }; dependencies = [ sources."accepts-1.3.5" sources."after-0.8.2" - sources."anymatch-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -45815,7 +45897,7 @@ in sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" sources."better-assert-1.0.2" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."blob-0.0.5" sources."bluebird-3.5.3" sources."body-parser-1.18.3" @@ -45832,7 +45914,7 @@ in sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."callsite-1.0.0" - sources."chokidar-2.0.4" + sources."chokidar-2.1.1" sources."circular-json-0.5.9" (sources."class-utils-0.3.6" // { dependencies = [ @@ -45862,7 +45944,7 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."core-util-is-1.0.2" sources."custom-event-1.0.1" sources."date-format-1.2.0" @@ -45995,7 +46077,6 @@ in sources."isobject-3.0.1" sources."kind-of-6.0.2" sources."lodash-4.17.11" - sources."lodash.debounce-4.0.8" (sources."log4js-3.0.6" // { dependencies = [ sources."debug-3.2.6" @@ -46018,7 +46099,7 @@ in sources."nan-2.12.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.1" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" sources."object-component-0.0.3" (sources."object-copy-0.1.0" // { dependencies = [ @@ -46222,10 +46303,10 @@ in sources."convert-source-map-1.6.0" sources."core-util-is-1.0.2" sources."define-properties-1.1.3" - sources."duplexify-3.6.1" + sources."duplexify-3.7.1" sources."end-of-stream-1.4.1" sources."extend-3.0.2" - sources."flush-write-stream-1.0.3" + sources."flush-write-stream-1.1.1" sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -46253,7 +46334,7 @@ in sources."minimatch-3.0.4" sources."normalize-path-2.1.1" sources."now-and-later-2.0.0" - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."object.assign-4.1.0" sources."once-1.4.0" sources."ordered-read-streams-1.0.1" @@ -46306,7 +46387,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -46337,7 +46418,7 @@ in sources."cross-spawn-6.0.5" sources."css-select-1.2.0" sources."css-what-2.1.2" - sources."cssom-0.3.4" + sources."cssom-0.3.6" sources."cssstyle-0.2.37" sources."cycle-1.0.3" sources."dashdash-1.14.1" @@ -46410,14 +46491,14 @@ in sources."lodash-4.17.11" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" - sources."mem-4.0.0" + sources."mem-4.1.0" sources."mime-db-1.37.0" sources."mime-types-2.1.21" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.23.0" + sources."moment-2.24.0" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -46443,7 +46524,7 @@ in sources."os-locale-1.4.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.0.0" sources."p-limit-2.1.0" sources."p-locate-3.0.0" sources."p-try-2.0.0" @@ -46482,7 +46563,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."source-map-0.6.1" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."stack-trace-0.0.10" sources."string-width-1.0.2" sources."string_decoder-0.10.31" @@ -46552,76 +46633,77 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.10.6"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.10.6.tgz"; - sha512 = "qdoyEpozHKQQnrpaDWbhiFG85/CBAyz2rkcj78JQVl2g400n9FFqS2Zweol5wusRnUzmpQKxFFll4P9DzIzSIA=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.11.1.tgz"; + sha512 = "7an/cia9u6qVTts5PQ/adFq8QSgE7gzG1pUHhH+XKVU1seDKQ99JLu61n3/euv2qeQF+ww4WLKnFHIPa5+LJSQ=="; }; dependencies = [ - sources."@lerna/add-3.10.6" - sources."@lerna/batch-packages-3.10.6" - sources."@lerna/bootstrap-3.10.6" - sources."@lerna/changed-3.10.6" - sources."@lerna/check-working-tree-3.10.0" + sources."@lerna/add-3.11.0" + sources."@lerna/batch-packages-3.11.0" + sources."@lerna/bootstrap-3.11.0" + sources."@lerna/changed-3.11.1" + sources."@lerna/check-working-tree-3.11.0" sources."@lerna/child-process-3.3.0" - sources."@lerna/clean-3.10.6" - sources."@lerna/cli-3.10.6" - sources."@lerna/collect-updates-3.10.1" - sources."@lerna/command-3.10.6" - sources."@lerna/conventional-commits-3.10.0" - (sources."@lerna/create-3.10.6" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) - sources."@lerna/create-symlink-3.6.0" - sources."@lerna/describe-ref-3.10.0" - sources."@lerna/diff-3.10.6" - sources."@lerna/exec-3.10.6" - sources."@lerna/filter-options-3.10.6" - sources."@lerna/filter-packages-3.10.0" - sources."@lerna/get-npm-exec-opts-3.6.0" + sources."@lerna/clean-3.11.0" + sources."@lerna/cli-3.11.0" + sources."@lerna/collect-updates-3.11.0" + sources."@lerna/command-3.11.0" + sources."@lerna/conventional-commits-3.11.0" + sources."@lerna/create-3.11.0" + sources."@lerna/create-symlink-3.11.0" + sources."@lerna/describe-ref-3.11.0" + sources."@lerna/diff-3.11.0" + sources."@lerna/exec-3.11.0" + sources."@lerna/filter-options-3.11.0" + sources."@lerna/filter-packages-3.11.0" + sources."@lerna/get-npm-exec-opts-3.11.0" sources."@lerna/get-packed-3.7.0" + sources."@lerna/github-client-3.11.0" sources."@lerna/global-options-3.10.6" sources."@lerna/has-npm-version-3.10.0" - sources."@lerna/import-3.10.6" - sources."@lerna/init-3.10.6" - sources."@lerna/link-3.10.6" - sources."@lerna/list-3.10.6" - sources."@lerna/listable-3.10.6" - sources."@lerna/log-packed-3.6.0" + sources."@lerna/import-3.11.0" + sources."@lerna/init-3.11.0" + sources."@lerna/link-3.11.0" + sources."@lerna/list-3.11.0" + sources."@lerna/listable-3.11.0" + sources."@lerna/log-packed-3.11.0" sources."@lerna/npm-conf-3.7.0" - sources."@lerna/npm-dist-tag-3.8.5" - sources."@lerna/npm-install-3.10.0" - sources."@lerna/npm-publish-3.10.5" - sources."@lerna/npm-run-script-3.10.0" - sources."@lerna/output-3.6.0" - sources."@lerna/pack-directory-3.10.5" - sources."@lerna/package-3.7.2" - sources."@lerna/package-graph-3.10.6" - sources."@lerna/project-3.10.0" - sources."@lerna/prompt-3.6.0" - sources."@lerna/publish-3.10.6" - sources."@lerna/pulse-till-done-3.7.1" - sources."@lerna/resolve-symlink-3.6.0" - sources."@lerna/rimraf-dir-3.10.0" - sources."@lerna/run-3.10.6" - sources."@lerna/run-lifecycle-3.10.5" + sources."@lerna/npm-dist-tag-3.11.0" + sources."@lerna/npm-install-3.11.0" + sources."@lerna/npm-publish-3.11.0" + sources."@lerna/npm-run-script-3.11.0" + sources."@lerna/output-3.11.0" + sources."@lerna/pack-directory-3.11.0" + sources."@lerna/package-3.11.0" + sources."@lerna/package-graph-3.11.0" + sources."@lerna/project-3.11.0" + sources."@lerna/prompt-3.11.0" + sources."@lerna/publish-3.11.1" + sources."@lerna/pulse-till-done-3.11.0" + sources."@lerna/resolve-symlink-3.11.0" + sources."@lerna/rimraf-dir-3.11.0" + sources."@lerna/run-3.11.0" + sources."@lerna/run-lifecycle-3.11.0" sources."@lerna/run-parallel-batches-3.0.0" - sources."@lerna/symlink-binary-3.10.0" - sources."@lerna/symlink-dependencies-3.10.0" + sources."@lerna/symlink-binary-3.11.0" + sources."@lerna/symlink-dependencies-3.11.0" sources."@lerna/timer-3.5.0" - sources."@lerna/validation-error-3.6.0" - sources."@lerna/version-3.10.6" - sources."@lerna/write-log-file-3.6.0" + sources."@lerna/validation-error-3.11.0" + sources."@lerna/version-3.11.1" + sources."@lerna/write-log-file-3.11.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" + sources."@octokit/endpoint-3.1.2" + sources."@octokit/plugin-enterprise-rest-2.1.1" + sources."@octokit/request-2.3.0" + sources."@octokit/rest-16.15.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."agentkeepalive-3.5.2" - sources."ajv-6.7.0" - sources."ansi-escapes-3.1.0" + sources."ajv-6.9.1" + sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" @@ -46641,7 +46723,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-2.6.1" + sources."async-2.6.2" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -46653,7 +46735,7 @@ in ]; }) sources."bcrypt-pbkdf-1.0.2" - sources."bin-links-1.1.2" + sources."before-after-hook-1.3.2" sources."block-stream-0.0.9" sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" @@ -46662,16 +46744,12 @@ in sources."extend-shallow-2.0.1" ]; }) + sources."btoa-lite-1.0.0" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."byline-5.0.0" sources."byte-size-4.0.4" - (sources."cacache-11.3.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - ]; - }) + sources."cacache-11.3.2" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -46759,6 +46837,7 @@ in }) sources."decode-uri-component-0.2.0" sources."dedent-0.7.0" + sources."deepmerge-3.1.0" sources."defaults-1.0.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" @@ -46768,7 +46847,7 @@ in sources."dir-glob-2.0.0" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" - sources."duplexify-3.6.1" + sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" @@ -46825,9 +46904,8 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-npm-prefix-1.0.2" sources."find-up-3.0.0" - sources."flush-write-stream-1.0.3" + sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -46835,7 +46913,6 @@ in sources."from2-2.3.0" sources."fs-extra-7.0.1" sources."fs-minipass-1.2.5" - sources."fs-vacuum-1.2.10" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" @@ -46846,7 +46923,6 @@ in ]; }) sources."genfun-5.0.0" - sources."gentle-fs-2.0.1" sources."get-caller-file-1.0.3" (sources."get-pkg-repo-1.4.0" // { dependencies = [ @@ -46881,13 +46957,15 @@ in ]; }) sources."git-semver-tags-2.0.2" + sources."git-up-4.0.1" + sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" sources."glob-7.1.3" sources."glob-parent-3.1.0" sources."glob-to-regexp-0.3.0" sources."globby-8.0.2" sources."graceful-fs-4.1.15" - (sources."handlebars-4.0.12" // { + (sources."handlebars-4.1.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -46933,7 +47011,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."init-package-json-1.10.3" - (sources."inquirer-6.2.1" // { + (sources."inquirer-6.2.2" // { dependencies = [ sources."ansi-regex-4.0.0" sources."strip-ansi-5.0.0" @@ -46944,7 +47022,6 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" @@ -46963,6 +47040,7 @@ in sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" + sources."is-ssh-1.3.1" sources."is-stream-1.1.0" sources."is-subset-0.1.1" sources."is-text-path-1.0.1" @@ -46984,56 +47062,42 @@ in sources."jsprim-1.4.1" sources."kind-of-6.0.2" sources."lcid-2.0.0" - sources."libnpm-2.0.1" (sources."libnpmaccess-3.0.1" // { dependencies = [ sources."aproba-2.0.0" ]; }) - sources."libnpmconfig-1.2.1" - (sources."libnpmhook-5.0.2" // { - dependencies = [ - sources."aproba-2.0.0" - ]; - }) - (sources."libnpmorg-1.0.0" // { - dependencies = [ - sources."aproba-2.0.0" - ]; - }) - (sources."libnpmpublish-1.1.0" // { - dependencies = [ - sources."aproba-2.0.0" - ]; - }) - sources."libnpmsearch-2.0.0" - (sources."libnpmteam-1.0.1" // { + (sources."libnpmpublish-1.1.1" // { dependencies = [ sources."aproba-2.0.0" ]; }) sources."load-json-file-4.0.0" sources."locate-path-3.0.0" - sources."lock-verify-2.0.2" sources."lodash-4.17.11" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" + sources."lodash.get-4.4.2" + sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" sources."lodash.template-4.4.0" sources."lodash.templatesettings-4.1.0" + sources."lodash.uniq-4.5.0" sources."loud-rejection-1.6.0" - (sources."lru-cache-4.1.5" // { + sources."lru-cache-5.1.1" + sources."macos-release-2.0.0" + sources."make-dir-1.3.0" + (sources."make-fetch-happen-4.0.1" // { dependencies = [ + sources."lru-cache-4.1.5" sources."yallist-2.1.2" ]; }) - sources."make-dir-1.3.0" - sources."make-fetch-happen-4.0.1" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" - sources."mem-4.0.0" + sources."mem-4.1.0" sources."meow-4.0.1" sources."merge2-1.2.3" sources."micromatch-3.1.10" @@ -47063,6 +47127,7 @@ in sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" sources."nice-try-1.0.5" + sources."node-fetch-2.3.0" sources."node-fetch-npm-2.0.2" (sources."node-gyp-3.8.0" // { dependencies = [ @@ -47071,15 +47136,19 @@ in ]; }) sources."nopt-3.0.6" - sources."normalize-package-data-2.4.0" - sources."npm-bundled-1.0.5" + sources."normalize-package-data-2.5.0" + sources."normalize-url-3.3.0" + sources."npm-bundled-1.0.6" sources."npm-lifecycle-2.1.0" - sources."npm-logical-tree-1.2.1" sources."npm-package-arg-6.1.0" - sources."npm-packlist-1.2.0" + sources."npm-packlist-1.3.0" sources."npm-pick-manifest-2.2.3" - sources."npm-profile-4.0.1" - sources."npm-registry-fetch-3.8.0" + (sources."npm-registry-fetch-3.9.0" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -47100,6 +47169,7 @@ in }) sources."object-visit-1.0.1" sources."object.pick-1.3.0" + sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" sources."onetime-2.0.1" (sources."optimist-0.6.1" // { @@ -47109,11 +47179,12 @@ in }) sources."os-homedir-1.0.2" sources."os-locale-3.1.0" + sources."os-name-3.0.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.0.0" sources."p-limit-2.1.0" sources."p-locate-3.0.0" sources."p-map-1.2.0" @@ -47122,20 +47193,18 @@ in sources."p-reduce-1.0.0" sources."p-try-2.0.0" sources."p-waterfall-1.0.0" - (sources."pacote-9.4.0" // { - dependencies = [ - sources."lru-cache-5.1.1" - ]; - }) + sources."pacote-9.4.1" sources."parallel-transform-1.1.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" + sources."parse-path-4.0.1" + sources."parse-url-5.0.1" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" sources."path-key-2.0.1" + sources."path-parse-1.0.6" sources."path-type-3.0.0" sources."performance-now-2.1.0" sources."pify-3.0.0" @@ -47156,6 +47225,7 @@ in sources."promise-retry-1.1.1" sources."promzard-0.3.0" sources."proto-list-1.2.4" + sources."protocols-1.4.7" sources."protoduck-5.0.1" sources."pseudomap-1.0.2" sources."psl-1.1.31" @@ -47172,7 +47242,7 @@ in sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-package-json-2.0.13" - sources."read-package-tree-5.2.1" + sources."read-package-tree-5.2.2" sources."read-pkg-3.0.0" (sources."read-pkg-up-3.0.0" // { dependencies = [ @@ -47193,6 +47263,7 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" + sources."resolve-1.10.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -47206,7 +47277,7 @@ in sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."run-queue-1.0.3" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -47222,7 +47293,7 @@ in sources."signal-exit-3.0.2" sources."slash-1.0.0" sources."slide-1.1.6" - sources."smart-buffer-4.0.1" + sources."smart-buffer-4.0.2" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -47251,7 +47322,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."socks-2.2.2" + sources."socks-2.2.3" sources."socks-proxy-agent-4.0.1" sources."sort-keys-2.0.0" sources."source-map-0.5.7" @@ -47265,7 +47336,7 @@ in sources."split-string-3.1.0" sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."ssri-6.0.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -47293,7 +47364,6 @@ in ]; }) sources."string_decoder-1.1.1" - sources."stringify-package-1.0.0" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" @@ -47341,6 +47411,7 @@ in }) sources."unique-filename-1.1.1" sources."unique-slug-2.0.1" + sources."universal-user-agent-2.0.3" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { dependencies = [ @@ -47354,6 +47425,7 @@ in }) sources."uri-js-4.2.2" sources."urix-0.1.0" + sources."url-template-2.0.8" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" @@ -47366,6 +47438,12 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" + (sources."windows-release-3.1.0" // { + dependencies = [ + sources."execa-0.10.0" + sources."get-stream-3.0.0" + ]; + }) sources."wordwrap-0.0.3" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -47374,7 +47452,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."write-json-file-2.3.0" sources."write-pkg-3.2.0" sources."xtend-4.0.1" @@ -47401,7 +47479,7 @@ in sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -47452,7 +47530,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."source-map-0.6.1" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -47506,7 +47584,11 @@ in }; dependencies = [ sources."accepts-1.3.5" - sources."anymatch-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."apache-crypt-1.2.1" sources."apache-md5-1.1.2" sources."arr-diff-4.0.0" @@ -47524,7 +47606,7 @@ in sources."basic-auth-2.0.1" sources."batch-0.6.1" sources."bcryptjs-2.4.3" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -47532,7 +47614,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."chokidar-2.0.4" + sources."chokidar-2.1.1" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -47648,7 +47730,6 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.2" - sources."lodash.debounce-4.0.8" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" @@ -47662,7 +47743,7 @@ in sources."nan-2.12.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.1" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -47825,7 +47906,7 @@ in dependencies = [ sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -47854,7 +47935,7 @@ in sources."base64id-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."blob-0.0.5" sources."body-parser-1.18.3" sources."braces-1.8.5" @@ -47916,7 +47997,7 @@ in sources."debug-3.1.0" ]; }) - (sources."engine.io-client-3.3.1" // { + (sources."engine.io-client-3.3.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -48242,7 +48323,7 @@ in sources."source-map-url-0.4.0" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -48278,7 +48359,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" - sources."uc.micro-1.0.5" + sources."uc.micro-1.0.6" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -48305,7 +48386,7 @@ in sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-6.1.2" + sources."ws-6.1.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -48326,11 +48407,11 @@ in dependencies = [ sources."@babel/code-frame-7.0.0" sources."@babel/core-7.2.2" - sources."@babel/generator-7.2.2" + sources."@babel/generator-7.3.2" 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.1.0" - sources."@babel/helper-create-class-features-plugin-7.2.3" + sources."@babel/helper-create-class-features-plugin-7.3.2" sources."@babel/helper-define-map-7.1.0" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" @@ -48347,14 +48428,14 @@ in sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.0.0" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.2.0" + sources."@babel/helpers-7.3.1" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.2.3" + sources."@babel/parser-7.3.2" 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.2.3" + sources."@babel/plugin-proposal-class-properties-7.3.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.2.0" + sources."@babel/plugin-proposal-object-rest-spread-7.3.2" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.2.0" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -48367,7 +48448,7 @@ in sources."@babel/plugin-transform-block-scoping-7.2.0" sources."@babel/plugin-transform-classes-7.2.2" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.2.0" + sources."@babel/plugin-transform-destructuring-7.3.2" sources."@babel/plugin-transform-dotall-regex-7.2.0" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" @@ -48378,6 +48459,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.2.0" sources."@babel/plugin-transform-modules-systemjs-7.2.0" sources."@babel/plugin-transform-modules-umd-7.2.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.3.0" sources."@babel/plugin-transform-new-target-7.0.0" sources."@babel/plugin-transform-object-super-7.2.0" sources."@babel/plugin-transform-parameters-7.2.0" @@ -48389,12 +48471,12 @@ in sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.2.0" - sources."@babel/preset-env-7.2.3" + sources."@babel/preset-env-7.3.1" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.2.0" + sources."@babel/runtime-7.3.1" sources."@babel/template-7.2.2" sources."@babel/traverse-7.2.3" - sources."@babel/types-7.2.2" + sources."@babel/types-7.3.2" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -48402,7 +48484,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/estree-0.0.39" - sources."@types/node-10.12.18" + sources."@types/node-11.9.3" sources."@webassemblyjs/ast-1.7.11" sources."@webassemblyjs/floating-point-hex-parser-1.7.11" sources."@webassemblyjs/helper-api-error-1.7.11" @@ -48424,17 +48506,13 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.1" sources."ace.improved-0.2.1" - sources."acorn-6.0.5" - (sources."acorn-dynamic-import-3.0.0" // { - dependencies = [ - sources."acorn-5.7.3" - ]; - }) - sources."ajv-6.7.0" + sources."acorn-6.1.0" + sources."acorn-dynamic-import-4.0.0" + sources."ajv-6.9.1" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.2.0" + sources."ajv-keywords-3.4.0" sources."amdefine-1.0.1" - sources."ansi-regex-2.1.1" + sources."ansi-regex-3.0.0" sources."ansi-styles-2.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -48504,8 +48582,10 @@ in sources."atob-2.1.2" (sources."babel-code-frame-6.26.0" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."chalk-1.1.3" sources."js-tokens-3.0.2" + sources."strip-ansi-3.0.1" ]; }) sources."babel-core-7.0.0-bridge.0" @@ -48525,7 +48605,15 @@ in sources."babel-jest-23.6.0" sources."babel-loader-8.0.5" sources."babel-messages-6.23.0" - sources."babel-plugin-istanbul-4.1.6" + (sources."babel-plugin-istanbul-4.1.6" // { + 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."babel-plugin-jest-hoist-23.2.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" @@ -48580,9 +48668,9 @@ in sources."isobject-3.0.1" ]; }) - sources."base64-js-0.0.8" + sources."base64-js-1.3.0" sources."big.js-5.2.2" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."bl-1.2.2" sources."bluebird-3.5.3" sources."bn.js-4.11.8" @@ -48596,14 +48684,14 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."browserslist-4.4.1" - sources."buffer-3.6.0" + sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-1.1.1" + sources."builtin-modules-2.0.0" sources."builtin-status-codes-3.0.0" sources."cacache-11.3.2" (sources."cache-base-1.0.1" // { @@ -48613,12 +48701,13 @@ in }) (sources."cacheable-request-2.1.4" // { dependencies = [ + sources."get-stream-3.0.0" sources."lowercase-keys-1.0.0" ]; }) sources."call-me-maybe-1.0.1" sources."camelcase-5.0.0" - sources."caniuse-lite-1.0.30000929" + sources."caniuse-lite-1.0.30000936" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -48627,7 +48716,7 @@ in ]; }) sources."cherow-1.6.9" - (sources."chokidar-2.0.4" // { + (sources."chokidar-2.1.1" // { dependencies = [ sources."array-unique-0.3.2" sources."braces-2.3.2" @@ -48642,6 +48731,7 @@ in sources."is-glob-4.0.0" sources."is-number-3.0.0" sources."isobject-3.0.1" + sources."normalize-path-3.0.0" ]; }) sources."chownr-1.1.1" @@ -48667,12 +48757,8 @@ in }) sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" - (sources."cliui-4.1.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."cli-table3-0.5.1" + sources."cliui-4.1.0" sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-response-1.0.2" @@ -48682,6 +48768,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colors-1.3.3" sources."commander-2.8.1" sources."commondir-1.0.1" sources."component-emitter-1.2.1" @@ -48694,7 +48781,7 @@ in sources."convert-source-map-1.6.0" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" @@ -48756,13 +48843,14 @@ in sources."domain-browser-1.2.0" (sources."download-7.1.0" // { dependencies = [ + sources."get-stream-3.0.0" sources."got-8.3.2" sources."pify-3.0.0" ]; }) sources."duplexer3-0.1.4" - sources."duplexify-3.6.1" - sources."electron-to-chromium-1.3.103" + sources."duplexify-3.7.1" + sources."electron-to-chromium-1.3.113" sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -48780,11 +48868,7 @@ in sources."esutils-2.0.2" sources."events-3.0.0" sources."evp_bytestokey-1.0.3" - (sources."execa-1.0.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) + sources."execa-1.0.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" sources."expand-tilde-2.0.2" @@ -48866,7 +48950,7 @@ in sources."filenamify-2.1.0" sources."fill-range-2.2.4" sources."find-cache-dir-2.0.0" - sources."find-up-2.1.0" + sources."find-up-3.0.0" (sources."findup-sync-2.0.0" // { dependencies = [ sources."arr-diff-4.0.0" @@ -48911,7 +48995,7 @@ in ]; }) sources."flow-bin-0.85.0" - sources."flush-write-stream-1.0.3" + sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -48923,16 +49007,15 @@ in sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."glob-to-regexp-0.3.0" sources."global-modules-1.0.0" - sources."global-modules-path-2.3.1" sources."global-prefix-1.0.2" - sources."globals-11.10.0" + sources."globals-11.11.0" (sources."globby-8.0.2" // { dependencies = [ sources."pify-3.0.0" @@ -48943,8 +49026,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."cacheable-request-6.0.0" - sources."get-stream-4.1.0" - sources."http-cache-semantics-4.0.2" + sources."http-cache-semantics-4.0.3" sources."normalize-url-3.3.0" sources."p-cancelable-1.0.0" ]; @@ -48952,7 +49034,11 @@ in sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" sources."has-1.0.3" - sources."has-ansi-2.0.0" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.0" @@ -48989,7 +49075,11 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."interpret-1.2.0" - sources."into-stream-3.1.0" + (sources."into-stream-3.1.0" // { + dependencies = [ + sources."p-is-promise-1.1.0" + ]; + }) sources."invariant-2.2.4" sources."invert-kv-2.0.0" (sources."is-accessor-descriptor-1.0.0" // { @@ -49000,7 +49090,6 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-callable-1.1.4" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -49018,7 +49107,7 @@ in sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-finite-1.0.2" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-2.0.1" sources."is-module-1.0.0" sources."is-natural-number-4.0.1" @@ -49055,7 +49144,6 @@ in sources."keyv-3.0.0" sources."kind-of-3.2.2" sources."lcid-2.0.0" - sources."lightercollective-0.1.0" sources."load-json-file-1.1.0" sources."loader-runner-2.4.0" (sources."loader-utils-1.2.3" // { @@ -49063,16 +49151,15 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.11" - sources."lodash.debounce-4.0.8" sources."lodash.isplainobject-4.0.6" sources."lodash.some-4.6.0" sources."log-symbols-2.2.0" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" - sources."magic-string-0.25.1" + sources."magic-string-0.25.2" (sources."make-dir-1.3.0" // { dependencies = [ sources."pify-3.0.0" @@ -49083,12 +49170,12 @@ in sources."map-visit-1.0.0" sources."math-random-1.0.4" sources."md5.js-1.3.5" - sources."mem-4.0.0" + sources."mem-4.1.0" sources."memory-fs-0.4.1" sources."merge2-1.2.3" sources."micromatch-2.3.11" sources."miller-rabin-4.0.1" - sources."mime-db-1.37.0" + sources."mime-db-1.38.0" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -49127,13 +49214,12 @@ in sources."node-fetch-2.3.0" (sources."node-libs-browser-2.2.0" // { dependencies = [ - sources."base64-js-1.3.0" sources."buffer-4.9.1" sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.3" - sources."normalize-package-data-2.4.0" + sources."node-releases-1.1.7" + sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { dependencies = [ @@ -49160,7 +49246,7 @@ in }) ]; }) - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -49175,23 +49261,23 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - (sources."ora-3.0.0" // { + (sources."ora-3.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-4.0.0" + sources."strip-ansi-5.0.0" ]; }) sources."os-browserify-0.3.0" sources."os-locale-3.1.0" sources."p-cancelable-0.4.1" sources."p-defer-1.0.0" - sources."p-event-2.1.0" + sources."p-event-2.3.1" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" + sources."p-is-promise-2.0.0" + sources."p-limit-2.1.0" + sources."p-locate-3.0.0" sources."p-timeout-2.0.1" - sources."p-try-1.0.0" + sources."p-try-2.0.0" sources."pako-1.0.8" sources."parallel-transform-1.1.0" sources."paredit.js-0.3.4" @@ -49212,15 +49298,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-3.0.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.1.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - ]; - }) + sources."pkg-dir-3.0.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" sources."prepend-http-2.0.0" @@ -49313,6 +49391,7 @@ in sources."regenerator-transform-0.13.3" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" + sources."regexp-tree-0.1.1" sources."regexpu-core-4.4.0" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -49327,7 +49406,7 @@ in sources."replace-ext-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-cwd-2.0.0" (sources."resolve-dependencies-2.2.1" // { dependencies = [ @@ -49356,17 +49435,13 @@ in sources."rollup-plugin-babel-4.0.3" sources."rollup-plugin-babel-minify-6.1.1" sources."rollup-plugin-commonjs-9.2.0" - (sources."rollup-plugin-node-resolve-3.4.0" // { - dependencies = [ - sources."builtin-modules-2.0.0" - ]; - }) + sources."rollup-plugin-node-resolve-3.4.0" sources."rollup-plugin-replace-2.1.0" sources."rollup-pluginutils-2.3.3" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."schema-utils-0.4.7" + sources."schema-utils-1.0.0" sources."seek-bzip-1.0.5" sources."semver-5.6.0" sources."serialize-javascript-1.6.1" @@ -49444,20 +49519,14 @@ in sources."kind-of-5.1.0" ]; }) - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.0" sources."strict-uri-encode-1.1.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-2.1.1" sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" + sources."strip-ansi-4.0.0" sources."strip-bom-2.0.0" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" @@ -49465,15 +49534,14 @@ in sources."supports-color-2.0.0" sources."tapable-1.1.1" sources."tar-stream-1.6.2" - (sources."terser-3.14.1" // { + (sources."terser-3.16.1" // { dependencies = [ sources."commander-2.17.1" sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.2.1" // { + (sources."terser-webpack-plugin-1.2.2" // { dependencies = [ - sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; }) @@ -49499,7 +49567,7 @@ in sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."typedarray-0.0.6" - sources."unbzip2-stream-1.3.1" + sources."unbzip2-stream-1.3.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.0.2" @@ -49543,9 +49611,8 @@ in sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.28.4" // { + (sources."webpack-4.29.3" // { dependencies = [ - sources."acorn-5.7.3" sources."arr-diff-4.0.0" sources."array-unique-0.3.2" sources."braces-2.3.2" @@ -49586,7 +49653,7 @@ in sources."ms-2.0.0" ]; }) - (sources."webpack-cli-3.2.1" // { + (sources."webpack-cli-3.2.3" // { dependencies = [ sources."supports-color-5.5.0" ]; @@ -49613,22 +49680,17 @@ in sources."worker-farm-1.6.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" ]; }) sources."wrappy-1.0.2" sources."xtend-4.0.1" sources."y18n-4.0.0" sources."yallist-3.0.3" - (sources."yargs-12.0.5" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.1.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - ]; - }) + sources."yargs-12.0.5" sources."yargs-parser-11.1.1" sources."yauzl-2.10.0" ]; @@ -49660,6 +49722,94 @@ in production = true; bypassCache = true; }; + markdown-link-check = nodeEnv.buildNodePackage { + name = "markdown-link-check"; + packageName = "markdown-link-check"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.7.2.tgz"; + sha512 = "rt6d75iz0Bw9LHmN+DT1a7kiVrkK3gsGhPVB/PwwZDq8LHlILQToC/hwq9tE2CUDg8OdZOV1+7j8vuG9Mu4sIQ=="; + }; + dependencies = [ + sources."ajv-6.9.1" + sources."ansi-styles-3.2.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-2.6.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.7" + sources."commander-2.19.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."escape-string-regexp-1.0.5" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-flag-3.0.0" + sources."http-signature-1.2.0" + sources."is-absolute-url-2.1.0" + sources."is-relative-url-2.0.0" + sources."is-typedarray-1.0.0" + sources."isemail-3.2.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."link-check-4.4.4" + sources."lodash-4.17.11" + sources."markdown-link-extractor-1.2.0" + sources."marked-0.4.0" + sources."mime-db-1.37.0" + sources."mime-types-2.1.21" + sources."ms-2.1.1" + sources."oauth-sign-0.9.0" + sources."performance-now-2.1.0" + sources."progress-2.0.3" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."request-2.88.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sshpk-1.16.1" + sources."supports-color-5.5.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "checks the all of the hyperlinks in a markdown text to determine if they are alive or dead"; + homepage = "https://github.com/tcort/markdown-link-check#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + }; mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; @@ -49878,7 +50028,7 @@ in sources."readable-stream-1.1.14" ]; }) - (sources."duplexify-3.6.1" // { + (sources."duplexify-3.7.1" // { dependencies = [ sources."end-of-stream-1.4.1" sources."once-1.4.0" @@ -49938,7 +50088,7 @@ in sources."fined-1.1.1" sources."first-chunk-stream-1.0.0" sources."flagged-respawn-1.0.1" - (sources."flush-write-stream-1.0.3" // { + (sources."flush-write-stream-1.1.1" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -50200,7 +50350,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.defaults-1.1.0" @@ -50211,7 +50361,7 @@ in sources."ordered-read-streams-0.1.0" sources."os-homedir-1.0.2" sources."parse-filepath-1.0.2" - sources."parse-node-version-1.0.0" + sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -50258,7 +50408,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."request-2.81.0" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -50309,7 +50459,7 @@ in sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."split-string-3.1.0" - (sources."sshpk-1.16.0" // { + (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -50598,7 +50748,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -50610,7 +50760,6 @@ in sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" sources."code-point-at-1.1.0" @@ -50651,7 +50800,6 @@ in sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -50671,7 +50819,7 @@ in sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."npm-package-arg-6.1.0" sources."npm-registry-client-8.5.1" (sources."npmconf-2.1.3" // { @@ -50689,6 +50837,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."path-parse-1.0.6" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" @@ -50697,6 +50846,7 @@ in sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.88.0" + sources."resolve-1.10.0" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" @@ -50710,7 +50860,7 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -50756,7 +50906,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -50835,7 +50985,7 @@ in sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -50867,10 +51017,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz"; - sha512 = "L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz"; + sha512 = "bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -50909,14 +51059,13 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.40" + sources."big-integer-1.6.41" sources."block-stream-0.0.9" sources."body-parser-1.18.3" sources."boom-2.10.1" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."browser-launcher2-0.4.6" - sources."builtin-modules-1.1.1" sources."bytes-3.0.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" @@ -50992,7 +51141,6 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.8.0" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -51040,7 +51188,7 @@ in ]; }) sources."nopt-4.0.1" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" @@ -51056,6 +51204,7 @@ in sources."parseurl-1.3.2" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."path-type-1.1.0" sources."performance-now-0.2.0" @@ -51080,6 +51229,7 @@ in sources."qs-6.4.0" ]; }) + sources."resolve-1.10.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -51100,7 +51250,7 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.3" - (sources."sshpk-1.16.0" // { + (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -51218,8 +51368,8 @@ in sources."ms-2.0.0" sources."needle-2.2.4" sources."nopt-4.0.1" - sources."npm-bundled-1.0.5" - sources."npm-packlist-1.2.0" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.3.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -51264,17 +51414,21 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.18.9"; + version = "1.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.9.tgz"; - sha512 = "oj/eEVTEI47pzYAjGkpcNw0xYwTl4XSTUQv2NPQI6PpN3b75PhpuYk3Vb3U80xHCyM2Jm+1j68ULHXl4OR3Afw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.10.tgz"; + sha512 = "we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ=="; }; dependencies = [ sources."abbrev-1.1.1" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."anymatch-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -51288,7 +51442,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -51301,7 +51455,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" - sources."chokidar-2.0.4" + sources."chokidar-2.1.1" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -51432,7 +51586,6 @@ in sources."isobject-3.0.1" sources."kind-of-6.0.2" sources."latest-version-3.1.0" - sources."lodash.debounce-4.0.8" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."make-dir-1.3.0" @@ -51446,7 +51599,7 @@ in sources."nan-2.12.1" sources."nanomatch-1.2.13" sources."nopt-1.0.10" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" (sources."object-copy-0.1.0" // { dependencies = [ @@ -51599,7 +51752,7 @@ in sources."util-deprecate-1.0.2" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" ]; @@ -51717,7 +51870,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - (sources."duplexify-3.6.1" // { + (sources."duplexify-3.7.1" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -51783,7 +51936,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.3" // { dependencies = [ - sources."ajv-6.7.0" + sources."ajv-6.9.1" ]; }) sources."hash-sum-1.0.2" @@ -51875,7 +52028,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.23.0" + sources."moment-2.24.0" sources."moment-timezone-0.5.23" (sources."mqtt-2.18.8" // { dependencies = [ @@ -51975,7 +52128,7 @@ in sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" @@ -52050,10 +52203,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.6.0"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.6.0.tgz"; - sha512 = "Q6Lb4YPWIGsyVzfxcZrTu6VQcMEvCHOBlSE0fbuNHj6CYCUuanMUf6HgNyj4QekWTORxQpOgOgaca2YEQ721Ug=="; + url = "https://registry.npmjs.org/npm/-/npm-6.7.0.tgz"; + sha512 = "OtxCLzx+pcsjMGrjZpBp214ZjxzHcAe3zLYIlaVpRYqFHff6bgggyTLf2OZPO8lfxN0RHLJnFFUU016JCzM/Ww=="; }; buildInputs = globalBuildInputs; meta = { @@ -52075,7 +52228,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -52192,7 +52345,7 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -52317,7 +52470,7 @@ in ]; }) sources."object-assign-4.1.1" - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."p-finally-1.0.0" sources."package-json-4.0.1" sources."path-exists-2.1.0" @@ -52370,7 +52523,7 @@ in sources."url-parse-lax-1.0.0" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" ]; @@ -52440,7 +52593,7 @@ in sources."mime-1.6.0" ]; }) - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."appendable-cli-menu-2.0.0" @@ -52448,8 +52601,8 @@ in sources."array-flatten-2.1.2" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bencode-2.0.0" - sources."big-integer-1.6.40" + sources."bencode-2.0.1" + sources."big-integer-1.6.41" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -52475,7 +52628,6 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" - sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" @@ -52547,9 +52699,8 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.8.1" + sources."ipaddr.js-1.9.0" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-promise-2.1.0" @@ -52582,7 +52733,7 @@ in sources."mute-stream-0.0.7" sources."network-address-1.1.2" sources."next-line-1.1.0" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" @@ -52609,6 +52760,7 @@ in }) sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" sources."path-type-1.1.0" (sources."peer-wire-protocol-0.7.1" // { dependencies = [ @@ -52625,7 +52777,7 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.0" sources."pump-2.0.1" - (sources."random-access-file-2.0.1" // { + (sources."random-access-file-2.1.0" // { dependencies = [ sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -52642,6 +52794,7 @@ in sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" + sources."resolve-1.10.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.6.3" @@ -52736,13 +52889,13 @@ in sources."accepts-1.2.13" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."archiver-3.0.0" sources."archiver-utils-2.0.0" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.1" + sources."async-2.6.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -52944,7 +53097,7 @@ in }) (sources."k-rpc-socket-1.8.0" // { dependencies = [ - sources."bencode-2.0.0" + sources."bencode-2.0.1" ]; }) sources."lazystream-1.0.0" @@ -53020,7 +53173,7 @@ in sources."pump-1.0.3" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."random-access-file-2.0.1" + sources."random-access-file-2.1.0" sources."random-access-storage-1.3.0" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" @@ -53111,7 +53264,7 @@ in ]; }) sources."speedometer-0.1.4" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."statuses-1.5.0" (sources."stream-counter-0.2.0" // { dependencies = [ @@ -53179,10 +53332,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.25.2"; + version = "2.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.2.tgz"; - sha512 = "DB1IFfFf4bxb2nVveQ+Xi4KXO/5uR/53w6GCBRWaej0SZnrHeK+6Lp+/dh0S3THMnX88TJLniTOkAUBco2AItA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.6.tgz"; + sha512 = "5N7JPGL0rwwWQU/ofxhnp3lgmRoF7LlxMvJUCLjWORavfpB8uBIOKoae4JGWt4cPhXY/u6y5k1yZRmHMZiyRKQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -53209,14 +53362,14 @@ in sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.2.2" // { + (sources."@babel/generator-7.3.2" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" - sources."@babel/helper-builder-react-jsx-7.0.0" + sources."@babel/helper-builder-react-jsx-7.3.0" sources."@babel/helper-call-delegate-7.1.0" sources."@babel/helper-define-map-7.1.0" sources."@babel/helper-explode-assignable-expression-7.1.0" @@ -53234,12 +53387,12 @@ in sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.0.0" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.2.0" + sources."@babel/helpers-7.3.1" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.2.3" + sources."@babel/parser-7.3.2" 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.2.0" + sources."@babel/plugin-proposal-object-rest-spread-7.3.2" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.2.0" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -53254,7 +53407,7 @@ in sources."@babel/plugin-transform-block-scoping-7.2.0" sources."@babel/plugin-transform-classes-7.2.2" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.2.0" + sources."@babel/plugin-transform-destructuring-7.3.2" sources."@babel/plugin-transform-dotall-regex-7.2.0" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" @@ -53266,10 +53419,11 @@ in sources."@babel/plugin-transform-modules-commonjs-7.2.0" sources."@babel/plugin-transform-modules-systemjs-7.2.0" sources."@babel/plugin-transform-modules-umd-7.2.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.3.0" sources."@babel/plugin-transform-new-target-7.0.0" sources."@babel/plugin-transform-object-super-7.2.0" sources."@babel/plugin-transform-parameters-7.2.0" - sources."@babel/plugin-transform-react-jsx-7.2.0" + sources."@babel/plugin-transform-react-jsx-7.3.0" sources."@babel/plugin-transform-regenerator-7.0.0" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" @@ -53277,11 +53431,11 @@ in sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.2.0" - sources."@babel/preset-env-7.2.3" - sources."@babel/runtime-7.2.0" + sources."@babel/preset-env-7.3.1" + sources."@babel/runtime-7.3.1" sources."@babel/template-7.2.2" sources."@babel/traverse-7.2.3" - sources."@babel/types-7.2.2" + sources."@babel/types-7.3.2" sources."@iarna/toml-2.2.1" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -53290,7 +53444,7 @@ in sources."@parcel/utils-1.11.0" sources."@parcel/watcher-1.11.0" sources."@parcel/workers-1.11.0" - sources."@types/node-10.12.18" + sources."@types/node-10.12.26" sources."@types/q-1.5.1" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" @@ -53298,8 +53452,12 @@ in sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ansi-to-html-0.6.9" - sources."anymatch-2.0.0" + sources."ansi-to-html-0.6.10" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -53351,7 +53509,7 @@ in ]; }) sources."base64-js-1.3.0" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."bindings-1.2.1" sources."bn.js-4.11.8" sources."boolbase-1.0.0" @@ -53384,11 +53542,12 @@ in sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" + sources."camelcase-5.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-db-1.0.30000929" - sources."caniuse-lite-1.0.30000929" + sources."caniuse-db-1.0.30000936" + sources."caniuse-lite-1.0.30000936" sources."chalk-2.4.2" - sources."chokidar-2.0.4" + sources."chokidar-2.1.1" sources."cipher-base-1.0.4" (sources."clap-1.2.3" // { dependencies = [ @@ -53402,9 +53561,12 @@ in sources."class-utils-0.3.6" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" + sources."cli-table3-0.5.1" + sources."cliui-4.1.0" sources."clone-2.1.2" sources."clones-1.2.0" sources."coa-2.0.2" + sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-3.1.0" sources."color-convert-1.9.3" @@ -53417,7 +53579,7 @@ in sources."color-string-0.3.0" ]; }) - sources."colors-1.1.2" + sources."colors-1.3.3" sources."command-exists-1.2.8" sources."commander-2.19.0" sources."component-emitter-1.2.1" @@ -53428,7 +53590,7 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."core-util-is-1.0.2" sources."cosmiconfig-5.0.7" sources."create-ecdh-4.0.3" @@ -53449,8 +53611,8 @@ in sources."css-url-regex-1.1.0" sources."css-what-2.1.2" sources."cssesc-2.0.0" - sources."cssnano-4.1.8" - sources."cssnano-preset-default-4.0.6" + sources."cssnano-4.1.9" + sources."cssnano-preset-default-4.0.7" sources."cssnano-util-get-arguments-4.0.0" sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" @@ -53509,9 +53671,10 @@ in sources."duplexer2-0.1.4" sources."editorconfig-0.15.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.103" + sources."electron-to-chromium-1.3.113" sources."elliptic-6.4.1" sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.13.0" @@ -53525,6 +53688,7 @@ in sources."etag-1.8.1" sources."events-3.0.0" sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."debug-2.6.9" @@ -53542,6 +53706,7 @@ in sources."fast-levenshtein-2.0.6" sources."filesize-3.6.1" sources."fill-range-4.0.0" + sources."find-up-3.0.0" sources."flatten-1.0.2" sources."for-in-1.0.2" sources."foreach-2.0.5" @@ -53550,7 +53715,9 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.7" sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" sources."get-port-3.2.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.3" (sources."glob-parent-3.1.0" // { @@ -53559,7 +53726,7 @@ in ]; }) sources."glob-to-regexp-0.3.0" - sources."globals-11.10.0" + sources."globals-11.11.0" sources."graceful-fs-4.1.15" sources."grapheme-breaker-0.3.2" sources."has-1.0.3" @@ -53595,6 +53762,7 @@ in ]; }) sources."coa-1.0.4" + sources."colors-1.1.2" sources."cssnano-3.10.0" sources."csso-2.3.2" sources."esprima-2.7.3" @@ -53648,6 +53816,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invariant-2.2.4" + sources."invert-kv-2.0.0" sources."is-absolute-url-2.1.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ @@ -53673,6 +53842,7 @@ in sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.0" sources."is-number-3.0.0" sources."is-obj-1.0.1" @@ -53680,6 +53850,7 @@ in sources."is-plain-object-2.0.4" sources."is-regex-1.0.4" sources."is-resolvable-1.1.0" + sources."is-stream-1.1.0" sources."is-svg-3.0.0" sources."is-symbol-1.0.2" sources."is-url-1.2.4" @@ -53688,7 +53859,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-base64-2.5.0" + sources."js-base64-2.5.1" sources."js-beautify-1.8.9" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" @@ -53701,21 +53872,24 @@ in sources."json-parse-better-errors-1.0.2" sources."json5-1.0.1" sources."kind-of-3.2.2" + sources."lcid-2.0.0" sources."levn-0.3.0" + sources."locate-path-3.0.0" sources."lodash-4.17.11" sources."lodash.clone-4.5.0" - sources."lodash.debounce-4.0.8" sources."lodash.memoize-4.1.2" sources."lodash.uniq-4.5.0" sources."log-symbols-2.2.0" sources."loose-envify-1.4.0" sources."lru-cache-4.1.5" sources."magic-string-0.22.5" + sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."math-expression-evaluator-1.2.17" sources."md5.js-1.3.5" sources."mdn-data-1.1.4" + sources."mem-4.1.0" (sources."merge-source-map-1.0.4" // { dependencies = [ sources."source-map-0.5.7" @@ -53761,17 +53935,19 @@ in sources."node-addon-api-1.6.2" sources."node-forge-0.7.6" sources."node-libs-browser-2.2.0" - sources."node-releases-1.1.3" + sources."node-releases-1.1.7" sources."nopt-4.0.1" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" sources."normalize-url-3.3.0" + sources."npm-run-path-2.0.2" sources."nth-check-1.0.2" sources."num2fraction-1.2.2" + sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."object-copy-0.1.0" sources."object-inspect-1.4.1" - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."object-visit-1.0.1" sources."object.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" @@ -53784,8 +53960,15 @@ in sources."ora-2.1.0" sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" + sources."os-locale-3.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.0.0" + sources."p-limit-2.1.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" sources."pako-0.2.9" sources."parse-asn1-5.1.3" sources."parse-json-4.0.0" @@ -53793,21 +53976,22 @@ in sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."pbkdf2-3.0.17" sources."physical-cpu-count-2.0.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.13" // { + (sources."postcss-7.0.14" // { dependencies = [ sources."supports-color-6.1.0" ]; }) sources."postcss-calc-7.0.1" - sources."postcss-colormin-4.0.2" + sources."postcss-colormin-4.0.3" sources."postcss-convert-values-4.0.1" - sources."postcss-discard-comments-4.0.1" + sources."postcss-discard-comments-4.0.2" sources."postcss-discard-duplicates-4.0.2" sources."postcss-discard-empty-4.0.1" sources."postcss-discard-overridden-4.0.1" @@ -53859,31 +54043,31 @@ in sources."supports-color-3.2.3" ]; }) - sources."postcss-merge-longhand-4.0.10" - (sources."postcss-merge-rules-4.0.2" // { + sources."postcss-merge-longhand-4.0.11" + (sources."postcss-merge-rules-4.0.3" // { dependencies = [ sources."postcss-selector-parser-3.1.1" ]; }) sources."postcss-message-helpers-2.0.0" sources."postcss-minify-font-values-4.0.2" - sources."postcss-minify-gradients-4.0.1" - sources."postcss-minify-params-4.0.1" - (sources."postcss-minify-selectors-4.0.1" // { + sources."postcss-minify-gradients-4.0.2" + sources."postcss-minify-params-4.0.2" + (sources."postcss-minify-selectors-4.0.2" // { dependencies = [ sources."postcss-selector-parser-3.1.1" ]; }) sources."postcss-normalize-charset-4.0.1" - sources."postcss-normalize-display-values-4.0.1" - sources."postcss-normalize-positions-4.0.1" - sources."postcss-normalize-repeat-style-4.0.1" - sources."postcss-normalize-string-4.0.1" - sources."postcss-normalize-timing-functions-4.0.1" + sources."postcss-normalize-display-values-4.0.2" + sources."postcss-normalize-positions-4.0.2" + sources."postcss-normalize-repeat-style-4.0.2" + sources."postcss-normalize-string-4.0.2" + sources."postcss-normalize-timing-functions-4.0.2" sources."postcss-normalize-unicode-4.0.1" sources."postcss-normalize-url-4.0.1" - sources."postcss-normalize-whitespace-4.0.1" - sources."postcss-ordered-values-4.1.1" + sources."postcss-normalize-whitespace-4.0.2" + sources."postcss-ordered-values-4.1.2" (sources."postcss-reduce-idents-2.4.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -53900,10 +54084,10 @@ in sources."supports-color-3.2.3" ]; }) - sources."postcss-reduce-initial-4.0.2" - sources."postcss-reduce-transforms-4.0.1" + sources."postcss-reduce-initial-4.0.3" + sources."postcss-reduce-transforms-4.0.2" sources."postcss-selector-parser-5.0.0" - sources."postcss-svgo-4.0.1" + sources."postcss-svgo-4.0.2" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" (sources."postcss-zindex-2.2.0" // { @@ -53939,6 +54123,7 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."public-encrypt-4.0.3" + sources."pump-3.0.0" sources."punycode-1.4.1" sources."q-1.5.1" sources."query-string-4.3.4" @@ -53974,6 +54159,7 @@ in sources."is-extendable-1.0.1" ]; }) + sources."regexp-tree-0.1.1" sources."regexpu-core-4.4.0" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -53984,7 +54170,9 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.9.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.10.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -54006,6 +54194,7 @@ in }) sources."serialize-to-js-1.2.2" sources."serve-static-1.13.2" + sources."set-blocking-2.0.0" sources."set-value-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.1.0" @@ -54050,19 +54239,25 @@ in sources."static-extend-0.1.2" sources."static-module-2.2.5" sources."statuses-1.4.0" - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" sources."strict-uri-encode-1.1.0" + sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" - (sources."stylehacks-4.0.1" // { + sources."strip-eof-1.0.0" + (sources."stylehacks-4.0.2" // { dependencies = [ sources."postcss-selector-parser-3.1.1" ]; }) sources."supports-color-5.5.0" - sources."svgo-1.1.1" - (sources."terser-3.14.1" // { + (sources."svgo-1.1.1" // { + dependencies = [ + sources."colors-1.1.2" + ]; + }) + (sources."terser-3.16.1" // { dependencies = [ sources."commander-2.17.1" ]; @@ -54128,11 +54323,23 @@ in sources."wcwidth-1.0.1" sources."whet.extend-0.9.9" sources."which-1.3.1" + sources."which-module-2.0.0" sources."wordwrap-1.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xtend-4.0.1" + sources."y18n-4.0.0" sources."yallist-2.1.2" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -54146,10 +54353,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.15.3"; + version = "1.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.15.3.tgz"; - sha512 = "gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.16.4.tgz"; + sha512 = "ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g=="; }; buildInputs = globalBuildInputs; meta = { @@ -54170,11 +54377,15 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.0.5" + sources."acorn-6.1.0" sources."acorn-dynamic-import-4.0.0" sources."acorn-node-1.6.2" sources."acorn-walk-6.1.1" - sources."anymatch-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -54200,7 +54411,7 @@ in ]; }) sources."base64-js-1.3.0" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -54245,7 +54456,7 @@ in sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" - sources."chokidar-2.0.4" + sources."chokidar-2.1.1" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -54390,7 +54601,6 @@ in sources."isarray-2.0.4" ]; }) - sources."lodash.debounce-4.0.8" sources."lodash.memoize-3.0.4" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -54428,7 +54638,7 @@ in sources."nanomatch-1.2.13" sources."neo-async-2.6.0" sources."node-static-0.7.11" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -54485,7 +54695,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."rimraf-2.6.3" @@ -54555,7 +54765,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" @@ -54754,7 +54964,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -54855,7 +55065,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."send-0.1.4" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."stream-counter-0.2.0" sources."string-1.6.1" sources."string_decoder-0.10.31" @@ -54890,11 +55100,7 @@ in }; dependencies = [ sources."abstract-leveldown-5.0.0" - (sources."aligned-block-file-1.1.4" // { - dependencies = [ - sources."obv-0.0.0" - ]; - }) + sources."aligned-block-file-1.1.5" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -54926,8 +55132,8 @@ in }) sources."base64-url-2.2.0" sources."bash-color-0.0.4" - sources."binary-extensions-1.12.0" - sources."binary-search-1.3.4" + sources."binary-extensions-1.13.0" + sources."binary-search-1.3.5" sources."bindings-1.3.1" sources."bl-1.2.2" sources."blake2s-1.1.0" @@ -55020,7 +55226,7 @@ in sources."detab-1.0.2" sources."detect-libc-1.0.3" sources."discontinuous-range-1.0.0" - sources."dynamic-dijkstra-1.0.1" + sources."dynamic-dijkstra-1.0.2" sources."ed2curve-0.1.4" sources."elegant-spinner-1.0.1" sources."emoji-named-characters-1.0.2" @@ -55053,43 +55259,20 @@ in sources."level-codec-6.2.0" ]; }) - (sources."flumedb-1.0.4" // { - dependencies = [ - sources."pull-cont-0.0.0" - ]; - }) + sources."flumedb-1.0.6" (sources."flumelog-offset-3.3.2" // { dependencies = [ sources."looper-4.0.0" ]; }) sources."flumeview-hashtable-1.0.4" - (sources."flumeview-level-3.0.6" // { - dependencies = [ - sources."abstract-leveldown-4.0.3" - sources."deferred-leveldown-3.0.0" - sources."encoding-down-4.0.1" - sources."level-3.0.2" - sources."level-codec-8.0.0" - sources."level-errors-1.1.2" - sources."level-iterator-stream-2.0.3" - sources."level-packager-2.1.1" - sources."leveldown-3.0.2" - sources."levelup-2.0.2" - sources."nan-2.10.0" - sources."obv-0.0.0" - ]; - }) + sources."flumeview-level-3.0.8" (sources."flumeview-query-6.3.0" // { dependencies = [ sources."map-filter-reduce-3.2.2" ]; }) - (sources."flumeview-reduce-1.3.14" // { - dependencies = [ - sources."obv-0.0.0" - ]; - }) + sources."flumeview-reduce-1.3.15" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."for-own-0.1.5" @@ -55256,7 +55439,7 @@ in sources."multiblob-1.13.3" sources."multiblob-http-0.4.2" sources."multicb-1.2.2" - sources."multiserver-3.1.1" + sources."multiserver-3.1.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" @@ -55286,8 +55469,8 @@ in sources."ncp-2.0.0" sources."nearley-2.16.0" sources."nice-try-1.0.5" - sources."node-abi-2.5.1" - sources."node-gyp-build-3.7.0" + sources."node-abi-2.7.1" + sources."node-gyp-build-3.8.0" sources."non-private-ip-1.4.4" sources."noop-logger-0.1.1" sources."normalize-path-2.1.1" @@ -55309,7 +55492,7 @@ in ]; }) sources."object-inspect-1.6.0" - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -55328,7 +55511,7 @@ in sources."on-wakeup-1.0.1" sources."once-1.4.0" sources."onetime-1.1.0" - sources."opencollective-postinstall-2.0.1" + sources."opencollective-postinstall-2.0.2" sources."options-0.0.6" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -55500,6 +55683,7 @@ in sources."glob-7.1.3" ]; }) + sources."rng-0.2.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."secret-handshake-1.1.16" @@ -55524,7 +55708,7 @@ in sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - sources."smart-buffer-4.0.1" + sources."smart-buffer-4.0.2" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -55550,7 +55734,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.2.1" + sources."socks-2.3.1" sources."sodium-browserify-1.2.4" (sources."sodium-browserify-tweetnacl-0.2.3" // { dependencies = [ @@ -55558,24 +55742,25 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.2.4" + sources."sodium-native-2.2.6" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - sources."ssb-blobs-1.1.9" - (sources."ssb-client-4.6.0" // { + (sources."ssb-blobs-1.1.12" // { dependencies = [ - sources."multiserver-1.13.7" + sources."debug-4.1.1" + sources."ms-2.1.1" ]; }) + sources."ssb-client-4.6.3" sources."ssb-config-2.3.9" sources."ssb-db-18.6.5" - sources."ssb-ebt-5.3.7" - sources."ssb-friends-3.1.12" - sources."ssb-keys-7.1.4" - sources."ssb-links-3.0.3" + sources."ssb-ebt-5.3.11" + sources."ssb-friends-3.1.13" + sources."ssb-keys-7.1.5" + sources."ssb-links-3.0.4" sources."ssb-msgs-5.2.0" (sources."ssb-query-2.3.0" // { dependencies = [ @@ -55613,7 +55798,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tape-4.9.2" // { + (sources."tape-4.10.0" // { dependencies = [ sources."glob-7.1.3" ]; @@ -55722,10 +55907,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-10.1.1.tgz"; - sha512 = "B1ca73zGFRS/bYQkbDw6BVEpRiUKdtnkwtvkMjx598jU5tyieua9lHyqdwUoup4/ek20I74EzncTC0gZuYng4Q=="; + url = "https://registry.npmjs.org/serve/-/serve-10.1.2.tgz"; + sha512 = "TVH35uwndRlCqSeX3grR3Ntrjx2aBTeu6sx+zTD2CzN2N/rHuEDTvxiBwWbrellJNyWiQFz2xZmoW+UxV+Zahg=="; }; dependencies = [ sources."@zeit/schemas-2.6.0" @@ -55793,7 +55978,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" - (sources."serve-handler-5.0.7" // { + (sources."serve-handler-5.0.8" // { dependencies = [ sources."mime-db-1.33.0" sources."mime-types-2.1.18" @@ -55837,7 +56022,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.5" sources."after-0.8.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -56008,7 +56193,7 @@ in ]; }) sources."split-1.0.1" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."statuses-1.4.0" sources."stream-combiner-0.2.2" sources."string_decoder-0.10.31" @@ -56435,27 +56620,26 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.122.0"; + version = "1.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.122.0.tgz"; - sha512 = "esbJEF/HubMdQqjArOqHXWP4iyGXs99yk5gbcs/wwDys2RNEHTQZAYTfQSdNGMHo/Ynylfcyqrhgcg3IR7wtjQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.127.0.tgz"; + sha512 = "+Q5coBgxXa/4sapCc4QvledVGKb1j1g85793AcSY7uDVuNeSgYInPrDHv4t2Xe7boYMBXbNqjhuazQ0DwRcBzg=="; }; dependencies = [ sources."@snyk/dep-graph-1.1.2" sources."@snyk/gemfile-1.1.0" - sources."@types/node-8.10.39" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."archy-1.0.0" sources."argparse-1.0.10" sources."asap-2.0.6" - sources."ast-types-0.12.1" + sources."ast-types-0.12.2" sources."async-1.5.2" sources."balanced-match-1.0.0" (sources."boxen-1.3.0" // { @@ -56494,7 +56678,7 @@ in sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - sources."data-uri-to-buffer-2.0.0" + sources."data-uri-to-buffer-1.2.0" sources."debug-3.2.6" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" @@ -56526,9 +56710,10 @@ in ]; }) sources."get-stream-3.0.0" - (sources."get-uri-2.0.3" // { + (sources."get-uri-2.0.2" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."global-dirs-0.1.1" @@ -56581,6 +56766,7 @@ in dependencies = [ sources."es6-promise-3.0.2" sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" sources."readable-stream-2.0.6" ]; }) @@ -56633,14 +56819,12 @@ in sources."pac-resolver-3.0.0" sources."package-json-4.0.1" sources."pako-1.0.8" - sources."path-0.12.7" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."pify-3.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" - sources."process-0.11.10" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."promise-7.3.1" sources."proxy-agent-2.3.1" sources."proxy-from-env-1.0.0" @@ -56651,9 +56835,10 @@ in ]; }) sources."rc-1.2.8" - (sources."readable-stream-3.1.1" // { + (sources."readable-stream-2.3.6" // { dependencies = [ - sources."string_decoder-1.2.0" + sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) sources."recursive-readdir-2.2.2" @@ -56680,18 +56865,14 @@ in sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" sources."snyk-config-2.2.0" - sources."snyk-docker-plugin-1.17.0" + sources."snyk-docker-plugin-1.21.2" sources."snyk-go-plugin-1.6.1" sources."snyk-gradle-plugin-2.1.3" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.1" - (sources."snyk-nodejs-lockfile-parser-1.10.1" // { - dependencies = [ - sources."lodash-4.17.10" - ]; - }) + sources."snyk-nodejs-lockfile-parser-1.11.0" sources."snyk-nuget-plugin-1.6.5" - sources."snyk-php-plugin-1.5.1" + sources."snyk-php-plugin-1.5.2" sources."snyk-policy-1.13.3" sources."snyk-python-plugin-1.9.1" sources."snyk-resolve-1.0.1" @@ -56719,7 +56900,7 @@ in sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" - sources."toml-2.3.5" + sources."toml-2.3.6" sources."tslib-1.9.3" sources."type-check-0.3.2" (sources."undefsafe-2.0.2" // { @@ -56733,7 +56914,6 @@ in sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" - sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."vscode-languageserver-types-3.14.0" @@ -56750,7 +56930,7 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -56805,7 +56985,7 @@ in sources."ms-2.0.0" ]; }) - (sources."engine.io-client-3.3.1" // { + (sources."engine.io-client-3.3.2" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" @@ -56837,7 +57017,7 @@ in ]; }) sources."to-array-0.1.4" - sources."ws-6.1.2" + sources."ws-6.1.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -56921,7 +57101,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.2" - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."object.getownpropertydescriptors-2.0.3" sources."object.values-1.1.0" sources."q-1.5.1" @@ -56957,7 +57137,11 @@ in sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."append-field-1.0.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -56975,7 +57159,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" (sources."body-parser-1.12.4" // { dependencies = [ sources."debug-2.2.0" @@ -57014,7 +57198,7 @@ in sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-2.0.4" + sources."chokidar-2.1.1" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -57051,7 +57235,7 @@ in sources."content-type-1.0.4" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" (sources."cross-spawn-5.1.0" // { @@ -57148,9 +57332,9 @@ in ]; }) sources."growl-1.9.2" - (sources."handlebars-4.0.12" // { + (sources."handlebars-4.1.0" // { dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" sources."lodash-4.17.11" sources."source-map-0.6.1" ]; @@ -57247,7 +57431,6 @@ in sources."lodash.assign-2.4.1" sources."lodash.bind-2.4.1" sources."lodash.clonedeep-2.4.1" - sources."lodash.debounce-4.0.8" sources."lodash.foreach-2.4.1" sources."lodash.forown-2.4.1" sources."lodash.get-4.4.2" @@ -57294,7 +57477,7 @@ in sources."nan-2.12.1" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - (sources."nodemon-1.18.9" // { + (sources."nodemon-1.18.10" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -57302,7 +57485,7 @@ in ]; }) sources."nopt-1.0.10" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -57556,11 +57739,11 @@ in sources."widest-line-2.0.1" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."xtend-4.0.1" sources."yallist-2.1.2" - sources."z-schema-3.24.2" + sources."z-schema-3.25.1" ]; buildInputs = globalBuildInputs; meta = { @@ -57580,7 +57763,7 @@ in sha512 = "lST8jq/DougDUADb+vBaufwjqNChwABSJTkWf+5GG4xNVJoR/atEaMe/G7buaVZrpGCy+zoaq1TuycQy8xX+Bg=="; }; dependencies = [ - sources."acorn-6.0.5" + sources."acorn-6.1.0" sources."acorn-loose-6.0.0" sources."acorn-walk-6.1.1" sources."balanced-match-1.0.0" @@ -57622,10 +57805,10 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.2.1"; + version = "11.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.2.1.tgz"; - sha512 = "BXknewyTyypmC7vBvY+2SY5uXmHPG8jnnbiV7f4PBOX8xRciMX7qU5ilGiOb8qDI0NBaNRcwn3lHUqW/90GBIg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.2.3.tgz"; + sha512 = "3bIe/S4Gw1Ln1HNaKRJ+25V4aqDQqtRuLC5GCse/8q4FUGaJYUhqDCVYDR2dXxwcVffPNb01SwSZsSbYcseBgQ=="; }; dependencies = [ sources."@azu/format-text-1.0.1" @@ -57633,14 +57816,14 @@ in sources."@textlint/ast-node-types-4.2.1" sources."@textlint/ast-traverse-2.1.2" sources."@textlint/feature-flag-3.1.2" - sources."@textlint/fixer-formatter-3.1.2" - sources."@textlint/kernel-3.1.2" - sources."@textlint/linter-formatter-3.1.2" + sources."@textlint/fixer-formatter-3.1.3" + sources."@textlint/kernel-3.1.4" + sources."@textlint/linter-formatter-3.1.3" sources."@textlint/markdown-to-ast-6.1.2" sources."@textlint/text-to-ast-3.1.2" - sources."@textlint/textlint-plugin-markdown-5.1.2" - sources."@textlint/textlint-plugin-text-4.1.2" - sources."@textlint/types-1.1.2" + sources."@textlint/textlint-plugin-markdown-5.1.4" + sources."@textlint/textlint-plugin-text-4.1.4" + sources."@textlint/types-1.1.3" sources."@types/bluebird-3.5.25" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" @@ -57653,7 +57836,6 @@ in sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."chalk-1.1.3" sources."character-entities-1.2.2" sources."character-entities-legacy-1.1.2" @@ -57700,7 +57882,6 @@ in sources."is-alphanumerical-1.0.2" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-decimal-1.0.2" @@ -57735,10 +57916,10 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.1.1" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."once-1.4.0" sources."optionator-0.8.2" sources."p-limit-1.3.0" @@ -57748,6 +57929,7 @@ in sources."parse-json-2.2.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" sources."path-to-glob-pattern-1.0.2" sources."path-type-1.1.0" sources."pify-2.3.0" @@ -57778,6 +57960,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" + sources."resolve-1.10.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.6.0" @@ -57843,10 +58026,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.100.0"; + version = "0.101.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.100.0.tgz"; - sha512 = "/lN2rdE1OqIwJr4/HcSaOisiCY0uVA0sqPpbCG5nil2uICEdS0LfGwSVYTtZDsIpR76r3++h5H3Hzg5D+SJBRQ=="; + url = "https://registry.npmjs.org/three/-/three-0.101.1.tgz"; + sha512 = "8ufimUVmRLtH+BTpEIbDjdGEKQOVWLMLgGynaKin1KbYTE136ZNOepJ8EgByi0tN43dQ7B1YrKLCJgXGy4bLmw=="; }; buildInputs = globalBuildInputs; meta = { @@ -57949,7 +58132,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.23.0" + sources."moment-2.24.0" sources."mooremachine-2.2.1" sources."mute-stream-0.0.8" sources."mv-2.1.1" @@ -58082,10 +58265,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.2.4"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; - sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.3.3.tgz"; + sha512 = "Y21Xqe54TBVp+VDSNbuDYdGw0BpoR/Q6wo/+35M8PAU0vipahnyduJWirxxdxjsAkS7hue53x2zp8gz7F05u0A=="; }; buildInputs = globalBuildInputs; meta = { @@ -58120,30 +58303,24 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.36"; + version = "1.4.41"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.36.tgz"; - sha512 = "Tpr9qHQZX/e4Qhz4dg1c5Y/jOs911E2MengusvNxO9+kxaw3ua/j+U0FCcPdg4vTDFtEydCGli3kJCoiEbK48w=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.41.tgz"; + sha512 = "vNXjGm61EiFiHkZDpXEmBybzU9r6wioO1bop9hmhNe+KYiWKCv9VySJ66EDE0tj9L2IxVI26zDFRE6kn+RLjQQ=="; }; dependencies = [ sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."are-we-there-yet-1.1.5" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-0.9.2" + sources."async-1.0.0" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -58160,7 +58337,6 @@ in sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."bytes-3.0.0" sources."callsite-1.0.0" @@ -58181,25 +58357,19 @@ in sources."color-name-1.1.3" sources."color-string-1.5.3" sources."colors-1.0.3" - sources."combined-stream-0.0.7" + sources."combined-stream-1.0.7" sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" + sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" - sources."cookie-parser-1.4.3" + sources."cookie-parser-1.4.4" sources."cookie-signature-1.0.6" - sources."cookiejar-2.0.1" + sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."crc-3.4.4" sources."cross-spawn-6.0.5" @@ -58208,8 +58378,9 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" + sources."dedent-0.7.0" sources."deep-extend-0.6.0" - sources."delayed-stream-0.0.5" + sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -58237,7 +58408,6 @@ in }) (sources."engine.io-client-3.2.1" // { dependencies = [ - sources."component-emitter-1.2.1" sources."debug-3.1.0" ]; }) @@ -58253,7 +58423,7 @@ in ]; }) sources."express-session-1.15.6" - sources."extend-1.2.1" + sources."extend-3.0.2" (sources."extract-opts-3.3.1" // { dependencies = [ sources."editions-1.3.4" @@ -58270,12 +58440,8 @@ in }) sources."find-up-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-0.1.3" // { - dependencies = [ - sources."mime-1.2.11" - ]; - }) - sources."formidable-1.0.14" + sources."form-data-2.3.3" + sources."formidable-1.2.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" @@ -58305,7 +58471,7 @@ in sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" - sources."ignore-5.0.4" + sources."ignore-5.0.5" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -58313,12 +58479,11 @@ in sources."invert-kv-2.0.0" sources."ipaddr.js-1.8.0" sources."is-arrayish-0.3.2" - sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-wsl-1.1.0" - sources."isarray-0.0.1" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jquery-3.3.1" @@ -58329,14 +58494,6 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."just-detect-adblock-1.0.0" - (sources."keen.io-0.1.5" // { - dependencies = [ - sources."methods-1.0.1" - sources."mime-1.2.11" - sources."qs-1.2.0" - sources."superagent-0.21.0" - ]; - }) sources."knockout-3.5.0-rc2" sources."lcid-2.0.0" sources."locate-path-3.0.0" @@ -58345,7 +58502,7 @@ in sources."lru-cache-4.1.5" sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" - sources."mem-4.0.0" + sources."mem-4.1.0" (sources."memorystore-1.6.0" // { dependencies = [ sources."debug-3.1.0" @@ -58366,7 +58523,7 @@ in sources."nice-try-1.0.5" sources."node-cache-4.2.0" sources."nopt-1.0.10" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."npm-6.4.1" sources."npm-package-arg-6.1.0" sources."npm-registry-client-8.6.0" @@ -58388,7 +58545,7 @@ in sources."osenv-0.1.5" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.0.0" sources."p-limit-2.1.0" sources."p-locate-3.0.0" sources."p-try-2.0.0" @@ -58401,6 +58558,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" + sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."pause-0.0.1" sources."performance-now-2.1.0" @@ -58420,18 +58578,11 @@ in sources."minimist-1.2.0" ]; }) - sources."readable-stream-1.0.27-1" - sources."reduce-component-1.0.1" - (sources."request-2.88.0" // { - dependencies = [ - sources."combined-stream-1.0.7" - sources."delayed-stream-1.0.0" - sources."extend-3.0.2" - sources."form-data-2.3.3" - ]; - }) + sources."readable-stream-2.3.6" + sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" + sources."resolve-1.10.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" @@ -58460,13 +58611,11 @@ in sources."socket.io-adapter-1.1.1" (sources."socket.io-client-2.1.1" // { dependencies = [ - sources."component-emitter-1.2.1" sources."debug-3.1.0" ]; }) (sources."socket.io-parser-3.2.0" // { dependencies = [ - sources."component-emitter-1.2.1" sources."debug-3.1.0" sources."isarray-2.0.1" ]; @@ -58475,28 +58624,21 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."stack-trace-0.0.10" sources."statuses-1.5.0" sources."string-width-1.0.2" - sources."string_decoder-0.10.31" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" (sources."superagent-4.0.0" // { dependencies = [ - sources."combined-stream-1.0.7" - sources."component-emitter-1.2.1" - sources."cookiejar-2.1.2" sources."debug-4.1.1" - sources."delayed-stream-1.0.0" - sources."form-data-2.3.3" - sources."formidable-1.2.1" sources."mime-2.4.0" sources."ms-2.1.1" sources."readable-stream-3.1.1" - sources."string_decoder-1.2.0" ]; }) (sources."temp-0.8.3" // { @@ -58517,7 +58659,6 @@ in sources."typedarray-0.0.6" sources."uid-safe-2.1.5" sources."ultron-1.1.1" - sources."underscore-1.5.2" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" @@ -58531,11 +58672,7 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" - (sources."winston-2.4.4" // { - dependencies = [ - sources."async-1.0.0" - ]; - }) + sources."winston-2.4.4" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."ws-3.3.3" @@ -58572,8 +58709,8 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.7.0" - sources."ansi-escapes-3.1.0" + sources."ajv-6.9.1" + sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -58585,17 +58722,17 @@ in sources."arrify-1.0.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.1" + sources."async-2.6.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" - sources."base64-js-0.0.8" + sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" - sources."buffer-3.6.0" + sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -58673,7 +58810,7 @@ in sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" - sources."handlebars-4.0.12" + sources."handlebars-4.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -58691,7 +58828,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.2.1" + sources."inquirer-6.2.2" sources."is-3.3.0" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -58771,7 +58908,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -58783,7 +58920,7 @@ in sources."signal-exit-3.0.2" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."stat-mode-0.2.2" (sources."string-width-2.1.1" // { dependencies = [ @@ -58807,7 +58944,7 @@ in sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" - sources."toml-2.3.5" + sources."toml-2.3.6" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -58823,7 +58960,7 @@ in ]; }) sources."uid-0.0.2" - sources."unbzip2-stream-1.3.1" + sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" sources."unzip-response-2.0.1" sources."uri-js-4.2.2" @@ -58855,14 +58992,14 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.3.0.tgz"; - sha512 = "iRncrlX1naNvNV9fgMuYVyHQhXpetbv+GqCM8HoXAekeF5iFhOCtA0U92pp4UnFIadc+kKtul+8VZZaHbrlIBQ=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.4.0.tgz"; + sha512 = "DM31N9pYph1hcsVwrRXvCKx8MuQmhduvZ2SWS97iiGftMEzbR9wl5Adb09TJg1arsHvsr39/lWytHrqIjy0wqg=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollographql/apollo-tools-0.2.9" + sources."@apollographql/apollo-tools-0.3.3" sources."@apollographql/graphql-playground-html-1.6.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -58880,68 +59017,69 @@ in sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" sources."@types/cors-2.8.4" - sources."@types/events-1.2.0" - sources."@types/express-4.16.0" - sources."@types/express-serve-static-core-4.16.0" + sources."@types/events-3.0.0" + sources."@types/express-4.16.1" + sources."@types/express-serve-static-core-4.16.1" sources."@types/long-4.0.0" - sources."@types/mime-2.0.0" - sources."@types/node-10.12.18" + sources."@types/mime-2.0.1" + sources."@types/node-11.9.3" 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.3.0" - (sources."@vue/cli-ui-3.3.0" // { + sources."@vue/cli-shared-utils-3.4.0" + (sources."@vue/cli-ui-3.4.0" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.3.0" - sources."@vue/cli-ui-addon-widgets-3.3.0" + sources."@vue/cli-ui-addon-webpack-3.4.0" + sources."@vue/cli-ui-addon-widgets-3.4.0" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."aggregate-error-1.0.0" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.1.0" - sources."ansi-regex-3.0.0" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" - sources."anymatch-2.0.0" - sources."apollo-cache-1.1.25" - (sources."apollo-cache-control-0.4.0" // { + (sources."anymatch-2.0.0" // { dependencies = [ - sources."graphql-extensions-0.4.0" + sources."normalize-path-2.1.1" + ]; + }) + sources."apollo-cache-1.1.25" + (sources."apollo-cache-control-0.5.0" // { + dependencies = [ + sources."graphql-extensions-0.5.0" ]; }) sources."apollo-cache-inmemory-1.4.2" sources."apollo-client-2.4.12" - sources."apollo-datasource-0.2.1" - (sources."apollo-engine-reporting-0.2.0" // { - dependencies = [ - sources."graphql-extensions-0.4.0" - ]; - }) + sources."apollo-datasource-0.3.0" + sources."apollo-engine-reporting-1.0.1" sources."apollo-engine-reporting-protobuf-0.2.0" - sources."apollo-env-0.2.5" - sources."apollo-link-1.2.6" - sources."apollo-link-context-1.0.12" - sources."apollo-link-dedup-1.0.13" - sources."apollo-link-http-common-0.2.8" + sources."apollo-env-0.3.3" + sources."apollo-graphql-0.1.0" + sources."apollo-link-1.2.8" + sources."apollo-link-context-1.0.14" + sources."apollo-link-dedup-1.0.15" + sources."apollo-link-http-common-0.2.10" sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" - sources."apollo-link-ws-1.0.12" - sources."apollo-server-caching-0.2.1" - sources."apollo-server-core-2.3.1" + sources."apollo-link-ws-1.0.14" + sources."apollo-server-caching-0.3.0" + sources."apollo-server-core-2.4.1" sources."apollo-server-env-2.2.0" sources."apollo-server-errors-2.2.0" - sources."apollo-server-express-2.3.1" - sources."apollo-server-plugin-base-0.2.1" - (sources."apollo-tracing-0.4.0" // { + sources."apollo-server-express-2.4.1" + sources."apollo-server-plugin-base-0.3.1" + (sources."apollo-tracing-0.5.0" // { dependencies = [ - sources."graphql-extensions-0.4.0" + sources."graphql-extensions-0.5.0" ]; }) - sources."apollo-upload-client-9.1.0" + sources."apollo-upload-client-10.0.0" sources."apollo-utilities-1.1.2" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -58958,7 +59096,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.11.5" + sources."ast-types-0.12.2" sources."async-1.5.2" sources."async-each-1.0.1" sources."async-limiter-1.0.0" @@ -58974,9 +59112,9 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-js-0.0.8" + sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."bl-1.2.2" (sources."body-parser-1.18.3" // { dependencies = [ @@ -58987,7 +59125,7 @@ in sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."buffer-3.6.0" + sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -59004,7 +59142,7 @@ in sources."caw-2.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-2.0.4" + sources."chokidar-2.1.1" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -59045,7 +59183,7 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.0.0-beta.9" + sources."core-js-3.0.0-beta.13" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."create-error-class-3.0.2" @@ -59096,7 +59234,7 @@ in sources."destroy-1.0.4" sources."dicer-0.3.0" sources."diff-3.5.0" - sources."dir-glob-2.0.0" + sources."dir-glob-2.2.2" sources."dot-prop-4.2.0" (sources."download-5.0.3" // { dependencies = [ @@ -59117,7 +59255,7 @@ in sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esm-3.1.0" + sources."esm-3.2.4" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -59166,7 +59304,7 @@ in sources."define-property-1.0.0" ]; }) - sources."extract-files-4.1.0" + sources."extract-files-5.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-glob-2.2.6" @@ -59219,9 +59357,9 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - (sources."globby-8.0.2" // { + (sources."globby-9.0.0" // { dependencies = [ - sources."slash-1.0.0" + sources."pify-4.0.1" ]; }) sources."good-listener-1.2.2" @@ -59230,10 +59368,10 @@ in sources."graceful-readlink-1.0.1" sources."graphql-14.1.1" sources."graphql-anywhere-4.1.27" - sources."graphql-extensions-0.4.1" + sources."graphql-extensions-0.5.1" sources."graphql-subscriptions-1.0.0" sources."graphql-tag-2.10.1" - sources."graphql-tools-4.0.3" + sources."graphql-tools-4.0.4" sources."graphql-type-json-0.2.1" sources."graphql-upload-8.0.4" sources."growly-1.3.0" @@ -59257,7 +59395,7 @@ in sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" sources."ieee754-1.1.12" - sources."ignore-3.3.10" + sources."ignore-4.0.6" sources."ignore-by-default-1.0.1" sources."immutable-tuple-0.4.10" sources."import-global-0.1.0" @@ -59267,12 +59405,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."inquirer-6.2.1" // { - dependencies = [ - sources."ansi-regex-4.0.0" - sources."strip-ansi-5.0.0" - ]; - }) + sources."inquirer-6.2.2" sources."into-stream-2.0.1" sources."ipaddr.js-1.8.0" sources."is-accessor-descriptor-1.0.0" @@ -59325,7 +59458,6 @@ in sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" @@ -59335,8 +59467,8 @@ in sources."launch-editor-2.2.1" sources."lodash-4.17.11" sources."lodash.clonedeep-4.5.0" - sources."lodash.debounce-4.0.8" sources."lodash.merge-4.6.1" + sources."lodash.sortby-4.7.0" sources."log-symbols-2.2.0" sources."long-4.0.0" sources."lowdb-1.0.0" @@ -59394,15 +59526,15 @@ in sources."nice-try-1.0.5" sources."node-fetch-2.3.0" sources."node-ipc-9.1.1" - sources."node-notifier-5.3.0" - (sources."nodemon-1.18.9" // { + sources."node-notifier-5.4.0" + (sources."nodemon-1.18.10" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" ]; }) sources."nopt-1.0.10" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -59420,7 +59552,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."object-path-0.11.4" sources."object-visit-1.0.1" sources."object.getownpropertydescriptors-2.0.3" @@ -59430,7 +59562,7 @@ in sources."onetime-2.0.1" sources."opn-5.4.0" sources."optimism-0.6.9" - sources."ora-3.0.0" + sources."ora-3.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" @@ -59470,7 +59602,11 @@ in sources."process-exists-3.1.0" sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" - sources."protobufjs-6.8.8" + (sources."protobufjs-6.8.8" // { + dependencies = [ + sources."@types/node-10.12.26" + ]; + }) sources."proxy-addr-2.0.4" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" @@ -59488,7 +59624,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" - (sources."recast-0.15.5" // { + (sources."recast-0.17.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -59507,7 +59643,7 @@ in sources."request-2.88.0" sources."request-promise-core-1.1.1" sources."request-promise-native-1.0.5" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" @@ -59515,7 +59651,7 @@ in sources."rimraf-2.6.3" sources."rss-parser-3.6.2" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -59539,6 +59675,7 @@ in sources."serve-static-1.13.2" sources."set-value-2.0.0" sources."setprototypeof-1.1.0" + sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" @@ -59590,7 +59727,7 @@ in }) sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -59612,10 +59749,15 @@ in sources."stealthy-require-1.1.1" sources."steno-0.4.4" sources."streamsearch-0.1.2" - sources."string-width-2.1.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) sources."string.prototype.padstart-3.0.0" sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" + sources."strip-ansi-5.0.0" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -59649,7 +59791,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."timed-out-4.0.1" - sources."tiny-emitter-2.0.2" + sources."tiny-emitter-2.1.0" sources."tmp-0.0.33" sources."to-buffer-1.1.1" (sources."to-object-path-0.3.0" // { @@ -59678,7 +59820,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" - sources."unbzip2-stream-1.3.1" + sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" @@ -59717,18 +59859,14 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - (sources."vue-cli-plugin-apollo-0.18.1" // { - dependencies = [ - sources."deepmerge-2.2.1" - ]; - }) + sources."vue-cli-plugin-apollo-0.19.1" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."widest-line-2.0.1" sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" - sources."ws-6.1.2" + sources."write-file-atomic-2.4.2" + sources."ws-6.1.3" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -59741,8 +59879,8 @@ in }) sources."yauzl-2.10.0" sources."yn-2.0.0" - sources."zen-observable-0.8.11" - sources."zen-observable-ts-0.8.13" + sources."zen-observable-0.8.13" + sources."zen-observable-ts-0.8.15" ]; buildInputs = globalBuildInputs; meta = { @@ -59875,11 +60013,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/generator-7.2.2" + sources."@babel/generator-7.3.2" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.2.3" + sources."@babel/parser-7.3.2" sources."@babel/template-7.2.2" - sources."@babel/types-7.2.2" + sources."@babel/types-7.3.2" sources."@webassemblyjs/ast-1.8.1" sources."@webassemblyjs/floating-point-hex-parser-1.8.1" sources."@webassemblyjs/helper-api-error-1.8.1" @@ -59950,10 +60088,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.28.4"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.28.4.tgz"; - sha512 = "NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.29.3.tgz"; + sha512 = "xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A=="; }; dependencies = [ sources."@webassemblyjs/ast-1.7.11" @@ -59976,12 +60114,16 @@ in sources."@webassemblyjs/wast-printer-1.7.11" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.1" - sources."acorn-5.7.3" - sources."acorn-dynamic-import-3.0.0" - sources."ajv-6.7.0" + sources."acorn-6.1.0" + sources."acorn-dynamic-import-4.0.0" + sources."ajv-6.9.1" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.2.0" - sources."anymatch-2.0.0" + sources."ajv-keywords-3.4.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."aproba-1.2.0" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -60005,7 +60147,7 @@ in }) sources."base64-js-1.3.0" sources."big.js-5.2.2" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" sources."bluebird-3.5.3" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" @@ -60027,7 +60169,7 @@ in sources."builtin-status-codes-3.0.0" sources."cacache-11.3.2" sources."cache-base-1.0.1" - sources."chokidar-2.0.4" + sources."chokidar-2.1.1" sources."chownr-1.1.1" sources."chrome-trace-event-1.0.0" sources."cipher-base-1.0.4" @@ -60071,7 +60213,7 @@ in sources."des.js-1.0.0" sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" - sources."duplexify-3.6.1" + sources."duplexify-3.7.1" sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -60121,7 +60263,7 @@ in }) sources."find-cache-dir-2.0.0" sources."find-up-3.0.0" - sources."flush-write-stream-1.0.3" + sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."from2-2.3.0" @@ -60176,7 +60318,6 @@ in sources."loader-runner-2.4.0" sources."loader-utils-1.2.3" sources."locate-path-3.0.0" - sources."lodash.debounce-4.0.8" sources."lru-cache-5.1.1" sources."make-dir-1.3.0" sources."map-cache-0.2.2" @@ -60210,7 +60351,7 @@ in sources."punycode-1.4.1" ]; }) - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -60272,7 +60413,7 @@ in sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."schema-utils-0.4.7" + sources."schema-utils-1.0.0" sources."serialize-javascript-1.6.1" (sources."set-value-2.0.0" // { dependencies = [ @@ -60337,20 +60478,19 @@ in sources."kind-of-5.1.0" ]; }) - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.1.1" - (sources."terser-3.14.1" // { + (sources."terser-3.16.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.2.1" // { + (sources."terser-webpack-plugin-1.2.2" // { dependencies = [ - sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; }) @@ -60421,10 +60561,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.2.1"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.1.tgz"; - sha512 = "jeJveHwz/vwpJ3B8bxEL5a/rVKIpRNJDsKggfKnxuYeohNDW4Y/wB9N/XHJA093qZyS0r6mYL+/crLsIol4WKA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.3.tgz"; + sha512 = "Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q=="; }; dependencies = [ sources."ansi-regex-3.0.0" @@ -60529,7 +60669,6 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."global-modules-1.0.0" - sources."global-modules-path-2.3.1" sources."global-prefix-1.0.2" sources."graceful-fs-4.1.15" sources."has-flag-3.0.0" @@ -60567,13 +60706,12 @@ in sources."json5-1.0.1" sources."kind-of-6.0.2" sources."lcid-2.0.0" - sources."lightercollective-0.1.0" sources."loader-utils-1.2.3" sources."locate-path-3.0.0" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-4.0.0" + sources."mem-4.1.0" sources."memory-fs-0.4.1" sources."micromatch-3.1.10" sources."mimic-fn-1.2.0" @@ -60607,7 +60745,7 @@ in sources."os-locale-3.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.0.0" sources."p-limit-2.1.0" sources."p-locate-3.0.0" sources."p-try-2.0.0" @@ -60766,8 +60904,8 @@ in sources."ascli-0.3.0" sources."async-limiter-1.0.0" sources."balanced-match-1.0.0" - sources."bencode-2.0.0" - sources."binary-search-1.3.4" + sources."bencode-2.0.1" + sources."binary-search-1.3.5" sources."bitfield-2.0.0" (sources."bittorrent-dht-9.0.0" // { dependencies = [ @@ -60842,7 +60980,7 @@ in }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - (sources."ecstatic-3.3.0" // { + (sources."ecstatic-3.3.1" // { dependencies = [ sources."mime-1.6.0" ]; @@ -60871,7 +61009,7 @@ in sources."inherits-2.0.3" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.8.1" + sources."ipaddr.js-1.9.0" sources."is-ascii-1.0.0" sources."is-file-1.0.0" sources."is-typedarray-1.0.0" @@ -60906,7 +61044,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.23.0" + sources."moment-2.24.0" sources."mp4-box-encoding-1.3.0" (sources."mp4-stream-2.0.3" // { dependencies = [ @@ -60953,7 +61091,7 @@ in sources."protobufjs-3.8.2" sources."pump-3.0.0" sources."qap-3.3.1" - sources."random-access-file-2.0.1" + sources."random-access-file-2.1.0" sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" @@ -60977,7 +61115,7 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.2.0" // { + (sources."simple-peer-9.2.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -61038,7 +61176,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-6.1.2" + sources."ws-6.1.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -61070,7 +61208,7 @@ in }) sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.12.18" + sources."@types/node-11.9.3" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -61098,10 +61236,10 @@ in sources."adm-zip-0.4.13" sources."agent-base-4.2.1" sources."ajv-6.5.5" - sources."ajv-keywords-3.2.0" + sources."ajv-keywords-3.4.0" sources."ajv-merge-patch-4.1.0" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" @@ -61109,7 +61247,7 @@ in sources."anymatch-2.0.0" (sources."archiver-2.1.1" // { dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; @@ -61138,7 +61276,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.12.1" + sources."ast-types-0.12.2" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" @@ -61166,7 +61304,7 @@ in }) sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.12.0" + sources."binary-extensions-1.13.0" (sources."bl-1.2.2" // { dependencies = [ sources."readable-stream-2.3.6" @@ -61189,7 +61327,6 @@ in sources."buffer-equal-constant-time-1.0.1" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."bunyan-1.8.12" sources."bytes-3.0.0" sources."cache-base-1.0.1" @@ -61201,9 +61338,10 @@ in sources."chalk-2.4.0" sources."chardet-0.4.2" sources."cheerio-1.0.0-rc.2" - (sources."chokidar-2.0.4" // { + (sources."chokidar-2.1.1" // { dependencies = [ sources."fsevents-1.2.7" + sources."normalize-path-3.0.0" ]; }) sources."circular-json-0.3.3" @@ -61262,7 +61400,7 @@ in }) sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -61281,7 +61419,7 @@ in sources."dashdash-1.14.1" (sources."data-uri-to-buffer-2.0.0" // { dependencies = [ - sources."@types/node-8.10.39" + sources."@types/node-8.10.40" ]; }) sources."debounce-1.1.0" @@ -61305,7 +61443,7 @@ in sources."depd-1.1.2" (sources."dispensary-0.27.0" // { dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" sources."decamelize-1.2.0" sources."find-up-3.0.0" sources."locate-path-3.0.0" @@ -61399,7 +61537,7 @@ in sources."eslint-visitor-keys-1.0.0" (sources."espree-4.1.0" // { dependencies = [ - sources."acorn-6.0.5" + sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" ]; }) @@ -61449,7 +61587,7 @@ in sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-1.4.2" + sources."fast-redact-1.4.3" sources."fast-safe-stringify-2.0.6" sources."fd-slicer-1.1.0" sources."figures-2.0.0" @@ -61528,7 +61666,7 @@ in ]; }) sources."global-dirs-0.1.1" - sources."globals-11.10.0" + sources."globals-11.11.0" sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" @@ -61595,7 +61733,6 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-callable-1.1.4" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -61673,8 +61810,8 @@ in sources."string_decoder-0.10.31" ]; }) - sources."jwa-1.1.6" - sources."jws-3.1.5" + sources."jwa-1.2.0" + sources."jws-3.2.1" sources."kind-of-3.2.2" sources."latest-version-3.1.0" sources."lazy-cache-0.2.7" @@ -61700,7 +61837,6 @@ in sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.debounce-4.0.8" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" @@ -61719,7 +61855,7 @@ in sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-4.0.0" + sources."mem-4.1.0" (sources."micromatch-3.1.10" // { dependencies = [ sources."kind-of-6.0.2" @@ -61745,7 +61881,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.23.0" + sources."moment-2.24.0" sources."ms-2.0.0" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" @@ -61794,7 +61930,7 @@ in sources."strip-ansi-0.1.1" ]; }) - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."nth-check-1.0.2" @@ -61813,7 +61949,7 @@ in }) ]; }) - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -61827,7 +61963,7 @@ in sources."os-tmpdir-1.0.2" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -61891,7 +62027,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."quick-format-unescaped-3.0.1" + sources."quick-format-unescaped-3.0.2" (sources."raw-body-2.3.3" // { dependencies = [ sources."iconv-lite-0.4.23" @@ -61939,7 +62075,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-uncached-1.0.3" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-from-1.0.1" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -62118,7 +62254,7 @@ in sources."split-0.3.3" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -62189,7 +62325,7 @@ in sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."toml-2.3.5" + sources."toml-2.3.6" sources."tosource-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -62257,7 +62393,7 @@ in }) sources."wrappy-1.0.2" sources."write-0.2.1" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -62356,10 +62492,10 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-0.3.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.1.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."are-we-there-yet-1.1.5" @@ -62375,7 +62511,7 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" - sources."async-2.6.1" + sources."async-2.6.2" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -62405,7 +62541,6 @@ in ]; }) sources."buffer-from-1.1.1" - sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ @@ -62600,7 +62735,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.2.1" + sources."inquirer-6.2.2" (sources."insight-0.10.1" // { dependencies = [ sources."chardet-0.4.2" @@ -62614,7 +62749,6 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" @@ -62722,7 +62856,7 @@ in sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" sources."nice-try-1.0.5" - sources."normalize-package-data-2.4.0" + sources."normalize-package-data-2.5.0" sources."normalize-url-2.0.1" sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { @@ -62789,6 +62923,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" + sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -62843,6 +62978,7 @@ in sources."tough-cookie-2.4.3" ]; }) + sources."resolve-1.10.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -62850,7 +62986,7 @@ in sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -62908,7 +63044,7 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.3" sources."split-string-3.1.0" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -63005,7 +63141,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.13.0" + sources."twig-1.13.2" sources."typedarray-0.0.6" (sources."union-value-1.0.0" // { dependencies = [ @@ -63056,7 +63192,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."xtend-4.0.1" sources."yallist-2.1.2" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 93ae18050daa..1e8dbac51b6f 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -13,13 +13,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "ajv-6.7.0" = { + "ajv-6.9.1" = { name = "ajv"; packageName = "ajv"; - version = "6.7.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz"; - sha512 = "RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; + sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; }; }; "ansi-regex-2.1.1" = { @@ -1300,22 +1300,22 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "npm-bundled-1.0.5" = { + "npm-bundled-1.0.6" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz"; - sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; + sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.2.0" = { + "npm-packlist-1.3.0" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz"; - sha512 = "7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; + sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; }; }; "npmlog-4.1.2" = { @@ -1624,13 +1624,13 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "resolve-1.9.0" = { + "resolve-1.10.0" = { name = "resolve"; packageName = "resolve"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz"; - sha512 = "TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; }; }; "resolve-dir-1.0.1" = { @@ -1822,13 +1822,13 @@ let sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; - "sshpk-1.16.0" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz"; - sha512 = "Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "static-extend-0.1.2" = { @@ -2080,10 +2080,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.4"; + version = "1.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; - sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; + sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; }; buildInputs = globalBuildInputs; meta = { @@ -2284,7 +2284,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -2391,7 +2391,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -2470,7 +2470,7 @@ in sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -2502,10 +2502,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz"; - sha512 = "L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz"; + sha512 = "bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -2560,8 +2560,8 @@ in sources."ms-2.0.0" sources."needle-2.2.4" sources."nopt-4.0.1" - sources."npm-bundled-1.0.5" - sources."npm-packlist-1.2.0" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.3.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -2606,10 +2606,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.25.1"; + version = "2.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.1.tgz"; - sha512 = "VlDIaWSEQJuIQOFzhcg4YQ7enQMrJHb11eUclMj1VxIOxCZX51e/EDu+PZ0IO/4iQsgifiVoQcBbacBKi55jDA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.6.tgz"; + sha512 = "5N7JPGL0rwwWQU/ofxhnp3lgmRoF7LlxMvJUCLjWORavfpB8uBIOKoae4JGWt4cPhXY/u6y5k1yZRmHMZiyRKQ=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 7e4b9dc15a17..8ba6a8909c84 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -4,13 +4,13 @@ let sources = { - "@types/node-8.10.39" = { + "@types/node-8.10.40" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.39"; + version = "8.10.40"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz"; - sha512 = "rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.40.tgz"; + sha512 = "RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ=="; }; }; "JSV-4.0.2" = { @@ -58,13 +58,13 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.7.0" = { + "ajv-6.9.1" = { name = "ajv"; packageName = "ajv"; - version = "6.7.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz"; - sha512 = "RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; + sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; }; }; "amdefine-1.0.1" = { @@ -292,6 +292,15 @@ let sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; }; }; + "async-2.6.2" = { + name = "async"; + packageName = "async"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; + sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -1156,13 +1165,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-2.6.2" = { + "core-js-2.6.4" = { name = "core-js"; packageName = "core-js"; - version = "2.6.2"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz"; - sha512 = "NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.4.tgz"; + sha512 = "05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A=="; }; }; "core-util-is-1.0.2" = { @@ -1399,13 +1408,13 @@ let sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; }; }; - "ensure-posix-path-1.0.2" = { + "ensure-posix-path-1.1.1" = { name = "ensure-posix-path"; packageName = "ensure-posix-path"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz"; - sha1 = "a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"; + url = "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz"; + sha512 = "VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw=="; }; }; "envconf-0.0.4" = { @@ -2560,22 +2569,22 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "jwa-1.1.6" = { + "jwa-1.2.0" = { name = "jwa"; packageName = "jwa"; - version = "1.1.6"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz"; - sha512 = "tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"; + sha512 = "Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg=="; }; }; - "jws-3.1.5" = { + "jws-3.2.1" = { name = "jws"; packageName = "jws"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz"; - sha512 = "GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ=="; + url = "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz"; + sha512 = "bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g=="; }; }; "jwt-decode-2.2.0" = { @@ -2722,13 +2731,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "matcher-collection-1.0.5" = { + "matcher-collection-1.1.2" = { name = "matcher-collection"; packageName = "matcher-collection"; - version = "1.0.5"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz"; - sha512 = "nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA=="; + url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.1.2.tgz"; + sha512 = "YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g=="; }; }; "md5.js-1.3.4" = { @@ -2857,13 +2866,13 @@ let sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; }; }; - "moment-2.23.0" = { + "moment-2.24.0" = { name = "moment"; packageName = "moment"; - version = "2.23.0"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz"; - sha512 = "3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA=="; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; "ms-2.0.0" = { @@ -2884,13 +2893,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.3.8" = { + "ms-rest-2.5.0" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.3.8"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.8.tgz"; - sha512 = "8kaerSPk0Z9W6z8VnJXjKOHDaGGXbsGyO22X4DFtlllzbYLryWo0Dor+jnIKpgvUOzQKSoLW2fel81piG3LnHQ=="; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.5.0.tgz"; + sha512 = "QUTg9CsmWpofDO0MR37z8B28/T9ObpQ+FM23GGDMKXw8KYDJ3cEBdK6dJTDDrtSoZG3U+S/vdmSEwJ7FNj6Kog=="; }; }; "ms-rest-azure-1.15.7" = { @@ -3010,22 +3019,22 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "npm-bundled-1.0.5" = { + "npm-bundled-1.0.6" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz"; - sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; + sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.2.0" = { + "npm-packlist-1.3.0" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz"; - sha512 = "7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; + sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; }; }; "npmlog-4.1.2" = { @@ -3532,13 +3541,13 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "resolve-1.9.0" = { + "resolve-1.10.0" = { name = "resolve"; packageName = "resolve"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz"; - sha512 = "TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; }; }; "resolve-dir-1.0.1" = { @@ -3856,13 +3865,13 @@ let sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; - "sshpk-1.16.0" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz"; - sha512 = "Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "stack-trace-0.0.10" = { @@ -4537,17 +4546,17 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.13.7"; + version = "1.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.13.7.tgz"; - sha512 = "4FUh6/7XppJQN+8L/sG+QZi3CEnXaJbWdb7DPMl44BLKfSg6CSxMJS6KeFo0CR/0RpobfCho6QRgzHfWMaZ0Yg=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.13.8.tgz"; + sha512 = "NhxxnijbAEtZg1x18aehW8VBqNMDurgFtJptKjC5k3lT3TDvu+/s6znxJ3x+8ZNpb0aTfkd6N6MvHx/a+6Uhvg=="; }; dependencies = [ sources."JSV-4.0.2" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."array-unique-0.3.2" - sources."async-2.6.1" + sources."async-2.6.2" sources."babel-code-frame-6.26.0" (sources."babel-core-6.26.3" // { dependencies = [ @@ -4575,11 +4584,11 @@ in sources."commander-2.19.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" - sources."core-js-2.6.2" + sources."core-js-2.6.4" sources."debug-2.6.9" sources."detect-indent-4.0.0" sources."ejs-2.5.7" - sources."ensure-posix-path-1.0.2" + sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" sources."esutils-2.0.2" sources."fs-extra-5.0.0" @@ -4613,7 +4622,7 @@ in sources."jsonlint-1.6.2" sources."lodash-4.17.11" sources."loose-envify-1.4.0" - sources."matcher-collection-1.0.5" + sources."matcher-collection-1.1.2" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -4637,7 +4646,7 @@ in sources."private-0.1.8" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."slash-1.0.0" @@ -4677,10 +4686,10 @@ in sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.39" + sources."@types/node-8.10.40" sources."JSV-4.0.2" sources."adal-node-0.1.28" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -4846,7 +4855,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" ]; }) sources."from-0.1.7" @@ -4902,8 +4911,8 @@ in ]; }) sources."jsrsasign-4.8.2" - sources."jwa-1.1.6" - sources."jws-3.1.5" + sources."jwa-1.2.0" + sources."jws-3.2.1" sources."jwt-decode-2.2.0" sources."keypress-0.1.0" (sources."kuduscript-1.0.16" // { @@ -4920,8 +4929,8 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.23.0" - (sources."ms-rest-2.3.8" // { + sources."moment-2.24.0" + (sources."ms-rest-2.5.0" // { dependencies = [ sources."through-2.3.8" sources."tunnel-0.0.5" @@ -5005,7 +5014,7 @@ in sources."asn1-0.1.11" ]; }) - (sources."sshpk-1.16.0" // { + (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -5074,10 +5083,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.4"; + version = "1.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; - sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; + sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; }; buildInputs = globalBuildInputs; meta = { @@ -5278,7 +5287,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.9.0" + sources."resolve-1.10.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -5385,7 +5394,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -5464,7 +5473,7 @@ in sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -5496,10 +5505,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz"; - sha512 = "L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz"; + sha512 = "bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -5554,8 +5563,8 @@ in sources."ms-2.0.0" sources."needle-2.2.4" sources."nopt-4.0.1" - sources."npm-bundled-1.0.5" - sources."npm-packlist-1.2.0" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.3.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -5600,10 +5609,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.25.1"; + version = "2.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.1.tgz"; - sha512 = "VlDIaWSEQJuIQOFzhcg4YQ7enQMrJHb11eUclMj1VxIOxCZX51e/EDu+PZ0IO/4iQsgifiVoQcBbacBKi55jDA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.6.tgz"; + sha512 = "5N7JPGL0rwwWQU/ofxhnp3lgmRoF7LlxMvJUCLjWORavfpB8uBIOKoae4JGWt4cPhXY/u6y5k1yZRmHMZiyRKQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -5624,7 +5633,7 @@ in }; dependencies = [ sources."adm-zip-0.4.11" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -5709,7 +5718,7 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.10" sources."sprintf-0.1.5" - sources."sshpk-1.16.0" + sources."sshpk-1.16.1" sources."stack-trace-0.0.10" sources."temp-0.8.3" (sources."tough-cookie-2.4.3" // { From 94136fdc1b6c0eb71d10b27a9a2cb597d73ca33e Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Wed, 13 Feb 2019 17:17:52 +0100 Subject: [PATCH 133/221] nixos/flannel: node name needs to be configured for flannel to work with kubernetes storage backend --- nixos/modules/services/networking/flannel.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index cb39a53b5f96..6c43573851b2 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -87,6 +87,15 @@ in { type = types.str; }; + nodeName = mkOption { + description = '' + Needed when running with Kubernetes as backend as this cannot be auto-detected"; + ''; + type = types.nullOr types.str; + default = with config.networking; (hostName + optionalString (!isNull domain) ".${domain}"); + example = "node1.example.com"; + }; + storageBackend = mkOption { description = "Determines where flannel stores its configuration at runtime"; type = types.enum ["etcd" "kubernetes"]; @@ -150,6 +159,7 @@ in { } // optionalAttrs (cfg.storageBackend == "kubernetes") { FLANNELD_KUBE_SUBNET_MGR = "true"; FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; + NODE_NAME = cfg.nodeName; }; preStart = mkIf (cfg.storageBackend == "etcd") '' echo "setting network configuration" From 58d69519718d71f5794c87404bac4ee44b16a5cd Mon Sep 17 00:00:00 2001 From: Alex Whitt Date: Wed, 13 Feb 2019 11:38:33 -0500 Subject: [PATCH 134/221] nzbget: Fix script for copying default config file template (#51235) * nzbget: Fix configFile / dataDir checking in service script * nzbget: improve the description for the `configFile` option * nzbget: Add detail to the `configFile` option description * nzbget: Improve wording of `configFile` option * nzbget: Refactor dataDir management into systemd config * nzbget: Remove debug --- nixos/modules/services/misc/nzbget.nix | 40 ++++++++++++-------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index e24cecf20807..6ab98751c57b 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.nzbget; + dataDir = builtins.dirOf cfg.configFile; in { options = { services.nzbget = { @@ -41,6 +42,12 @@ in { default = "nzbget"; description = "Group under which NZBGet runs"; }; + + configFile = mkOption { + type = types.str; + default = "/var/lib/nzbget/nzbget.conf"; + description = "Path for NZBGet's config file. (If this doesn't exist, the default config template is copied here.)"; + }; }; }; @@ -54,36 +61,25 @@ in { p7zip ]; preStart = '' - datadir=${cfg.dataDir} - configfile=${cfg.dataDir}/nzbget.conf cfgtemplate=${cfg.package}/share/nzbget/nzbget.conf - test -d $datadir || { - echo "Creating nzbget data directory in $datadir" - mkdir -p $datadir - } - test -f $configfile || { - echo "nzbget.conf not found. Copying default config $cfgtemplate to $configfile" - cp $cfgtemplate $configfile - echo "Setting $configfile permissions to 0700 (needs to be written and contains plaintext credentials)" - chmod 0700 $configfile + if [ ! -f ${cfg.configFile} ]; then + echo "${cfg.configFile} not found. Copying default config $cfgtemplate to ${cfg.configFile}" + install -m 0700 $cfgtemplate ${cfg.configFile} echo "Setting temporary \$MAINDIR variable in default config required in order to allow nzbget to complete initial start" echo "Remember to change this to a proper value once NZBGet startup has been completed" - sed -i -e 's/MainDir=.*/MainDir=\/tmp/g' $configfile - } - echo "Ensuring proper ownership of $datadir (${cfg.user}:${cfg.group})." - chown -R ${cfg.user}:${cfg.group} $datadir + sed -i -e 's/MainDir=.*/MainDir=\/tmp/g' ${cfg.configFile} + fi ''; script = '' - configfile=${cfg.dataDir}/nzbget.conf - args="--daemon --configfile $configfile" - # The script in preStart (above) copies nzbget's config template to datadir on first run, containing paths that point to the nzbget derivation installed at the time. - # These paths break when nzbget is upgraded & the original derivation is garbage collected. If such broken paths are found in the config file, override them to point to + args="--daemon --configfile ${cfg.configFile}" + # The script in preStart (above) copies nzbget's config template to datadir on first run, containing paths that point to the nzbget derivation installed at the time. + # These paths break when nzbget is upgraded & the original derivation is garbage collected. If such broken paths are found in the config file, override them to point to # the currently installed nzbget derivation. cfgfallback () { - local hit=`grep -Po "(?<=^$1=).*+" "$configfile" | sed 's/[ \t]*$//'` # Strip trailing whitespace + local hit=`grep -Po "(?<=^$1=).*+" "${cfg.configFile}" | sed 's/[ \t]*$//'` # Strip trailing whitespace ( test $hit && test -e $hit ) || { - echo "In $configfile, valid $1 not found; falling back to $1=$2" + echo "In ${cfg.configFile}, valid $1 not found; falling back to $1=$2" args+=" -o $1=$2" } } @@ -93,6 +89,8 @@ in { ''; serviceConfig = { + StateDirectory = dataDir; + StateDirectoryMode = "0700"; Type = "forking"; User = cfg.user; Group = cfg.group; From 86c5937bcb97bfce55c5b3e3edabd7c6521a1637 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Wed, 13 Feb 2019 17:39:16 +0000 Subject: [PATCH 135/221] haskellPackages.equivalence: dontCheck in GHC 8.6 The test suite fails due to MonadFail changes --- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index b6aae3d8e733..b5d325e42b39 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -49,6 +49,7 @@ self: super: { data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; + equivalence = dontCheck super.equivalence; # test suite doesn't compile https://github.com/pa-ba/equivalence/issues/5 HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126 hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; From 0b006f60ac212ac22b4fe82baad8469fc0e76d0a Mon Sep 17 00:00:00 2001 From: dywedir Date: Wed, 13 Feb 2019 22:45:31 +0200 Subject: [PATCH 136/221] fd: 7.2.0 -> 7.3.0 --- pkgs/tools/misc/fd/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 75c7897ac842..70bbbea72887 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,25 +2,26 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1h7ar1m7w3vmakg9rp1nfmz7q5pqwvd8yyxwj335ixb49gph1zi5"; + sha256 = "0y4657w1pi4x9nmbv551dj00dyiv935m8ph7jlv00chwy3hrb3yi"; }; - cargoSha256 = "0y6xp7fdjfmjfqf9avbq9bdvzvwkf3v1dv7a4k03w5279vxafzi4"; + cargoSha256 = "0dfv6nia3v3f3rwbjh2h3zdqd48vw8gwilhq0z4n6xvjzk7qydj5"; preFixup = '' - mkdir -p "$out/man/man1" - cp "$src/doc/fd.1" "$out/man/man1" + install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1" - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - cp target/release/build/fd-find-*/out/fd.bash "$out/share/bash-completion/completions/" - cp target/release/build/fd-find-*/out/fd.fish "$out/share/fish/vendor_completions.d/" - cp target/release/build/fd-find-*/out/_fd "$out/share/zsh/site-functions/" + install -Dm644 target/release/build/fd-find-*/out/fd.bash \ + "$out/share/bash-completion/completions/fd.bash" + install -Dm644 target/release/build/fd-find-*/out/fd.fish \ + "$out/share/fish/vendor_completions.d/fd.fish" + install -Dm644 target/release/build/fd-find-*/out/_fd \ + "$out/share/zsh/site-functions/_fd" ''; meta = with stdenv.lib; { From d4b3f3bbdd19f28a3dda7b00ec8c388384d1b0fc Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Wed, 13 Feb 2019 21:45:44 +0100 Subject: [PATCH 137/221] fdroidserver: 1.1 -> 1.1.1 (#55718) --- pkgs/development/tools/fdroidserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 2bdb455f8e88..24eba03946ac 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -4,14 +4,14 @@ , lib }: python.pkgs.buildPythonApplication rec { - version = "1.1"; + version = "1.1.1"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "1910ali90aj3wkxy6mi88c5ya6n7zbqr69nvmpc5dydxm0gb98w5"; + sha256 = "0m618rvjh8h8hnbafrxsdkw8m5r2wnkz7whqnh60jh91h3yr0kzs"; }; patchPhase = '' From 7be98fbd6c2a444b00cbf0a80f1475f6a7e8e33d Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Wed, 13 Feb 2019 21:48:59 +0100 Subject: [PATCH 138/221] pythonPackages.pyogg: 0.6.2a1 -> 0.6.6a1 (#55720) --- pkgs/development/python-modules/pyogg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 09b7f3861303..901cc137f192 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyOgg"; - version = "0.6.2a1"; + version = "0.6.6a1"; src = fetchPypi { inherit pname version; - sha256 = "1mjh5zx7mfy246lya1qc42j4q4pz6v5zbd8blnfib9ncswcb1v6l"; + sha256 = "1ihzgl8p0rc3yjsp27zdrrs2r4qar5yf5l4v8wg0lilvan78h0rs"; }; buildInputs = [ libvorbis flac libogg libopus ]; From ee0dfdc7fe4915cb48103464c8c3f173bbc2dc9d Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Wed, 13 Feb 2019 21:55:20 +0100 Subject: [PATCH 139/221] pythonPackages.typing-extensions: 3.6.6 -> 3.7.2 (#55719) --- pkgs/development/python-modules/typing-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 55be51362f42..daaafbd7b3ec 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.6.6"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "07vhddjnd3mhdijyc3s0mwi9jgfjp3rr056nxqiavydbvkrvgrsi"; + sha256 = "0wfsv71pvkyf2na938l579jh0v3kzl6g744ijgnahcwd4d9x0b7v"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; From 097746fec2b60a48c4a12e25717848bf4203761e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?= Date: Wed, 13 Feb 2019 21:50:31 +0100 Subject: [PATCH 140/221] maintainers: added netixx --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc121c15ac88..864b3701f26a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3228,6 +3228,11 @@ github = "nequissimus"; name = "Tim Steinbach"; }; + netixx = { + email = "dev.espinetfrancois@gmail.com"; + github = "netixx"; + name = "François Espinet"; + }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; github = "nikitavoloboev"; From b15869456790f0e08d976af4fa7ba6545ac5c7f8 Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Wed, 13 Feb 2019 22:12:20 +0100 Subject: [PATCH 141/221] pythonPackages.androguard: 3.3.3 -> 3.3.4 (#55728) --- pkgs/development/python-modules/androguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 686d6a2a75e1..6cd4c030767c 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -2,12 +2,12 @@ asn1crypto, click, pydot, ipython, pyqt5, pyperclip }: buildPythonPackage rec { - version = "3.3.3"; + version = "3.3.4"; pname = "androguard"; src = fetchPypi { inherit pname version; - sha256 = "1zlmn3byh2whg7k2xmcd7yy43lcawhryjnzcxr9bhn54709b6iyd"; + sha256 = "1hinfbvha7f1py1jnvxih7lx0p4z2nyaiq9bvg8v3bykwrd9jff2"; }; propagatedBuildInputs = [ From 01d8894c4d0f7fdd4f3534e6268b8e4c503d7258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 13 Feb 2019 22:55:36 +0100 Subject: [PATCH 142/221] Revert "linux: 4.14.98 -> 4.14.99" This reverts commit 0e1eb30a1d92d3ac0573fefd33a8f039b0e8e36b. It broke the installer tests, e.g. https://hydra.nixos.org/build/88704861 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5f333205dd52..78448b4bc389 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.99"; + version = "4.14.98"; # 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 = "02pbi5jck6fp7y5lihn077i0j3hssxcrbsfbxlyp62xjsnp8rycg"; + sha256 = "0pqc04ij6qdfhh3rpakas0qc0vqj8mm120z64q9v9vxin5qi20lg"; }; } // (args.argsOverride or {})) From 9e65251afeb1a26e836379495e1f2250ff495fa4 Mon Sep 17 00:00:00 2001 From: SLNOS Date: Fri, 1 Feb 2019 00:00:00 +0000 Subject: [PATCH 143/221] firefoxPackages.tor-browser: 8.0.5 -> 8.0.6 --- .../networking/browsers/firefox/packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6a2f2ed4efd2..abe07058d8de 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -237,16 +237,16 @@ in rec { }; tor-browser-8-0 = tbcommon rec { - ffversion = "60.5.0esr"; - tbversion = "8.0.5"; + ffversion = "60.5.1esr"; + tbversion = "8.0.6"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.5.0esr-8.0-1-slnos" - rev = "7f113a4ea0539bd2ea9687fe4296c880f2b006c4"; - sha256 = "11qbhwy2q9rinfw8337b9f78x0r26lnxg25581z85vxshp2jszdq"; + # branch "tor-browser-60.5.1esr-8.0-1-slnos" + rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf"; + sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1"; }; }; From 20193f85e9c1b1540bca86233a0f3d2ebf7efaa1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:20 +0000 Subject: [PATCH 144/221] mplayer: move defaults to package file --- pkgs/applications/video/mplayer/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index e017e7cc0015..c77486a30cf1 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg +{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -19,7 +19,7 @@ , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null , jackaudioSupport ? false, libjack2 ? null -, pulseSupport ? false, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9c07edc2c87..ebb7ec105cec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18278,7 +18278,6 @@ in mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; mplayer = callPackage ../applications/video/mplayer ({ - pulseSupport = config.pulseaudio or false; libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); From 9361acfff13586840a41e16496c28dc27848671d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:21 +0000 Subject: [PATCH 145/221] aegisub: move defaults to package file --- pkgs/applications/video/aegisub/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 10 ++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index d4208aee62e0..a613ad1c5842 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ config, stdenv, fetchurl , libX11, wxGTK , libiconv, fontconfig, freetype , libGLU_combined @@ -8,8 +8,8 @@ , spellcheckSupport ? true, hunspell ? null , automationSupport ? true, lua ? null , openalSupport ? false, openal ? null -, alsaSupport ? true, alsaLib ? null -, pulseaudioSupport ? true, libpulseaudio ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , portaudioSupport ? false, portaudio ? null }: assert spellcheckSupport -> (hunspell != null); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebb7ec105cec..b684dcd3c2b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -406,15 +406,9 @@ in aefs = callPackage ../tools/filesystems/aefs { }; - aegisub = callPackage ../applications/video/aegisub { + aegisub = callPackage ../applications/video/aegisub ({ wxGTK = wxGTK30; - spellcheckSupport = config.aegisub.spellcheckSupport or true; - automationSupport = config.aegisub.automationSupport or true; - openalSupport = config.aegisub.openalSupport or false; - alsaSupport = config.aegisub.alsaSupport or true; - pulseaudioSupport = config.aegisub.pulseaudioSupport or true; - portaudioSupport = config.aegisub.portaudioSupport or false; - }; + } // (config.aegisub or {})); aerospike = callPackage ../servers/nosql/aerospike { }; From 578408aa16443b3301fdb239145f92cb004ece89 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:22 +0000 Subject: [PATCH 146/221] brltty: move defaults to package file, use ALSA on Linux --- pkgs/tools/misc/brltty/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 6635f2931955..99ba8e5e5159 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, python3, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: +{ stdenv, fetchurl, pkgconfig, python3, bluez +, alsaSupport ? stdenv.isLinux, alsaLib ? null +, systemdSupport ? stdenv.isLinux, systemd ? null }: assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b684dcd3c2b2..e01aeb721f81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -967,10 +967,8 @@ in brigand = callPackage ../development/libraries/brigand { }; - brltty = callPackage ../tools/misc/brltty { - alsaSupport = (!stdenv.isDarwin); - systemdSupport = stdenv.isLinux; - }; + brltty = callPackage ../tools/misc/brltty { }; + bro = callPackage ../applications/networking/ids/bro { }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; From d364e682b07447c81bc07a2c5b77cf815abc4738 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:23 +0000 Subject: [PATCH 147/221] pcaudiolib: move defaults to package file --- pkgs/development/libraries/pcaudiolib/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index efaf2cfd429a..2050e5cdfe79 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig, - alsaLib, portaudio, - pulseaudioSupport ? true, libpulseaudio }: +{ config, stdenv, lib, fetchFromGitHub +, autoconf, automake, which, libtool, pkgconfig +, portaudio, alsaLib +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { name = "pcaudiolib-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e01aeb721f81..6a2e5ff86d24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11890,9 +11890,7 @@ in pangoxsl = callPackage ../development/libraries/pangoxsl { }; - pcaudiolib = callPackage ../development/libraries/pcaudiolib { - pulseaudioSupport = config.pulseaudio or true; - }; + pcaudiolib = callPackage ../development/libraries/pcaudiolib { }; pcg_c = callPackage ../development/libraries/pcg-c { }; From fe7537945909ad051ad1ae532a656f49fd9b4301 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:24 +0000 Subject: [PATCH 148/221] bomi: move defaults to package file --- pkgs/applications/video/bomi/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 671d67946354..bbac10140344 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which +{ config, stdenv, fetchFromGitHub +, fetchpatch, pkgconfig, perl, python, which , libX11, libxcb, libGLU_combined , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet @@ -15,7 +16,7 @@ , libbluray , jackSupport ? false, jack ? null , portaudioSupport ? false, portaudio ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , cddaSupport ? false, libcdda ? null , youtubeSupport ? true, youtube-dl ? null }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a2e5ff86d24..9c38b75a17ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16207,7 +16207,6 @@ in bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { - pulseSupport = config.pulseaudio or true; ffmpeg = ffmpeg_2; }; From f91e811e44ccfdfd8190dd192145baa5670960ac Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:25 +0000 Subject: [PATCH 149/221] chromium: move defaults to package file This one is a bit untrivial. --- .../networking/browsers/chromium/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 13 +------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 88b0a89db4b1..c7917e923d4c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,5 @@ -{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed +{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7 +, makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas # package customization @@ -10,12 +11,17 @@ , enablePepperFlash ? false , enableWideVine ? false , cupsSupport ? true -, pulseSupport ? false +, pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" }: -assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv); let + stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv; + llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7; +in let + stdenv = stdenv_; + llvmPackages = llvmPackages_; + callPackage = newScope chromium; chromium = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c38b75a17ab..59bc2d4ad18e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16295,18 +16295,7 @@ in bookworm = callPackage ../applications/office/bookworm { }; - chromium = callPackage ../applications/networking/browsers/chromium ({ - channel = "stable"; - pulseSupport = config.pulseaudio or true; - enablePepperFlash = config.chromium.enablePepperFlash or false; - enableWideVine = config.chromium.enableWideVine or false; - } // (if stdenv.isAarch64 then { - stdenv = gcc8Stdenv; - } else { - llvmPackages = llvmPackages_7; - stdenv = llvmPackages_7.stdenv; - }) - ); + chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chronos = callPackage ../applications/networking/cluster/chronos { }; From 1eea8a5f4a5837b0cb150742fbf1fb02e6d8d4b4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:26 +0000 Subject: [PATCH 150/221] cmus: move defaults to package file --- pkgs/applications/audio/cmus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index f8c5a4e5acff..5282af654f75 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig +{ config, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig , libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -7,7 +7,7 @@ , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null , ossSupport ? false, alsaOss ? null -, pulseaudioSupport ? false, libpulseaudio ? null +, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null # TODO: add these #, artsSupport diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59bc2d4ad18e..e4172105b126 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16335,8 +16335,6 @@ in inherit (darwin.apple_sdk.frameworks) CoreAudio; libjack = libjack2; ffmpeg = ffmpeg_2; - - pulseaudioSupport = config.pulseaudio or false; }; cmusfm = callPackage ../applications/audio/cmusfm { }; From 15a1e879a99603acee7c4d8c168f3fd4699703c8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:27 +0000 Subject: [PATCH 151/221] deadbeef: move defaults to package file --- pkgs/applications/audio/deadbeef/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index e2fcc3c4626a..0212560cd03b 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, jansson +{ config, stdenv, fetchurl, intltool, pkgconfig, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null @@ -20,7 +20,7 @@ , osdSupport ? true, dbus ? null # output plugins , alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null , overloadSupport ? true, zlib ? null diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4172105b126..01af6e5b601d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16443,9 +16443,7 @@ in ddgr = callPackage ../applications/misc/ddgr { }; - deadbeef = callPackage ../applications/audio/deadbeef { - pulseSupport = config.pulseaudio or true; - }; + deadbeef = callPackage ../applications/audio/deadbeef { }; deadbeefPlugins = { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; From ce14636ae0661ec3050611fbed7e5f16a651fdf6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:28 +0000 Subject: [PATCH 152/221] mimic: move defaults to package file and fix some eol spaces. --- pkgs/applications/audio/mimic/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index a4cd0c944dc2..dcaffe3eb9b4 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,6 +1,6 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +{ config, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig , alsaLib, libtool, icu -, pulseaudioSupport ? true, libpulseaudio }: +, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { name = "mimic-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,15 +21,14 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libtool - icu + icu ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; meta = { description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; - homepage = https://mimic.mycroft.ai/; + homepage = https://mimic.mycroft.ai/; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.noneucat ]; + maintainers = [ stdenv.lib.maintainers.noneucat ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01af6e5b601d..82d214d61a63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18118,9 +18118,7 @@ in minitube = libsForQt5.callPackage ../applications/video/minitube { }; - mimic = callPackage ../applications/audio/mimic { - pulseaudioSupport = config.pulseaudio or false; - }; + mimic = callPackage ../applications/audio/mimic { }; mimms = callPackage ../applications/audio/mimms {}; From e29565110886f9857e48376191f9fbd8e43e2a6d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:29 +0000 Subject: [PATCH 153/221] virtualbox: move defaults to package file --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 828db24c325a..8304dd15597b 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 +{ config, stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 , libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap , libpng, glib, lvm2, libXrandr, libXinerama, libopus , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 @@ -7,7 +7,7 @@ , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null , extensionPack ? null, fakeroot ? null -, pulseSupport ? false, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , enableHardening ? false , headless ? false , enable32bitGuests ? true diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82d214d61a63..9e8ca93f4f19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19726,7 +19726,6 @@ in virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - pulseSupport = config.pulseaudio or true; }; virtualboxHardened = lowPrio (virtualbox.override { From ea4431750e1e8537badf76d8bd427951c620df21 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 14 Feb 2019 01:14:55 +0100 Subject: [PATCH 154/221] brasero: fix libdvdcss usage turns out, prefixing LD_PRELOAD with the path to libdvdcss works just fine. --- pkgs/tools/cd-dvd/brasero/default.nix | 2 -- pkgs/tools/cd-dvd/brasero/wrapper.nix | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 753bdd49959c..402073ff5241 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -2,8 +2,6 @@ , libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs , vcdimager, wrapGAppsHook, hicolor-icon-theme }: -# libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 - let major = "3.12"; minor = "2"; diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 7f97209a4aa9..8112b0971f3d 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, brasero-original, cdrtools, makeWrapper }: +{ lib, symlinkJoin, brasero-original, cdrtools, libdvdcss, makeWrapper }: let binPath = lib.makeBinPath [ cdrtools ]; @@ -10,8 +10,9 @@ in symlinkJoin { postBuild = '' wrapProgram $out/bin/brasero \ - --prefix PATH ':' ${binPath} + --prefix PATH ':' ${binPath} \ + --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdvdcss ]}/libdvdcss.so ''; - + inherit (brasero-original) meta; } From 5eef3590ae0d6215c8b3764aa11266d1eed9ad39 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 13 Feb 2019 19:58:02 -0500 Subject: [PATCH 155/221] nixos/phpfpm: allow configuring php.ini files per-pool --- nixos/modules/services/web-servers/phpfpm/default.nix | 9 ++++++--- .../modules/services/web-servers/phpfpm/pool-options.nix | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 152c89a2caec..97c730061bd1 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -14,11 +14,13 @@ let mapPoolConfig = n: p: { phpPackage = cfg.phpPackage; + phpOptions = cfg.phpOptions; config = p; }; mapPool = n: p: { phpPackage = p.phpPackage; + phpOptions = p.phpOptions; config = '' listen = ${p.listen} ${p.extraConfig} @@ -35,8 +37,8 @@ let ${conf} ''; - phpIni = pkgs.runCommand "php.ini" { - inherit (cfg) phpPackage phpOptions; + phpIni = pool: pkgs.runCommand "php.ini" { + inherit (pool) phpPackage phpOptions; nixDefaults = '' sendmail_path = "/run/wrappers/bin/sendmail -t -i" ''; @@ -156,6 +158,7 @@ in { ''; serviceConfig = let cfgFile = fpmCfgFile pool poolConfig.config; + iniFile = phpIni poolConfig; in { Slice = "phpfpm.slice"; PrivateDevices = true; @@ -164,7 +167,7 @@ in { # XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK"; Type = "notify"; - ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}"; + ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${iniFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; }; } diff --git a/nixos/modules/services/web-servers/phpfpm/pool-options.nix b/nixos/modules/services/web-servers/phpfpm/pool-options.nix index 40c83cddb957..d9ad7eff71f2 100644 --- a/nixos/modules/services/web-servers/phpfpm/pool-options.nix +++ b/nixos/modules/services/web-servers/phpfpm/pool-options.nix @@ -25,6 +25,15 @@ with lib; { ''; }; + phpOptions = mkOption { + type = types.lines; + default = fpmCfg.phpOptions; + defaultText = "config.services.phpfpm.phpOptions"; + description = '' + "Options appended to the PHP configuration file php.ini used for this PHP-FPM pool." + ''; + }; + extraConfig = mkOption { type = types.lines; example = '' From 2b15d5c4c86825ac3faf7c1a2196de06e3cecb68 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 13 Feb 2019 23:03:37 -0500 Subject: [PATCH 156/221] pythonPackages.pandas: don't propagate cython dependency --- pkgs/development/python-modules/pandas/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 839e7f1e8192..0fa5db6ca101 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -37,9 +37,8 @@ in buildPythonPackage rec { checkInputs = [ pytest glibcLocales moto ]; - buildInputs = [] ++ optional isDarwin libcxx; + buildInputs = [ cython ] ++ optional isDarwin libcxx; propagatedBuildInputs = [ - cython dateutil scipy numexpr From 444b26e3b5df0d3207b08c0e0102d27d07403d15 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 13 Feb 2019 23:35:45 -0500 Subject: [PATCH 157/221] lazarus: format expression with more modern style This package was written more than a decade ago; this commit updates the layout to be more conventional without making any meaningful changes. Note that because it now has a version attribute in the derivation this does change the hash. --- pkgs/development/compilers/fpc/lazarus.nix | 43 +++++++++------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 8507fe4b222e..74ca246deb09 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,37 +1,29 @@ -{ -stdenv, fetchurl -, fpc -, gtk2, glib, pango, atk, gdk_pixbuf +{ stdenv, fetchurl, makeWrapper +, fpc, gtk2, glib, pango, atk, gdk_pixbuf , libXi, xorgproto, libX11, libXext -, makeWrapper }: -let - s = - rec { - version = "1.8.4"; - versionSuffix = ""; - url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; +stdenv.mkDerivation rec { + name = "lazarus-${version}"; + version = "1.8.4"; + + src = fetchurl { + url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"; sha256 = "1s8hdip973fc1lynklddl0mvg2jd2lzkfk8hzb8jlchs6jn0362s"; - name = "lazarus-${version}"; }; + buildInputs = [ fpc gtk2 glib libXi xorgproto libX11 libXext pango atk stdenv.cc makeWrapper gdk_pixbuf ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; + makeFlags = [ "FPC=fpc" "PP=fpc" "REQUIRE_PACKAGES+=tachartlazaruspkg" "bigide" ]; + preBuild = '' export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/share/lazarus/ INSTALL_PREFIX=$out/" export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.cc.cc.lib}/lib -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s" @@ -40,16 +32,17 @@ stdenv.mkDerivation { tar xf ${fpc.src} --strip-components=1 -C $out/share -m sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc ''; + postInstall = '' wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ - --prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'" + --prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'" ''; - meta = { - inherit (s) version; - license = stdenv.lib.licenses.gpl2Plus ; - platforms = stdenv.lib.platforms.linux; + + meta = with stdenv.lib; { description = "Lazarus graphical IDE for FreePascal language"; homepage = http://www.lazarus.freepascal.org; - maintainers = [stdenv.lib.maintainers.raskin]; + license = licenses.gpl2Plus ; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; }; } From 300094d2aa669e6018be7ea78f2577be91132825 Mon Sep 17 00:00:00 2001 From: hhm Date: Wed, 13 Feb 2019 23:53:59 -0500 Subject: [PATCH 158/221] bbe: init at 0.2.2 --- pkgs/tools/misc/bbe/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/bbe/default.nix diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix new file mode 100644 index 000000000000..ecff2459ef26 --- /dev/null +++ b/pkgs/tools/misc/bbe/default.nix @@ -0,0 +1,22 @@ +{ stdenv , fetchurl, autoreconfHook }: +stdenv.mkDerivation rec { + name = "bbe-${version}"; + version = "0.2.2"; + + src = fetchurl { + url = "mirror://sourceforge/bbe-/${version}/bbe-${version}.tar.gz"; + sha256 = "1nyxdqi4425sffjrylh7gl57lrssyk4018afb7mvrnd6fmbszbms"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + outputs = [ "out" "doc" ]; + + meta = with stdenv.lib; { + description = "A sed-like editor for binary files"; + homepage = "http://bbe-.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.hhm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee950c438775..6a7a3eec4d52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1726,6 +1726,8 @@ in bats = callPackage ../development/interpreters/bats { }; + bbe = callPackage ../tools/misc/bbe { }; + bdsync = callPackage ../tools/backup/bdsync { }; beanstalkd = callPackage ../servers/beanstalkd { }; From 9f93ed545076a30d2c53bcbad2332cd4a1bf064d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20H=C3=B6ppner?= Date: Thu, 14 Feb 2019 07:23:26 +0100 Subject: [PATCH 159/221] slirp4netns: init at 0.3.0-alpha.2 (#55446) --- pkgs/tools/networking/slirp4netns/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/slirp4netns/default.nix diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix new file mode 100644 index 000000000000..3515a127510f --- /dev/null +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "slirp4netns-${version}"; + version = "0.3.0-alpha.2"; + + src = fetchFromGitHub { + owner = "rootless-containers"; + repo = "slirp4netns"; + rev = "v${version}"; + sha256 = "163nwdwi1qigma1c5svm8llgd8pn4sbkchw67ry3v0gfxa9mxibk"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/rootless-containers/slirp4netns; + description = "User-mode networking for unprivileged network namespaces"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c185df833676..30698a0c7fb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18499,6 +18499,8 @@ in shogun = callPackage ../applications/science/machine-learning/shogun { }; + slirp4netns = callPackages ../tools/networking/slirp4netns/default.nix { }; + smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; smtube = libsForQt5.callPackage ../applications/video/smtube {}; From d55f53d019b26ea0b99bb50b09dd812cdd4e9700 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 14 Feb 2019 09:18:33 +0000 Subject: [PATCH 160/221] slirp4netns: fix call --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30698a0c7fb8..b660681a6b84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5439,6 +5439,8 @@ in slimrat = callPackage ../tools/networking/slimrat { }; + slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; + slsnif = callPackage ../tools/misc/slsnif { }; slstatus = callPackage ../applications/misc/slstatus { @@ -18499,8 +18501,6 @@ in shogun = callPackage ../applications/science/machine-learning/shogun { }; - slirp4netns = callPackages ../tools/networking/slirp4netns/default.nix { }; - smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; smtube = libsForQt5.callPackage ../applications/video/smtube {}; From aa2acd01231a2553922a1bbb2428710e9de1566b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 14 Feb 2019 11:24:09 +0100 Subject: [PATCH 161/221] firefox: 65.0 -> 65.0.1 Release notes: https://www.mozilla.org/en-US/firefox/65.0.1/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6a2f2ed4efd2..b743c1bfd184 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -10,10 +10,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "65.0"; + ffversion = "65.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "39bx76whgf53rkfqqy8gfhd44wikh89zpnqr930v4grqg3v0pfr8mbvp7xzjjlf5r7bski0wxibn9vyyy273fp99zyj1w2m5ihh9aqh"; + sha512 = "2crb46l5r0rwmzr1m8cn9f6xgajwcvansnplqg4kg91rf6x8q0zqzfnmyli9ccsbqvh7bqd31dmy14gwjskasqc4v103x9hchzshxnc"; }; patches = [ From 2f4c7f3f9282ad44e8554464bf6acef705449aba Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 14 Feb 2019 11:25:34 +0100 Subject: [PATCH 162/221] firefox-esr-60: 60.5.0esr -> 60.5.1esr Release notes: https://www.mozilla.org/en-US/firefox/60.5.1/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b743c1bfd184..c971888573bb 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -67,10 +67,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.5.0esr"; + ffversion = "60.5.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3n7l146gdjwhi0iq85awc0yykvi4x5m91mcylxa5mrq911bv6xgn2i92nzhgnhdilqap5218778vgvnalikzsh67irrncx1hy5f6iyx"; + sha512 = "0fvjw5zd8a9ki0a8phavi6xxfxbck21vj0k8415c5sxv48fwhqdhlnv3wx7riss4rjy9dylhr5xpa99dj9q98z735r8fxb7s3x3vrjz"; }; patches = [ From 826611bef9e88d89ed0b20caf7cdfbd07a78e361 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 14 Feb 2019 11:27:14 +0100 Subject: [PATCH 163/221] firefox: add andir (myself) as maintainer I have been working on this for some time now so it probably makes sense... --- pkgs/applications/networking/browsers/firefox/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c971888573bb..85645e04ef35 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -25,7 +25,7 @@ rec { meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = with lib.maintainers; [ eelco ]; + maintainers = with lib.maintainers; [ eelco andir ]; platforms = lib.platforms.unix; license = lib.licenses.mpl20; }; From 808ddabe706fc27b96fc678ac570a471f33d2c46 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 5 Feb 2019 15:05:32 -0600 Subject: [PATCH 164/221] libgxps: 0.3.0 -> 0.3.1 --- .../development/libraries/libgxps/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 3b7f29de573f..13f9cffad136 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,29 +1,16 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch +, libarchive, freetype, libjpeg, libtiff, gnome3 }: stdenv.mkDerivation rec { pname = "libgxps"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; + sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-10733-1.patch"; - url = https://gitlab.gnome.org/GNOME/libgxps/commit/b458226e162fe1ffe7acb4230c114a52ada5131b.patch; - sha256 = "0pqg9iwkg69qknj7vkgn26c32fndy55byxivd4km0vjfhfyx69hd"; - }) - (fetchpatch { - name = "CVE-2018-10733-2.patch"; - url = https://gitlab.gnome.org/GNOME/libgxps/commit/133fe2a96e020d4ca65c6f64fb28a404050ebbfd.patch; - sha256 = "19n01x8zs05wf801mkz4mypvapph7h941md3hr3rj0ry6r88pkir"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; buildInputs = [ glib cairo freetype libjpeg libtiff ]; propagatedBuildInputs = [ libarchive ]; From b759cf366b6373ea2642939ae83a28ede894cea4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 Feb 2019 13:31:17 +0100 Subject: [PATCH 165/221] libgxps: add lcms2 support --- pkgs/development/libraries/libgxps/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 13f9cffad136..30e5e247ab2b 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3 +, libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 }: stdenv.mkDerivation rec { @@ -12,12 +12,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; - buildInputs = [ glib cairo freetype libjpeg libtiff ]; + buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ]; propagatedBuildInputs = [ libarchive ]; mesonFlags = [ "-Denable-test=false" - "-Dwith-liblcms2=false" ]; passthru = { From 59379d1f4f012ed4bf26c24062282dd9005676c4 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Thu, 14 Feb 2019 15:04:32 +0100 Subject: [PATCH 166/221] pybind11: 2.2.2 -> 2.2.4 (#54792) --- .../libraries/pybind11/default.nix | 23 +++++++++++-------- .../pybind11/no_test_cmake_build.patch | 7 ++++++ 2 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/pybind11/no_test_cmake_build.patch diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix index d7bca0de2498..0a8972d4876d 100644 --- a/pkgs/development/libraries/pybind11/default.nix +++ b/pkgs/development/libraries/pybind11/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ stdenv, fetchFromGitHub, cmake, catch, python, eigen }: stdenv.mkDerivation rec { name = "pybind-${version}"; - version = "2.2.2"; + version = "2.2.4"; + src = fetchFromGitHub { owner = "pybind"; repo = "pybind11"; rev = "v${version}"; - sha256 = "0x71i1n5d02hjbdcnkscrwxs9pb8kplmdpqddhsimabfp84fip48"; + sha256 = "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv"; }; nativeBuildInputs = [ cmake ]; + checkInputs = with python.pkgs; [ catch eigen pytest numpy scipy ]; - # disable tests as some tests (test_embed/test_interpreter) are failing at the moment - cmakeFlags = [ - "-DPYTHON_EXECUTABLE=${python.interpreter}" - "-DPYBIND11_TEST=0" + # Disable test_cmake_build test, as it fails in sandbox + # https://github.com/pybind/pybind11/issues/1355 + patches = [ ./no_test_cmake_build.patch ]; + + doCheck = true; + + cmakeFlags = [ + "-DPYTHON_EXECUTABLE=${python.interpreter}" + "-DPYBIND11_TEST=${if doCheck then "ON" else "OFF"}" ]; - doCheck = false; meta = { homepage = https://github.com/pybind/pybind11; @@ -31,5 +37,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; }; - } diff --git a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch b/pkgs/development/libraries/pybind11/no_test_cmake_build.patch new file mode 100644 index 000000000000..c5d6ecc4481e --- /dev/null +++ b/pkgs/development/libraries/pybind11/no_test_cmake_build.patch @@ -0,0 +1,7 @@ +--- a/tests/CMakeLists.txt 2019-01-28 14:13:55.822119328 +0100 ++++ b/tests/CMakeLists.txt 2019-01-28 14:14:06.741161928 +0100 +@@ -233,4 +233,3 @@ + add_subdirectory(test_embed) + + # Test CMake build using functions and targets from subdirectory or installed location +-add_subdirectory(test_cmake_build) From 52a7c4e30ed38e66360a46b1aa42b0433a48c58f Mon Sep 17 00:00:00 2001 From: "Samuel W. Flint" Date: Thu, 14 Feb 2019 10:11:15 -0600 Subject: [PATCH 167/221] z3: Patch file to get rid of python error See #55591, Z3Prover/z3#2131 --- .../science/logic/z3/0001-fix-2131.patch | 66 +++++++++++++++++++ .../applications/science/logic/z3/default.nix | 4 ++ 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/science/logic/z3/0001-fix-2131.patch diff --git a/pkgs/applications/science/logic/z3/0001-fix-2131.patch b/pkgs/applications/science/logic/z3/0001-fix-2131.patch new file mode 100644 index 000000000000..0b21b8fffd40 --- /dev/null +++ b/pkgs/applications/science/logic/z3/0001-fix-2131.patch @@ -0,0 +1,66 @@ +From c5df6ce96e068eceb77019e48634721c6a5bb607 Mon Sep 17 00:00:00 2001 +From: Nikolaj Bjorner +Date: Sun, 10 Feb 2019 10:07:24 -0800 +Subject: [PATCH 1/1] fix #2131 + +Signed-off-by: Nikolaj Bjorner +--- + src/api/python/README.txt | 10 +++------- + src/api/python/setup.py | 2 +- + src/ast/recfun_decl_plugin.h | 2 +- + 3 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/src/api/python/README.txt b/src/api/python/README.txt +index 9312b1119..561b8dedc 100644 +--- a/src/api/python/README.txt ++++ b/src/api/python/README.txt +@@ -1,8 +1,4 @@ +-You can learn more about Z3Py at: +-http://rise4fun.com/Z3Py/tutorial/guide +- +-On Windows, you must build Z3 before using Z3Py. +-To build Z3, you should executed the following command ++On Windows, to build Z3, you should executed the following command + in the Z3 root directory at the Visual Studio Command Prompt + + msbuild /p:configuration=external +@@ -12,8 +8,8 @@ If you are using a 64-bit Python interpreter, you should use + msbuild /p:configuration=external /p:platform=x64 + + +-On Linux and macOS, you must install Z3Py, before trying example.py. +-To install Z3Py on Linux and macOS, you should execute the following ++On Linux and macOS, you must install python bindings, before trying example.py. ++To install python on Linux and macOS, you should execute the following + command in the Z3 root directory + + sudo make install-z3py +diff --git a/src/api/python/setup.py b/src/api/python/setup.py +index 2a750fee6..063680e2b 100644 +--- a/src/api/python/setup.py ++++ b/src/api/python/setup.py +@@ -178,7 +178,7 @@ setup( + name='z3-solver', + version=_z3_version(), + description='an efficient SMT solver library', +- long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compiliation, or installation, please submit issues to https://github.com/angr/angr-z3', ++ long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compilation, or installation, please submit issues to https://github.com/angr/angr-z3', + author="The Z3 Theorem Prover Project", + maintainer="Audrey Dutcher", + maintainer_email="audrey@rhelmot.io", +diff --git a/src/ast/recfun_decl_plugin.h b/src/ast/recfun_decl_plugin.h +index 0247335e8..b294cdfce 100644 +--- a/src/ast/recfun_decl_plugin.h ++++ b/src/ast/recfun_decl_plugin.h +@@ -56,7 +56,7 @@ namespace recfun { + friend class def; + func_decl_ref m_pred; // Date: Thu, 14 Feb 2019 19:46:57 +0100 Subject: [PATCH 168/221] riot-web: 0.17.9 -> 1.0.0 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index d9f26fa72b0f..53f93b01b1f4 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.17.9"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1k7664b0yxvzc7l8mnh9a0kqi8qfj6rdjblfksrd3wg8hdrb7wb1"; + sha256 = "1rnr6c8qwf8hy1d197xb40f5ajhqdm9sd65n1d9h2x036dqiic7i"; }; installPhase = '' From 7bc350cc28c6c91840e82789a63c5b509f820b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 13 Feb 2019 12:25:01 +0100 Subject: [PATCH 169/221] unison: 2.48.4 -> 2.51.2 --- .../networking/sync/unison/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index ed48bce7b2e2..7862cc1e6e4f 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,20 +1,23 @@ -{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses +{stdenv, fetchFromGitHub, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses , enableX11 ? true}: stdenv.mkDerivation (rec { - name = "unison-2.48.4"; - src = fetchurl { - url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/${name}.tar.gz"; - sha256 = "30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8"; + name = "unison-${version}"; + version = "2.51.2"; + src = fetchFromGitHub { + owner = "bcpierce00"; + repo = "unison"; + rev = "v${version}"; + sha256 = "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq"; }; buildInputs = [ ocaml makeWrapper ncurses ]; preBuild = (if enableX11 then '' - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml '' else "") + '' - echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> fsmonitor/linux/Makefile + echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") From 33b3272692868d9a746f4f703c1d917fb7b9adb6 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sun, 10 Feb 2019 12:48:32 +0100 Subject: [PATCH 170/221] nixos/cups: Fix Unable to encrypt connection: Unable to create server credentials by creating /var/lib/cups/ssl directory. --- nixos/modules/services/printing/cupsd.nix | 4 ++++ nixos/tests/printing.nix | 2 ++ 2 files changed, 6 insertions(+) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 1031d6f3d7e2..3a43ebbb889c 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -316,6 +316,10 @@ in mkdir -m 0755 -p ${cfg.tempDir} mkdir -m 0755 -p /var/lib/cups + # While cups will automatically create self-signed certificates if accessed via TLS, + # this directory to store the certificates needs to be created manually. + mkdir -m 0700 -p /var/lib/cups/ssl + # Backwards compatibility if [ ! -L /etc/cups ]; then mv /etc/cups/* /var/lib/cups diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index d85abf3c105c..7026637ead11 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -39,6 +39,8 @@ import ./make-test.nix ({pkgs, ... }: { $client->waitForUnit("cups.service"); $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; + # check local encrypted connections work without error + $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die; # Test that UNIX socket is used for connections. $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; # Test that HTTP server is available too. From e69fdc171521a9f0f1cf81ba187ac2a0fd81bc16 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Thu, 14 Feb 2019 15:10:37 -0500 Subject: [PATCH 171/221] sympow: fix patch url to working revision (#55778) fix_pointer_initialization2.patch no longer exists on trunk -- download from a fixed older revision where it did. --- pkgs/development/libraries/science/math/sympow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index f421755b6182..080cab86ca4b 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }) (fetchpatch { name = "fix_pointer_initialization2.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow&id=5088e641a45b23d0385d8e63be65315129b4cf58"; sha256 = "1m0vz048layb47r1jjf7fplw650ccc9x0w3l322iqmppzmv3022a"; }) ]; From 9243e85fbc5d526390bf70260f9e266fa6e91ad8 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 14 Feb 2019 21:48:03 +0100 Subject: [PATCH 172/221] sage: fix fetchSageDiff (#55783) For some reason I changed it to use `cgit`s `rawdiff` instead of `patch` in the update to sage 8.6. Probably commited that by accident, at least I can't remember the reason. Also changed the excludes filter, the leading slash prevented it from working. As a result, the cypari2 patch changed. Only didn't notice because it was cached. Fixes #55780 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4ef88e34f032..b9d0a9ef4486 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: ( fetchpatch ({ inherit name; - url = "https://git.sagemath.org/sage.git/rawdiff?id2=${base}&id=${rev}"; + url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"; # We don't care about sage's own build system (which builds all its dependencies). # Exclude build system changes to avoid conflicts. - excludes = [ "/build/*" ]; + excludes = [ "build/*" ]; } // builtins.removeAttrs args [ "rev" "base" ]) ); in [ From 7c860b5fd8e7e721c99ceaf4bcf61b70cfe22768 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Feb 2019 12:53:05 -0800 Subject: [PATCH 173/221] conan: 1.11.2 -> 1.12.0 (#55335) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/conan/versions --- pkgs/development/tools/build-managers/conan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 2ec33980caad..72d9f631afbc 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -34,12 +34,12 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.11.2"; + version = "1.12.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0b4r9n6541jjp2lsdzc1nc6mk1a953w0d4ynjss3ns7pp89y4nd4"; + sha256 = "0hgy3wfy96likdchz42h9mawfjw4dxx7k2iinrrlhph7128kji1j"; }; checkInputs = [ git From 22069991d04a03f3340e415f4eafebc6f3130fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?= Date: Wed, 13 Feb 2019 20:15:49 +0100 Subject: [PATCH 174/221] pythonPackages.aiolifx: init at 0.6.7 Aiolifx package provides ability to control lifx (https://www.lifx.com) light fixtures using python. The original need was to use it with the home-assistant package, specifically the "lifx" component. --- .../python-modules/aiolifx/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/aiolifx/default.nix diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix new file mode 100644 index 000000000000..b7855bee72dc --- /dev/null +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchPypi +, buildPythonPackage +, isPy3k +, ifaddr +, bitstring +}: + +buildPythonPackage rec { + pname = "aiolifx"; + version = "0.6.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "cf53c9faea6eee25a466e73eef1753b82a75c7497648149c19c15342df2678f2"; + }; + + # tests are not implemented + doCheck = false; + + disabled = !isPy3k; + + propagatedBuildInputs = [ bitstring ifaddr ]; + + meta = with lib; { + homepage = http://github.com/frawau/aiolifx; + license = licenses.mit; + description = "API for local communication with LIFX devices over a LAN with asyncio"; + maintainers = with maintainers; [ netixx ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33b9645a8a12..2abed93a71dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -168,6 +168,8 @@ in { aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; ansicolor = callPackage ../development/python-modules/ansicolor { }; From 9b02f5ec4e91ab24dc2e389c2c07f05d9bdc3108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?= Date: Wed, 13 Feb 2019 20:22:39 +0100 Subject: [PATCH 175/221] pythonPackages.aiolifx-effects: init at 0.2.1 Aiolifx_effects package extends the pythonPackages.aiolifx package to provide the ability to program effects (strobe, fade) into lifx light fixtures (https://www.lifx.com) using python. The original need was to use it with the home-assistant package, specifically the "lifx" component. Although not strictly required to control the lights, the lifx compopent imports this package and will fail if it's not present. --- .../aiolifx-effects/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/aiolifx-effects/default.nix diff --git a/pkgs/development/python-modules/aiolifx-effects/default.nix b/pkgs/development/python-modules/aiolifx-effects/default.nix new file mode 100644 index 000000000000..bbe2b538ac5e --- /dev/null +++ b/pkgs/development/python-modules/aiolifx-effects/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchPypi +, buildPythonPackage +, isPy3k +, aiolifx +}: + +buildPythonPackage rec { + pname = "aiolifx-effects"; + version = "0.2.1"; + + src = fetchPypi { + inherit version; + pname = "aiolifx_effects"; + sha256 = "cb4ac52deeb220783fc6449251cf40833fcffa28648270be64b1b3e83e06b503"; + }; + + # tests are not implemented + doCheck = false; + + disabled = !isPy3k; + + propagatedBuildInputs = [ aiolifx ]; + + meta = with lib; { + homepage = https://github.com/amelchio/aiolifx_effects; + license = licenses.mit; + description = "Light effects (pulse, colorloop ...) for LIFX lights running on aiolifx"; + maintainers = with maintainers; [ netixx ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2abed93a71dc..5c81e74cb8ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -170,6 +170,8 @@ in { aiolifx = callPackage ../development/python-modules/aiolifx { }; + aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; ansicolor = callPackage ../development/python-modules/ansicolor { }; From 2d0abff4c18631ea73d61f231a6ce6ea32699cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?= Date: Thu, 14 Feb 2019 20:25:47 +0100 Subject: [PATCH 176/221] home-assistant: fix dependencies for lifx component Update components dependencies for home-assistant. --- pkgs/servers/home-assistant/component-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7e5eb47953ec..3b3d997e6aa6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -559,7 +559,7 @@ "konnected" = ps: with ps; [ aiohttp-cors ]; "lametric" = ps: with ps; [ ]; "lcn" = ps: with ps; [ ]; - "lifx" = ps: with ps; [ ]; + "lifx" = ps: with ps; [ aiolifx ]; "light" = ps: with ps; [ ]; "light.abode" = ps: with ps; [ ]; "light.ads" = ps: with ps; [ ]; @@ -589,7 +589,7 @@ "light.isy994" = ps: with ps; [ ]; "light.knx" = ps: with ps; [ ]; "light.lcn" = ps: with ps; [ ]; - "light.lifx" = ps: with ps; [ ]; + "light.lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "light.lifx_legacy" = ps: with ps; [ ]; "light.lightwave" = ps: with ps; [ ]; "light.limitlessled" = ps: with ps; [ limitlessled ]; @@ -1144,7 +1144,7 @@ "sensor.serial" = ps: with ps; [ ]; "sensor.serial_pm" = ps: with ps; [ ]; "sensor.seventeentrack" = ps: with ps; [ ]; - "sensor.shodan" = ps: with ps; [ ]; + "sensor.shodan" = ps: with ps; [ shodan ]; "sensor.sht31" = ps: with ps; [ ]; "sensor.sigfox" = ps: with ps; [ ]; "sensor.simulated" = ps: with ps; [ ]; From 69e64aa3ba1158e2787b640ff39cf593b2649490 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Thu, 14 Feb 2019 22:09:32 +0100 Subject: [PATCH 177/221] i3-gaps: update releaseDate to match version --- pkgs/applications/window-managers/i3/gaps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index dc54f671e3c5..f2dc023c81d6 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -4,7 +4,7 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; version = "4.16.1"; - releaseDate = "2018-03-13"; + releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; From 7db1bc584ee1df1b9e06386c0b6c27cf4fc02a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 14 Feb 2019 19:28:12 -0200 Subject: [PATCH 178/221] shades-of-gray-theme: 1.1.4 -> 1.1.5 (#55767) --- pkgs/data/themes/shades-of-gray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix index 391c99c0ab92..af73ec322d00 100644 --- a/pkgs/data/themes/shades-of-gray/default.nix +++ b/pkgs/data/themes/shades-of-gray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "shades-of-gray-theme-${version}"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "WernerFP"; repo = "Shades-of-gray-theme"; rev = version; - sha256 = "1i5mra1ib3c8xqnhwjh8yzjcdnhvqdmccw5x52sfh9xq797px39l"; + sha256 = "1ql8rkbm5l94b842hg53cwf02vbw2785rlrs4cr60d4kn2c0lj2y"; }; buildInputs = [ gtk_engines ]; From 738d4362d1bccd1b853cc11b2b260e6d9f8e51bc Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Thu, 14 Feb 2019 13:42:31 -0800 Subject: [PATCH 179/221] direnv: 2.19.0 -> 2.19.2 --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 2a02b0391aeb..de8130ff3f1f 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.19.0"; + version = "2.19.2"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0v5r07b5r0wmmf8wndi0z1fp979pyqg6xpx7w847bkyn4pvgpscm"; + sha256 = "1iq9wmc63x1c7g1ixdhd6q3w1sx8xl8kf1bprxwq26n9zpd0g13g"; }; postConfigure = '' From 98419a0f6453a99e9f57da7edcc53d662561a4f2 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 14 Feb 2019 16:55:16 -0500 Subject: [PATCH 180/221] nixos/tests/switch-test: Ensures the test fails on failure (#55744) The `| tee` invocation always masked the return value of the switch-to-configuration test. ``` ~ $ false | tee && echo "oh no" oh no ``` The added wrapper script will still output everything to stderr, while passing failures to the test harness. --- nixos/tests/switch-test.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 32010838e67b..0dba3697980f 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -18,8 +18,17 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = {nodes, ...}: let originalSystem = nodes.machine.config.system.build.toplevel; otherSystem = nodes.other.config.system.build.toplevel; + + # Ensures failures pass through using pipefail, otherwise failing to + # switch-to-configuration is hidden by the success of `tee`. + stderrRunner = pkgs.writeScript "stderr-runner" '' + #! ${pkgs.stdenv.shell} + set -e + set -o pipefail + exec env -i "$@" | tee /dev/stderr + ''; in '' - $machine->succeed("env -i ${originalSystem}/bin/switch-to-configuration test | tee /dev/stderr"); - $machine->succeed("env -i ${otherSystem}/bin/switch-to-configuration test | tee /dev/stderr"); + $machine->succeed("${stderrRunner} ${originalSystem}/bin/switch-to-configuration test"); + $machine->succeed("${stderrRunner} ${otherSystem}/bin/switch-to-configuration test"); ''; }) From a70e52647ac4ddf244ca85dfeb9b328bdbec7e76 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Thu, 14 Feb 2019 23:27:34 +0100 Subject: [PATCH 181/221] restic: 0.9.2 -> 0.9.4 --- pkgs/tools/backup/restic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 453e31f5d13a..7b039f93a039 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.9.2"; + version = "0.9.4"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "0kl8yk636i3y7f2kd43pydjh4pv7hhq09p5k54jlysnrbf2kjb4h"; + sha256 = "15lx01w46bwn3hjwpmm8xy71m7ml9wdwddbbfvmk5in61gv1acr5"; }; buildPhase = '' From 6c610e01f1dc8382b4072885668c71b1ad709201 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 14 Feb 2019 18:41:57 -0500 Subject: [PATCH 182/221] atom: 1.33.0 -> 1.34.0 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 13dc9e1285b1..3a396b7923ad 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,8 +3,8 @@ let versions = { atom = { - version = "1.33.0"; - sha256 = "0f6m6zwgz94m3q11ipyiliap3s5a3zlrg3ldjwkqnxjl6gwlxc2r"; + version = "1.34.0"; + sha256 = "16hrjymrc43izg7frcrk7cwjwwrclcxzcwb5iw2llzjc6iadzlkb"; }; atom-beta = { From 3cff784b3a54050874abcd4abdca9bd4e0e45839 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 14 Feb 2019 18:46:19 -0500 Subject: [PATCH 183/221] atom-beta: 1.34.0-beta0 -> 1.35.0-beta0 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 3a396b7923ad..e5a71b134f1b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -8,9 +8,9 @@ let }; atom-beta = { - version = "1.34.0"; + version = "1.35.0"; beta = 0; - sha256 = "1xnrr4z55sj46hqr0il26sfs6s3knv60m340cw3rzzic271b3ifw"; + sha256 = "0gm5k573dq1hhnyw3719f5k1c6rsz872mhzg8q53n89y0g2r5xmw"; }; }; From 13d1ba3439c91a187ae92e3f158c7c556b4f8c70 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 14 Feb 2019 18:15:02 -0500 Subject: [PATCH 184/221] Revert "Revert "linux: 4.14.98 -> 4.14.99"" This reverts commit 01d8894c4d0f7fdd4f3534e6268b8e4c503d7258. --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 78448b4bc389..5f333205dd52 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.98"; + version = "4.14.99"; # 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 = "0pqc04ij6qdfhh3rpakas0qc0vqj8mm120z64q9v9vxin5qi20lg"; + sha256 = "02pbi5jck6fp7y5lihn077i0j3hssxcrbsfbxlyp62xjsnp8rycg"; }; } // (args.argsOverride or {})) From f0b8a113dd04f1b973beb1d6a1675978aa2b2cc7 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 14 Feb 2019 18:16:17 -0500 Subject: [PATCH 185/221] linux: allow for interpreter to be truncated via https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb5b020a8d38f77209d0472a0fea755299a8ec78 see https://github.com/NixOS/nixpkgs/issues/53672 --- .../linux/kernel/interpreter-trunc.patch | 44 +++++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 7 +++ pkgs/top-level/all-packages.nix | 5 +++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/interpreter-trunc.patch diff --git a/pkgs/os-specific/linux/kernel/interpreter-trunc.patch b/pkgs/os-specific/linux/kernel/interpreter-trunc.patch new file mode 100644 index 000000000000..a0eceec2258f --- /dev/null +++ b/pkgs/os-specific/linux/kernel/interpreter-trunc.patch @@ -0,0 +1,44 @@ +From cb5b020a8d38f77209d0472a0fea755299a8ec78 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Thu, 14 Feb 2019 15:02:18 -0800 +Subject: Revert "exec: load_script: don't blindly truncate shebang string" + +This reverts commit 8099b047ecc431518b9bb6bdbba3549bbecdc343. + +It turns out that people do actually depend on the shebang string being +truncated, and on the fact that an interpreter (like perl) will often +just re-interpret it entirely to get the full argument list. + +Reported-by: Samuel Dionne-Riel +Acked-by: Kees Cook +Cc: Oleg Nesterov +Signed-off-by: Linus Torvalds +--- + fs/binfmt_script.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c +index d0078cbb718b..7cde3f46ad26 100644 +--- a/fs/binfmt_script.c ++++ b/fs/binfmt_script.c +@@ -42,14 +42,10 @@ static int load_script(struct linux_binprm *bprm) + fput(bprm->file); + bprm->file = NULL; + +- for (cp = bprm->buf+2;; cp++) { +- if (cp >= bprm->buf + BINPRM_BUF_SIZE) +- return -ENOEXEC; +- if (!*cp || (*cp == '\n')) +- break; +- } ++ bprm->buf[BINPRM_BUF_SIZE - 1] = '\0'; ++ if ((cp = strchr(bprm->buf, '\n')) == NULL) ++ cp = bprm->buf+BINPRM_BUF_SIZE-1; + *cp = '\0'; +- + while (cp > bprm->buf) { + cp--; + if ((*cp == ' ') || (*cp == '\t')) +-- +cgit 1.2-0.3.lf.el7 + diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4c338b37deca..18fd311ca067 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,4 +57,11 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; + + # https://github.com/NixOS/nixpkgs/issues/53672 + # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb5b020a8d38f77209d0472a0fea755299a8ec78 + interpreter-trunc = { + name = "interpreter-trunc"; + patch = ./interpreter-trunc.patch; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c5c9ec8e917..2791b1f93a9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14576,6 +14576,7 @@ in # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.interpreter-trunc ]; }; @@ -14583,6 +14584,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.interpreter-trunc ]; }; @@ -14590,6 +14592,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.interpreter-trunc ]; }; @@ -14597,6 +14600,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.interpreter-trunc ]; }; @@ -14611,6 +14615,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.interpreter-trunc ]; }; From 4a82f6ac581a0c803948fbf63683a6e1ffeaf808 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 13 Feb 2019 12:39:22 +0100 Subject: [PATCH 186/221] broot: init at 0.6.0 --- pkgs/tools/misc/broot/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/broot/default.nix diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix new file mode 100644 index 000000000000..d09f313e147d --- /dev/null +++ b/pkgs/tools/misc/broot/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "broot-${version}"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = "broot"; + rev = "v${version}"; + sha256 = "192qqlqym8lpskh6f7sf5fanybjwhdqs1cgl6mqm35763fa5jrdj"; + }; + + cargoSha256 = "059iylnkjb7lxxs9v2b6h05nidwgcj6kqyhcq58lalkhb63srb1q"; + + meta = with stdenv.lib; { + description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; + homepage = "https://github.com/Canop/broot"; + maintainers = with maintainers; [ magnetophon ]; + license = with licenses; [ mit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2791b1f93a9a..5f55f2f8be12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -994,6 +994,8 @@ in }; bro = callPackage ../applications/networking/ids/bro { }; + broot = callPackage ../tools/misc/broot { }; + bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; breakpointHook = assert stdenv.isLinux; From 14cbd06e0615d1c2ae798973cdbdb377525b5f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 Feb 2019 09:27:38 +0100 Subject: [PATCH 187/221] linux 4.9: also apply interpreter-trunc 4.4.174 doesn't need this (possibly after a future bump). I think this covers all the affected kernels ATM. Builds tested. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f55f2f8be12..5429068c0ba6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14568,6 +14568,7 @@ in [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long + kernelPatches.interpreter-trunc ]; }; From 6dde3a215a592ba69c7625a6c77993003a73dc59 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 13 Feb 2019 17:52:06 +0100 Subject: [PATCH 188/221] rippled: 0.30.0-rc1 -> 1.2.0 --- pkgs/servers/rippled/default.nix | 141 ++++++++++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 129 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index af25da7ae458..75aced300ed3 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,26 +1,142 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, openssl, protobuf, boost, zlib}: +{ stdenv, fetchFromGitHub, fetchgit, fetchurl, git, cmake, pkgconfig +, openssl, boost, zlib }: -stdenv.mkDerivation rec { +let + sqlite3 = fetchurl { + url = "https://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip"; + sha256 = "0vh9aa5dyvdwsyd8yp88ss300mv2c2m40z79z569lcxa6fqwlpfy"; + }; + + beast = fetchgit { + url = "https://github.com/boostorg/beast.git"; + rev = "2f9a8440c2432d8a196571d6300404cb76314125"; + sha256 = "1n9ms5cn67b0p0mhldz5psgylds22sm5x22q7knrsf20856vlk5a"; + fetchSubmodules = false; + leaveDotGit = true; + }; + + docca = fetchgit { + url = "https://github.com/vinniefalco/docca.git"; + rev = "335dbf9c3613e997ed56d540cc8c5ff2e28cab2d"; + sha256 = "09cb90k0ygmnlpidybv6nzf6is51i80lnwlvad6ijc3gf1z6i1yh"; + fetchSubmodules = false; + leaveDotGit = true; + }; + + rocksdb = fetchgit { + url = "https://github.com/facebook/rocksdb.git"; + rev = "a297643f2e327a8bc7061bfc838fdf11935a2cf2"; + sha256 = "00z8i4fwr27j9d4ymnls7rcgfvm6xh36a4hy2m2njx4x513pgyzw"; + fetchSubmodules = false; + leaveDotGit = true; + }; + + lz4 = fetchgit rec { + url = "https://github.com/lz4/lz4.git"; + rev = "v1.8.2"; + sha256 = "1niv553q60hwn95yflzmrqkp1046hrid13h0yr36lm4fjza21h9w"; + leaveDotGit = true; + fetchSubmodules = false; + postFetch = "cd $out && git tag ${rev}"; + }; + + libarchive = fetchgit rec { + url = "https://github.com/libarchive/libarchive.git"; + rev = "v3.3.3"; + sha256 = "165imgfmizpi4ffpiwfs8gxysn6lw3y1fxj5rga98filkl7hxs31"; + leaveDotGit = true; + fetchSubmodules = false; + postFetch = "cd $out && git tag ${rev}"; + }; + + soci = fetchgit rec { + url = "https://github.com/SOCI/soci.git"; + rev = "3a1f602b3021b925d38828e3ff95f9e7f8887ff7"; + sha256 = "0lnps42cidlrn43h13b9yc8cs3fwgz7wb6a1kfc9rnw7swkh757f"; + leaveDotGit = true; + fetchSubmodules = false; + }; + + snappy = fetchgit rec { + url = "https://github.com/google/snappy.git"; + rev = "1.1.7"; + sha256 = "1f0i0sz5gc8aqd594zn3py6j4w86gi1xry6qaz2vzyl4w7cb4v35"; + leaveDotGit = true; + fetchSubmodules = false; + postFetch = "cd $out && git tag ${rev}"; + }; + + nudb = fetchgit rec { + url = "https://github.com/vinniefalco/NuDB.git"; + rev = "1.0.0"; + sha256 = "142bxicv25xaw4fmpw8bbblb1grdw30wyj181xl4a5734zw3qgmz"; + leaveDotGit = true; + fetchSubmodules = false; + postFetch = "cd $out && git tag ${rev}"; + }; + + protobuf = fetchgit rec { + url = "https://github.com/protocolbuffers/protobuf.git"; + rev = "v3.6.1"; + sha256 = "0zl09q25ggfw95lakcs3mkq5pvsj17mx29b4nqr09g0mnbw9709c"; + leaveDotGit = true; + fetchSubmodules = false; + postFetch = "cd $out && git tag ${rev}"; + }; + + google-test = fetchgit rec { + url = "https://github.com/google/googletest.git"; + rev = "c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2"; + sha256 = "0pj5b6jnrj5lrccz2disr8hklbnzd8hwmrwbfqmvhiwb9q9p0k2k"; + leaveDotGit = true; + fetchSubmodules = false; + }; + + google-benchmark = fetchgit rec { + url = "https://github.com/google/benchmark.git"; + rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8"; + sha256 = "0qg70j47zqnrbszlgrzmxpr4g88kq0gyq6v16bhaggfm83c6mg6i"; + leaveDotGit = true; + fetchSubmodules = false; + }; +in stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "0.30.0-rc1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ripple"; repo = "rippled"; rev = version; - sha256 = "0l1dg29mg6wsdkh0lwi2znpl2wcm6bs6d3lswk5g1m1nk2mk7lr7"; + sha256 = "1zx8qs32v5ibkwm9nm6m0qh0gcr0vcigr2wbxpd40pqqk73cqb3q"; }; - postPatch = '' - sed -i -e "s@ENV = dict.*@ENV = os.environ@g" SConstruct + hardeningDisable = ["format"]; + cmakeFlags = ["-Dstatic=OFF"]; + + nativeBuildInputs = [ pkgconfig cmake git ]; + buildInputs = [ openssl openssl.dev boost zlib ]; + + preConfigure = '' + export HOME=$PWD + + git config --global url."file://${beast}".insteadOf "https://github.com/vinniefalco/Beast.git" + git config --global url."file://${docca}".insteadOf "https://github.com/vinniefalco/docca.git" + git config --global url."file://${rocksdb}".insteadOf "https://github.com/facebook/rocksdb.git" + git config --global url."file://${lz4}".insteadOf "${lz4.url}" + git config --global url."file://${libarchive}".insteadOf "${libarchive.url}" + git config --global url."file://${soci}".insteadOf "${soci.url}" + git config --global url."file://${snappy}".insteadOf "${snappy.url}" + git config --global url."file://${nudb}".insteadOf "${nudb.url}" + git config --global url."file://${protobuf}".insteadOf "${protobuf.url}" + git config --global url."file://${google-benchmark}".insteadOf "${google-benchmark.url}" + git config --global url."file://${google-test}".insteadOf "${google-test.url}" + + substituteInPlace CMakeLists.txt --replace "URL https://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "URL ${sqlite3}" ''; - nativeBuildInputs = [ pkgconfig scons ]; - buildInputs = [ openssl protobuf boost zlib ]; - - postInstall = '' - mkdir -p $out/bin - cp build/rippled $out/bin/ + doCheck = true; + checkPhase = '' + ./rippled --unittest ''; meta = with stdenv.lib; { @@ -29,6 +145,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ehmry offline ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b660681a6b84..91d72c5ce77f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13988,7 +13988,7 @@ in }; rippled = callPackage ../servers/rippled { - boost = boost159; + boost = boost167; }; s6 = skawarePackages.s6; From d0b0cf7cd9b3b1a7cdc070342682eed9418bb5bb Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Fri, 15 Feb 2019 09:47:35 +0100 Subject: [PATCH 189/221] Update to 2.0.1, lock deps with dep2nix --- pkgs/development/tools/kustomize/default.nix | 12 +- pkgs/development/tools/kustomize/deps.nix | 282 +++++++++++++++++++ 2 files changed, 288 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/kustomize/deps.nix diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index cbe37cec3c78..06b1b2866fde 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,13 +1,13 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 { lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "kustomize-${version}"; - version = "1.0.11"; - # rev is the 1.0.11 commit, mainly for kustomize version command output - rev = "8f701a00417a812558a7b785e8354957afa469ae"; + version = "2.0.1"; + # rev is the 2.0.1 commit, mainly for kustomize version command output + rev = "ce7e5ee2c30cc5856fea01fe423cf167f2a2d0c3"; goPackagePath = "sigs.k8s.io/kustomize"; + goDeps = ./deps.nix; buildFlagsArray = let t = "${goPackagePath}/pkg/commands"; in '' -ldflags= @@ -17,7 +17,7 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - sha256 = "18kc23l6r2di35md9jbinyzxr791vvdjyklaf3k725imqksikwri"; + sha256 = "1ljllx2gd329lnq6mdsgh8zzr517ji80b0j21pgr23y0xmd43ijf"; rev = "v${version}"; repo = "kustomize"; owner = "kubernetes-sigs"; @@ -32,6 +32,6 @@ buildGoPackage rec { ''; homepage = https://github.com/kubernetes-sigs/kustomize; license = licenses.asl20; - maintainers = with maintainers; [ carlosdagos vdemeester periklis ]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime ]; }; } diff --git a/pkgs/development/tools/kustomize/deps.nix b/pkgs/development/tools/kustomize/deps.nix new file mode 100644 index 000000000000..0c34e4a35d8c --- /dev/null +++ b/pkgs/development/tools/kustomize/deps.nix @@ -0,0 +1,282 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "3658237ded108b4134956c1b3050349d93e7b895"; + sha256 = "07sm3b5dlrqld4r8r1w79s37y41fk4zmw4afhi2ragjy1iarqck3"; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "afac545df32f2287a079e2dfb7ba2745a643747e"; + sha256 = "1d90prf8wfvndqjn6nr0k405ykia5vb70sjw4ywd49s9p3wcdyn8"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2"; + sha256 = "02an755ashhckqwxyq2avgn8mm4qq3hxda2jsj1a3bix2gkb45v7"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "3fb327e6747da3043567ee86abd02bb6376b6be2"; + sha256 = "0zwsrmqqcihm0lj2pc18cpm7wnn1dzwr4kvrlyrxf0lnn7dsdsbm"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "bcff419492eeeb01f76e77d2ebc714dc97b607f5"; + sha256 = "00z8sv766kjdrdvpyzm9c5x3d45gssbwsm77qihmkflric6a3d3l"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "811b1089cde9dad18d4d0c2d09fbdbf28dbd27a5"; + sha256 = "0hkbrq4jq9s4nrz7xpx03z1zljss1zdylm3zb76hhjpp0s7hz418"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; + sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "ee43cbb60db7bd22502942cccbc39059117352ab"; + sha256 = "0vsahn8fxmiv1647j1qspn57fhiky0xh4g34vh62lyk7nfz0lszi"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "ca39e5af3ece67bbcda3d0f4f56a8e24d9f2dad4"; + sha256 = "168prr6gwfsvpnmg21zwbp87jkgpkrliklajpwj5lvsphn5dg181"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "1df9eeb2bb81f327b96228865c5687bc2194af3f"; + sha256 = "1ahjf7fj1z10mn9djaadyhhlygb0ifific6lys635q24hlhd9071"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "a1f051bc3eba734da4772d60e2d677f47cf93ef4"; + sha256 = "1x4p6nz5079h6iqmap3wf21h0ndzc4xm2j0xlm7dd95ivj7b0l02"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; + sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "53d615ae3f440f957cb9989d989d597f047262d9"; + sha256 = "1p7cpva316v2wn6n4632zxasaqa24bs9f935csd333ak550zrj4z"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"; + sha256 = "1h6s11y8g76rgyv2gnd8vhb7bp8fpda2z2p0n44mrgaz42h76bdw"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "23781f4d6632d88e869066eaebb743857aa1ef9b"; + sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "b3f03f55328800731ce03a164b80973014ecd455"; + sha256 = "0zs27kvv8p4lms81v2sm87w7jcng6qys8fabip79ys0adm44lk95"; + }; + } +] \ No newline at end of file From 24277a2ec8fd5a19a1a8ac91e6125a2fa343e3bb Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Fri, 15 Feb 2019 09:51:34 +0100 Subject: [PATCH 190/221] Restore writing the version info correctly --- pkgs/development/tools/kustomize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 06b1b2866fde..2c7577a5d81e 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -9,11 +9,11 @@ buildGoPackage rec { goPackagePath = "sigs.k8s.io/kustomize"; goDeps = ./deps.nix; - buildFlagsArray = let t = "${goPackagePath}/pkg/commands"; in '' + buildFlagsArray = let t = "${goPackagePath}/pkg/commands/misc"; in '' -ldflags= -s -X ${t}.kustomizeVersion=${version} -X ${t}.gitCommit=${rev} - -X ${t}.buildDate=unknow + -X ${t}.buildDate=unknown ''; src = fetchFromGitHub { From 59641ac201ab9445be5275aceec79d004df9e460 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 00:55:29 -0800 Subject: [PATCH 191/221] vault: 1.0.2 -> 1.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vault/versions --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index c21064c708d4..35b39196b336 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vault-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1nrqwgxfs6n2bjhjndqvwzn9c62pb5ky9biyh47i0wvbxhdh0hfj"; + sha256 = "1c5v1m8b6nm28mjwpsgc73n8q475pkzpdvyx46rf3xyrh01rfrnz"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; From 66d9561345efb74d8065ab230da3d8f0167ffb6b Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 14 Feb 2019 17:29:16 -0700 Subject: [PATCH 192/221] Fix compilation ``` building '/nix/store/7n2cag47gl93wp3f0mv7fiq3dybq2a6l-wkhtmltopdf-0.12.5.drv'... unpacking sources unpacking source archive /nix/store/lv2zcapqqn1kjlc616ljap1ddlc2lvx8-source source root is source patching sources configuring Info: creating stash file /tmp/nix-build-wkhtmltopdf-0.12.5.drv-0/source/.qmake.stash building build flags: -j4 -l4 SHELL=/nix/store/i82x3x0yiijkgyqkzh8ni87gspas0f48-bash-4.4-p23/bin/bash cd src/lib/ && ( test -e Makefile || /nix/store/334ck8czp3jhfy0ppy55sb6dxf7yxsdv-qtbase-5.12.0-dev/bin/qmake -o Makefile /tmp/nix-build-wkhtmltopdf-0.12.5.drv-0/source/src/lib/lib.pro INSTALLBASE=/nix/store/rc8z502xa3w0n2qm2vmr5d3l73v1lyyd-wkhtmltopdf-0.12.5 ) && make -f Makefile Project ERROR: Unknown module(s) in QT: xmlpatterns make: *** [Makefile:47: sub-src-lib-make_first-ordered] Error 3 builder for '/nix/store/7n2cag47gl93wp3f0mv7fiq3dybq2a6l-wkhtmltopdf-0.12.5.drv' failed with exit code 2 ``` --- pkgs/tools/graphics/wkhtmltopdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 14ba0f8c2a9a..237c9bb398b1 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype libpng zlib libjpeg openssl libX11 libXext libXrender - qt5.qtwebkit qt5.qtsvg + qt5.qtwebkit qt5.qtsvg qt5.qtxmlpatterns ]; prePatch = '' From 9461a108bca83737611d89ad75cb91028c06c2aa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 8 Feb 2019 09:27:08 +0000 Subject: [PATCH 193/221] coqPackages.coquelicot: 3.0.1 -> 3.0.2 --- pkgs/development/coq-modules/coquelicot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index baad637cbb73..e316a8b792da 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, coq, ssreflect }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-3.0.1"; + name = "coq${coq.coq-version}-coquelicot-3.0.2"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz"; - sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r"; + url = "https://gforge.inria.fr/frs/download.php/file/37523/coquelicot-3.0.2.tar.gz"; + sha256 = "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w"; }; nativeBuildInputs = [ which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; }; } From 1613f3db274f76b1a9c850252f1f48449bbc5d34 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 8 Feb 2019 09:40:55 +0000 Subject: [PATCH 194/221] coqPackages.interval: 3.3.0 -> 3.4.0 --- .../coq-modules/interval/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 6797a71703b4..0b97358d8639 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,12 +1,24 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp , bignums ? null }: +let params = + if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { + version = "3.4.0"; + uid = "37524"; + sha256 = "023j9sd64brqvjdidqkn5m8d7a93zd9r86ggh573z9nkjm2m7vvg"; + } else { + version = "3.3.0"; + uid = "37077"; + sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; + } +; in + stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-3.3.0"; + name = "coq${coq.coq-version}-interval-${params.version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; - sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; + url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/interval-${params.version}.tar.gz"; + inherit (params) sha256; }; nativeBuildInputs = [ which ]; @@ -26,7 +38,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; }; From 86db60f3f3b6d68c61c4a4c54bc4a5bb175a76d8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 8 Feb 2019 08:05:31 +0000 Subject: [PATCH 195/221] coqPackages.flocq: 3.0.0 -> 3.1.0 --- pkgs/development/coq-modules/flocq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 6c0be377bc0b..09fbd5808459 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -2,9 +2,9 @@ let params = if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.0.0"; - uid = "37477"; - sha256 = "1h05ji5cmyqyv2i1l83xgkm7vfvcnl8r1dzvbp5yncm1jr9kf6nn"; + version = "3.1.0"; + uid = "37901"; + sha256 = "02szrgz9m0ac51la1lqpiv6i2g0zbgx9gz5rp0q1g00ajldyna5c"; } else { version = "2.6.1"; uid = "37454"; @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; }; } From cba377937cafe7a366057d5be95813948922fdfd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 Feb 2019 11:28:54 +0100 Subject: [PATCH 196/221] androidStudioPackages.beta: 3.4.0.12 -> 3.4.0.13 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2d5028cf83bc..4ac7b3d9a85c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42"; }; betaVersion = { - version = "3.4.0.12"; # "Android Studio 3.4 Beta 3" - build = "183.5256591"; - sha256Hash = "1yab2sgabgk3wa3wrzv9z1dc2k7x0079v0mlwrp32jwx8r9byvcw"; + version = "3.4.0.13"; # "Android Studio 3.4 Beta 4" + build = "183.5304277"; + sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f"; }; latestVersion = { # canary & dev version = "3.5.0.2"; # "Android Studio 3.5 Canary 3" From fe16c54d1a7311cf6e42254e4c39cbf30913360e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 Feb 2019 11:33:53 +0100 Subject: [PATCH 197/221] androidStudioPackages.{dev,canary}: 3.5.0.2 -> 3.5.0.3 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4ac7b3d9a85c..cb0aa393380f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f"; }; latestVersion = { # canary & dev - version = "3.5.0.2"; # "Android Studio 3.5 Canary 3" - build = "183.5256920"; - sha256Hash = "09bd80ld21hq743xjacsq0nkxwl5xzr253p86n71n580yn4rgmlb"; + version = "3.5.0.3"; # "Android Studio 3.5 Canary 4" + build = "183.5290690"; + sha256Hash = "0d1cl78b25pksaj0scv3hxb14bjxk3591zbc0v7dykk1gf4pvxd1"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): From 293ca25fea3a0206ac67a8b265ba65fa1de1cba8 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 15 Feb 2019 10:52:46 +0000 Subject: [PATCH 198/221] mkp224o: init at 1.2.0 (#55104) * mkp224o: init at 1.2.0 * mkp224o: remove unwanted spaces --- pkgs/tools/security/mkp224o/default.nix | 47 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/security/mkp224o/default.nix diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix new file mode 100644 index 000000000000..b649c57b3462 --- /dev/null +++ b/pkgs/tools/security/mkp224o/default.nix @@ -0,0 +1,47 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, libsodium }: + +stdenv.mkDerivation rec { + name = "mkp224o-${version}"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "cathugger"; + repo = "mkp224o"; + rev = "v${version}"; + sha256 = "1m7r0jfm6na6rk75v1kals3bx2cs6jsfxdgpxdljn39j3qr4mxvd"; + }; + + buildCommand = + let + # compile few variants with different implementation of crypto + # the fastest depends on a particular cpu + variants = [ + { suffix = "ref10"; configureFlags = ["--enable-ref10"]; } + { suffix = "donna"; configureFlags = ["--enable-donna"]; } + ] ++ lib.optionals (stdenv.isi686 || stdenv.isx86_64) [ + { suffix = "donna-sse2"; configureFlags = ["--enable-donna-sse2"]; } + ] ++ lib.optionals stdenv.isx86_64 [ + { suffix = "amd64-51-30k"; configureFlags = ["--enable-amd64-51-30k"]; } + { suffix = "amd64-64-20k"; configureFlags = ["--enable-amd64-64-24k"]; } + ]; + in + lib.concatMapStrings ({suffix, configureFlags}: '' + install -D ${ + stdenv.mkDerivation { + name = "mkp224o-${suffix}-${version}"; + inherit version src configureFlags; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libsodium ]; + installPhase = "install -D mkp224o $out"; + } + } $out/bin/mkp224o-${suffix} + '') variants; + + meta = with lib; { + description = "Vanity address generator for tor onion v3 (ed25519) hidden services"; + homepage = http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/; + license = licenses.cc0; + platforms = platforms.linux; + maintainers = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5429068c0ba6..c985ff8f9947 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4209,6 +4209,8 @@ in mkcue = callPackage ../tools/cd-dvd/mkcue { }; + mkp224o = callPackage ../tools/security/mkp224o { }; + mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { }); mkrand = callPackage ../tools/security/mkrand { }; From 1576c7474318dc7ef4f68258b5394aebc930d94b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 02:53:53 -0800 Subject: [PATCH 199/221] libgit2_0_27: 0.27.7 -> 0.27.8 (#55256) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libgit2/versions --- pkgs/development/libraries/git2/0.27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/git2/0.27.nix b/pkgs/development/libraries/git2/0.27.nix index 93948a1b0d67..510f53f24b17 100644 --- a/pkgs/development/libraries/git2/0.27.nix +++ b/pkgs/development/libraries/git2/0.27.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.27.7"; + version = "0.27.8"; name = "libgit2-${version}"; src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "1q3mp7xjpbmdsnk4sdzf2askbb4pgbxcmr1h7y7zk2738dndwkha"; + sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; }; cmakeFlags = [ "-DTHREADSAFE=ON" ]; From 2075b3715b529bf8fb593235321556ac8084c73d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 15 Feb 2019 12:17:29 +0100 Subject: [PATCH 200/221] Revert "shellFor: Don't suck in src to compare to deps. [Fixes #51079]" --- pkgs/development/haskell-modules/make-package-set.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index e33ac7c5f852..b4cd7fee311b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -272,10 +272,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # bash$ nix-shell --run "cabal new-build all" shellFor = { packages, withHoogle ? false, ... } @ args: let - nullSrc = p: overrideCabal p (_: { src = null; }); - - # Make sure we *never* accidentally suck in src. - selected = map nullSrc (packages self); + selected = packages self; packageInputs = map getBuildInputs selected; @@ -287,8 +284,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # because cabal will end up ignoring that built version, assuming # new-style commands. haskellInputs = pkgs.lib.filter - # nullSrc in case a dep is one of the selected packages. - (input: pkgs.lib.all (p: (nullSrc input).outPath != p.outPath) selected) + (input: pkgs.lib.all (p: input.outPath != p.outPath) selected) (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs); systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs; From 7b3dd7bc1e89f7b7d608fb5b1dd70a6fac878b10 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 04:59:21 -0800 Subject: [PATCH 201/221] safeeyes: 2.0.8 -> 2.0.8.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/safeeyes/versions --- pkgs/applications/misc/safeeyes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index deb456e53ed9..e99b305b2b33 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -6,12 +6,12 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi; in buildPythonApplication rec { name = "${pname}-${version}"; pname = "safeeyes"; - version = "2.0.8"; + version = "2.0.8.1"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "08acrf9sngjjmplszjxzfq3af9xg4xscga94q0lkck2l1kqckc2l"; + sha256 = "1x52ym8n4r6h38n4mcydxkvz71hhrd9wbiq4gzvwrai0xzl6qqsq"; }; buildInputs = [ From 50f518c93f4c55ca065573e3ffdcf7192a632f66 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Feb 2019 09:50:01 -0500 Subject: [PATCH 202/221] linux: 4.9.156 -> 4.9.158 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 334fb6e81b68..cdebebc74824 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.156"; + version = "4.9.158"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "05m82x2zg0nkc6ayk6akgpfhz31zp6dhhlklcfmi419p8fxbkcay"; + sha256 = "1vvm2gw5cddy40amxxr1hcw0bis2zldzyicvjhy11wg6j3snk2lc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c985ff8f9947..59aa29dadef1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14570,7 +14570,6 @@ in [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long - kernelPatches.interpreter-trunc ]; }; From 7954ec0ffdff541fcc27d89ac9b722d0505931fd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Feb 2019 09:51:51 -0500 Subject: [PATCH 203/221] linux: 4.14.99 -> 4.14.101 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5f333205dd52..95050a37d28f 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.99"; + version = "4.14.101"; # 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 = "02pbi5jck6fp7y5lihn077i0j3hssxcrbsfbxlyp62xjsnp8rycg"; + sha256 = "16mnrn2lb6xhcmpqx8brk2w4g6igfb1cwkqkpvlnc7003g2zfbql"; }; } // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59aa29dadef1..0dc074ac79ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14580,7 +14580,6 @@ in # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - kernelPatches.interpreter-trunc ]; }; From 8c14948343fd678cbf639861e1792b2477a8d925 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Feb 2019 09:53:22 -0500 Subject: [PATCH 204/221] linux: 4.19.21 -> 4.19.23 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 200264df22a5..ac6b3dad86bb 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.21"; + version = "4.19.23"; # 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 = "1hdvk1lz9gi8b6gahqqb1r5zzndfw86qzsg1fji0shgy4vkys26v"; + sha256 = "02hkiz5vlx2qhyi1hxar9d1cr2gfnrpjdrjjkh83yzxci9kjb6rd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dc074ac79ae..47518874b696 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14587,7 +14587,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.interpreter-trunc ]; }; From 93e9b53b96d29ed8f737fb18d4b3478153c6fa21 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Feb 2019 10:01:15 -0500 Subject: [PATCH 205/221] linux: 4.20.8 -> 4.20.10 --- pkgs/os-specific/linux/kernel/linux-4.20.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix index 799f36f7dc27..382747b69d95 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.20.8"; + version = "4.20.10"; # 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 = "0qnh0h7c7ni7j1cgm20sqsfkbri98bckxms494w9ig539b2ac35n"; + sha256 = "1y1w3j65n2k4ibn9clapbhy5m2rbyspg2maql7q9k27vmplnppjk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47518874b696..6fb569d8a16c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14594,7 +14594,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.interpreter-trunc ]; }; From 4698105747d622f88e169d30cc39f8e1d4e7fa64 Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Fri, 15 Feb 2019 16:05:32 +0100 Subject: [PATCH 206/221] Remove deps.nix again --- pkgs/development/tools/kustomize/default.nix | 1 - pkgs/development/tools/kustomize/deps.nix | 282 ------------------- 2 files changed, 283 deletions(-) delete mode 100644 pkgs/development/tools/kustomize/deps.nix diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 2c7577a5d81e..2b2930a61b43 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -7,7 +7,6 @@ buildGoPackage rec { rev = "ce7e5ee2c30cc5856fea01fe423cf167f2a2d0c3"; goPackagePath = "sigs.k8s.io/kustomize"; - goDeps = ./deps.nix; buildFlagsArray = let t = "${goPackagePath}/pkg/commands/misc"; in '' -ldflags= diff --git a/pkgs/development/tools/kustomize/deps.nix b/pkgs/development/tools/kustomize/deps.nix deleted file mode 100644 index 0c34e4a35d8c..000000000000 --- a/pkgs/development/tools/kustomize/deps.nix +++ /dev/null @@ -1,282 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad457846296e2031421a34e2568e304e35"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "3658237ded108b4134956c1b3050349d93e7b895"; - sha256 = "07sm3b5dlrqld4r8r1w79s37y41fk4zmw4afhi2ragjy1iarqck3"; - }; - } - { - goPackagePath = "github.com/evanphx/json-patch"; - fetch = { - type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "afac545df32f2287a079e2dfb7ba2745a643747e"; - sha256 = "1d90prf8wfvndqjn6nr0k405ykia5vb70sjw4ywd49s9p3wcdyn8"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2"; - sha256 = "02an755ashhckqwxyq2avgn8mm4qq3hxda2jsj1a3bix2gkb45v7"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "3fb327e6747da3043567ee86abd02bb6376b6be2"; - sha256 = "0zwsrmqqcihm0lj2pc18cpm7wnn1dzwr4kvrlyrxf0lnn7dsdsbm"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "bcff419492eeeb01f76e77d2ebc714dc97b607f5"; - sha256 = "00z8sv766kjdrdvpyzm9c5x3d45gssbwsm77qihmkflric6a3d3l"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "811b1089cde9dad18d4d0c2d09fbdbf28dbd27a5"; - sha256 = "0hkbrq4jq9s4nrz7xpx03z1zljss1zdylm3zb76hhjpp0s7hz418"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; - sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "ee43cbb60db7bd22502942cccbc39059117352ab"; - sha256 = "0vsahn8fxmiv1647j1qspn57fhiky0xh4g34vh62lyk7nfz0lszi"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "ca39e5af3ece67bbcda3d0f4f56a8e24d9f2dad4"; - sha256 = "168prr6gwfsvpnmg21zwbp87jkgpkrliklajpwj5lvsphn5dg181"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "1df9eeb2bb81f327b96228865c5687bc2194af3f"; - sha256 = "1ahjf7fj1z10mn9djaadyhhlygb0ifific6lys635q24hlhd9071"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "a1f051bc3eba734da4772d60e2d677f47cf93ef4"; - sha256 = "1x4p6nz5079h6iqmap3wf21h0ndzc4xm2j0xlm7dd95ivj7b0l02"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "53d615ae3f440f957cb9989d989d597f047262d9"; - sha256 = "1p7cpva316v2wn6n4632zxasaqa24bs9f935csd333ak550zrj4z"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"; - sha256 = "1h6s11y8g76rgyv2gnd8vhb7bp8fpda2z2p0n44mrgaz42h76bdw"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "23781f4d6632d88e869066eaebb743857aa1ef9b"; - sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "b3f03f55328800731ce03a164b80973014ecd455"; - sha256 = "0zs27kvv8p4lms81v2sm87w7jcng6qys8fabip79ys0adm44lk95"; - }; - } -] \ No newline at end of file From 89c832dc46f2407782296cffed391b80e2cdbf25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 08:14:23 -0800 Subject: [PATCH 207/221] gnome3.shotwell: 0.30.1 -> 0.30.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shotwell/versions --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 2f06451438d9..03cac9114afe 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ let pname = "shotwell"; - version = "0.30.1"; + version = "0.30.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01hsmig06hjv34yf9y60hv2gml593xfkza4ilq4b22gr8l4v2qip"; + sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r"; }; nativeBuildInputs = [ From c400bdaa4990978078102fb75b026c10713c620c Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 16 Feb 2019 01:41:06 +0900 Subject: [PATCH 208/221] mikutter: drop maintainership --- .../networking/instant-messengers/mikutter/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 3c267e612a68..42888da842c7 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extensible Twitter client"; homepage = https://mikutter.hachune.net; - maintainers = with maintainers; [ midchildan ]; platforms = ruby.meta.platforms; license = licenses.mit; }; From 55be337d47170a5ad67ee1acaf27c3f9f6b0d762 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 09:14:04 -0800 Subject: [PATCH 209/221] python37Packages.twilio: 6.23.1 -> 6.24.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-twilio/versions --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ba37373e8ea9..c9b80f3699bd 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.23.1"; + version = "6.24.0"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0f6r2qcgcg4pnnsgf9d1k03ri7h7k8kpasp9mdgv421a4rvqh8lm"; + sha256 = "16lxns59fms75swfjz46484464q4b1fw3ybf8f2k56aas9gyzb2j"; }; buildInputs = [ nose mock ]; From 6f205d1684162d6c9be0e91dc6320c54edea9749 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 10:32:51 -0800 Subject: [PATCH 210/221] qmapshack: 1.12.1 -> 1.12.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qmapshack/versions --- pkgs/applications/misc/qmapshack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index 7b2e8bed10e5..f4983ad94428 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qmapshack-${version}"; - version = "1.12.1"; + version = "1.12.3"; src = fetchurl { url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; - sha256 = "1d6n7xk0ksxb1fw43s5lb08vgxf6h93k3rb401cbka1inpyf2232"; + sha256 = "1yp5gw4q4gwiwr9w4dz19am0bhsla9n2l3bdlk98a7f46kxgnkrx"; }; nativeBuildInputs = [ cmake ]; From 2f5b369a5b5bff80c2b9cfa3cfe7e243951116e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 11:32:41 -0800 Subject: [PATCH 211/221] python37Packages.rasterio: 1.0.15 -> 1.0.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-rasterio/versions --- pkgs/development/python-modules/rasterio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 6b9ed24488fd..9717a9cda23d 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.15"; + version = "1.0.18"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "0waxkqdkaxxmqnkpj397niq193l2bg8s9isal4c7q12jbm6mf7f7"; + sha256 = "05miivbn2c5slc5nn7fpdn1da42qwzg4z046i71f4r70bc49vsj9"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; From 311b70dd3e702a82cc73bad6208b3e0fff81e8b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 05:22:52 -0800 Subject: [PATCH 212/221] slurp: 1.0 -> 1.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/slurp/versions --- pkgs/tools/misc/slurp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index a729ea6381ac..8b7f1d38744d 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "slurp-${version}"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${version}"; - sha256 = "03igv8r8n772xb0y7whhs1pa298l3d94jbnknaxpwp2n4fi04syb"; + sha256 = "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y"; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Grab images from a Wayland compositor"; + description = "Select a region in a Wayland compositor"; homepage = https://github.com/emersion/slurp; license = licenses.mit; platforms = platforms.linux; From 7c15efb57cf13c5173e34d9147c51b9def788bba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 11:44:53 -0800 Subject: [PATCH 213/221] python37Packages.telethon: 1.5.4 -> 1.5.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-telethon/versions --- pkgs/development/python-modules/telethon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index d847a4942018..23a06c0cd253 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.5.4"; + version = "1.5.5"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "52cb4929bf37c98ab5f3e173325dbb3cb9c1ca3f4fe6ba87d35c43e2f98858ce"; + sha256 = "1qpc4vc3lidhlp1c7521nxizjr6y5c3l9x41knqv02x8n3l9knxa"; }; propagatedBuildInputs = [ From 6ff00fe96a66446a07c020b75d814bef235ef388 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 15 Feb 2019 14:05:28 -0600 Subject: [PATCH 214/221] elfutils: 0.175 -> 0.176 https://sourceware.org/ml/elfutils-devel/2019-q1/msg00147.html Since it'short, NEWS is reproduced below ------ * NEWS * build: Add new --enable-install-elfh option. Do NOT use this for system installs (it overrides glibc elf.h). backends: riscv improved core file and return value location support. Fixes CVE-2019-7146, CVE-2019-7148, CVE-2019-7149, CVE-2019-7150, CVE-2019-7664, CVE-2019-7665 --- pkgs/development/tools/misc/elfutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 477a5aa415d0..424032e21af4 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -3,11 +3,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { name = "elfutils-${version}"; - version = "0.175"; + version = "0.176"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; - sha256 = "0nx6nzbk0rw3pxbzxsfvrjjh37hibzd2gjz5bb8wccpf85ar5vzp"; + sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb"; }; patches = [ ./debug-info-from-env.patch ]; From 703e8763d5d0eca99e0d86c22f4d863b903fbb0f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Feb 2019 22:19:35 +0100 Subject: [PATCH 215/221] yubikey-manager-qt: cleanup * Explicitly specify all QT dependencies rather than import from the `qt5` attr set. This makes overrides of a single library easier. * Drop the superfluous `with stdenv` expression and reference lib or stdenv itself where possible. * Don't manually configure shared libraries to load. This is mostly done automatically during the build steps. --- .../tools/misc/yubikey-manager-qt/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index a463faa43503..c8521efb28d6 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -6,18 +6,23 @@ , pythonPackages , python3 , qmake -, qt5 +, qtbase +, qtgraphicaleffects +, qtquickcontrols +, qtquickcontrols2 +, qtdeclarative +, qtsvg , yubikey-manager , yubikey-personalization }: -with stdenv; - let - qmlPath = qmlLib: "${qmlLib}/${qt5.qtbase.qtQmlPrefix}"; + qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; + + inherit (stdenv) lib; qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [ - qt5.qtbase.bin qt5.qtdeclarative.bin pyotherside qt5.qtquickcontrols qt5.qtquickcontrols2.bin qt5.qtgraphicaleffects + qtbase.bin qtdeclarative.bin pyotherside qtquickcontrols qtquickcontrols2.bin qtgraphicaleffects ]; in stdenv.mkDerivation rec { @@ -37,7 +42,7 @@ in stdenv.mkDerivation rec { substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" ''; - buildInputs = [ pythonPackages.python qt5.qtbase qt5.qtgraphicaleffects qt5.qtquickcontrols qt5.qtquickcontrols2 pyotherside ]; + buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ]; enableParallelBuilding = true; @@ -50,11 +55,9 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/ykman-gui \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ - --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ --set QML2_IMPORT_PATH "${qml2ImportPath}" \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ - --prefix QT_PLUGIN_PATH : "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ + --prefix QT_PLUGIN_PATH : "${qtsvg.bin}/${qtbase.qtPluginPrefix}" mkdir -p $out/share/applications cp resources/ykman-gui.desktop $out/share/applications/ykman-gui.desktop @@ -64,7 +67,7 @@ in stdenv.mkDerivation rec { --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" \ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; homepage = https://developers.yubico.com/yubikey-manager-qt/; From 495689ddd759fd9891e2cfe522c187f1ec145476 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 13:41:55 -0800 Subject: [PATCH 216/221] python37Packages.mail-parser: 3.4.1 -> 3.9.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-mail-parser/versions --- pkgs/development/python-modules/mail-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index da74830f8798..42162d62aac4 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.4.1"; + version = "3.9.2"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0nxilshq4gwpicdklja9p275yf8l5kr1lk620c3cx9w4qai4cmbv"; + sha256 = "0f515a8r3qz3i2cm4lvs5aw59193jl9mk7bmaj9545n4miyar4nr"; }; LC_ALL = "en_US.utf-8"; From cba2549e9867c40bdbf4d65f62306d32d5c8bc17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 14:37:21 -0800 Subject: [PATCH 217/221] python37Packages.llfuse: 1.3.5 -> 1.3.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-llfuse/versions --- pkgs/development/python-modules/llfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 21ea6de02f19..2b8e21bd6496 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.3.5"; + version = "1.3.6"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "6e412a3d9be69162d49b8a4d6fb3c343d1c1fba847f4535d229e0ece2548ead8"; + sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii"; }; nativeBuildInputs = [ pkgconfig ]; From a1525c5d482ec2ca84c4210d53c224005fc37414 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 15 Feb 2019 17:50:07 -0500 Subject: [PATCH 218/221] docs: give matomo an ID --- nixos/modules/services/web-apps/matomo-doc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml index c71c22e810ee..20d2de9f4189 100644 --- a/nixos/modules/services/web-apps/matomo-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -47,7 +47,7 @@
-
+
Archive Processing This module comes with the systemd service matomo-archive-processing.service From 0e8ab58f459b49e968ecbc312175a062af2776f9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Feb 2019 18:20:19 -0500 Subject: [PATCH 219/221] pythonPackages.llfuse: update homepage --- pkgs/development/python-modules/llfuse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 2b8e21bd6496..7f9aa3fa2e48 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for the low-level FUSE API"; - homepage = https://code.google.com/p/python-llfuse/; + homepage = https://github.com/python-llfuse/python-llfuse; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; From 60b5347fb53823a59346df0705b795ea6c6aacc5 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 15 Feb 2019 18:56:55 -0500 Subject: [PATCH 220/221] linux_hardkernel_4_14: don't apply interpreter-trunc patch The only 4.14.y versions that need the patch are 4.14.99 and 4.14.100. --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f27260d8e164..e340aaaffd53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14616,7 +14616,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.interpreter-trunc ]; }; From 039f359a7d366e6d8594a4238aac6fcb4dbd7be8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 6 Feb 2019 16:29:28 +0000 Subject: [PATCH 221/221] ocamlPackages.ocaml-migrate-parsetree: 1.1.0 -> 1.2.0 --- .../ocaml-modules/ocaml-migrate-parsetree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index a9496576875c..38050bc09a12 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, result }: +{ stdenv, fetchFromGitHub, buildDunePackage, result, ppx_derivers }: buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = "v${version}"; - sha256 = "1d2n349d1cqm3dr09mwy5m9rfd4bkkqvri5i94wknpsrr35vnrr1"; + sha256 = "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm"; }; - propagatedBuildInputs = [ result ]; + propagatedBuildInputs = [ ppx_derivers result ]; meta = { description = "Convert OCaml parsetrees between different major versions";