From bd170e778bed8c968b9cb1d6097fba780a453686 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 7 Sep 2017 14:00:34 +0200 Subject: [PATCH 01/80] qtcreator: 4.3.1 -> 4.4.0 See http://blog.qt.io/blog/2017/09/05/qt-creator-4-4-0-released/ for release information --- pkgs/development/qtcreator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index a40a34052ca..51667bef143 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -6,8 +6,8 @@ with stdenv.lib; let - baseVersion = "4.3"; - revision = "1"; + baseVersion = "4.4"; + revision = "0"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "1bd4wxvp8b5imsmrbnn8rkiln38g74g2545x07pmihc8z51qh2h6"; + sha256 = "00k2bb2pamqlq0i619wz8chii8yp884qnrjngzzxrdffk05d95wc"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; From c3f6b53bb6ddadabcf599de1e3a48a158136ddb6 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 7 Sep 2017 21:42:06 +0200 Subject: [PATCH 02/80] vaultenv: init at 0.5.0 --- .../haskell-modules/configuration-common.nix | 3 +++ .../tools/haskell/vaultenv/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/haskell/vaultenv/default.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cdb15fd9f81..240c4fd21f7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -686,6 +686,9 @@ self: super: { # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only. intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {}; + # vaultenv is not available from Hackage. + vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix new file mode 100644 index 00000000000..9b5a19700ff --- /dev/null +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, fetchurl, async, base, bytestring, http-conduit, lens +, lens-aeson, optparse-applicative, retry, stdenv, text, unix +, unordered-containers, utf8-string +}: + +mkDerivation rec { + pname = "vaultenv"; + version = "0.5.0"; + + src = fetchurl { + url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz"; + sha256 = "0hdcxq88cf3ygnikkppyg3fcf7xmwm9zif7274j3n34p9vd8xci3"; + }; + + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base bytestring http-conduit lens lens-aeson + optparse-applicative retry text unix unordered-containers + utf8-string + ]; + homepage = "https://github.com/channable/vaultenv"; + description = "Runs processes with secrets from HashiCorp Vault"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ lnl7 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d30e7f1fab..226bc09c348 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19114,6 +19114,8 @@ with pkgs; vault = callPackage ../tools/security/vault { }; + vaultenv = haskellPackages.vaultenv; + vbam = callPackage ../misc/emulators/vbam { ffmpeg = ffmpeg_2; }; From 274333e22299f1bef44b2044b296dc9e07780ce4 Mon Sep 17 00:00:00 2001 From: timor Date: Sun, 10 Sep 2017 18:00:38 +0200 Subject: [PATCH 03/80] ParaView: 4.0.1 -> 5.4.0 --- .../graphics/paraview/default.nix | 64 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 8736721b43d..730f809eef4 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,40 +1,46 @@ -{ fetchurl, stdenv, cmake, qt4 -, hdf5 -, mpich2 -, python -, libxml2 -, mesa, libXt -}: +{stdenv, fetchFromGitHub, cmake +,full, python, mesa, libXt }: stdenv.mkDerivation rec { - name = "paraview-4.0.1"; - src = fetchurl { - url = "http://paraview.org/files/v4.0/ParaView-v4.0.1-source.tgz"; - sha256 = "1qj8dq8gqpsw75sv4sdc7xm1xcpv0ilsddnrcfhha0zfhp0gq10y"; + name = "paraview-${version}"; + version = "5.4.0"; + + # fetching from GitHub instead of taking an "official" source + # tarball because of missing submodules there + src = fetchFromGitHub { + owner = "Kitware"; + repo = "ParaView"; + rev = "v${version}"; + sha256 = "0h1vkgwm10mc5mnr3djp81lxr5pi0hyj776z77hiib6xm5596q9n"; + fetchSubmodules = true; }; - # [ 5%] Generating vtkGLSLShaderLibrary.h - # ../../../bin/ProcessShader: error while loading shared libraries: libvtksys.so.pv3.10: cannot open shared object file: No such file or directory - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.98 -rpath ../../../../../../lib -rpath ../../../../../lib -rpath ../../../../lib -rpath ../../../lib -rpath ../../lib -rpath ../lib" - ''; - cmakeFlags = [ - "-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON" - "-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON" - "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON" -# use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html - "-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=ON" - "-DVTK_USE_RPATH:BOOL=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT=ON" - ]; + cmakeFlags = [ + "-DPARAVIEW_ENABLE_PYTHON=ON" + "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" + ]; - # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 - NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + # During build, binaries are called that rely on freshly built + # libraries. These reside in build/lib, and are not found by + # default. + preBuild = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + ''; enableParallelBuilding = true; - buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ]; + buildInputs = [ cmake + python + mesa + libXt + + # theoretically the following should be fine, but there is an error + # due to missing libqminimal when not using qt5.full + + # qtbase qtx11extras qttools + full + ]; + meta = { homepage = http://www.paraview.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c92cb0ea62..d00fb1d3e42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15698,7 +15698,7 @@ with pkgs; pavucontrol = callPackage ../applications/audio/pavucontrol { }; - paraview = callPackage ../applications/graphics/paraview { }; + paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; packet = callPackage ../development/tools/packet { }; From 69379fcf10f1f51cd4820e2bfb7241f182cb2971 Mon Sep 17 00:00:00 2001 From: dywedir Date: Tue, 12 Sep 2017 00:55:06 +0300 Subject: [PATCH 04/80] tokei: 6.0.1 -> 6.1.2 --- pkgs/development/tools/misc/tokei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index f47fab71b83..c0a56648db9 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "tokei-${version}"; - version = "6.0.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "Aaronepower"; repo = "tokei"; rev = "v${version}"; - sha256 = "1v9h45vspsqsy86fm78bc2g5byqa4cd9b9fbmv7imi87yjbm8i7x"; + sha256 = "1bzs3mr6f9bna39b9ddwwq0raas07nbn106mnq3widxg59i0gxhd"; }; - depsSha256 = "0jqzk5qlrc7pm3s7jf8130vgnrcd54izw3mx84m9b5lhf3rz98hm"; + depsSha256 = "1cz93mrpxmyrza0ipdyg2a6mynl66plpsb446wxnmmy7y7zd6xbf"; installPhase = '' mkdir -p $out/bin From a217d73381ba593f88f4b20111b7922eda1f1aac Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 12 Sep 2017 22:37:38 +0200 Subject: [PATCH 05/80] node-exporter service: fix documentation for enabledCollectors --- nixos/modules/services/monitoring/prometheus/node-exporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix index 0cf0b85afb5..b5b852438d7 100644 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -33,7 +33,7 @@ in { default = []; example = ''[ "systemd" ]''; description = '' - Collectors to enable, additionally to the defaults. + Collectors to enable. Only collectors explicitly listed here will be enabled. ''; }; From 2000fba5619c105f7df24736789365cc271b6596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 14 Sep 2017 04:44:14 +0200 Subject: [PATCH 06/80] nixos/fileystems: Fix boot fails with encrypted fs Boot fails when a keyfile is configured for all encrypted filesystems and no other luks devices are configured. This is because luks support is only enabled in the initrd, when boot.initrd.luks.devices has entries. When a fileystem has a keyfile configured though, it is setup by a custom command, not by boot.initrd.luks. This commit adds an internal config flag to enable luks support in the initrd file, even if there are no luks devices configured. --- nixos/modules/system/boot/luksroot.nix | 12 +++++++++++- nixos/modules/tasks/encrypted-devices.nix | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 3ca679b479a..06f004fb06e 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -235,6 +235,16 @@ in ''; }; + boot.initrd.luks.forceLuksSupportInInitrd = mkOption { + type = types.bool; + default = false; + internal = true; + description = '' + Whether to configure luks support in the initrd, when no luks + devices are configured. + ''; + }; + boot.initrd.luks.devices = mkOption { default = { }; example = { "luksroot".device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; }; @@ -417,7 +427,7 @@ in }; }; - config = mkIf (luks.devices != {}) { + config = mkIf (luks.devices != {} || luks.forceLuksSupportInInitrd) { # actually, sbp2 driver is the one enabling the DMA attack, but this needs to be tested boot.blacklistedKernelModules = optionals luks.mitigateDMAAttacks diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index b1a7711ddcb..b019ddc3a98 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -61,6 +61,7 @@ in devices = map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; cryptoModules = [ "aes" "sha256" "sha1" "xts" ]; + forceLuksSupportInInitrd = true; }; postMountCommands = concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n") keyedEncDevs; From d2fdc9cb1f301a11bc5e45e4cbd8581e74e1cd69 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 16 Sep 2017 13:16:47 +0200 Subject: [PATCH 07/80] dmd: Add darwin/Foundation dependency to fix build on Darwin --- pkgs/development/compilers/dmd/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 2b29ba9aa3e..57952e47f2e 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , makeWrapper, unzip, which -, curl, tzdata, gdb +, curl, tzdata, gdb, darwin # Versions 2.070.2 and up require a working dmd compiler to build: , bootstrapDmd }: @@ -73,7 +73,12 @@ stdenv.mkDerivation rec { --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ ''; - nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ]; + nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + buildInputs = [ curl tzdata ]; # Buid and install are based on http://wiki.dlang.org/Building_DMD From 8fa1b392798858f0521aadf1704d9b52701d6f29 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 16 Sep 2017 14:09:50 +0200 Subject: [PATCH 08/80] dmd: Fix bootstrap dmd to build with sandboxing of nixUnstable --- pkgs/development/compilers/dmd/2.067.1.nix | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index 3cf530e9e5e..e2bd9c708dc 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { # Compile with PIC to prevent colliding modules with binutils 2.28. # https://issues.dlang.org/show_bug.cgi?id=17375 usePIC = "-fPIC"; + ROOT_HOME_DIR = "$(echo ~root)"; postPatch = '' # Ugly hack so the dlopen call has a chance to succeed. @@ -67,19 +68,23 @@ stdenv.mkDerivation rec { --replace g++ $CXX '' - + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace dmd/src/root/port.c \ - --replace "#include " "#include " - '' + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace dmd/src/root/port.c \ + --replace "#include " "#include " - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace dmd/src/posix.mak \ - --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + # See https://github.com/NixOS/nixpkgs/issues/29443 + substituteInPlace phobos/std/path.d \ + --replace "\"/root" "\"${ROOT_HOME_DIR}" + '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace dmd/src/root/port.c --replace __inline_isnanl __inline_isnan - ''; + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace dmd/src/posix.mak \ + --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + substituteInPlace dmd/src/root/port.c --replace __inline_isnanl __inline_isnan + ''; nativeBuildInputs = [ makeWrapper unzip which ]; buildInputs = [ curl tzdata ]; From 4535008a4cf2ed3b700ea273b9980684e7ada692 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 17 Sep 2017 00:15:31 +0200 Subject: [PATCH 09/80] dmd: Disable check phase because some tests are not working if build has sandboxing enabled --- pkgs/development/compilers/dmd/2.067.1.nix | 3 ++- pkgs/development/compilers/dmd/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index e2bd9c708dc..6fab56e4e7d 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -101,7 +101,8 @@ stdenv.mkDerivation rec { cd .. ''; - doCheck = true; + # disable check phase because some tests are not working with sandboxing + doCheck = false; checkPhase = '' cd dmd diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 57952e47f2e..27f70b8d6c7 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -97,7 +97,8 @@ stdenv.mkDerivation rec { cd .. ''; - doCheck = true; + # disable check phase because some tests are not working with sandboxing + doCheck = false; checkPhase = '' cd dmd From 59cdc2564cec4b5f681a5c625aa951350244315b Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 17 Sep 2017 00:16:58 +0200 Subject: [PATCH 10/80] ldc: Disable check phase because some tests are not working if build has sandboxing enabled --- pkgs/development/compilers/ldc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 22d2923897c..4be27531888 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -81,7 +81,8 @@ stdenv.mkDerivation rec { makeFlags = [ "DMD=$DMD" ]; - doCheck = true; + # disable check phase because some tests are not working with sandboxing + doCheck = false; checkPhase = '' ctest -j $NIX_BUILD_CORES -V DMD=$DMD From c68118ce651adde39bbb6352151deedb72cecf86 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 10 Sep 2017 09:39:26 +0200 Subject: [PATCH 11/80] glusterfs service: add support for TLS communication TLS settings are implemented as submodule. --- .../network-filesystems/glusterfs.nix | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index 7454eeef803..ae4f4521cf2 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -5,6 +5,22 @@ with lib; let inherit (pkgs) glusterfs rsync; + tlsCmd = if (cfg.tlsSettings != null) then + '' + mkdir -p /var/lib/glusterd + touch /var/lib/glusterd/secure-access + '' + else + '' + rm -f /var/lib/glusterd/secure-access + ''; + + restartTriggers = if (cfg.tlsSettings != null) then [ + config.environment.etc."ssl/glusterfs.pem".source + config.environment.etc."ssl/glusterfs.key".source + config.environment.etc."ssl/glusterfs.ca".source + ] else []; + cfg = config.services.glusterfs; in @@ -30,6 +46,41 @@ in description = "Extra flags passed to the GlusterFS daemon"; default = []; }; + + tlsSettings = mkOption { + description = '' + Make the server communicate via TLS. + This means it will only connect to other gluster + servers having certificates signed by the same CA. + + Enabling this will create a file /var/lib/glusterd/secure-access. + Disabling will delete this file again. + + See also: https://gluster.readthedocs.io/en/latest/Administrator%20Guide/SSL/ + ''; + default = null; + type = types.nullOr (types.submodule { + options = { + tlsKey = mkOption { + default = null; + type = types.path; + description = "Path to the private key used for TLS."; + }; + + tlsPem = mkOption { + default = null; + type = types.path; + description = "Path to the certificate used for TLS."; + }; + + caCert = mkOption { + default = null; + type = types.path; + description = "Path certificate authority used to sign the cluster certificates."; + }; + }; + }); + }; }; }; @@ -40,7 +91,14 @@ in services.rpcbind.enable = true; + environment.etc = mkIf (cfg.tlsSettings != null) { + "ssl/glusterfs.pem".source = cfg.tlsSettings.tlsPem; + "ssl/glusterfs.key".source = cfg.tlsSettings.tlsKey; + "ssl/glusterfs.ca".source = cfg.tlsSettings.caCert; + }; + systemd.services.glusterd = { + inherit restartTriggers; description = "GlusterFS, a clustered file-system server"; @@ -57,6 +115,8 @@ in + '' mkdir -p /var/lib/glusterd/hooks/ ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ + + ${tlsCmd} '' # `glusterfind` needs dirs that upstream installs at `make install` phase # https://github.com/gluster/glusterfs/blob/v3.10.2/tools/glusterfind/Makefile.am#L16-L17 @@ -75,6 +135,7 @@ in }; systemd.services.glustereventsd = { + inherit restartTriggers; description = "Gluster Events Notifier"; From f4b207438d53fce58c8dcfa9265bec2b24ce9978 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Mon, 18 Sep 2017 13:50:56 +0200 Subject: [PATCH 12/80] libuv: 1.13.1 -> 1.14.1 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 1bc58260afe..50d588dad79 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.13.1"; + version = "1.14.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "0k348kgdphha1w4cw78zngq3gqcrhcn0az7k0k4w2bgmdf4ip8z8"; + sha256 = "1121qvnvpcabq1bl2k41jq8r2hn2x123csiaf7s9vrq66bbxgfdx"; }; postPatch = let From 9d2a2dc43e70d8da21c82596cf80d55d53086fc3 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Mon, 18 Sep 2017 13:51:27 +0200 Subject: [PATCH 13/80] nodejs: 8.4.0 -> 8.5.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index af329063e9f..244c236cd18 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.4.0"; + version = "8.5.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "0qgkccsldpdrjxwwq78z94hsqz6qivmi4n2738iiginw06hs4njx"; + sha256 = "0g2wyy9zdjzm9c0vbjn8bn49s1b2c7r2iwdfc4dpx7h4wpcfbkg1"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; From 98a2316166cbb4e9dc87e35d07dd520acb362ef2 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Mon, 18 Sep 2017 19:12:40 +0930 Subject: [PATCH 14/80] nfs-utils: set /etc/krb5.keytab as default path for rpc-gssd Currently the `rpc-gssd.service` has a `ConditionPathExists` clause that can never be met, because it's looking for stateful data inside `/nix/store`. `auth-rpcgss-module.service` also only starts if this file exists. Fixes NixOS/nixpkgs#29509. --- nixos/modules/tasks/filesystems/nfs.nix | 6 ++++++ pkgs/os-specific/linux/nfs-utils/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index 73cf18384bd..d3a558738f4 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -85,8 +85,14 @@ in enable = mkDefault false; }; + systemd.services.auth-rpcgss-module = + { + unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ]; + }; + systemd.services.rpc-gssd = { restartTriggers = [ nfsConfFile ]; + unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ]; }; systemd.services.rpc-statd = diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index d28cf44bd67..294dde2a0a6 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags" - + substituteInPlace systemd/nfs-utils.service \ --replace "/bin/true" "${coreutils}/bin/true" From df589a438e01c06a6661cbd18bfe8f568d8b7f83 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Fri, 25 Aug 2017 11:47:28 +0200 Subject: [PATCH 15/80] dockerTools.buildImageWithNixDb: populate the Nix Db of the image Nix store Currently, the contents closure is copied to the layer but there is no nix database initialization. If pkgs.nix is added in the contents, nix-store doesn't work because there is no nix database. From the contents of the layer, this commit generates and loads the database in the nix store of the container. This only works if there is no parent layer that already have a nix store (to support several nix layers, we would have to merge nix databases of parent layers). We also add an example to play with the nix store inside the container. Note it seems `more` is a missing dependency of the nix package! --- pkgs/build-support/docker/default.nix | 32 +++++++++++++++++++++++++- pkgs/build-support/docker/examples.nix | 17 ++++++++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 8a7b362bd5e..cfd2c8a31f9 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -10,6 +10,8 @@ lib, pkgs, pigz, + nixUnstable, + perl, runCommand, rsync, shadow, @@ -27,7 +29,7 @@ rec { examples = import ./examples.nix { - inherit pkgs buildImage pullImage shadowSetup; + inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb; }; pullImage = @@ -239,6 +241,17 @@ rec { ${text} ''; + nixRegistration = contents: runCommand "nix-registration" { + buildInputs = [ nixUnstable perl ]; + # For obtaining the closure of `contents'. + exportReferencesGraph = + let contentsList = if builtins.isList contents then contents else [ contents ]; + in map (x: [("closure-" + baseNameOf x) x]) contentsList; + } + '' + printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out + ''; + # Create a "layer" (set of files). mkPureLayer = { # Name of the layer @@ -544,4 +557,21 @@ rec { in result; + + # Build an image and populate its nix database with the provided + # contents. The main purpose is to be able to use nix commands in + # the container. + # Be careful since this doesn't work well with multilayer. + buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: + buildImage (args // { + extraCommands = '' + echo "Generating the nix database..." + echo "Warning: only the database of the deepest Nix layer is loaded." + echo " If you want to use nix commands in the container, it would" + echo " be better to only have one layer that contains a nix store." + # This requires Nix 1.12 or higher + export NIX_REMOTE=local?root=$PWD + ${nixUnstable}/bin/nix-store --load-db < ${nixRegistration contents} + '' + extraCommands; + }); } diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index aead53f6f7d..1a8b9c7f8ed 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -7,7 +7,7 @@ # $ nix-build '' -A dockerTools.examples.redis # $ docker load < result -{ pkgs, buildImage, pullImage, shadowSetup }: +{ pkgs, buildImage, pullImage, shadowSetup, buildImageWithNixDb }: rec { # 1. basic example @@ -83,7 +83,7 @@ rec { }; # 4. example of pulling an image. could be used as a base for other images - nix = pullImage { + nixFromDockerHub = pullImage { imageName = "nixos/nix"; imageTag = "1.11"; # this hash will need change if the tag is updated at docker hub @@ -101,4 +101,17 @@ rec { pkgs.nano ]; }; + + # 5. nix example to play with the container nix store + # docker run -it --rm nix nix-store -qR $(nix-build '' -A nix) + nix = buildImageWithNixDb { + name = "nix"; + contents = [ + # nix-store -qR uses the 'more' program which is not included in + # the pkgs.nix dependencies. We then have to manually get it + # from the 'eject' package:/ + pkgs.eject + pkgs.nix + ]; + }; } From cb6fc52f998f8f3106a1506c052cffae752e8b7c Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 13 Sep 2017 11:40:26 +0200 Subject: [PATCH 16/80] dockerTools.buildImageWithNixDb: Make output paths valid and add gcroots The database dump doesn't contain sha and size. This leads to invalid path in the container. We have to fix the database by using nix-store. Note a better way to do this is available in Nix 1.12 (since the database dump contains all required information). We also add content output paths in the gcroots since they ca be used by the container. --- pkgs/build-support/docker/default.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index cfd2c8a31f9..267a2812a2a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -249,7 +249,9 @@ rec { in map (x: [("closure-" + baseNameOf x) x]) contentsList; } '' - printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out + mkdir $out + printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out/db.dump + perl ${pkgs.pathsFromGraph} closure-* > $out/storePaths ''; # Create a "layer" (set of files). @@ -571,7 +573,23 @@ rec { echo " be better to only have one layer that contains a nix store." # This requires Nix 1.12 or higher export NIX_REMOTE=local?root=$PWD - ${nixUnstable}/bin/nix-store --load-db < ${nixRegistration contents} + ${nixUnstable}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump + + # We fill the store in order to run the 'verify' command that + # generates hash and size of output paths. + # Note when Nix 1.12 is be the stable one, the database dump + # generated by the exportReferencesGraph function will + # contains sha and size. See + # https://github.com/NixOS/nix/commit/c2b0d8749f7e77afc1c4b3e8dd36b7ee9720af4a + storePaths=$(cat ${nixRegistration contents}/storePaths) + echo "Copying everything to /nix/store (will take a while)..." + cp -prd $storePaths nix/store/ + ${nixUnstable}/bin/nix-store --verify --check-contents + + mkdir -p nix/var/nix/gcroots/docker/ + for i in ${lib.concatStringsSep " " contents}; do + ln -s $i nix/var/nix/gcroots/docker/$(basename $i) + done; '' + extraCommands; }); } From c7bbe471b093418eaaad5f2a9e7183d2195b5b24 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2017 14:13:41 -0400 Subject: [PATCH 17/80] ants: bump version and fix sandboxed build --- .../science/biology/ants/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 24ab2ee9ac5..0b8ddd0d4fb 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -2,23 +2,26 @@ stdenv.mkDerivation rec { _name = "ANTs"; - _version = "2.1.0"; + _version = "2.2.0"; name = "${_name}-${_version}"; src = fetchFromGitHub { - owner = "stnava"; + owner = "ANTsX"; repo = "ANTs"; - rev = "4e02aa76621698e3513330dd9e863e22917e14b7"; - sha256 = "0gyys1lf69bl3569cskxc8r5llwcr0dsyzvlby5skhfpsyw0dh8r"; + rev = "37ad4e20be3a5ecd26c2e4e41b49e778a0246c3d"; + sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q"; }; nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ itk vtk ]; - cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; + cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" + # as cmake otherwise tries to download test data: + "-DBUILD_TESTING=FALSE" ]; + + enableParallelBuilding = true; checkPhase = "ctest"; - doCheck = false; postInstall = '' for file in $out/bin/*; do @@ -27,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/stnava/ANTs; + homepage = https://github.com/ANTxS/ANTs; description = "Advanced normalization toolkit for medical image registration and other processing"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; From 6bf56656f021a1f6dbeab9e26ccde78b5ea469f8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 21 Sep 2017 00:41:04 +0200 Subject: [PATCH 18/80] snapper: 0.3.3 -> 0.5.0 --- pkgs/tools/misc/snapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 5f482d68dd9..9895fff3ba8 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "snapper-${version}"; - version = "0.3.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "12c2ygaanr4gny4ixnly4vpi0kv7snbg3khr3i5zwridhmdzz9hm"; + sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm"; }; nativeBuildInputs = [ From 3e96cee147d1ab9ee790f5b47871472a48e71a8d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 21 Sep 2017 00:51:00 +0200 Subject: [PATCH 19/80] hydra: 2017-07-27 -> 2017-09-14 Builds against recent nixUnstable --- pkgs/development/tools/misc/hydra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index d3a213ecfc5..2ac7ef4593c 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -62,15 +62,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-07-27"; + version = "2017-09-14"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "3fc320db320c9aa5180c54e77513f1bcb7407079"; - sha256 = "0kml2rvy5pz8pzl23vfib5vrwxccff9j1jmyq926qv7f5kbzy61b"; + rev = "b828224fee451ad26e87cfe4eeb9c0704ee1062b"; + sha256 = "05xv10ldsa1rahxbbgh5kwvl1dv4yvc8idczpifgb55fgqj8zazm"; }; buildInputs = From 6aea372e28615c3c8cee5ca0ac904d7f5acea7a6 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Thu, 21 Sep 2017 08:27:16 +0200 Subject: [PATCH 20/80] piwik: 3.1.0 -> 3.1.1 --- pkgs/servers/web-apps/piwik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix index 3981a5eeb14..091391166d7 100644 --- a/pkgs/servers/web-apps/piwik/default.nix +++ b/pkgs/servers/web-apps/piwik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "piwik-${version}"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "175300ibf0lg4xnyn5v47czi3vd6i7yqf1im3br4975f6k7w8q22m2mk2mi006795js5q52x48g4sc7wb47wac7wbla8wp98al48gfb"; + sha512 = "2mqzk12959j9xqb9cqz8np35zcs1313zjx9pikbjw9z9mfcqgv0ccvrnl2ymmwll333drr9qaxs54n0mkk66xbhz04nmzmib0kp9k8h"; }; nativeBuildInputs = [ makeWrapper ]; From 8ed758696c321a84b3d3d5d08b6bfa004779f211 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 17 Sep 2017 18:49:02 +0200 Subject: [PATCH 21/80] gluster service: use str instead of path for private key This pervents the user from accidently commiting the key to the nix store. If providing a path instead of a string. --- nixos/modules/services/network-filesystems/glusterfs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index ae4f4521cf2..e7f52bc4a7d 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -61,9 +61,9 @@ in default = null; type = types.nullOr (types.submodule { options = { - tlsKey = mkOption { + tlsKeyPath = mkOption { default = null; - type = types.path; + type = types.str; description = "Path to the private key used for TLS."; }; @@ -93,7 +93,7 @@ in environment.etc = mkIf (cfg.tlsSettings != null) { "ssl/glusterfs.pem".source = cfg.tlsSettings.tlsPem; - "ssl/glusterfs.key".source = cfg.tlsSettings.tlsKey; + "ssl/glusterfs.key".source = cfg.tlsSettings.tlsKeyPath; "ssl/glusterfs.ca".source = cfg.tlsSettings.caCert; }; From bafb9c4d50d08a373f83b15be6fa0ad1fe2b44cf Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 21 Sep 2017 21:10:03 +0200 Subject: [PATCH 22/80] vsqlite: fix darwin build --- pkgs/development/libraries/vsqlite/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index 43a8f7db8d6..bfb07c2df33 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -11,10 +11,17 @@ stdenv.mkDerivation rec { buildInputs = [ boost sqlite ]; - meta = { + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.in \ + --replace '-Wl,--as-needed' "" \ + --replace '-Wl,-soname -Wl,libvsqlitepp.so.3' \ + "-Wl,-install_name,$out/lib/libvsqlitepp.3.dylib" + ''; + + meta = with stdenv.lib; { homepage = http://vsqlite.virtuosic-bytes.com/; description = "C++ wrapper library for sqlite."; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; }; } From ab390ab050149da469b198ed1c968c0cbc03e8e7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 23 Jun 2017 19:46:05 +0200 Subject: [PATCH 23/80] erlang: remove erlangR16 and all versioned variants from all-packages (re-applies commit 0fafa0d7d7c89dfb8c3c7fbc5977cfe7959ebb78) --- 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 12a94c79b36..6493d7574ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6290,15 +6290,9 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlang_odbc erlang_javac erlang_odbc_javac + erlang erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_5 elixir_1_4 elixir_1_3 - lfe lfe_1_2 - erlangR16 erlangR16_odbc - erlang_basho_R16B02 erlang_basho_R16B02_odbc - erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac - erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac - erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac - erlangR20 erlangR20_odbc erlangR20_javac erlangR20_odbc_javac; + lfe lfe_1_2; inherit (beam.packages.erlang) rebar rebar3-open rebar3 From ef4c15e54dae4507e1d8141a0a28b20cc778e85c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 21 Sep 2017 21:32:03 +0200 Subject: [PATCH 24/80] erlang: add R17-R20 back to all-packages --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6493d7574ed..acc753ce58c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6290,7 +6290,8 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 + erlang erlangR17 erlangR18 erlangR19 erlangR20 + erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; From 50f12373afaf90abebd571dfba747eda3aecdb04 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 21 Sep 2017 21:23:28 +0200 Subject: [PATCH 25/80] riot-web: 0.12.3 -> 0.12.5 --- .../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 c57fd413689..964f1ab5204 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.12.3"; + version = "0.12.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1v9k9rna9rziis5ld4x4lw3rhgm504cnnafiwk175jpjbbd8h4b3"; + sha256 = "1g30gl4b5fk1h13r2v4rspcqic9jg99717lxplk5birg3wi3b2d3"; }; installPhase = '' From 2bbef7658afa2b83f2e1bc01cf2cf9182fc913f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 20 Sep 2017 08:56:11 -0300 Subject: [PATCH 26/80] google-drive-ocamlfuse: 0.6.17 -> 0.6.21 --- .../google-drive-ocamlfuse/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 674cf60161d..ddc9df75999 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, zlib +{ stdenv, fetchFromGitHub, zlib , ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { - name = "google-drive-ocamlfuse-${version}"; - version = "0.6.17"; + name = "google-drive-ocamlfuse-${version}"; + version = "0.6.21"; - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1674/${name}.tar.gz"; - sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas"; + src = fetchFromGitHub { + owner = "astrada"; + repo = "google-drive-ocamlfuse"; + rev = "v${version}"; + sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59"; }; - buildInputs = [ zlib ocaml ocamlbuild ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; + nativeBuildInputs = [ ocamlbuild ]; + + buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ]; configurePhase = "ocaml setup.ml -configure --prefix \"$out\""; buildPhase = "ocaml setup.ml -build"; From 7c30c83b7b09c41dda2f2766607a8376c91c3129 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 21 Sep 2017 21:51:32 +0200 Subject: [PATCH 27/80] vmmlib: fix darwin frameworks --- pkgs/development/libraries/vmmlib/default.nix | 21 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 3a7f8770e6c..ccdf2b05e7e 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas +, Accelerate, CoreGraphics, CoreVideo +}: stdenv.mkDerivation rec { version = "1.6.2"; name = "vmmlib-${version}"; - buildInputs = [ stdenv pkgconfig cmake boost blas ]; src = fetchFromGitHub { owner = "VMML"; @@ -12,13 +13,17 @@ stdenv.mkDerivation rec { sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml"; }; - patches = [ - ./disable-cpack.patch #disable the need of cpack/rpm - ]; - + patches = [ + ./disable-cpack.patch #disable the need of cpack/rpm + ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ boost blas ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; + enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; checkTarget = "test"; @@ -36,6 +41,6 @@ stdenv.mkDerivation rec { homepage = http://github.com/VMML/vmmlib/; maintainers = [ maintainers.adev ]; platforms = platforms.all; - }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acc753ce58c..d65cf86dff5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7902,7 +7902,9 @@ with pkgs; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; - vmmlib = callPackage ../development/libraries/vmmlib {}; + vmmlib = callPackage ../development/libraries/vmmlib { + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; + }; elastix = callPackage ../development/libraries/science/biology/elastix { }; From 4d225b3d405870b8584e7d27b54c8afa1c1908aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 21 Sep 2017 20:54:50 +0100 Subject: [PATCH 28/80] nodePackages.pulp: init at 12.0.1 fixes #29374 --- .../node-packages/node-packages-v4.nix | 1054 ++- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 5918 +++++++++-------- 3 files changed, 4015 insertions(+), 2958 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 7e5a8f1db53..a015c3b4553 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -175,13 +175,13 @@ let sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; - "interpret-1.0.3" = { + "interpret-1.0.4" = { name = "interpret"; packageName = "interpret"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz"; - sha1 = "cbc35c62eeee73f19ab7b10a801511401afc0f90"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz"; + sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0"; }; }; "liftoff-2.3.0" = { @@ -337,13 +337,13 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "dateformat-2.0.0" = { + "dateformat-2.2.0" = { name = "dateformat"; packageName = "dateformat"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz"; - sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17"; + url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"; + sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; }; }; "fancy-log-1.3.0" = { @@ -1741,22 +1741,22 @@ let sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; }; }; - "request-2.81.0" = { + "request-2.82.0" = { name = "request"; packageName = "request"; - version = "2.81.0"; + version = "2.82.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + url = "https://registry.npmjs.org/request/-/request-2.82.0.tgz"; + sha512 = "079947pnxi0h8jdiv5wb64rj3gnq4a02dfj47c41wsdi3g6pp1v3yfg3m1rphib7igf6vkisrgjq16vc4fq916fc870wzckdizal1gx"; }; }; - "rimraf-2.6.1" = { + "rimraf-2.6.2" = { name = "rimraf"; packageName = "rimraf"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"; - sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; "semver-5.3.0" = { @@ -1831,13 +1831,13 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "aproba-1.1.2" = { + "aproba-1.2.0" = { name = "aproba"; packageName = "aproba"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"; - sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; "has-unicode-2.0.1" = { @@ -1921,13 +1921,13 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "aws-sign2-0.6.0" = { + "aws-sign2-0.7.0" = { name = "aws-sign2"; packageName = "aws-sign2"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; "aws4-1.6.0" = { @@ -1966,40 +1966,40 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-2.1.4" = { + "form-data-2.3.1" = { name = "form-data"; packageName = "form-data"; - version = "2.1.4"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; + sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; }; }; - "har-validator-4.2.1" = { + "har-validator-5.0.3" = { name = "har-validator"; packageName = "har-validator"; - version = "4.2.1"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; + sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "hawk-3.1.3" = { + "hawk-6.0.2" = { name = "hawk"; packageName = "hawk"; - version = "3.1.3"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; + sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; }; }; - "http-signature-1.1.1" = { + "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; "is-typedarray-1.0.0" = { @@ -2047,22 +2047,22 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "performance-now-0.2.0" = { + "performance-now-2.1.0" = { name = "performance-now"; packageName = "performance-now"; - version = "0.2.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "qs-6.4.0" = { + "qs-6.5.1" = { name = "qs"; packageName = "qs"; - version = "6.4.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; "stringstream-0.0.5" = { @@ -2119,22 +2119,22 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-4.11.8" = { + "ajv-5.2.2" = { name = "ajv"; packageName = "ajv"; - version = "4.11.8"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz"; + sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39"; }; }; - "har-schema-1.0.5" = { + "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; - version = "1.0.5"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; "co-4.6.0" = { @@ -2146,6 +2146,24 @@ let sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; + "fast-deep-equal-1.0.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; + sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + }; + }; + "json-schema-traverse-0.3.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + }; + }; "json-stable-stringify-1.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -2164,49 +2182,58 @@ let sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; - "hoek-2.16.3" = { + "hoek-4.2.0" = { name = "hoek"; packageName = "hoek"; - version = "2.16.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; + sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; }; }; - "boom-2.10.1" = { + "boom-4.3.1" = { name = "boom"; packageName = "boom"; - version = "2.10.1"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; + sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; }; }; - "cryptiles-2.0.5" = { + "cryptiles-3.1.2" = { name = "cryptiles"; packageName = "cryptiles"; - version = "2.0.5"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; + sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; }; }; - "sntp-1.0.9" = { + "sntp-2.0.2" = { name = "sntp"; packageName = "sntp"; - version = "1.0.9"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz"; + sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"; }; }; - "assert-plus-0.2.0" = { + "boom-5.2.0" = { + name = "boom"; + packageName = "boom"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; + }; + }; + "assert-plus-1.0.0" = { name = "assert-plus"; packageName = "assert-plus"; - version = "0.2.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; "jsprim-1.4.1" = { @@ -2227,15 +2254,6 @@ let sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -2398,13 +2416,13 @@ let sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; }; }; - "serve-favicon-2.4.3" = { + "serve-favicon-2.4.4" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.3.tgz"; - sha1 = "5986b17b0502642b641c21f818b1acce32025d23"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.4.tgz"; + sha1 = "412ddd74965151c9f74c0828f35d50c5250210de"; }; }; "strong-data-uri-1.0.4" = { @@ -2974,13 +2992,13 @@ let sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; - "content-type-1.0.2" = { + "content-type-1.0.4" = { name = "content-type"; packageName = "content-type"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"; - sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed"; + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; }; }; "cookie-0.3.1" = { @@ -3028,22 +3046,22 @@ let sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; }; - "etag-1.8.0" = { + "etag-1.8.1" = { name = "etag"; packageName = "etag"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz"; - sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "finalhandler-1.0.4" = { + "finalhandler-1.0.5" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz"; - sha512 = "2vbps6iw562i2zxd973z5mmbs8ggx3wbz4g1jqwvkjibiwrk9ym8bxcvvwnlmxqad92x120x5xz5nyfq68nd8akk355bkk0qjppzafp"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.5.tgz"; + sha1 = "a701303d257a1bc82fea547a33e5ae89531723df"; }; }; "fresh-0.5.0" = { @@ -3082,13 +3100,13 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; - "parseurl-1.3.1" = { + "parseurl-1.3.2" = { name = "parseurl"; packageName = "parseurl"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; - sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; + sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; }; }; "path-to-regexp-0.1.7" = { @@ -3217,13 +3235,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "forwarded-0.1.0" = { + "forwarded-0.1.2" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.0"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; "ipaddr.js-1.4.0" = { @@ -3289,13 +3307,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; + "fresh-0.5.1" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.1.tgz"; + sha1 = "c3a08bcec0fcdcc223edf3b23eb327f1f9fcbf5c"; }; }; "truncate-1.0.5" = { @@ -3316,13 +3334,13 @@ let sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46"; }; }; - "node-pre-gyp-0.6.36" = { + "node-pre-gyp-0.6.37" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.36"; + version = "0.6.37"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; - sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz"; + sha1 = "3c872b236b2e266e4140578fe1ee88f693323a05"; }; }; "nopt-4.0.1" = { @@ -3343,6 +3361,15 @@ let sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; }; }; + "tape-4.8.0" = { + name = "tape"; + packageName = "tape"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tape/-/tape-4.8.0.tgz"; + sha512 = "026x60jpvkdwfvbd6gls76zjj3yiqfz4cg9imi80r25zdziaiy87jkpw9mwbrbg9k2xc4nsn9yzk90pgkgybdspk0yb4fzg95y0nqjd"; + }; + }; "tar-pack-3.4.0" = { name = "tar-pack"; packageName = "tar-pack"; @@ -3352,6 +3379,177 @@ let sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984"; }; }; + "deep-equal-1.0.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + }; + "defined-1.0.0" = { + name = "defined"; + packageName = "defined"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + }; + }; + "for-each-0.3.2" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; + sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + }; + }; + "has-1.0.1" = { + name = "has"; + packageName = "has"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + }; + }; + "object-inspect-1.3.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.3.0.tgz"; + sha512 = "1302hkgbynr48i0h4n5psz3ln624f8516qh68kpah1ziczyg8vpyfxws5x6iazncaw5jgg9bp19pgbfl4n4gjb9z0z96pnd08pffw9q"; + }; + }; + "resumer-0.0.0" = { + name = "resumer"; + packageName = "resumer"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; + sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + }; + }; + "string.prototype.trim-1.1.2" = { + name = "string.prototype.trim"; + packageName = "string.prototype.trim"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; + sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "is-function-1.0.1" = { + name = "is-function"; + packageName = "is-function"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; + sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + }; + }; + "define-properties-1.1.2" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; + sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + }; + }; + "es-abstract-1.8.2" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.8.2.tgz"; + sha512 = "0cz5pzkb9xh1askig7mrv990raaa1pym6a8acyyjw405bnzdznck7q9qg2rcybwjq866i6226nq6mijn6kwg5n36r6hr3gjpla71y3n"; + }; + }; + "foreach-2.0.5" = { + name = "foreach"; + packageName = "foreach"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; + }; + }; + "object-keys-1.0.11" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; + sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; + }; + }; + "es-to-primitive-1.1.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; + sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + }; + }; + "is-callable-1.1.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; + sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + }; + }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-symbol-1.0.1" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; + sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + }; + }; "fstream-ignore-1.0.5" = { name = "fstream-ignore"; packageName = "fstream-ignore"; @@ -3487,6 +3685,15 @@ let sha1 = "5de60415bda071bb37127854c864f41b23254539"; }; }; + "aproba-1.1.2" = { + name = "aproba"; + packageName = "aproba"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"; + sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6"; + }; + }; "bluebird-3.5.0" = { name = "bluebird"; packageName = "bluebird"; @@ -3766,13 +3973,13 @@ let sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; }; }; - "npm-packlist-1.1.8" = { + "npm-packlist-1.1.9" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.8.tgz"; - sha512 = "3wbyrf8k8ziygg8lyaj5v0kfpw9mhz4an8hqznapf7n0g2ik02shn91607274zvvayl5zcgmfkf17yy4vgz67lsdjmhzwi8rmrzapv4"; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.9.tgz"; + sha512 = "1d1l5hasnw67hczgcwbc8534n1hgvx87hin1yr14yz70b4yzp06gfrj97lhh0qfmk5p1lqfrzajhs5wywx98hj75g00mqmir54050gm"; }; }; "npm-registry-client-8.4.0" = { @@ -3874,6 +4081,15 @@ let sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l"; }; }; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + }; + }; "retry-0.10.1" = { name = "retry"; packageName = "retry"; @@ -4000,13 +4216,13 @@ let sha512 = "2lrlysxfbyzywla6i1q07xncmw30w1icgq18c4bra25dl6wvcd3mxg1lqbf88w5h7mqnf98j8ll657wnqwjq9rwd7pbmd9i11964x0c"; }; }; - "write-file-atomic-2.3.0" = { + "write-file-atomic-2.1.0" = { name = "write-file-atomic"; packageName = "write-file-atomic"; - version = "2.3.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; - sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; + sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni"; }; }; "debuglog-1.0.1" = { @@ -4081,15 +4297,6 @@ let sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; }; }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - }; "wcwidth-1.0.1" = { name = "wcwidth"; packageName = "wcwidth"; @@ -4675,13 +4882,13 @@ let sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw"; }; }; - "socks-proxy-agent-3.0.0" = { + "socks-proxy-agent-3.0.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz"; - sha512 = "3zn9cz2ry5m1akapj7hvhgkxfq7ffwynia46lmwipsw2jk5sv8dvs32dc4hfx3xvp34i1jff1bg870a1xnknsgk5dl021jd4gwi75v0"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; + sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7"; }; }; "humanize-ms-1.2.1" = { @@ -4738,13 +4945,13 @@ let sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967"; }; }; - "iconv-lite-0.4.18" = { + "iconv-lite-0.4.19" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.18"; + version = "0.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; - sha512 = "2l97vd6kax8syr9aggcqhiyhd3b2rf506wdq6wapfrc74qwpdzqf2a3891kq9ri3g5sdzayph2sz4zkr8kbbps58z9h2lvpk115kgdj"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; "socks-1.1.10" = { @@ -4819,6 +5026,132 @@ let sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; }; }; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + }; + "form-data-2.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + }; + }; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + }; + }; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + }; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + }; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + }; + }; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + }; + }; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + }; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + }; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + }; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + }; "from2-1.3.0" = { name = "from2"; packageName = "from2"; @@ -5844,7 +6177,7 @@ in sources."array-differ-1.0.0" sources."array-uniq-1.0.3" sources."beeper-1.1.1" - sources."dateformat-2.0.0" + sources."dateformat-2.2.0" (sources."fancy-log-1.3.0" // { dependencies = [ sources."time-stamp-1.1.0" @@ -5931,7 +6264,7 @@ in }) ]; }) - sources."interpret-1.0.3" + sources."interpret-1.0.4" (sources."liftoff-2.3.0" // { dependencies = [ sources."extend-3.0.1" @@ -6360,7 +6693,7 @@ in sources."console-control-strings-1.1.0" (sources."gauge-2.7.4" // { dependencies = [ - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -6391,9 +6724,9 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."request-2.81.0" // { + (sources."request-2.82.0" // { dependencies = [ - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { @@ -6403,16 +6736,18 @@ in }) sources."extend-3.0.1" sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { + (sources."form-data-2.3.1" // { dependencies = [ sources."asynckit-0.4.0" ]; }) - (sources."har-validator-4.2.1" // { + (sources."har-validator-5.0.3" // { dependencies = [ - (sources."ajv-4.11.8" // { + (sources."ajv-5.2.2" // { dependencies = [ sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" (sources."json-stable-stringify-1.0.1" // { dependencies = [ sources."jsonify-0.0.0" @@ -6420,23 +6755,26 @@ in }) ]; }) - sources."har-schema-1.0.5" + sources."har-schema-2.0.0" ]; }) - (sources."hawk-3.1.3" // { + (sources."hawk-6.0.2" // { dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" ]; }) - (sources."http-signature-1.1.1" // { + (sources."http-signature-1.2.0" // { dependencies = [ - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" (sources."jsprim-1.4.1" // { dependencies = [ - sources."assert-plus-1.0.0" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" (sources."verror-1.10.0" // { @@ -6449,7 +6787,6 @@ in (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" - sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.7" sources."jsbn-0.1.1" @@ -6469,8 +6806,8 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { @@ -6482,7 +6819,7 @@ in sources."uuid-3.1.0" ]; }) - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."semver-5.3.0" (sources."tar-2.2.1" // { dependencies = [ @@ -6713,14 +7050,14 @@ in }) sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" - sources."content-type-1.0.2" + sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" - (sources."finalhandler-1.0.4" // { + sources."etag-1.8.1" + (sources."finalhandler-1.0.5" // { dependencies = [ sources."unpipe-1.0.0" ]; @@ -6733,11 +7070,11 @@ in sources."ee-first-1.1.1" ]; }) - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" (sources."proxy-addr-1.1.5" // { dependencies = [ - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" ]; }) @@ -6807,13 +7144,13 @@ in ]; }) sources."semver-4.3.6" - (sources."serve-favicon-2.4.3" // { + (sources."serve-favicon-2.4.4" // { dependencies = [ - sources."etag-1.8.0" - sources."fresh-0.5.0" + sources."etag-1.8.1" + sources."fresh-0.5.1" sources."ms-2.0.0" - sources."parseurl-1.3.1" - sources."safe-buffer-5.0.1" + sources."parseurl-1.3.2" + sources."safe-buffer-5.1.1" ]; }) (sources."strong-data-uri-1.0.4" // { @@ -6824,7 +7161,7 @@ in (sources."v8-debug-1.0.1" // { dependencies = [ sources."nan-2.7.0" - (sources."node-pre-gyp-0.6.36" // { + (sources."node-pre-gyp-0.6.37" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -6863,7 +7200,7 @@ in sources."console-control-strings-1.1.0" (sources."gauge-2.7.4" // { dependencies = [ - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -6888,9 +7225,9 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.81.0" // { + (sources."request-2.82.0" // { dependencies = [ - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { @@ -6900,16 +7237,18 @@ in }) sources."extend-3.0.1" sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { + (sources."form-data-2.3.1" // { dependencies = [ sources."asynckit-0.4.0" ]; }) - (sources."har-validator-4.2.1" // { + (sources."har-validator-5.0.3" // { dependencies = [ - (sources."ajv-4.11.8" // { + (sources."ajv-5.2.2" // { dependencies = [ sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" (sources."json-stable-stringify-1.0.1" // { dependencies = [ sources."jsonify-0.0.0" @@ -6917,23 +7256,26 @@ in }) ]; }) - sources."har-schema-1.0.5" + sources."har-schema-2.0.0" ]; }) - (sources."hawk-3.1.3" // { + (sources."hawk-6.0.2" // { dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" ]; }) - (sources."http-signature-1.1.1" // { + (sources."http-signature-1.2.0" // { dependencies = [ - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" (sources."jsprim-1.4.1" // { dependencies = [ - sources."assert-plus-1.0.0" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" (sources."verror-1.10.0" // { @@ -6946,7 +7288,6 @@ in (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" - sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.7" sources."jsbn-0.1.1" @@ -6966,8 +7307,8 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { @@ -6979,7 +7320,7 @@ in sources."uuid-3.1.0" ]; }) - (sources."rimraf-2.6.1" // { + (sources."rimraf-2.6.2" // { dependencies = [ (sources."glob-7.1.2" // { dependencies = [ @@ -7010,6 +7351,76 @@ in ]; }) sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + (sources."for-each-0.3.2" // { + dependencies = [ + sources."is-function-1.0.1" + ]; + }) + sources."function-bind-1.1.1" + (sources."glob-7.1.2" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + (sources."minimatch-3.0.4" // { + dependencies = [ + (sources."brace-expansion-1.1.8" // { + dependencies = [ + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + ]; + }) + sources."has-1.0.1" + sources."inherits-2.0.3" + sources."minimist-1.2.0" + sources."object-inspect-1.3.0" + (sources."resolve-1.4.0" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) + sources."resumer-0.0.0" + (sources."string.prototype.trim-1.1.2" // { + dependencies = [ + (sources."define-properties-1.1.2" // { + dependencies = [ + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + ]; + }) + (sources."es-abstract-1.8.2" // { + dependencies = [ + (sources."es-to-primitive-1.1.1" // { + dependencies = [ + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" + ]; + }) + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + ]; + }) + ]; + }) + sources."through-2.3.8" + ]; + }) (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7070,7 +7481,7 @@ in (sources."v8-profiler-5.7.0" // { dependencies = [ sources."nan-2.7.0" - (sources."node-pre-gyp-0.6.36" // { + (sources."node-pre-gyp-0.6.37" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -7109,7 +7520,7 @@ in sources."console-control-strings-1.1.0" (sources."gauge-2.7.4" // { dependencies = [ - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -7134,9 +7545,9 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.81.0" // { + (sources."request-2.82.0" // { dependencies = [ - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { @@ -7146,16 +7557,18 @@ in }) sources."extend-3.0.1" sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { + (sources."form-data-2.3.1" // { dependencies = [ sources."asynckit-0.4.0" ]; }) - (sources."har-validator-4.2.1" // { + (sources."har-validator-5.0.3" // { dependencies = [ - (sources."ajv-4.11.8" // { + (sources."ajv-5.2.2" // { dependencies = [ sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" (sources."json-stable-stringify-1.0.1" // { dependencies = [ sources."jsonify-0.0.0" @@ -7163,23 +7576,26 @@ in }) ]; }) - sources."har-schema-1.0.5" + sources."har-schema-2.0.0" ]; }) - (sources."hawk-3.1.3" // { + (sources."hawk-6.0.2" // { dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" ]; }) - (sources."http-signature-1.1.1" // { + (sources."http-signature-1.2.0" // { dependencies = [ - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" (sources."jsprim-1.4.1" // { dependencies = [ - sources."assert-plus-1.0.0" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" (sources."verror-1.10.0" // { @@ -7192,7 +7608,6 @@ in (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" - sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.7" sources."jsbn-0.1.1" @@ -7212,8 +7627,8 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { @@ -7225,7 +7640,7 @@ in sources."uuid-3.1.0" ]; }) - (sources."rimraf-2.6.1" // { + (sources."rimraf-2.6.2" // { dependencies = [ (sources."glob-7.1.2" // { dependencies = [ @@ -7256,6 +7671,76 @@ in ]; }) sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + (sources."for-each-0.3.2" // { + dependencies = [ + sources."is-function-1.0.1" + ]; + }) + sources."function-bind-1.1.1" + (sources."glob-7.1.2" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + (sources."minimatch-3.0.4" // { + dependencies = [ + (sources."brace-expansion-1.1.8" // { + dependencies = [ + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + ]; + }) + sources."has-1.0.1" + sources."inherits-2.0.3" + sources."minimist-1.2.0" + sources."object-inspect-1.3.0" + (sources."resolve-1.4.0" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) + sources."resumer-0.0.0" + (sources."string.prototype.trim-1.1.2" // { + dependencies = [ + (sources."define-properties-1.1.2" // { + dependencies = [ + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + ]; + }) + (sources."es-abstract-1.8.2" // { + dependencies = [ + (sources."es-to-primitive-1.1.1" // { + dependencies = [ + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" + ]; + }) + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + ]; + }) + ]; + }) + sources."through-2.3.8" + ]; + }) (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7377,10 +7862,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.36"; + version = "0.6.37"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; - sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz"; + sha1 = "3c872b236b2e266e4140578fe1ee88f693323a05"; }; dependencies = [ (sources."mkdirp-0.5.1" // { @@ -7420,7 +7905,7 @@ in sources."console-control-strings-1.1.0" (sources."gauge-2.7.4" // { dependencies = [ - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -7453,9 +7938,9 @@ in sources."strip-json-comments-2.0.1" ]; }) - (sources."request-2.81.0" // { + (sources."request-2.82.0" // { dependencies = [ - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { @@ -7465,16 +7950,18 @@ in }) sources."extend-3.0.1" sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { + (sources."form-data-2.3.1" // { dependencies = [ sources."asynckit-0.4.0" ]; }) - (sources."har-validator-4.2.1" // { + (sources."har-validator-5.0.3" // { dependencies = [ - (sources."ajv-4.11.8" // { + (sources."ajv-5.2.2" // { dependencies = [ sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" (sources."json-stable-stringify-1.0.1" // { dependencies = [ sources."jsonify-0.0.0" @@ -7482,23 +7969,26 @@ in }) ]; }) - sources."har-schema-1.0.5" + sources."har-schema-2.0.0" ]; }) - (sources."hawk-3.1.3" // { + (sources."hawk-6.0.2" // { dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" ]; }) - (sources."http-signature-1.1.1" // { + (sources."http-signature-1.2.0" // { dependencies = [ - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" (sources."jsprim-1.4.1" // { dependencies = [ - sources."assert-plus-1.0.0" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" (sources."verror-1.10.0" // { @@ -7511,7 +8001,6 @@ in (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" - sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.7" sources."jsbn-0.1.1" @@ -7531,8 +8020,8 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { @@ -7544,7 +8033,7 @@ in sources."uuid-3.1.0" ]; }) - (sources."rimraf-2.6.1" // { + (sources."rimraf-2.6.2" // { dependencies = [ (sources."glob-7.1.2" // { dependencies = [ @@ -7576,6 +8065,77 @@ in ]; }) sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + (sources."for-each-0.3.2" // { + dependencies = [ + sources."is-function-1.0.1" + ]; + }) + sources."function-bind-1.1.1" + (sources."glob-7.1.2" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + (sources."minimatch-3.0.4" // { + dependencies = [ + (sources."brace-expansion-1.1.8" // { + dependencies = [ + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + sources."has-1.0.1" + sources."inherits-2.0.3" + sources."minimist-1.2.0" + sources."object-inspect-1.3.0" + (sources."resolve-1.4.0" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) + sources."resumer-0.0.0" + (sources."string.prototype.trim-1.1.2" // { + dependencies = [ + (sources."define-properties-1.1.2" // { + dependencies = [ + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + ]; + }) + (sources."es-abstract-1.8.2" // { + dependencies = [ + (sources."es-to-primitive-1.1.1" // { + dependencies = [ + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" + ]; + }) + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + ]; + }) + ]; + }) + sources."through-2.3.8" + ]; + }) (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7646,10 +8206,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.4.1.tgz"; - sha512 = "0vb3ad2wgv4y52jwbz8xpzg36hzimbbnlad594kblfq2mjfnaw9v4zzgd19ghan4a622s4zcrap51l2fww79lbl6n2qfv26allyg26z"; + url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz"; + sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -7955,7 +8515,7 @@ in sources."npm-install-checks-3.0.0" sources."npm-lifecycle-1.0.3" sources."npm-package-arg-5.1.2" - (sources."npm-packlist-1.1.8" // { + (sources."npm-packlist-1.1.9" // { dependencies = [ (sources."ignore-walk-3.0.0" // { dependencies = [ @@ -8079,13 +8639,13 @@ in dependencies = [ (sources."encoding-0.1.12" // { dependencies = [ - sources."iconv-lite-0.4.18" + sources."iconv-lite-0.4.19" ]; }) sources."json-parse-better-errors-1.0.1" ]; }) - (sources."socks-proxy-agent-3.0.0" // { + (sources."socks-proxy-agent-3.0.1" // { dependencies = [ (sources."agent-base-4.1.1" // { dependencies = [ @@ -8248,7 +8808,7 @@ in ]; }) sources."retry-0.10.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."semver-5.4.1" sources."sha-2.0.1" @@ -8487,11 +9047,7 @@ in ]; }) sources."wrappy-1.0.2" - (sources."write-file-atomic-2.3.0" // { - dependencies = [ - sources."signal-exit-3.0.2" - ]; - }) + sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 1ba3e0de1dd..b9373b82edf 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -65,6 +65,7 @@ , "peerflix-server" , "phantomjs" , "prettier" +, "pulp" , "react-tools" , "s3http" , "semver" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 1d2d629e01c..1bdde35c226 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -4,6 +4,69 @@ let sources = { + "async-2.5.0" = { + name = "async"; + packageName = "async"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; + sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv"; + }; + }; + "babel-core-6.26.0" = { + name = "babel-core"; + packageName = "babel-core"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; + sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; + }; + }; + "babel-generator-6.26.0" = { + name = "babel-generator"; + packageName = "babel-generator"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz"; + sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5"; + }; + }; + "babel-traverse-6.26.0" = { + name = "babel-traverse"; + packageName = "babel-traverse"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; + sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; + }; + }; + "babel-types-6.26.0" = { + name = "babel-types"; + packageName = "babel-types"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"; + sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; + }; + }; + "babylon-6.18.0" = { + name = "babylon"; + packageName = "babylon"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; + sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; + }; + }; + "chmodr-1.0.2" = { + name = "chmodr"; + packageName = "chmodr"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"; + sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9"; + }; + }; "colors-0.6.0-1" = { name = "colors"; packageName = "colors"; @@ -13,24 +76,6 @@ let sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; }; }; - "ejs-2.3.4" = { - name = "ejs"; - packageName = "ejs"; - version = "2.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz"; - sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98"; - }; - }; - "pkginfo-0.2.2" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; - sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; - }; - }; "commander-0.6.1" = { name = "commander"; packageName = "commander"; @@ -40,49 +85,31 @@ let sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }; }; - "wrench-1.3.9" = { - name = "wrench"; - packageName = "wrench"; - version = "1.3.9"; + "deasync-0.1.10" = { + name = "deasync"; + packageName = "deasync"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz"; - sha1 = "6f13ec35145317eb292ca5f6531391b244111411"; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.10.tgz"; + sha1 = "4e4a6836fbe0477bd5f908308bd2a96557d5d7fe"; }; }; - "xmldom-0.1.19" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.19"; + "ejs-2.3.4" = { + name = "ejs"; + packageName = "ejs"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; - sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; + url = "https://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz"; + sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98"; }; }; - "jsonlint-1.5.1" = { - name = "jsonlint"; - packageName = "jsonlint"; - version = "1.5.1"; + "fs-extra-3.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.5.1.tgz"; - sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; - }; - }; - "uglify-js-2.6.1" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; - sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; - }; - }; - "resolve-1.4.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"; - sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; }; }; "global-paths-0.1.2" = { @@ -94,22 +121,13 @@ let sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299"; }; }; - "source-map-0.1.9" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.9"; + "jsonlint-1.5.1" = { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; - sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; - }; - }; - "xml2tss-0.0.5" = { - name = "xml2tss"; - packageName = "xml2tss"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; - sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.5.1.tgz"; + sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; }; }; "moment-2.17.1" = { @@ -130,76 +148,184 @@ let sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f"; }; }; - "nomnom-1.8.1" = { - name = "nomnom"; - packageName = "nomnom"; - version = "1.8.1"; + "pkginfo-0.2.2" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; - sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; + sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; }; }; - "JSV-4.0.2" = { - name = "JSV"; - packageName = "JSV"; - version = "4.0.2"; + "resolve-1.4.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"; - sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"; + sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9"; }; }; - "underscore-1.6.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.6.0"; + "source-map-0.1.9" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; + sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; }; }; - "chalk-0.4.0" = { - name = "chalk"; - packageName = "chalk"; - version = "0.4.0"; + "walk-sync-0.3.2" = { + name = "walk-sync"; + packageName = "walk-sync"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; + url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz"; + sha512 = "2cycfx3lc52h2684s54pd81wz42f9lbggff4yva194nzr5x8nxp4fl437scd2dayyvxk68v8jmk1k8m364zdh5wmaff1a2bm9b7kh0l"; }; }; - "has-color-0.1.7" = { - name = "has-color"; - packageName = "has-color"; + "xml2tss-0.0.5" = { + name = "xml2tss"; + packageName = "xml2tss"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; + sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; + }; + }; + "xmldom-0.1.19" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.19"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; + sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; + }; + }; + "lodash-4.17.4" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; + sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + }; + }; + "babel-code-frame-6.26.0" = { + name = "babel-code-frame"; + packageName = "babel-code-frame"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + }; + }; + "babel-helpers-6.24.1" = { + name = "babel-helpers"; + packageName = "babel-helpers"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; + sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; + }; + }; + "babel-messages-6.23.0" = { + name = "babel-messages"; + packageName = "babel-messages"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; + }; + }; + "babel-register-6.26.0" = { + name = "babel-register"; + packageName = "babel-register"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; + sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; + }; + }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + }; + "babel-template-6.26.0" = { + name = "babel-template"; + packageName = "babel-template"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; + sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; + }; + }; + "convert-source-map-1.5.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; + sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; + }; + }; + "debug-2.6.8" = { + name = "debug"; + packageName = "debug"; + version = "2.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; + sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; + }; + }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "private-0.1.7" = { + name = "private"; + packageName = "private"; version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; - sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; + url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; + sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "ansi-styles-1.0.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; - sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; - }; - }; - "strip-ansi-0.1.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; - sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; - }; - }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; }; }; "source-map-0.5.7" = { @@ -211,148 +337,328 @@ let sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; }; }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; }; }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; + "js-tokens-3.0.2" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; }; }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "is-buffer-1.1.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; - }; - }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "core-js-2.5.1" = { + name = "core-js"; + packageName = "core-js"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz"; + sha1 = "ae6874dc66937789b80754ff5428df66819ca50b"; + }; + }; + "home-or-tmp-2.0.0" = { + name = "home-or-tmp"; + packageName = "home-or-tmp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; + sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "source-map-support-0.4.18" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; + sha512 = "1n37icn5xpsxs2x8szv6ifajjf066fskm04xn6agr79sid57n0yws4n0cis7m9q5hr0hxzr8dv2fnmmpgb4mvz8kiyv2g5ikbyb9g5n"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "regenerator-runtime-0.11.0" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"; + sha512 = "3a1pn2aankj443h5v8png8dbgrlyb7fcdn66vjglxwqvdpivpq959qsl2n44i6zwf1k5y6y23xwhim0x077yy275dyr6vwiny83987x"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "brace-expansion-1.1.8" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "detect-indent-4.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + }; + }; + "jsesc-1.3.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + }; + }; + "trim-right-1.0.1" = { + name = "trim-right"; + packageName = "trim-right"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "globals-9.18.0" = { + name = "globals"; + packageName = "globals"; + version = "9.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab"; + }; + }; + "invariant-2.2.2" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; + sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + }; + }; + "loose-envify-1.3.1" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; + }; + }; + "to-fast-properties-1.0.3" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; + sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; + }; + }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; + "nan-2.7.0" = { + name = "nan"; + packageName = "nan"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz"; + sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46"; + }; + }; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + }; + }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; + "universalify-0.1.1" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"; + sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7"; }; }; "array-unique-0.2.1" = { @@ -445,6 +751,87 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; + "nomnom-1.8.1" = { + name = "nomnom"; + packageName = "nomnom"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; + sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; + }; + }; + "JSV-4.0.2" = { + name = "JSV"; + packageName = "JSV"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"; + sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; + }; + }; + "underscore-1.6.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + }; + }; + "chalk-0.4.0" = { + name = "chalk"; + packageName = "chalk"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; + }; + }; + "has-color-0.1.7" = { + name = "has-color"; + packageName = "has-color"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; + sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; + }; + }; + "ansi-styles-1.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; + sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; + }; + }; + "strip-ansi-0.1.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; + sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; + }; + }; + "is-0.3.0" = { + name = "is"; + packageName = "is"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; + sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; + }; + }; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + }; + }; "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; @@ -454,6 +841,24 @@ let sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; + "ensure-posix-path-1.0.2" = { + name = "ensure-posix-path"; + packageName = "ensure-posix-path"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz"; + sha1 = "a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"; + }; + }; + "matcher-collection-1.0.5" = { + name = "matcher-collection"; + packageName = "matcher-collection"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz"; + sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x"; + }; + }; "xml2js-0.2.8" = { name = "xml2js"; packageName = "xml2js"; @@ -472,15 +877,6 @@ let sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }; }; - "is-0.3.0" = { - name = "is"; - packageName = "is"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; - sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; - }; - }; "adal-node-0.1.21" = { name = "adal-node"; packageName = "adal-node"; @@ -1012,13 +1408,13 @@ let sha1 = "be191c4fbdff2e208bda440933436af80e7425b9"; }; }; - "ms-rest-azure-2.3.0" = { + "ms-rest-azure-2.3.1" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.3.0.tgz"; - sha1 = "526b4c39a3c02e50913b92787a9e95ce833b37f1"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.3.1.tgz"; + sha1 = "25f2c6bdc721ec41187606b8d71a7b6090dc708e"; }; }; "node-forge-0.6.23" = { @@ -1183,6 +1579,15 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -1615,13 +2020,13 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "@types/node-8.0.27" = { + "@types/node-8.0.28" = { name = "@types/node"; packageName = "@types/node"; - version = "8.0.27"; + version = "8.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.0.27.tgz"; - sha512 = "26y8ngdixrwyzyas9bbb4cq9gpb2mawnp4j94vi035hzajrskcp48nm90pcx1ma0gv5x8qkibskyjqpvmsn62x8qd7djzks63jrs8rj"; + url = "https://registry.npmjs.org/@types/node/-/node-8.0.28.tgz"; + sha512 = "2wlavwh38262crr2wm0zhzgp1ibkd2wy2hpmby0xr218k36vls3gdbya0848wx6r51hs1mbly8k8f3aby4xsarp9g5fvp1gf4an9shy"; }; }; "@types/request-2.0.3" = { @@ -1642,6 +2047,15 @@ let sha512 = "2k89p1xsllidfwgic0qklzdp1lpvyzw22z7xlphii062jm6rh58xajz11r4lby49kghc5zrmmqrsi1mkmzm6ix8x3rhcrj1rnixhykx"; }; }; + "is-buffer-1.1.5" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; + }; + }; "is-stream-1.1.0" = { name = "is-stream"; packageName = "is-stream"; @@ -1714,6 +2128,15 @@ let sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; }; }; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + }; "deep-equal-1.0.1" = { name = "deep-equal"; packageName = "deep-equal"; @@ -1732,15 +2155,6 @@ let sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; }; }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -1750,22 +2164,13 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "rimraf-2.6.1" = { + "rimraf-2.6.2" = { name = "rimraf"; packageName = "rimraf"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"; - sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; "glob-7.1.2" = { @@ -1795,15 +2200,6 @@ let sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -1813,15 +2209,6 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -1831,33 +2218,6 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; "colors-0.6.2" = { name = "colors"; packageName = "colors"; @@ -2083,33 +2443,6 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.5.0" = { - name = "async"; - packageName = "async"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; - sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv"; - }; - }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; "commander-2.11.0" = { name = "commander"; packageName = "commander"; @@ -2137,60 +2470,6 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; "generate-function-2.0.0" = { name = "generate-function"; packageName = "generate-function"; @@ -2551,15 +2830,6 @@ let sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; "async-1.0.0" = { name = "async"; packageName = "async"; @@ -2596,13 +2866,13 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "bower-1.8.0" = { + "bower-1.8.2" = { name = "bower"; packageName = "bower"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; - sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; + sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; }; }; "bower-endpoint-parser-0.2.1" = { @@ -2776,6 +3046,15 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -2992,15 +3271,6 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; "parse-json-2.2.0" = { name = "parse-json"; packageName = "parse-json"; @@ -3073,33 +3343,6 @@ let sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; }; }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -3163,33 +3406,6 @@ let sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"; }; }; - "debug-2.6.8" = { - name = "debug"; - packageName = "debug"; - version = "2.6.8"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; - sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -3721,13 +3937,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.13" = { + "pbkdf2-3.0.14" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.13"; + version = "3.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz"; - sha512 = "3crgpf13g3zshm39jjfgnp4lfg5jilllwk6ixi07nzyf4yghmxrhrdmhsgr5jr855ma790a21hd4bcvpx8bv9h5irnk6xpy6728gl7r"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; + sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; }; }; "public-encrypt-4.0.0" = { @@ -6232,13 +6448,13 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "interpret-1.0.3" = { + "interpret-1.0.4" = { name = "interpret"; packageName = "interpret"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz"; - sha1 = "cbc35c62eeee73f19ab7b10a801511401afc0f90"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz"; + sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0"; }; }; "rechoir-0.6.2" = { @@ -6367,13 +6583,13 @@ let sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; - "content-type-1.0.2" = { + "content-type-1.0.4" = { name = "content-type"; packageName = "content-type"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"; - sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed"; + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; }; }; "cookie-0.3.1" = { @@ -6421,22 +6637,22 @@ let sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; }; - "etag-1.8.0" = { + "etag-1.8.1" = { name = "etag"; packageName = "etag"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz"; - sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "finalhandler-1.0.4" = { + "finalhandler-1.0.5" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz"; - sha512 = "2vbps6iw562i2zxd973z5mmbs8ggx3wbz4g1jqwvkjibiwrk9ym8bxcvvwnlmxqad92x120x5xz5nyfq68nd8akk355bkk0qjppzafp"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.5.tgz"; + sha1 = "a701303d257a1bc82fea547a33e5ae89531723df"; }; }; "fresh-0.5.0" = { @@ -6475,13 +6691,13 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; - "parseurl-1.3.1" = { + "parseurl-1.3.2" = { name = "parseurl"; packageName = "parseurl"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; - sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; + sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; }; }; "path-to-regexp-0.1.7" = { @@ -6583,13 +6799,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "forwarded-0.1.0" = { + "forwarded-0.1.2" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.0"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; "ipaddr.js-1.4.0" = { @@ -6691,15 +6907,6 @@ let sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967"; }; }; - "slash-1.0.0" = { - name = "slash"; - packageName = "slash"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; - }; - }; "builtins-1.0.3" = { name = "builtins"; packageName = "builtins"; @@ -6781,15 +6988,6 @@ let sha1 = "e6ea67bd247e107112983b7ab0479ed362800081"; }; }; - "chmodr-1.0.2" = { - name = "chmodr"; - packageName = "chmodr"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"; - sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9"; - }; - }; "chownr-1.0.1" = { name = "chownr"; packageName = "chownr"; @@ -8186,15 +8384,6 @@ let sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; }; }; - "nan-2.7.0" = { - name = "nan"; - packageName = "nan"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz"; - sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46"; - }; - }; "jsonparse-0.0.6" = { name = "jsonparse"; packageName = "jsonparse"; @@ -8258,22 +8447,31 @@ let sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; }; }; - "websocket-driver-0.6.5" = { + "websocket-driver-0.7.0" = { name = "websocket-driver"; packageName = "websocket-driver"; - version = "0.6.5"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz"; + sha1 = "0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"; }; }; - "websocket-extensions-0.1.1" = { + "http-parser-js-0.4.7" = { + name = "http-parser-js"; + packageName = "http-parser-js"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.7.tgz"; + sha1 = "1cecc9c4ce845c0288224d8844854c1ef08c9ad7"; + }; + }; + "websocket-extensions-0.1.2" = { name = "websocket-extensions"; packageName = "websocket-extensions"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; - sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz"; + sha1 = "0e18781de629a18308ce1481650f67ffa2693a5d"; }; }; "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { @@ -8675,13 +8873,13 @@ let sha1 = "9500635e257945d6feede185f5d7a24773455b17"; }; }; - "pull-stream-3.6.0" = { + "pull-stream-3.6.1" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.0.tgz"; - sha1 = "59d033a6815d4e3097d47c3d2b1893a9e58a2351"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.1.tgz"; + sha1 = "c5c2ae4a51246efeebcc65c0412a3d725a92ce00"; }; }; "typewiselite-1.0.0" = { @@ -8846,15 +9044,6 @@ let sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; - "bindings-1.2.1" = { - name = "bindings"; - packageName = "bindings"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - }; "nan-2.1.0" = { name = "nan"; packageName = "nan"; @@ -8918,22 +9107,22 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.110.0" = { + "aws-sdk-2.120.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.110.0"; + version = "2.120.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.110.0.tgz"; - sha1 = "ef3a88b08e8100d984c307108e0617a56eb74fdb"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.120.0.tgz"; + sha1 = "44857ecb476936fce891850ff27a502210814fb6"; }; }; - "request-2.81.0" = { + "request-2.82.0" = { name = "request"; packageName = "request"; - version = "2.81.0"; + version = "2.82.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + url = "https://registry.npmjs.org/request/-/request-2.82.0.tgz"; + sha512 = "079947pnxi0h8jdiv5wb64rj3gnq4a02dfj47c41wsdi3g6pp1v3yfg3m1rphib7igf6vkisrgjq16vc4fq916fc870wzckdizal1gx"; }; }; "crypto-browserify-1.0.9" = { @@ -8990,6 +9179,15 @@ let sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; }; }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -8999,31 +9197,58 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "har-validator-4.2.1" = { + "form-data-2.3.1" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; + sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; + }; + }; + "har-validator-5.0.3" = { name = "har-validator"; packageName = "har-validator"; - version = "4.2.1"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; + sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "performance-now-0.2.0" = { + "hawk-6.0.2" = { + name = "hawk"; + packageName = "hawk"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; + sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "performance-now-2.1.0" = { name = "performance-now"; packageName = "performance-now"; - version = "0.2.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "qs-6.4.0" = { + "qs-6.5.1" = { name = "qs"; packageName = "qs"; - version = "6.4.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; "tunnel-agent-0.6.0" = { @@ -9035,22 +9260,22 @@ let sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; - "ajv-4.11.8" = { + "ajv-5.2.2" = { name = "ajv"; packageName = "ajv"; - version = "4.11.8"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz"; + sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39"; }; }; - "har-schema-1.0.5" = { + "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; - version = "1.0.5"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; "co-4.6.0" = { @@ -9062,6 +9287,24 @@ let sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; + "fast-deep-equal-1.0.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; + sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + }; + }; + "json-schema-traverse-0.3.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + }; + }; "json-stable-stringify-1.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -9071,6 +9314,51 @@ let sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; + "hoek-4.2.0" = { + name = "hoek"; + packageName = "hoek"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; + sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; + }; + }; + "boom-4.3.1" = { + name = "boom"; + packageName = "boom"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; + sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; + }; + }; + "cryptiles-3.1.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; + sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; + }; + }; + "sntp-2.0.2" = { + name = "sntp"; + packageName = "sntp"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz"; + sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"; + }; + }; + "boom-5.2.0" = { + name = "boom"; + packageName = "boom"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; + }; + }; "auto-bind-1.1.0" = { name = "auto-bind"; packageName = "auto-bind"; @@ -9089,13 +9377,13 @@ let sha1 = "51b17574fc682588e2dd295cfa6e6aa109eab5ee"; }; }; - "conf-1.2.0" = { + "conf-1.3.0" = { name = "conf"; packageName = "conf"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-1.2.0.tgz"; - sha512 = "1sxfpzqlcpjj6cndz2h78xa9y8z5k9hw7nb7d1whd0044l78b2dqs93k9bfksqbn6s7vp472rk4w3qgggn58mraycs143pr6hh1zszl"; + url = "https://registry.npmjs.org/conf/-/conf-1.3.0.tgz"; + sha512 = "21wa83v253mikyav1r639cnmycyribfhr6d4kzmzhgcs8l1ahn6mb37lmr3wnzjrca53f52w30p5ccxhm58zh1lmr01naf0kb3fc2qh"; }; }; "got-7.1.0" = { @@ -9458,15 +9746,6 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "babel-core-6.26.0" = { - name = "babel-core"; - packageName = "babel-core"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; - sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; - }; - }; "babel-plugin-transform-es2015-destructuring-6.23.0" = { name = "babel-plugin-transform-es2015-destructuring"; packageName = "babel-plugin-transform-es2015-destructuring"; @@ -9521,240 +9800,6 @@ let sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; }; }; - "babel-code-frame-6.26.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; - }; - }; - "babel-generator-6.26.0" = { - name = "babel-generator"; - packageName = "babel-generator"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz"; - sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5"; - }; - }; - "babel-helpers-6.24.1" = { - name = "babel-helpers"; - packageName = "babel-helpers"; - version = "6.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; - sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; - }; - }; - "babel-messages-6.23.0" = { - name = "babel-messages"; - packageName = "babel-messages"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; - }; - }; - "babel-register-6.26.0" = { - name = "babel-register"; - packageName = "babel-register"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; - sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; - }; - }; - "babel-runtime-6.26.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; - }; - }; - "babel-template-6.26.0" = { - name = "babel-template"; - packageName = "babel-template"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; - sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; - }; - }; - "babel-traverse-6.26.0" = { - name = "babel-traverse"; - packageName = "babel-traverse"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; - sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; - }; - }; - "babel-types-6.26.0" = { - name = "babel-types"; - packageName = "babel-types"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"; - sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; - }; - }; - "babylon-6.18.0" = { - name = "babylon"; - packageName = "babylon"; - version = "6.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; - sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; - }; - }; - "convert-source-map-1.5.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; - sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; - }; - }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; - "private-0.1.7" = { - name = "private"; - packageName = "private"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; - sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; - }; - }; - "esutils-2.0.2" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; - }; - }; - "js-tokens-3.0.2" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "9866df395102130e38f7f996bceb65443209c25b"; - }; - }; - "detect-indent-4.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; - }; - }; - "jsesc-1.3.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; - }; - }; - "trim-right-1.0.1" = { - name = "trim-right"; - packageName = "trim-right"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - }; - "core-js-2.5.1" = { - name = "core-js"; - packageName = "core-js"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz"; - sha1 = "ae6874dc66937789b80754ff5428df66819ca50b"; - }; - }; - "home-or-tmp-2.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; - sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; - }; - }; - "source-map-support-0.4.17" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.17"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.17.tgz"; - sha512 = "170xri02n6vla7f8xny3qcmnmf533i535i5k2as1nzcpsb36f6s0laj95k11h2jhc97lf9zsp8y7dmmkxwfgdh02xs3ajh53w53aiyz"; - }; - }; - "regenerator-runtime-0.11.0" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"; - sha512 = "3a1pn2aankj443h5v8png8dbgrlyb7fcdn66vjglxwqvdpivpq959qsl2n44i6zwf1k5y6y23xwhim0x077yy275dyr6vwiny83987x"; - }; - }; - "globals-9.18.0" = { - name = "globals"; - packageName = "globals"; - version = "9.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab"; - }; - }; - "invariant-2.2.2" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; - sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; - }; - }; - "loose-envify-1.3.1" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; - sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; - }; - }; - "to-fast-properties-1.0.3" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; - sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; - }; - }; "babel-plugin-syntax-object-rest-spread-6.13.0" = { name = "babel-plugin-syntax-object-rest-spread"; packageName = "babel-plugin-syntax-object-rest-spread"; @@ -9989,13 +10034,13 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; - "fbjs-0.8.14" = { + "fbjs-0.8.15" = { name = "fbjs"; packageName = "fbjs"; - version = "0.8.14"; + version = "0.8.15"; src = fetchurl { - url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.14.tgz"; - sha1 = "d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"; + url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.15.tgz"; + sha1 = "4f0695fdfcc16c37c0b07facec8cb4c4091685b9"; }; }; "core-js-1.2.7" = { @@ -10034,13 +10079,13 @@ let sha1 = "110d53fa4c3f326c121292bbeac904d2e03387ca"; }; }; - "node-fetch-1.7.2" = { + "node-fetch-1.7.3" = { name = "node-fetch"; packageName = "node-fetch"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz"; - sha512 = "250k1k343w8g1ndd16h1lqcdvp989id6agsppfqi9a6lcqk89ga56xjz78hhy1dqn86vha8n8s551pwpyd1n87mkw4a7143djmm95n5"; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"; + sha512 = "0lz5m15w7qaks0a0s3dm0crsjrsd123dy00pn6qwcp50zfjykxkp22i5ymh6smlc0ags38nmdxlxw9yyq509azlv8kcdvdiq857h5in"; }; }; "whatwg-fetch-2.0.3" = { @@ -10061,13 +10106,13 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "iconv-lite-0.4.18" = { + "iconv-lite-0.4.19" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.18"; + version = "0.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; - sha512 = "2l97vd6kax8syr9aggcqhiyhd3b2rf506wdq6wapfrc74qwpdzqf2a3891kq9ri3g5sdzayph2sz4zkr8kbbps58z9h2lvpk115kgdj"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; "unicode-emoji-modifier-base-1.0.0" = { @@ -10079,13 +10124,13 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; - "ajv-5.2.2" = { - name = "ajv"; - packageName = "ajv"; - version = "5.2.2"; + "debug-3.0.1" = { + name = "debug"; + packageName = "debug"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz"; - sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39"; + url = "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz"; + sha512 = "3rnqa9m5ma6whhiailgppfhnm4gkv4brw9619yvxz59di3g306svl7na9qj6n9l887ra3fgr80b0xij0vjvfwpbk9zvpags5plmqxga"; }; }; "doctrine-2.0.0" = { @@ -10106,13 +10151,13 @@ let sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; - "espree-3.5.0" = { + "espree-3.5.1" = { name = "espree"; packageName = "espree"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz"; - sha1 = "98358625bdd055861ea27e2867ea729faf463d8d"; + url = "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz"; + sha1 = "0c988b8ab46db53100a1954ae4ba995ddd27d87e"; }; }; "esquery-1.0.0" = { @@ -10160,13 +10205,13 @@ let sha512 = "07qdg1b3fwg8b7zwq83rljcx2h0ybq8s43h5xkvsr252qij7ib2gcjamqsb25zv1nvxm94yrvf4fl41s1kyms8zhr86cspwcbggvc94"; }; }; - "inquirer-3.2.3" = { + "inquirer-3.3.0" = { name = "inquirer"; packageName = "inquirer"; - version = "3.2.3"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.3.tgz"; - sha512 = "1dncd0lws3fdvpgxzhi7y4lcfijrnhphn9bzxlhdl3c2aifqff1v6c6i85niwg9fim26ja1x0d6rfgy5g1dgqyh86g363d955pcmk85"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz"; + sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; "is-resolvable-1.0.0" = { @@ -10178,13 +10223,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.9.1" = { + "js-yaml-3.10.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz"; - sha512 = "31wxw267vdf4nnjpksnzcb4i603366sjrw7g08bkxi3cwlrfl67458v7rvj72vbxcycq43z4ldkrfvqjrsvrjqrb2kfzmabpzghddq9"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; + sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; }; "levn-0.3.0" = { @@ -10214,13 +10259,13 @@ let sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; - "pluralize-4.0.0" = { + "pluralize-7.0.0" = { name = "pluralize"; packageName = "pluralize"; - version = "4.0.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz"; - sha1 = "59b708c1c0190a2f692f1c7618c446b052fd1762"; + url = "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz"; + sha512 = "2ihaln20qjx82jx73wgzirbyp8mfmhxr75am1h0w8n5hy2gsbgvw9dricv7h57ycxzax84bma96wjscmdszs5mr2lsyxpfjvhwl2601"; }; }; "progress-2.0.0" = { @@ -10250,24 +10295,6 @@ let sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"; }; }; - "fast-deep-equal-1.0.0" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; - }; - }; - "json-schema-traverse-0.3.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; - }; - }; "esrecurse-4.2.0" = { name = "esrecurse"; packageName = "esrecurse"; @@ -10385,6 +10412,15 @@ let sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; }; }; + "ansi-escapes-3.0.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; + sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; + }; + }; "cli-width-2.2.0" = { name = "cli-width"; packageName = "cli-width"; @@ -10394,13 +10430,13 @@ let sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; }; }; - "external-editor-2.0.4" = { + "external-editor-2.0.5" = { name = "external-editor"; packageName = "external-editor"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz"; - sha1 = "1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"; + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz"; + sha512 = "3znpqavb7rxmw74p6hnq963agimzsm5r524jrpy9v6sbbhbbk77qhklgkr65jirq0a58lsz8jgvwy9q4wfmwl7ahj6nzrckhpmyij1j"; }; }; "figures-2.0.0" = { @@ -10448,13 +10484,13 @@ let sha512 = "3c44v9rz6j4z6i7gj2v3wmfcqv5i47psysgd1p4jcgz114vfk99fif1n1r08jbsdkp4g3smv1wx7x4ikwa7q9dp5i1bc77la17s2kdw"; }; }; - "tmp-0.0.31" = { + "tmp-0.0.33" = { name = "tmp"; packageName = "tmp"; - version = "0.0.31"; + version = "0.0.33"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; }; }; "is-promise-2.1.0" = { @@ -10565,6 +10601,15 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -10583,13 +10628,13 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "eslint-4.6.1" = { + "eslint-4.7.2" = { name = "eslint"; packageName = "eslint"; - version = "4.6.1"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.6.1.tgz"; - sha1 = "ddc7fc7fd70bf93205b0b3449bb16a1e9e7d4950"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.7.2.tgz"; + sha1 = "ff6f5f5193848a27ee9b627be3e73fb9cb5e662e"; }; }; "supports-color-3.2.3" = { @@ -10718,6 +10763,15 @@ let sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; }; }; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + }; + }; "request-progress-2.0.1" = { name = "request-progress"; packageName = "request-progress"; @@ -10781,6 +10835,42 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + }; + }; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + }; + }; "throttleit-1.0.0" = { name = "throttleit"; packageName = "throttleit"; @@ -10808,6 +10898,15 @@ let sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; }; }; + "tmp-0.0.31" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; + sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; + }; + }; "glob-3.2.11" = { name = "glob"; packageName = "glob"; @@ -11105,6 +11204,15 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; "object.omit-2.0.1" = { name = "object.omit"; packageName = "object.omit"; @@ -11204,6 +11312,15 @@ let sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; }; }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; "is-number-3.0.0" = { name = "is-number"; packageName = "is-number"; @@ -11321,13 +11438,13 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "node-pre-gyp-0.6.36" = { + "node-pre-gyp-0.6.37" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.36"; + version = "0.6.37"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; - sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz"; + sha1 = "3c872b236b2e266e4140578fe1ee88f693323a05"; }; }; "npmlog-4.1.2" = { @@ -11339,6 +11456,15 @@ let sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; + "tape-4.8.0" = { + name = "tape"; + packageName = "tape"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tape/-/tape-4.8.0.tgz"; + sha512 = "026x60jpvkdwfvbd6gls76zjj3yiqfz4cg9imi80r25zdziaiy87jkpw9mwbrbg9k2xc4nsn9yzk90pgkgybdspk0yb4fzg95y0nqjd"; + }; + }; "tar-pack-3.4.0" = { name = "tar-pack"; packageName = "tar-pack"; @@ -11375,13 +11501,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "aproba-1.1.2" = { + "aproba-1.2.0" = { name = "aproba"; packageName = "aproba"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"; - sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; "string-width-1.0.2" = { @@ -11402,6 +11528,114 @@ let sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; }; }; + "for-each-0.3.2" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; + sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; + }; + }; + "object-inspect-1.3.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.3.0.tgz"; + sha512 = "1302hkgbynr48i0h4n5psz3ln624f8516qh68kpah1ziczyg8vpyfxws5x6iazncaw5jgg9bp19pgbfl4n4gjb9z0z96pnd08pffw9q"; + }; + }; + "resumer-0.0.0" = { + name = "resumer"; + packageName = "resumer"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; + sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + }; + }; + "string.prototype.trim-1.1.2" = { + name = "string.prototype.trim"; + packageName = "string.prototype.trim"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; + sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + }; + }; + "is-function-1.0.1" = { + name = "is-function"; + packageName = "is-function"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; + sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + }; + }; + "define-properties-1.1.2" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; + sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + }; + }; + "es-abstract-1.8.2" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.8.2.tgz"; + sha512 = "0cz5pzkb9xh1askig7mrv990raaa1pym6a8acyyjw405bnzdznck7q9qg2rcybwjq866i6226nq6mijn6kwg5n36r6hr3gjpla71y3n"; + }; + }; + "es-to-primitive-1.1.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; + sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + }; + }; + "is-callable-1.1.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; + sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + }; + }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-symbol-1.0.1" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; + sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + }; + }; "event-stream-0.5.3" = { name = "event-stream"; packageName = "event-stream"; @@ -11474,15 +11708,6 @@ let sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; }; }; - "resumer-0.0.0" = { - name = "resumer"; - packageName = "resumer"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; - }; - }; "lodash.groupby-4.6.0" = { name = "lodash.groupby"; packageName = "lodash.groupby"; @@ -11781,6 +12006,96 @@ let sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }; }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; "acorn-1.2.2" = { name = "acorn"; packageName = "acorn"; @@ -11916,13 +12231,13 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "dateformat-2.0.0" = { + "dateformat-2.2.0" = { name = "dateformat"; packageName = "dateformat"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz"; - sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17"; + url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"; + sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; }; }; "fancy-log-1.3.0" = { @@ -12771,13 +13086,22 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "@ionic/cli-utils-1.9.2" = { + "@ionic/cli-utils-1.10.2" = { name = "@ionic/cli-utils"; packageName = "@ionic/cli-utils"; - version = "1.9.2"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.9.2.tgz"; - sha512 = "0swmlwdlxhnfb2bvkzg5vw9jpmgccp0frivlyiadakn0b6v2h9g0nlmfnmfk7sy8hazxlpd8z986i94mnkc53j5c7dqlmjq9l1ff29x"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.10.2.tgz"; + sha512 = "3nnaaxpbcfqhp3hdi5gqjllw11li8pmbcpbwixyfxly5sy6m7izid84a80azmd1hh2f3pv68n07qm3prznzvx495vnvw3qyaxg0hi6x"; + }; + }; + "@ionic/discover-0.3.1" = { + name = "@ionic/discover"; + packageName = "@ionic/discover"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.1.tgz"; + sha512 = "35246ajg70xdrv5r5ln20m3b3h8gqa7gvmcraalmr5nk7pkmrldfr8cyscm9zrqpzpsjbbs2h2vdy0nh0ghlnyhiywry8ivxn7agk90"; }; }; "opn-5.1.0" = { @@ -12807,15 +13131,6 @@ let sha1 = "bc8004164691923a79fe8378bbeb3da2017538ec"; }; }; - "@types/gulp-3.8.33" = { - name = "@types/gulp"; - packageName = "@types/gulp"; - version = "3.8.33"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/gulp/-/gulp-3.8.33.tgz"; - sha512 = "01i562c5pc602w3jnb960nqh7afknhjv3i9mjkqv7k4300prh61z27akxh6fzgk4nxiw9vx4h0r4ma09jyg3gzp6hf8sfqak7d40jnx"; - }; - }; "archiver-2.0.3" = { name = "archiver"; packageName = "archiver"; @@ -12825,6 +13140,15 @@ let sha1 = "b4360bb584af1437991942716f21d7c523d1dbbd"; }; }; + "body-parser-1.18.1" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.1.tgz"; + sha512 = "1i2fmb5q1gy3zand1lmqbyamdg1iapbmy1wk9fr181fwcwjnsay1fvqkzbf9lx98mghlc061bhg15ymq4wm663qciparjxgj5kakg98"; + }; + }; "ci-info-1.1.1" = { name = "ci-info"; packageName = "ci-info"; @@ -12897,13 +13221,13 @@ let sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "ssh-config-1.1.0" = { + "ssh-config-1.1.1" = { name = "ssh-config"; packageName = "ssh-config"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.0.tgz"; - sha1 = "bbc7f92204a385b5dececec8f8b63be9c125079b"; + url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.1.tgz"; + sha512 = "34a8bmib45cxms67cjfwwwfaay3amvzj61ay7k7qj9lajxqb8qjp5m4ivn89pzcy1siiqxs47mmh63dsq2lrypjci2w9b4lp9cqpak4"; }; }; "superagent-3.6.0" = { @@ -12924,31 +13248,13 @@ let sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32"; }; }; - "@types/orchestrator-0.3.0" = { - name = "@types/orchestrator"; - packageName = "@types/orchestrator"; - version = "0.3.0"; + "ws-3.2.0" = { + name = "ws"; + packageName = "ws"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/orchestrator/-/orchestrator-0.3.0.tgz"; - sha1 = "bf84a1699c9330d4fe89cd81263e8fc09fb32978"; - }; - }; - "@types/vinyl-2.0.1" = { - name = "@types/vinyl"; - packageName = "@types/vinyl"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.1.tgz"; - sha512 = "39di6nqjv2i8yqjq1zqyrlg237a9ma5npnggwq77qvj9rk982hzj5x04xq4y0j3bcj99vbfpqvydqph6975pb3bacgrmng7nxlrv2r6"; - }; - }; - "@types/q-0.0.37" = { - name = "@types/q"; - packageName = "@types/q"; - version = "0.0.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz"; - sha512 = "1jsz2sb10m3vshfy9k9k7zkmzcnlafp76ivzp04yf9xda3h7kv75vdxf82lfd17jzfwlm0n8cp1a4vkr43wcxsaj7zwqk6cbiglccdy"; + url = "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz"; + sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45"; }; }; "archiver-utils-1.3.0" = { @@ -13023,6 +13329,24 @@ let sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "raw-body-2.3.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; + sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + }; + }; "sax-1.1.4" = { name = "sax"; packageName = "sax"; @@ -13185,6 +13509,24 @@ let sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; }; }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; + }; + }; + "netmask-1.0.6" = { + name = "netmask"; + packageName = "netmask"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; + sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; + }; + }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -13302,13 +13644,13 @@ let sha1 = "30a3989642ee3e8ea06d10c2b9f9e046d424d8ed"; }; }; - "mz-2.6.0" = { + "mz-2.7.0" = { name = "mz"; packageName = "mz"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.6.0.tgz"; - sha1 = "c8b8521d958df0a4f2768025db69c719ee4ef1ce"; + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; }; }; "object-hash-1.1.8" = { @@ -13356,31 +13698,31 @@ let sha1 = "3d38321828231e434f287514959c37a82b629f42"; }; }; - "vscode-jsonrpc-3.3.1" = { + "vscode-jsonrpc-3.4.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"; - sha512 = "1dwznr02qr6wd7886k3i7y3vxgzqdm14gc5vs892vrc8azhh6hl79bvl5lgc05004lzqbazj9p7vdkbms62f1iys92h5w1xpvdldfc8"; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.4.0.tgz"; + sha1 = "aa95ac583bf31d80f725d57c27c09f4c2cfe9fa9"; }; }; - "vscode-languageserver-3.3.0" = { + "vscode-languageserver-3.4.2" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "3.3.0"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz"; - sha512 = "380fi37ifwdgndnglvymyrb844aybpm5mjpwmq4p3dm1b93iqdfr00pr2b692d15k5hn9x82h98zw0bs0k7287pwdvdkv3v75pc92zi"; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.2.tgz"; + sha1 = "08cbe50ee26901d37dd4b5dc52c25b909363c1f1"; }; }; - "vscode-languageserver-types-3.3.0" = { + "vscode-languageserver-types-3.4.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz"; - sha512 = "1xjiay30jyp6sj9nq55zwjmxyq5ajcdrv4bw9ypkplv7mg57h4skiqvcsd6wbizidpx3xanqmnl04l66491fmlrwijn9ph3rsa044z4"; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.4.0.tgz"; + sha1 = "5043ae47ee4ac16af07bb3d0ca561235e0c0d2fa"; }; }; "symbol-observable-1.0.4" = { @@ -13527,6 +13869,24 @@ let sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; }; }; + "vscode-uri-1.0.1" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz"; + sha1 = "11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"; + }; + }; + "vscode-languageserver-protocol-3.4.2" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.4.2.tgz"; + sha512 = "1vm846vq0y63gjxgjnng6zd4196yjx212rmzjr1ljwmkrgb2f1llgpc13ly1b1zsg6v1zjzj473i0dql50sykxwm5vdzaavl28knl6r"; + }; + }; "when-3.4.6" = { name = "when"; packageName = "when"; @@ -13608,15 +13968,6 @@ let sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; }; }; - "form-data-2.3.1" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; - }; - }; "punycode-2.1.0" = { name = "punycode"; packageName = "punycode"; @@ -13626,15 +13977,6 @@ let sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; }; }; - "body-parser-1.17.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz"; - sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee"; - }; - }; "connect-pause-0.1.1" = { name = "connect-pause"; packageName = "connect-pause"; @@ -13761,42 +14103,6 @@ let sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; - "bytes-2.4.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; - sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; - }; - }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; - }; - }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; - }; - }; - "raw-body-2.2.0" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; - sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; - }; - }; "path-to-regexp-1.7.0" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -14076,13 +14382,13 @@ let sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.6.3" = { + "connect-3.6.4" = { name = "connect"; packageName = "connect"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz"; - sha512 = "2fkfixwv0fqqxw5rhmzrczj8ayxccwnxwkgyv4w8sxnkz52sl6dsx2nirg1vryxxqdlwph4ag9vc17yzzydmzshc73gpi6m12m9kd0q"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.4.tgz"; + sha1 = "52ea19c38607318784269297b0218ed074a01687"; }; }; "di-0.0.1" = { @@ -14166,6 +14472,15 @@ let sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; "custom-event-1.0.1" = { name = "custom-event"; packageName = "custom-event"; @@ -14850,6 +15165,15 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; + "bytes-2.4.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; + sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; + }; + }; "iconv-lite-0.4.13" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -15084,13 +15408,13 @@ let sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; }; }; - "fs-extra-4.0.1" = { + "fs-extra-4.0.2" = { name = "fs-extra"; packageName = "fs-extra"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz"; - sha1 = "7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz"; + sha1 = "f91704c53d1b461f893452b0c307d9997647ab6b"; }; }; "get-port-3.2.0" = { @@ -15507,22 +15831,13 @@ let sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; }; }; - "jsonfile-3.0.1" = { + "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; - sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; - }; - }; - "universalify-0.1.1" = { - name = "universalify"; - packageName = "universalify"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"; - sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; "is-glob-3.1.0" = { @@ -15876,13 +16191,13 @@ let sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; }; }; - "github-slugger-1.1.3" = { + "github-slugger-1.2.0" = { name = "github-slugger"; packageName = "github-slugger"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.1.3.tgz"; - sha1 = "314a6e759a18c2b0cc5760d512ccbab549c549a7"; + url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz"; + sha512 = "3nya50972xq88vz4p5gqz63014dkwlp5f40cz1fgad4ifnhprpr4qlqvvi44qxs3arikyfm3ygmf3phyjq5lwkg7rr9ig9mk7prm1n0"; }; }; "innertext-1.0.2" = { @@ -16020,6 +16335,15 @@ let sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31"; }; }; + "send-0.15.5" = { + name = "send"; + packageName = "send"; + version = "0.15.5"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.15.5.tgz"; + sha1 = "32ef6c8d820c9756597c3174b8c9dd51e3319be2"; + }; + }; "serve-index-1.9.0" = { name = "serve-index"; packageName = "serve-index"; @@ -16074,6 +16398,15 @@ let sha1 = "1c0824150481bc7a01d49e98f1ec668d82412f3b"; }; }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; "batch-0.6.1" = { name = "batch"; packageName = "batch"; @@ -16236,6 +16569,15 @@ let sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; }; }; + "he-1.1.1" = { + name = "he"; + packageName = "he"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; + sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + }; + }; "lodash.create-3.1.1" = { name = "lodash.create"; packageName = "lodash.create"; @@ -16434,13 +16776,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "serve-favicon-2.4.3" = { + "serve-favicon-2.4.4" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.3.tgz"; - sha1 = "5986b17b0502642b641c21f818b1acce32025d23"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.4.tgz"; + sha1 = "412ddd74965151c9f74c0828f35d50c5250210de"; }; }; "strong-data-uri-1.0.4" = { @@ -16551,6 +16893,15 @@ let sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; }; }; + "fresh-0.5.1" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.1.tgz"; + sha1 = "c3a08bcec0fcdcc223edf3b23eb327f1f9fcbf5c"; + }; + }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -16749,6 +17100,15 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; + "body-parser-1.17.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.17.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz"; + sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee"; + }; + }; "cheerio-0.22.0" = { name = "cheerio"; packageName = "cheerio"; @@ -16920,6 +17280,15 @@ let sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; }; }; + "raw-body-2.2.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; + sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; + }; + }; "sentiment-2.1.0" = { name = "sentiment"; packageName = "sentiment"; @@ -16983,13 +17352,13 @@ let sha1 = "52c074f42a32140132baea108d42cbcd0ef397d2"; }; }; - "node-red-node-rbe-0.1.11" = { + "node-red-node-rbe-0.1.13" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.11"; + version = "0.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.11.tgz"; - sha1 = "a670c1542a6eaf5e06db45490c2a7edf8a9f70b6"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.13.tgz"; + sha1 = "734ff1264cdbe0a8aaade20696dd4bfc6bbcdd49"; }; }; "bcrypt-1.0.3" = { @@ -17001,6 +17370,24 @@ let sha512 = "1zfn87155w6q9fsv5ls3gxwih7yvarrh16kzpfrpppblzpmp1cy9gjkknsf9lkixacza39h51jd7varqfg19w3qkdic62zpirv86755"; }; }; + "debug-2.6.7" = { + name = "debug"; + packageName = "debug"; + version = "2.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; + sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; + }; + }; + "iconv-lite-0.4.15" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; + }; + }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -17361,15 +17748,6 @@ let sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; }; }; - "ws-3.1.0" = { - name = "ws"; - packageName = "ws"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-3.1.0.tgz"; - sha512 = "07wdh2llaz8j5nbjpvl1zbbksw2pikqnw243c6a1ifmshp095hgam79vv5nbp1pjwnlm120m4d3sih9iwm5mkc46im03jb5l6l3ykjd"; - }; - }; "append-field-0.1.0" = { name = "append-field"; packageName = "append-field"; @@ -17649,6 +18027,15 @@ let sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; + "node-pre-gyp-0.6.36" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.36"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; + sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -17910,15 +18297,6 @@ let sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; }; }; - "debug-3.0.1" = { - name = "debug"; - packageName = "debug"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz"; - sha512 = "3rnqa9m5ma6whhiailgppfhnm4gkv4brw9619yvxz59di3g306svl7na9qj6n9l887ra3fgr80b0xij0vjvfwpbk9zvpags5plmqxga"; - }; - }; "qs-0.5.1" = { name = "qs"; packageName = "qs"; @@ -18243,6 +18621,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "aproba-1.1.2" = { + name = "aproba"; + packageName = "aproba"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"; + sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6"; + }; + }; "cacache-9.2.9" = { name = "cacache"; packageName = "cacache"; @@ -18369,13 +18756,13 @@ let sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa"; }; }; - "npm-packlist-1.1.8" = { + "npm-packlist-1.1.9" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.8.tgz"; - sha512 = "3wbyrf8k8ziygg8lyaj5v0kfpw9mhz4an8hqznapf7n0g2ik02shn91607274zvvayl5zcgmfkf17yy4vgz67lsdjmhzwi8rmrzapv4"; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.9.tgz"; + sha512 = "1d1l5hasnw67hczgcwbc8534n1hgvx87hin1yr14yz70b4yzp06gfrj97lhh0qfmk5p1lqfrzajhs5wywx98hj75g00mqmir54050gm"; }; }; "npm-user-validate-1.0.0" = { @@ -18459,6 +18846,15 @@ let sha512 = "2lrlysxfbyzywla6i1q07xncmw30w1icgq18c4bra25dl6wvcd3mxg1lqbf88w5h7mqnf98j8ll657wnqwjq9rwd7pbmd9i11964x0c"; }; }; + "write-file-atomic-2.1.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; + sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni"; + }; + }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -18666,13 +19062,13 @@ let sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw"; }; }; - "socks-proxy-agent-3.0.0" = { + "socks-proxy-agent-3.0.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz"; - sha512 = "3zn9cz2ry5m1akapj7hvhgkxfq7ffwynia46lmwipsw2jk5sv8dvs32dc4hfx3xvp34i1jff1bg870a1xnknsgk5dl021jd4gwi75v0"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; + sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7"; }; }; "humanize-ms-1.2.1" = { @@ -18936,13 +19332,13 @@ let sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; }; }; - "fast-diff-1.1.1" = { + "fast-diff-1.1.2" = { name = "fast-diff"; packageName = "fast-diff"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.1.tgz"; - sha1 = "0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b"; + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz"; + sha512 = "2550z1qvyfv9js9vg2aaj57ji5d9hhg4f6zl4rf483d6xswv23ac6ipj8gbapv4sjx14dpcslqmnx1z78vvx4np4ad5mdrxwfvm98i9"; }; }; "node-alias-1.0.4" = { @@ -18990,13 +19386,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.40.2" = { + "snyk-1.41.0" = { name = "snyk"; packageName = "snyk"; - version = "1.40.2"; + version = "1.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.40.2.tgz"; - sha1 = "0084cdb969f0ee0282f5b1de562434d916c732c5"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.41.0.tgz"; + sha1 = "6c7a9a94f788181a21575f1b4ee59e6d80f6a059"; }; }; "spawn-please-0.3.0" = { @@ -19161,6 +19557,15 @@ let sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; }; }; + "needle-2.0.1" = { + name = "needle"; + packageName = "needle"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.0.1.tgz"; + sha1 = "c21fc961ce3c340fb082250da6a08a32f38631f1"; + }; + }; "snyk-config-1.0.1" = { name = "snyk-config"; packageName = "snyk-config"; @@ -19170,13 +19575,13 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-go-plugin-1.1.3" = { + "snyk-go-plugin-1.2.1" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.1.3"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.1.3.tgz"; - sha512 = "2yxrc9kh1i9xxa012g3gwx5hdv0df0d0jkqh5h9bm6lkjs567kyh116bfvk6y3gj2cy39a85gvm0dd9gc92fy8i6if8d0zgh9w5wj2i"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.2.1.tgz"; + sha512 = "3fvzskjkhljbpcha1z2bk9ca96bcyqc1hb8i2fz7ck71bmfvq9q1wxq1rmp981zmmxvag6igdxsxcq8nrc5igq5s452qr8x9b2g6s9a"; }; }; "snyk-gradle-plugin-1.1.2" = { @@ -19197,13 +19602,13 @@ let sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; - "snyk-mvn-plugin-1.0.1" = { + "snyk-mvn-plugin-1.0.3" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.1.tgz"; - sha512 = "2hyx0v53423yszxyxx41swndwqxya92iw3zjqaa35fl1ial9zxrmvrvlrc6jv4jaimv9ci7ni9jkascs1cgm85gqf1ifzkl9kfg0h3c"; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.3.tgz"; + sha512 = "3p1ji20lrwfgq8gv8br38nk8l5sklhpvmgdcp9il01f22pzclaqnvrh8pcihkq5x74rifhcra6kqjz057i0mmrk8p3w3yq8gikqgz7l"; }; }; "snyk-policy-1.7.1" = { @@ -19323,15 +19728,6 @@ let sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181"; }; }; - "fs-0.0.1-security" = { - name = "fs"; - packageName = "fs"; - version = "0.0.1-security"; - src = fetchurl { - url = "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz"; - sha1 = "8a7bd37186b6dddf3813f23858b57ecaaf5e41d4"; - }; - }; "toml-2.3.3" = { name = "toml"; packageName = "toml"; @@ -19485,13 +19881,13 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; - "async-2.1.5" = { + "async-2.4.1" = { name = "async"; packageName = "async"; - version = "2.1.5"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz"; + sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"; }; }; "lokijs-1.4.3" = { @@ -19503,40 +19899,40 @@ let sha1 = "f2a47ba8d6991c92d6da6a5b35be79b674453abb"; }; }; - "vscode-jsonrpc-3.0.4" = { + "vscode-jsonrpc-3.2.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "3.0.4"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.0.4.tgz"; - sha1 = "07fdae38e3122412faddf45756fba1d2cb1eb9c8"; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.2.0.tgz"; + sha1 = "c92b946ac385c8b41439b842b6bd07d517b64a7d"; }; }; - "vscode-languageclient-3.0.4" = { + "vscode-languageclient-3.2.2" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "3.0.4"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.0.4.tgz"; - sha1 = "d0a4ecf3e1c5bf486a49a161962f9189b0bd2bf7"; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.2.2.tgz"; + sha1 = "7843839614aa099f172b4e5f8967d42b58d77f0d"; }; }; - "vscode-languageserver-3.0.5" = { + "vscode-languageserver-3.2.2" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "3.0.5"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.0.5.tgz"; - sha1 = "080f7b7ce6d43a0785a21195e00068ac57558c85"; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.2.2.tgz"; + sha1 = "9a7b66e1252838ea51a0061145089a2b88a9516a"; }; }; - "vscode-languageserver-types-3.0.3" = { + "vscode-languageserver-types-3.2.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.0.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.3.tgz"; - sha1 = "303b2a307c20952ff5c1f5a608f3c91146028d47"; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.2.0.tgz"; + sha1 = "8874ed92dbfa66df5fb0e2bf73f614cf9483be8f"; }; }; "babybird-0.0.1" = { @@ -19677,15 +20073,6 @@ let sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; }; }; - "define-properties-1.1.2" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; - sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; - }; - }; "bunyan-1.8.12" = { name = "bunyan"; packageName = "bunyan"; @@ -19713,13 +20100,13 @@ let sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; }; }; - "hot-shots-4.5.0" = { + "hot-shots-4.7.0" = { name = "hot-shots"; packageName = "hot-shots"; - version = "4.5.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.5.0.tgz"; - sha1 = "d0b7c2ad367cbb2f8c062b26151c0949ad9271f9"; + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.7.0.tgz"; + sha1 = "1fb2eecd234c938e3ccb56c93681b573455dd64c"; }; }; "limitation-0.2.0" = { @@ -20263,6 +20650,69 @@ let sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; }; }; + "browserify-incremental-3.1.1" = { + name = "browserify-incremental"; + packageName = "browserify-incremental"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz"; + sha1 = "0713cb7587247a632a9f08cf1bd169b878b62a8a"; + }; + }; + "node-static-0.7.10" = { + name = "node-static"; + packageName = "node-static"; + version = "0.7.10"; + src = fetchurl { + url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz"; + sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd"; + }; + }; + "string-stream-0.0.7" = { + name = "string-stream"; + packageName = "string-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/string-stream/-/string-stream-0.0.7.tgz"; + sha1 = "cfcde82799fa62f303429aaa79336ee8834332fe"; + }; + }; + "tree-kill-1.2.0" = { + name = "tree-kill"; + packageName = "tree-kill"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz"; + sha512 = "1r0mixygpdqrm2fn92z4cyxzbnvimm16k5gdm2m2jxx8wrj3w0mql9s748hcqp2nzcnybnw74wkm211zlr9ld0j2x1q8f153mszlm8f"; + }; + }; + "watchpack-1.4.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; + sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; + }; + }; + "JSONStream-0.10.0" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"; + sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0"; + }; + }; + "browserify-cache-api-3.0.1" = { + name = "browserify-cache-api"; + packageName = "browserify-cache-api"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz"; + sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02"; + }; + }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -20651,13 +21101,13 @@ let sha512 = "2441a84bwxxm0zcn133ngf0aj1f8jidgfsvm40wa8ap98lkzyzv8fppfsl1dhxpni70mpgl8yik9anc2vrgh1n1immkhw3z6727r9ll"; }; }; - "chalk-2.0.1" = { - name = "chalk"; - packageName = "chalk"; - version = "2.0.1"; + "basic-auth-2.0.0" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"; - sha512 = "398mvhli8dvcn53xaqllyjzp19z8gh3j75fvp4gv5njnnkhsikx3byfb6lx432pl0073hn75prc8gb0ysbf65bnzlcbq5iy89f8b7rj"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz"; + sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; }; }; "detect-port-1.2.1" = { @@ -20678,13 +21128,13 @@ let sha1 = "fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"; }; }; - "micro-8.0.1" = { + "micro-9.0.0" = { name = "micro"; packageName = "micro"; - version = "8.0.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/micro/-/micro-8.0.1.tgz"; - sha512 = "3fbrk4yxb1bj097n2w8iqapyq5znp13p8lgc3kd6h53aakpp52779qicbfzd89dva5yj5pinb9swf92j8k5ksl82llahc0y8kg45q1z"; + url = "https://registry.npmjs.org/micro/-/micro-9.0.0.tgz"; + sha512 = "1ga72y60zj44dy1y3md37x86klv6nxs7ii0aap37p4qwhq5rb5mcl5yn0kmkrgy6wbvgcnw761rjq7ripiqn1w8q2nl23g2rdj64x69"; }; }; "micro-compress-1.0.0" = { @@ -20696,15 +21146,6 @@ let sha1 = "53f5a80b4ad0320ca165a559b6e3df145d4f704f"; }; }; - "mime-types-2.1.16" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"; - sha1 = "2b858a52e5ecd516db897ac2be87487830698e23"; - }; - }; "node-version-1.1.0" = { name = "node-version"; packageName = "node-version"; @@ -20723,6 +21164,15 @@ let sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; }; }; + "chalk-2.0.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"; + sha512 = "398mvhli8dvcn53xaqllyjzp19z8gh3j75fvp4gv5njnnkhsikx3byfb6lx432pl0073hn75prc8gb0ysbf65bnzlcbq5iy89f8b7rj"; + }; + }; "pkginfo-0.4.0" = { name = "pkginfo"; packageName = "pkginfo"; @@ -20750,15 +21200,6 @@ let sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; }; }; - "mime-db-1.29.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.29.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"; - sha1 = "48d26d235589651704ac5916ca06001914266878"; - }; - }; "pify-3.0.0" = { name = "pify"; packageName = "pify"; @@ -20966,6 +21407,15 @@ let sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; }; }; + "async-2.1.5" = { + name = "async"; + packageName = "async"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + }; + }; "assert-plus-0.1.5" = { name = "assert-plus"; packageName = "assert-plus"; @@ -21155,13 +21605,13 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.2.1" = { + "csv-parse-1.2.2" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.1.tgz"; - sha1 = "9199c23f2490d98c4d9ab2a0167b06927498c9df"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.2.tgz"; + sha512 = "0f3kdjcfncknijsn256frrcdmpw52wkimylhbds095kmkva57dhhnrlqzlzsxvf60d1qzfzqlhhc0wj25b9rg1w6rwxfixx2q9a6bx7"; }; }; "stream-transform-0.1.2" = { @@ -21236,15 +21686,6 @@ let sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60"; }; }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; "once-1.3.0" = { name = "once"; packageName = "once"; @@ -21380,13 +21821,13 @@ let sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85"; }; }; - "clap-1.2.0" = { + "clap-1.2.3" = { name = "clap"; packageName = "clap"; - version = "1.2.0"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz"; - sha1 = "59c90fe3e137104746ff19469a27a634ff68c857"; + url = "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz"; + sha512 = "1ha66pbxhll7c6vv641rahzq0ylwaifskwpwggy9k4sfh8r9n0r8mpqbib22dppb7zfrk6a84a4dyaal7mqs12jvlaxszz11py0nap0"; }; }; "enhanced-resolve-2.3.0" = { @@ -21884,15 +22325,6 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; - "tmp-0.0.33" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; - }; - }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -21992,15 +22424,6 @@ let sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; }; }; - "watchpack-1.4.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; - sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; - }; - }; "webpack-sources-1.0.1" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -22046,13 +22469,13 @@ let sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; - "big.js-3.1.3" = { + "big.js-3.2.0" = { name = "big.js"; packageName = "big.js"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"; - sha1 = "4cada2193652eb3ca9ec8e55c9015669c9806978"; + url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; + sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs"; }; }; "emojis-list-2.1.0" = { @@ -22091,123 +22514,6 @@ let sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93"; }; }; - "death-1.1.0" = { - name = "death"; - packageName = "death"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/death/-/death-1.1.0.tgz"; - sha1 = "01aa9c401edd92750514470b8266390c66c67318"; - }; - }; - "gunzip-maybe-1.4.1" = { - name = "gunzip-maybe"; - packageName = "gunzip-maybe"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; - sha512 = "3d6jyhcq21cxy2n6mnalnxcdxl9i00n8qka7awrqamggss8yllz57msx7c480knv037snkzkymq6npl36wlpl71h54x511dlchavnxa"; - }; - }; - "leven-2.1.0" = { - name = "leven"; - packageName = "leven"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; - }; - }; - "node-emoji-1.8.1" = { - name = "node-emoji"; - packageName = "node-emoji"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz"; - sha512 = "1bdm7sms59bj5fa575nda007mvn4nibjla4hm9bf9ry70kgqw7slmz3l4md4cyx2j4zda0dh0mcjildkzq7ba3i9qzapha93l14qjzs"; - }; - }; - "object-path-0.11.4" = { - name = "object-path"; - packageName = "object-path"; - version = "0.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz"; - sha1 = "370ae752fbf37de3ea70a861c23bba8915691949"; - }; - }; - "proper-lockfile-2.0.1" = { - name = "proper-lockfile"; - packageName = "proper-lockfile"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz"; - sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; - }; - }; - "request-capture-har-1.2.2" = { - name = "request-capture-har"; - packageName = "request-capture-har"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz"; - sha1 = "cd692cfb2cc744fd84a3358aac6ee51528cf720d"; - }; - }; - "tar-fs-1.15.3" = { - name = "tar-fs"; - packageName = "tar-fs"; - version = "1.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz"; - sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20"; - }; - }; - "v8-compile-cache-1.1.0" = { - name = "v8-compile-cache"; - packageName = "v8-compile-cache"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz"; - sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"; - }; - }; - "is-deflate-1.0.0" = { - name = "is-deflate"; - packageName = "is-deflate"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz"; - sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14"; - }; - }; - "is-gzip-1.0.0" = { - name = "is-gzip"; - packageName = "is-gzip"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"; - sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83"; - }; - }; - "peek-stream-1.1.2" = { - name = "peek-stream"; - packageName = "peek-stream"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.2.tgz"; - sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; - }; - }; - "lodash.toarray-4.4.0" = { - name = "lodash.toarray"; - packageName = "lodash.toarray"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz"; - sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; - }; - }; "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; @@ -22691,54 +22997,96 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.13"; + version = "1.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.13.tgz"; - sha1 = "5ab8089cee9a9bf4ba46298d87c7039a4f2a7410"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.10.4.tgz"; + sha1 = "8df4818788ba3735122383f99c61cc6ce50626fa"; }; dependencies = [ - sources."colors-0.6.0-1" - sources."ejs-2.3.4" - sources."pkginfo-0.2.2" - sources."commander-0.6.1" - sources."wrench-1.3.9" - sources."xmldom-0.1.19" - sources."jsonlint-1.5.1" - (sources."uglify-js-2.6.1" // { + sources."async-2.5.0" + (sources."babel-core-6.26.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."resolve-1.4.0" + (sources."babel-generator-6.26.0" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."babel-traverse-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."chmodr-1.0.2" + sources."colors-0.6.0-1" + sources."commander-0.6.1" + sources."deasync-0.1.10" + sources."ejs-2.3.4" + sources."fs-extra-3.0.1" sources."global-paths-0.1.2" - sources."source-map-0.1.9" - sources."xml2tss-0.0.5" + sources."jsonlint-1.5.1" sources."moment-2.17.1" sources."node.extend-1.0.10" - sources."nomnom-1.8.1" - sources."JSV-4.0.2" - sources."underscore-1.6.0" - sources."chalk-0.4.0" - sources."has-color-0.1.7" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.1" - sources."async-0.2.10" - sources."uglify-to-browserify-1.0.2" - sources."yargs-3.10.0" - sources."camelcase-1.2.1" - sources."cliui-2.1.0" - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - sources."center-align-0.1.3" - sources."right-align-0.1.3" - sources."wordwrap-0.0.2" - sources."align-text-0.1.4" - sources."lazy-cache-1.0.4" - sources."kind-of-3.2.2" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" - sources."path-parse-1.0.5" + sources."pkginfo-0.2.2" + sources."resolve-1.4.0" + sources."source-map-0.1.9" + sources."walk-sync-0.3.2" + sources."xml2tss-0.0.5" + sources."xmldom-0.1.19" + sources."lodash-4.17.4" + sources."babel-code-frame-6.26.0" + sources."babel-helpers-6.24.1" + sources."babel-messages-6.23.0" + sources."babel-register-6.26.0" + sources."babel-runtime-6.26.0" + sources."babel-template-6.26.0" + sources."convert-source-map-1.5.0" + sources."debug-2.6.8" + sources."json5-0.5.1" + sources."minimatch-3.0.4" + sources."path-is-absolute-1.0.1" + sources."private-0.1.7" + sources."slash-1.0.0" + sources."chalk-1.1.3" + sources."esutils-2.0.2" + sources."js-tokens-3.0.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."core-js-2.5.1" + sources."home-or-tmp-2.0.0" + sources."mkdirp-0.5.1" + (sources."source-map-support-0.4.18" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."minimist-0.0.8" + sources."regenerator-runtime-0.11.0" + sources."ms-2.0.0" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."detect-indent-4.0.0" + sources."jsesc-1.3.0" + sources."trim-right-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."globals-9.18.0" + sources."invariant-2.2.2" + sources."loose-envify-1.3.1" + sources."to-fast-properties-1.0.3" + sources."bindings-1.2.1" + sources."nan-2.7.0" + sources."graceful-fs-4.1.11" + sources."jsonfile-3.0.1" + sources."universalify-0.1.1" sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { dependencies = [ @@ -22756,10 +23104,23 @@ in sources."which-1.3.0" sources."parse-passwd-1.0.0" sources."isexe-2.0.0" + (sources."nomnom-1.8.1" // { + dependencies = [ + sources."chalk-0.4.0" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + ]; + }) + sources."JSV-4.0.2" + sources."underscore-1.6.0" + sources."has-color-0.1.7" + sources."is-0.3.0" + sources."path-parse-1.0.5" sources."amdefine-1.0.1" + sources."ensure-posix-path-1.0.2" + sources."matcher-collection-1.0.5" sources."xml2js-0.2.8" sources."sax-0.5.8" - sources."is-0.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -22957,7 +23318,7 @@ in }) sources."moment-2.18.1" sources."ms-rest-2.2.2" - (sources."ms-rest-azure-2.3.0" // { + (sources."ms-rest-azure-2.3.1" // { dependencies = [ sources."async-0.2.7" ]; @@ -23057,7 +23418,7 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" - sources."@types/node-8.0.27" + sources."@types/node-8.0.28" sources."@types/request-2.0.3" sources."@types/uuid-3.4.2" sources."is-buffer-1.1.5" @@ -23076,7 +23437,7 @@ in sources."i-0.3.5" sources."mkdirp-0.5.1" sources."ncp-0.4.2" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."minimist-0.0.8" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -23207,10 +23568,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; - sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; + sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; }; buildInputs = globalBuildInputs; meta = { @@ -23230,7 +23591,7 @@ in }; dependencies = [ sources."argparse-1.0.4" - sources."bower-1.8.0" + sources."bower-1.8.2" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -23320,7 +23681,7 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."rimraf-2.6.1" // { + (sources."rimraf-2.6.2" // { dependencies = [ sources."glob-7.1.2" ]; @@ -23452,7 +23813,7 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.13" + sources."pbkdf2-3.0.14" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" sources."browserify-aes-1.0.8" @@ -23747,7 +24108,7 @@ in sources."ip-set-1.0.1" sources."mkdirp-0.3.5" sources."peer-wire-swarm-0.12.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" (sources."random-access-file-1.8.1" // { @@ -24069,7 +24430,7 @@ in ]; }) sources."is-url-1.2.2" - sources."interpret-1.0.3" + sources."interpret-1.0.4" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" sources."resolve-1.4.0" @@ -24177,7 +24538,7 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.13" + sources."pbkdf2-3.0.14" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" sources."browserify-aes-1.0.8" @@ -24252,19 +24613,19 @@ in sources."ms-2.0.0" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" - sources."content-type-1.0.2" + sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" - sources."finalhandler-1.0.4" + sources."etag-1.8.1" + sources."finalhandler-1.0.5" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."qs-6.5.0" @@ -24277,7 +24638,7 @@ in sources."utils-merge-1.0.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."http-errors-1.6.2" @@ -24636,7 +24997,7 @@ in sources."media-typer-0.3.0" sources."methods-1.1.2" sources."on-finished-2.2.1" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.3" sources."proxy-addr-1.0.10" sources."qs-2.3.3" @@ -24659,7 +25020,7 @@ in sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.0.5" sources."destroy-1.0.3" sources."mime-1.2.11" @@ -24670,8 +25031,9 @@ in sources."faye-websocket-0.11.1" sources."eventemitter3-0.1.6" sources."better-curry-1.6.0" - sources."websocket-driver-0.6.5" - sources."websocket-extensions-0.1.1" + sources."websocket-driver-0.7.0" + sources."http-parser-js-0.4.7" + sources."websocket-extensions-0.1.2" (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" @@ -24821,7 +25183,7 @@ in sources."bytewise-1.1.0" sources."ltgt-2.1.3" sources."pull-level-2.0.3" - sources."pull-stream-3.6.0" + sources."pull-stream-3.6.1" sources."typewiselite-1.0.0" sources."bytewise-core-1.2.3" sources."typewise-1.0.3" @@ -24878,10 +25240,14 @@ in sources."JSONStream-1.3.1" sources."async-2.5.0" sources."aws4-1.6.0" - sources."aws-sdk-2.110.0" + sources."aws-sdk-2.120.0" sources."ini-1.3.4" sources."optimist-0.6.1" - sources."request-2.81.0" + (sources."request-2.82.0" // { + dependencies = [ + sources."uuid-3.1.0" + ]; + }) sources."jsonparse-1.3.1" sources."through-2.3.8" sources."lodash-4.17.4" @@ -24901,22 +25267,22 @@ in sources."punycode-1.3.2" sources."wordwrap-0.0.3" sources."minimist-0.0.10" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { @@ -24927,45 +25293,31 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."core-util-is-1.0.2" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -24991,7 +25343,7 @@ in dependencies = [ sources."auto-bind-1.1.0" sources."clipboardy-1.1.4" - sources."conf-1.2.0" + sources."conf-1.3.0" sources."got-7.1.0" sources."has-ansi-3.0.0" sources."import-jsx-1.3.0" @@ -25110,7 +25462,7 @@ in sources."core-js-2.5.1" sources."home-or-tmp-2.0.0" sources."mkdirp-0.5.1" - sources."source-map-support-0.4.17" + sources."source-map-support-0.4.18" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."minimist-0.0.8" @@ -25153,7 +25505,7 @@ in ]; }) sources."is-fullwidth-code-point-2.0.0" - (sources."fbjs-0.8.14" // { + (sources."fbjs-0.8.15" // { dependencies = [ sources."core-js-1.2.7" ]; @@ -25163,10 +25515,10 @@ in sources."promise-7.3.1" sources."setimmediate-1.0.5" sources."ua-parser-js-0.7.14" - sources."node-fetch-1.7.2" + sources."node-fetch-1.7.3" sources."whatwg-fetch-2.0.3" sources."encoding-0.1.12" - sources."iconv-lite-0.4.18" + sources."iconv-lite-0.4.19" sources."asap-2.0.6" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" @@ -25221,10 +25573,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.6.1"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.6.1.tgz"; - sha1 = "ddc7fc7fd70bf93205b0b3449bb16a1e9e7d4950"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.7.2.tgz"; + sha1 = "ff6f5f5193848a27ee9b627be3e73fb9cb5e662e"; }; dependencies = [ sources."ajv-5.2.2" @@ -25242,10 +25594,10 @@ in }) sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" - sources."debug-2.6.8" + sources."debug-3.0.1" sources."doctrine-2.0.0" sources."eslint-scope-3.7.1" - sources."espree-3.5.0" + sources."espree-3.5.1" sources."esquery-1.0.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -25255,9 +25607,9 @@ in sources."globals-9.18.0" sources."ignore-3.3.5" sources."imurmurhash-0.1.4" - sources."inquirer-3.2.3" + sources."inquirer-3.3.0" sources."is-resolvable-1.0.0" - sources."js-yaml-3.9.1" + sources."js-yaml-3.10.0" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -25266,7 +25618,7 @@ in sources."natural-compare-1.4.0" sources."optionator-0.8.2" sources."path-is-inside-1.0.2" - sources."pluralize-4.0.0" + sources."pluralize-7.0.0" sources."progress-2.0.0" sources."require-uncached-1.0.3" sources."semver-5.4.1" @@ -25331,7 +25683,7 @@ in sources."is-path-in-cwd-1.0.0" sources."pify-2.3.0" sources."pinkie-promise-2.0.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."array-union-1.0.2" sources."arrify-1.0.1" sources."array-uniq-1.0.3" @@ -25342,10 +25694,10 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."ansi-escapes-2.0.0" + sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."external-editor-2.0.4" + sources."external-editor-2.0.5" sources."figures-2.0.0" sources."mute-stream-0.0.7" sources."run-async-2.3.0" @@ -25357,9 +25709,9 @@ in sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" - sources."iconv-lite-0.4.18" + sources."iconv-lite-0.4.19" sources."jschardet-1.5.1" - sources."tmp-0.0.31" + sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" @@ -25405,7 +25757,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."eslint-4.6.1" // { + (sources."eslint-4.7.2" // { dependencies = [ sources."chalk-2.1.0" sources."strip-ansi-4.0.0" @@ -25430,10 +25782,10 @@ in sources."babel-code-frame-6.26.0" sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" - sources."debug-2.6.8" + sources."debug-3.0.1" sources."doctrine-2.0.0" sources."eslint-scope-3.7.1" - sources."espree-3.5.0" + sources."espree-3.5.1" sources."esquery-1.0.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -25443,7 +25795,7 @@ in sources."globals-9.18.0" sources."ignore-3.3.5" sources."imurmurhash-0.1.4" - (sources."inquirer-3.2.3" // { + (sources."inquirer-3.3.0" // { dependencies = [ sources."chalk-2.1.0" sources."strip-ansi-4.0.0" @@ -25453,7 +25805,7 @@ in ]; }) sources."is-resolvable-1.0.0" - sources."js-yaml-3.9.1" + sources."js-yaml-3.10.0" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -25461,7 +25813,7 @@ in sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."path-is-inside-1.0.2" - sources."pluralize-4.0.0" + sources."pluralize-7.0.0" sources."progress-2.0.0" sources."require-uncached-1.0.3" sources."semver-5.4.1" @@ -25514,7 +25866,7 @@ in sources."is-path-in-cwd-1.0.0" sources."pify-2.3.0" sources."pinkie-promise-2.0.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."array-union-1.0.2" sources."arrify-1.0.1" sources."array-uniq-1.0.3" @@ -25525,10 +25877,10 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."ansi-escapes-2.0.0" + sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."external-editor-2.0.4" + sources."external-editor-2.0.5" sources."figures-2.0.0" sources."mute-stream-0.0.7" sources."run-async-2.3.0" @@ -25545,9 +25897,9 @@ in sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" - sources."iconv-lite-0.4.18" + sources."iconv-lite-0.4.19" sources."jschardet-1.5.1" - sources."tmp-0.0.31" + sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" @@ -25798,7 +26150,7 @@ in dependencies = [ sources."bower-endpoint-parser-0.2.1" sources."bower-logger-0.2.1" - sources."bower-1.8.0" + sources."bower-1.8.2" sources."glob-3.2.11" sources."inherits-2.0.3" sources."minimatch-0.3.0" @@ -25940,7 +26292,7 @@ in sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.7.0" - sources."node-pre-gyp-0.6.36" + sources."node-pre-gyp-0.6.37" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -25953,9 +26305,14 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.81.0" - sources."rimraf-2.6.1" + sources."request-2.82.0" + sources."rimraf-2.6.2" sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."abbrev-1.1.0" @@ -25971,7 +26328,7 @@ in }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -25984,67 +26341,53 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -26056,6 +26399,27 @@ in sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."debug-2.6.8" @@ -26071,12 +26435,13 @@ in ]; }) sources."lazy-1.0.11" - sources."caller-0.0.1" - sources."tape-2.3.3" - sources."deep-equal-0.1.2" - sources."defined-0.0.0" - sources."through-2.3.8" - sources."resumer-0.0.0" + (sources."caller-0.0.1" // { + dependencies = [ + sources."tape-2.3.3" + sources."deep-equal-0.1.2" + sources."defined-0.0.0" + ]; + }) sources."i-0.3.5" sources."ncp-0.4.2" ]; @@ -26270,7 +26635,7 @@ in sources."chalk-1.1.3" sources."deprecated-0.0.1" sources."gulp-util-3.0.8" - sources."interpret-1.0.3" + sources."interpret-1.0.4" sources."liftoff-2.3.0" sources."minimist-1.2.0" sources."orchestrator-0.3.8" @@ -26295,7 +26660,7 @@ in sources."array-differ-1.0.0" sources."array-uniq-1.0.3" sources."beeper-1.1.1" - sources."dateformat-2.0.0" + sources."dateformat-2.2.0" sources."fancy-log-1.3.0" sources."gulplog-1.0.0" sources."has-gulplog-0.1.0" @@ -26596,21 +26961,23 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.9.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.9.2.tgz"; - sha512 = "0d5fbf59ri01dfn213cxbc7vb2z6c4i3sz4k9kji1p8xlcfxg5nj1aprjm4zvdmc6mgryp15g5kvsy7p1qdh2rcdvcqiyn1r70g834c"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.10.3.tgz"; + sha512 = "2n96j5a5fpy6pjgmgsnkx5d2asxha7yvlmlj77fpg31qg7nij0p9y4sq00zjrdzhzq2avsc9r25pjgy3i8cb16il9w9rrd210rlzc15"; }; dependencies = [ - sources."@ionic/cli-utils-1.9.2" + sources."@ionic/cli-utils-1.10.2" + sources."@ionic/discover-0.3.1" sources."chalk-2.1.0" sources."opn-5.1.0" sources."os-name-2.0.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tslib-1.7.1" - sources."@types/gulp-3.8.33" sources."archiver-2.0.3" + sources."basic-auth-1.1.0" + sources."body-parser-1.18.1" sources."chokidar-1.7.0" sources."ci-info-1.1.1" sources."cross-spawn-5.1.0" @@ -26622,7 +26989,7 @@ in sources."qs-6.5.0" ]; }) - sources."inquirer-3.2.3" + sources."inquirer-3.3.0" sources."leek-0.0.24" sources."lodash-4.17.4" sources."minimist-1.2.0" @@ -26633,7 +27000,7 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."ssh-config-1.1.0" + sources."ssh-config-1.1.1" (sources."string-width-2.1.1" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -26653,10 +27020,7 @@ in sources."tiny-lr-1.0.5" sources."uuid-3.1.0" sources."wrap-ansi-3.0.1" - sources."@types/orchestrator-0.3.0" - sources."@types/vinyl-2.0.1" - sources."@types/node-8.0.27" - sources."@types/q-0.0.37" + sources."ws-3.2.0" sources."archiver-utils-1.3.0" sources."async-2.5.0" sources."buffer-crc32-0.2.13" @@ -26691,6 +27055,24 @@ in sources."compress-commons-1.2.0" sources."crc32-stream-2.0.0" sources."crc-3.4.4" + sources."bytes-3.0.0" + sources."content-type-1.0.4" + sources."debug-2.6.8" + sources."depd-1.1.1" + sources."http-errors-1.6.2" + sources."iconv-lite-0.4.19" + sources."on-finished-2.3.0" + sources."qs-6.5.1" + sources."raw-body-2.3.2" + sources."type-is-1.6.15" + sources."ms-2.0.0" + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" + sources."ee-first-1.1.1" + sources."unpipe-1.0.0" + sources."media-typer-0.3.0" + sources."mime-types-2.1.17" + sources."mime-db-1.30.0" sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -26740,7 +27122,7 @@ in sources."binary-extensions-1.10.0" sources."set-immediate-shim-1.0.1" sources."nan-2.7.0" - sources."node-pre-gyp-0.6.36" + sources."node-pre-gyp-0.6.37" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -26749,7 +27131,8 @@ in sources."nopt-4.0.1" sources."npmlog-4.1.2" sources."rc-1.2.1" - sources."request-2.81.0" + sources."request-2.82.0" + sources."tape-4.8.0" sources."tar-pack-3.4.0" sources."abbrev-1.1.0" sources."osenv-0.1.4" @@ -26765,7 +27148,7 @@ in }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -26782,77 +27165,79 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.30.0" sources."punycode-1.4.1" - sources."debug-2.6.8" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-2.0.0" sources."lru-cache-4.1.1" sources."shebang-command-1.2.0" sources."which-1.3.0" @@ -26864,54 +27249,42 @@ in sources."accepts-1.3.4" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" - sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" - sources."finalhandler-1.0.4" + sources."etag-1.8.1" + sources."finalhandler-1.0.5" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."on-finished-2.3.0" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" sources."send-0.15.4" sources."serve-static-1.12.4" - sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" - sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."negotiator-0.6.1" - sources."unpipe-1.0.0" - sources."ee-first-1.1.1" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" - sources."http-errors-1.6.2" sources."mime-1.3.4" - sources."media-typer-0.3.0" - sources."ansi-escapes-2.0.0" + sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."external-editor-2.0.4" + sources."external-editor-2.0.5" sources."figures-2.0.0" sources."mute-stream-0.0.7" sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."through-2.3.8" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."mimic-fn-1.1.0" - sources."iconv-lite-0.4.18" sources."jschardet-1.5.1" - sources."tmp-0.0.31" + sources."tmp-0.0.33" sources."escape-string-regexp-1.0.5" sources."is-promise-2.1.0" sources."lodash.assign-3.2.0" @@ -26930,21 +27303,25 @@ in sources."cookiejar-2.1.1" sources."formidable-1.1.1" sources."block-stream-0.0.9" - sources."body-5.1.0" + (sources."body-5.1.0" // { + dependencies = [ + sources."raw-body-1.1.7" + sources."bytes-1.0.0" + sources."string_decoder-0.10.31" + ]; + }) sources."faye-websocket-0.10.0" sources."livereload-js-2.2.2" sources."continuable-cache-0.3.1" sources."error-7.0.2" - (sources."raw-body-1.1.7" // { - dependencies = [ - sources."string_decoder-0.10.31" - ]; - }) sources."safe-json-parse-1.0.1" sources."string-template-0.2.1" - sources."bytes-1.0.0" - sources."websocket-driver-0.6.5" - sources."websocket-extensions-0.1.1" + sources."websocket-driver-0.7.0" + sources."http-parser-js-0.4.7" + sources."websocket-extensions-0.1.2" + sources."async-limiter-1.0.0" + sources."ultron-1.1.0" + sources."netmask-1.0.6" sources."ansi-styles-3.2.0" sources."supports-color-4.4.0" sources."color-convert-1.9.0" @@ -26997,7 +27374,7 @@ in sources."source-map-0.4.4" ]; }) - (sources."js-yaml-3.9.1" // { + (sources."js-yaml-3.10.0" // { dependencies = [ sources."esprima-4.0.0" ]; @@ -27076,10 +27453,10 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.2.1.tgz"; - sha1 = "26c2f378cad3ad94282f8dcf0f2b1b8ddc33c612"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.3.1.tgz"; + sha1 = "b7db14bee9db6497788e2f5a7d49db2b7a2e1891"; }; dependencies = [ sources."@reactivex/rxjs-5.4.3" @@ -27096,15 +27473,15 @@ in ]; }) sources."lodash-4.17.4" - sources."mz-2.6.0" + sources."mz-2.7.0" sources."object-hash-1.1.8" sources."opentracing-0.14.1" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."typescript-2.3.4" - sources."vscode-jsonrpc-3.3.1" - sources."vscode-languageserver-3.3.0" - sources."vscode-languageserver-types-3.3.0" + sources."vscode-jsonrpc-3.4.0" + sources."vscode-languageserver-3.4.2" + sources."vscode-languageserver-types-3.4.0" sources."symbol-observable-1.0.4" sources."assertion-error-1.0.2" sources."check-error-1.0.2" @@ -27142,6 +27519,8 @@ in sources."object-assign-4.1.1" sources."thenify-all-1.6.0" sources."thenify-3.3.0" + sources."vscode-uri-1.0.1" + sources."vscode-languageserver-protocol-3.4.2" ]; buildInputs = globalBuildInputs; meta = { @@ -27239,10 +27618,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.6.14"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.6.14.tgz"; - sha1 = "d3b8f7322d02b9277d58bd238264c327e58044cd"; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.3.tgz"; + sha512 = "18pcdycadk2ijyxsgl2kr14hzf75cwp4va0laidqls6haq3h0laj6f7kbbl27mwicqxi3zdin1c34w20ag1ikpm830nffdlif86qgwr"; }; dependencies = [ sources."config-chain-1.1.11" @@ -27318,7 +27697,7 @@ in dependencies = [ sources."commander-2.11.0" sources."graphlib-2.1.1" - sources."js-yaml-3.9.1" + sources."js-yaml-3.10.0" sources."lodash-4.17.4" sources."native-promise-only-0.8.1" sources."path-loader-1.0.2" @@ -27336,7 +27715,7 @@ in sources."formidable-1.1.1" sources."methods-1.1.2" sources."mime-1.4.0" - sources."qs-6.5.0" + sources."qs-6.5.1" sources."readable-stream-2.3.3" sources."ms-2.0.0" sources."asynckit-0.4.0" @@ -27370,12 +27749,11 @@ in sha512 = "2iqk65hy94j010zlqsl4rzfkz4f9ic1pqbvsf5w1lrgmda9wmhxl5kmvnmwikjilmn6kz9kniqzl7rpq3xv3cmpx8rppb7ipk5ddhzj"; }; dependencies = [ - sources."body-parser-1.17.2" + sources."body-parser-1.18.1" sources."chalk-1.1.3" (sources."compression-1.7.0" // { dependencies = [ sources."bytes-2.5.0" - sources."debug-2.6.8" ]; }) sources."connect-pause-0.1.1" @@ -27383,7 +27761,6 @@ in sources."errorhandler-1.5.0" (sources."express-4.15.4" // { dependencies = [ - sources."debug-2.6.8" sources."qs-6.5.0" ]; }) @@ -27396,20 +27773,12 @@ in sources."lodash-4.17.4" sources."lodash-id-0.13.0" sources."lowdb-0.15.5" - (sources."method-override-2.3.9" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) - (sources."morgan-1.8.2" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."method-override-2.3.9" + sources."morgan-1.8.2" sources."object-assign-4.1.1" sources."please-upgrade-node-3.0.1" sources."pluralize-3.1.0" - sources."request-2.81.0" + sources."request-2.82.0" sources."server-destroy-1.0.1" sources."shortid-2.2.8" sources."update-notifier-1.0.3" @@ -27418,15 +27787,15 @@ in sources."camelcase-3.0.0" ]; }) - sources."bytes-2.4.0" - sources."content-type-1.0.2" - sources."debug-2.6.7" + sources."bytes-3.0.0" + sources."content-type-1.0.4" + sources."debug-2.6.8" sources."depd-1.1.1" sources."http-errors-1.6.2" - sources."iconv-lite-0.4.15" + sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."qs-6.4.0" - sources."raw-body-2.2.0" + sources."qs-6.5.1" + sources."raw-body-2.3.2" sources."type-is-1.6.15" sources."ms-2.0.0" sources."inherits-2.0.3" @@ -27455,27 +27824,19 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" - sources."etag-1.8.0" - (sources."finalhandler-1.0.4" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."etag-1.8.1" + sources."finalhandler-1.0.5" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."send-0.15.4" sources."serve-static-1.12.4" sources."utils-merge-1.0.0" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" @@ -27485,66 +27846,52 @@ in sources."is-promise-2.1.0" sources."steno-0.4.4" sources."basic-auth-1.1.0" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."core-util-is-1.0.2" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -27667,10 +28014,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz"; - sha512 = "31wxw267vdf4nnjpksnzcb4i603366sjrw7g08bkxi3cwlrfl67458v7rvj72vbxcycq43z4ldkrfvqjrsvrjqrb2kfzmabpzghddq9"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; + sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; dependencies = [ sources."argparse-1.0.9" @@ -27695,7 +28042,7 @@ in }; dependencies = [ sources."bluebird-3.5.0" - sources."body-parser-1.17.2" + sources."body-parser-1.18.1" sources."chokidar-1.7.0" sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { @@ -27703,11 +28050,7 @@ in sources."lodash-4.17.4" ]; }) - (sources."connect-3.6.3" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."connect-3.6.4" sources."core-js-2.5.1" sources."di-0.0.1" sources."dom-serialize-2.2.1" @@ -27737,7 +28080,7 @@ in sources."optimist-0.6.1" sources."qjobs-1.1.5" sources."range-parser-1.2.0" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" (sources."socket.io-1.7.3" // { dependencies = [ @@ -27749,15 +28092,15 @@ in sources."source-map-0.5.7" sources."tmp-0.0.31" sources."useragent-2.2.1" - sources."bytes-2.4.0" - sources."content-type-1.0.2" - sources."debug-2.6.7" + sources."bytes-3.0.0" + sources."content-type-1.0.4" + sources."debug-2.6.8" sources."depd-1.1.1" sources."http-errors-1.6.2" - sources."iconv-lite-0.4.15" + sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."qs-6.4.0" - sources."raw-body-2.2.0" + sources."qs-6.5.1" + sources."raw-body-2.3.2" sources."type-is-1.6.15" sources."ms-2.0.0" sources."inherits-2.0.3" @@ -27826,7 +28169,7 @@ in sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.7.0" - sources."node-pre-gyp-0.6.36" + sources."node-pre-gyp-0.6.37" sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.1.2" @@ -27835,8 +28178,13 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.81.0" + sources."request-2.82.0" sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -27849,7 +28197,7 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -27863,83 +28211,86 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."once-1.4.0" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - (sources."finalhandler-1.0.4" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) - sources."parseurl-1.3.1" - sources."utils-merge-1.0.0" + sources."finalhandler-1.0.5" + sources."parseurl-1.3.2" + sources."utils-merge-1.0.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."custom-event-1.0.1" @@ -28052,7 +28403,7 @@ in sources."basic-auth-1.0.4" sources."connect-2.30.2" sources."content-disposition-0.5.0" - sources."content-type-1.0.2" + sources."content-type-1.0.4" sources."commander-2.6.0" sources."cookie-0.1.3" sources."cookie-signature-1.0.6" @@ -28064,7 +28415,7 @@ in sources."merge-descriptors-1.0.0" sources."methods-1.1.2" sources."mkdirp-0.5.1" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."proxy-addr-1.0.10" sources."range-parser-1.0.3" (sources."send-0.13.0" // { @@ -28168,7 +28519,7 @@ in sources."mime-1.3.4" sources."media-typer-0.3.0" sources."minimist-0.0.8" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.0.5" sources."passport-strategy-1.0.0" sources."passport-google-oauth1-1.0.0" @@ -28190,10 +28541,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.1.2.tgz"; - sha1 = "b07eb7a4d7dd7d44a105262fef49b2229301c577"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.2.0.tgz"; + sha512 = "1dcq9rq01bw9g2yqljwf4lmp7x9wzn5bq8yy2x0sjxc9xdr024924ay6a52grjc0lymqs8rj6320kr4xm438qc4xy4yp2xg9crjh82f"; }; dependencies = [ sources."async-1.5.2" @@ -28206,13 +28557,13 @@ in sources."dedent-0.7.0" sources."execa-0.8.0" sources."find-up-2.1.0" - sources."fs-extra-4.0.1" + sources."fs-extra-4.0.2" sources."get-port-3.2.0" sources."glob-7.1.2" sources."glob-parent-3.1.0" sources."globby-6.1.0" sources."graceful-fs-4.1.11" - (sources."inquirer-3.2.3" // { + (sources."inquirer-3.3.0" // { dependencies = [ sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -28238,7 +28589,7 @@ in sources."strip-bom-3.0.0" ]; }) - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."semver-5.4.1" sources."signal-exit-3.0.2" @@ -28438,7 +28789,7 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."p-limit-1.1.0" - sources."jsonfile-3.0.1" + sources."jsonfile-4.0.0" sources."universalify-0.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -28450,10 +28801,10 @@ in sources."is-extglob-2.1.1" sources."array-union-1.0.2" sources."array-uniq-1.0.3" - sources."ansi-escapes-2.0.0" + sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."external-editor-2.0.4" + sources."external-editor-2.0.5" sources."figures-2.0.0" sources."mute-stream-0.0.7" sources."run-async-2.3.0" @@ -28468,9 +28819,9 @@ in sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."mimic-fn-1.1.0" - sources."iconv-lite-0.4.18" + sources."iconv-lite-0.4.19" sources."jschardet-1.5.1" - sources."tmp-0.0.31" + sources."tmp-0.0.33" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" sources."ci-info-1.1.1" @@ -28487,7 +28838,7 @@ in }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" (sources."wide-align-1.1.2" // { dependencies = [ @@ -28688,11 +29039,10 @@ in sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b"; }; dependencies = [ - sources."body-parser-1.17.2" + sources."body-parser-1.18.1" sources."chokidar-1.7.0" (sources."express-4.15.4" // { dependencies = [ - sources."debug-2.6.8" sources."qs-6.5.0" ]; }) @@ -28702,17 +29052,17 @@ in sources."markdown-it-task-checkbox-1.0.4" sources."minimist-1.2.0" sources."opn-5.1.0" - sources."request-2.81.0" + sources."request-2.82.0" sources."socket.io-2.0.3" - sources."bytes-2.4.0" - sources."content-type-1.0.2" - sources."debug-2.6.7" + sources."bytes-3.0.0" + sources."content-type-1.0.4" + sources."debug-2.6.8" sources."depd-1.1.1" sources."http-errors-1.6.2" - sources."iconv-lite-0.4.15" + sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."qs-6.4.0" - sources."raw-body-2.2.0" + sources."qs-6.5.1" + sources."raw-body-2.3.2" sources."type-is-1.6.15" sources."ms-2.0.0" sources."inherits-2.0.3" @@ -28787,7 +29137,7 @@ in sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.7.0" - sources."node-pre-gyp-0.6.36" + sources."node-pre-gyp-0.6.37" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -28796,8 +29146,9 @@ in sources."nopt-4.0.1" sources."npmlog-4.1.2" sources."rc-1.2.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."semver-5.4.1" + sources."tape-4.8.0" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."abbrev-1.1.0" @@ -28809,7 +29160,7 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -28828,6 +29179,27 @@ in sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" @@ -28839,29 +29211,21 @@ in sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" - (sources."finalhandler-1.0.4" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."etag-1.8.1" + sources."finalhandler-1.0.5" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."send-0.15.4" sources."serve-static-1.12.4" sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."negotiator-0.6.1" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" @@ -28871,70 +29235,56 @@ in sources."mdurl-1.0.1" sources."uc.micro-1.0.3" sources."sprintf-js-1.0.3" - sources."github-slugger-1.1.3" + sources."github-slugger-1.2.0" sources."innertext-1.0.2" sources."emoji-regex-6.1.1" sources."html-entities-1.2.1" sources."is-wsl-1.1.0" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -29020,7 +29370,7 @@ in sources."object-assign-4.1.1" sources."opn-5.1.0" sources."proxy-middleware-0.15.0" - sources."send-0.15.4" + sources."send-0.15.5" sources."serve-index-1.9.0" sources."anymatch-1.3.2" sources."async-each-1.0.1" @@ -29087,7 +29437,7 @@ in sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.7.0" - sources."node-pre-gyp-0.6.36" + sources."node-pre-gyp-0.6.37" sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.1.2" @@ -29096,9 +29446,14 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.81.0" - sources."rimraf-2.6.1" + sources."request-2.82.0" + sources."rimraf-2.6.2" sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -29111,7 +29466,7 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -29124,67 +29479,53 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -29196,6 +29537,27 @@ in sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."debug-2.6.8" @@ -29208,7 +29570,7 @@ in sources."ms-0.7.1" ]; }) - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."utils-merge-1.0.0" sources."escape-html-1.0.3" sources."on-finished-2.3.0" @@ -29216,15 +29578,15 @@ in sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."vary-1.1.1" - sources."through-2.3.8" sources."duplexer-0.1.1" sources."from-0.1.7" sources."map-stream-0.1.0" sources."pause-stream-0.0.11" sources."split-0.3.3" sources."stream-combiner-0.0.4" - sources."websocket-driver-0.6.5" - sources."websocket-extensions-0.1.1" + sources."websocket-driver-0.7.0" + sources."http-parser-js-0.4.7" + sources."websocket-extensions-0.1.2" sources."apache-crypt-1.2.1" sources."apache-md5-1.1.2" sources."bcryptjs-2.4.3" @@ -29235,8 +29597,8 @@ in sources."is-wsl-1.1.0" sources."destroy-1.0.4" sources."encodeurl-1.0.1" - sources."etag-1.8.0" - sources."fresh-0.5.0" + sources."etag-1.8.1" + sources."fresh-0.5.2" sources."http-errors-1.6.2" sources."mime-1.3.4" sources."range-parser-1.2.0" @@ -29291,10 +29653,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "3.5.0"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz"; - sha512 = "0ygdqmd1pxvdrgyympyhfy8cg90632jkggbv7l7irnzl0gaxdmyrrs9bf634046q8xq41bfxysabapgwdy8ssd58vc8nggbk0y3d1d4"; + url = "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz"; + sha512 = "093v1508xiyy2l0fp2c0rv9qc0jdhi4hz2xil2zyawjvcmag11scslkkyzv2cqwhh24b7ijhbhr3jbyidamgkhiccnn29ac9p9xmagz"; }; dependencies = [ sources."browser-stdout-1.3.0" @@ -29304,6 +29666,7 @@ in sources."escape-string-regexp-1.0.5" sources."glob-7.1.1" sources."growl-1.9.2" + sources."he-1.1.1" sources."json3-3.3.2" sources."lodash.create-3.1.1" sources."mkdirp-0.5.1" @@ -29349,7 +29712,7 @@ in }; dependencies = [ sources."commander-2.11.0" - sources."js-yaml-3.9.1" + sources."js-yaml-3.10.0" sources."json-refs-2.1.7" sources."argparse-1.0.9" sources."esprima-4.0.0" @@ -29369,7 +29732,7 @@ in sources."formidable-1.1.1" sources."methods-1.1.2" sources."mime-1.4.0" - sources."qs-6.5.0" + sources."qs-6.5.1" sources."readable-stream-2.3.3" sources."ms-2.0.0" sources."asynckit-0.4.0" @@ -29396,10 +29759,10 @@ in nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; - version = "0.0.23"; + version = "0.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz"; - sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.24.tgz"; + sha1 = "6581de112f5810c9930d5fcdf772f67787e797eb"; }; dependencies = [ sources."optparse-1.0.5" @@ -29408,7 +29771,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An internal DSL for the Nix package manager in JavaScript"; - homepage = https://github.com/svanderburg/nijs; + homepage = "https://github.com/svanderburg/nijs#readme"; license = "MIT"; }; production = true; @@ -29447,7 +29810,7 @@ in sources."normalize-package-data-2.4.0" sources."npm-package-arg-5.1.2" sources."once-1.4.0" - sources."request-2.81.0" + sources."request-2.82.0" sources."retry-0.10.1" sources."slide-1.1.6" sources."ssri-4.1.6" @@ -29474,67 +29837,53 @@ in sources."os-tmpdir-1.0.2" sources."builtins-1.0.3" sources."wrappy-1.0.2" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -29546,7 +29895,7 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -29604,8 +29953,8 @@ in sources."nopt-3.0.6" sources."npmlog-4.1.2" sources."osenv-0.1.4" - sources."request-2.81.0" - sources."rimraf-2.6.1" + sources."request-2.82.0" + sources."rimraf-2.6.2" sources."semver-5.3.0" sources."tar-2.2.1" sources."which-1.3.0" @@ -29632,7 +29981,7 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -29645,67 +29994,53 @@ in sources."ansi-regex-2.1.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -29740,7 +30075,11 @@ in sources."path-is-absolute-1.0.1" sources."rc-1.2.1" sources."semver-4.3.6" - sources."serve-favicon-2.4.3" + (sources."serve-favicon-2.4.4" // { + dependencies = [ + sources."fresh-0.5.1" + ]; + }) sources."strong-data-uri-1.0.4" sources."v8-debug-1.0.1" sources."v8-profiler-5.7.0" @@ -29827,19 +30166,19 @@ in sources."accepts-1.3.4" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" - sources."content-type-1.0.2" + sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" - sources."finalhandler-1.0.4" + sources."etag-1.8.1" + sources."finalhandler-1.0.5" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."qs-6.5.0" @@ -29856,7 +30195,7 @@ in sources."mime-db-1.30.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."http-errors-1.6.2" @@ -29873,27 +30212,32 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.1" sources."truncate-1.0.5" sources."nan-2.7.0" - (sources."node-pre-gyp-0.6.36" // { + (sources."node-pre-gyp-0.6.37" // { dependencies = [ - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."semver-5.4.1" sources."glob-7.1.2" ]; }) sources."nopt-4.0.1" sources."npmlog-4.1.2" - (sources."request-2.81.0" // { + (sources."request-2.82.0" // { dependencies = [ - sources."qs-6.4.0" + sources."qs-6.5.1" + ]; + }) + (sources."tape-4.8.0" // { + dependencies = [ + sources."glob-7.1.2" ]; }) sources."tar-2.2.1" (sources."tar-pack-3.4.0" // { dependencies = [ - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."glob-7.1.2" ]; }) @@ -29903,20 +30247,12 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.3" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) - sources."aproba-1.1.2" + sources."string_decoder-1.0.3" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" @@ -29924,71 +30260,78 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.1.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."fs.realpath-1.0.0" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" @@ -30014,10 +30357,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.36"; + version = "0.6.37"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; - sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz"; + sha1 = "3c872b236b2e266e4140578fe1ee88f693323a05"; }; dependencies = [ sources."mkdirp-0.5.1" @@ -30028,9 +30371,14 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.81.0" - sources."rimraf-2.6.1" + sources."request-2.82.0" + sources."rimraf-2.6.2" sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -30051,7 +30399,7 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -30065,67 +30413,53 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -30142,6 +30476,27 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."graceful-fs-4.1.11" @@ -30161,10 +30516,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.12.0.tgz"; - sha1 = "e538548a777340a19f855c4f087b7e528aa3feda"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.12.1.tgz"; + sha1 = "996a56dc49d9f16bbf1b78a4de08f13634b3878d"; }; dependencies = [ sources."chokidar-1.7.0" @@ -30242,7 +30597,7 @@ in sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.7.0" - sources."node-pre-gyp-0.6.36" + sources."node-pre-gyp-0.6.37" sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.1.2" @@ -30251,9 +30606,14 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.81.0" - sources."rimraf-2.6.1" + sources."request-2.82.0" + sources."rimraf-2.6.2" sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -30266,7 +30626,7 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -30280,67 +30640,53 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -30352,6 +30698,27 @@ in sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" @@ -30372,7 +30739,6 @@ in sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."event-stream-3.3.4" - sources."through-2.3.8" sources."duplexer-0.1.1" sources."from-0.1.7" sources."map-stream-0.1.0" @@ -30528,17 +30894,30 @@ in sources."node-red-node-email-0.1.24" (sources."node-red-node-twitter-0.1.11" // { dependencies = [ - sources."request-2.81.0" + sources."request-2.82.0" + sources."aws-sign2-0.7.0" sources."caseless-0.12.0" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."qs-6.5.1" sources."tunnel-agent-0.6.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" ]; }) - sources."node-red-node-rbe-0.1.11" + sources."node-red-node-rbe-0.1.13" sources."bcrypt-1.0.3" sources."bytes-2.4.0" - sources."content-type-1.0.2" + sources."content-type-1.0.4" sources."debug-2.6.7" sources."depd-1.1.1" sources."http-errors-1.6.2" @@ -30596,8 +30975,8 @@ in sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" - (sources."finalhandler-1.0.4" // { + sources."etag-1.8.1" + (sources."finalhandler-1.0.5" // { dependencies = [ sources."debug-2.6.8" ]; @@ -30605,7 +30984,7 @@ in sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" @@ -30614,7 +30993,7 @@ in sources."utils-merge-1.0.0" sources."negotiator-0.6.1" sources."unpipe-1.0.0" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" @@ -30644,7 +31023,7 @@ in sources."split2-2.1.1" (sources."websocket-stream-5.0.1" // { dependencies = [ - sources."ws-3.1.0" + sources."ws-3.2.0" ]; }) sources."xtend-4.0.1" @@ -30687,6 +31066,7 @@ in sources."through2-filter-2.0.0" sources."jsonify-0.0.0" sources."bl-1.2.1" + sources."async-limiter-1.0.0" sources."ultron-1.1.0" sources."append-field-0.1.0" (sources."busboy-0.2.14" // { @@ -30856,26 +31236,41 @@ in sources."utf7-1.0.2" sources."twitter-ng-0.6.2" sources."oauth-0.9.14" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."uuid-3.1.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."nan-2.6.2" (sources."node-pre-gyp-0.6.36" // { dependencies = [ sources."nopt-4.0.1" - sources."request-2.81.0" + sources."request-2.82.0" + sources."aws-sign2-0.7.0" sources."caseless-0.12.0" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."qs-6.5.1" sources."tunnel-agent-0.6.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" ]; }) sources."npmlog-4.1.2" sources."rc-1.2.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."osenv-0.1.4" @@ -30886,7 +31281,7 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -31039,10 +31434,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.4.1.tgz"; - sha512 = "0vb3ad2wgv4y52jwbz8xpzg36hzimbbnlad594kblfq2mjfnaw9v4zzgd19ghan4a622s4zcrap51l2fww79lbl6n2qfv26allyg26z"; + url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz"; + sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp"; }; dependencies = [ sources."JSONStream-1.3.1" @@ -31104,7 +31499,7 @@ in sources."npm-install-checks-3.0.0" sources."npm-lifecycle-1.0.3" sources."npm-package-arg-5.1.2" - sources."npm-packlist-1.1.8" + sources."npm-packlist-1.1.9" sources."npm-registry-client-8.4.0" sources."npm-user-validate-1.0.0" sources."npmlog-4.1.2" @@ -31122,7 +31517,7 @@ in sources."readable-stream-2.3.3" sources."request-2.81.0" sources."retry-0.10.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."semver-5.4.1" sources."sha-2.0.1" @@ -31154,7 +31549,7 @@ in sources."which-1.3.0" sources."worker-farm-1.5.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.3.0" + sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -31298,7 +31693,7 @@ in sources."http-proxy-agent-2.0.0" sources."https-proxy-agent-2.1.0" sources."node-fetch-npm-2.0.2" - sources."socks-proxy-agent-3.0.0" + sources."socks-proxy-agent-3.0.1" sources."humanize-ms-1.2.1" sources."ms-2.0.0" sources."agent-base-4.1.1" @@ -31307,7 +31702,7 @@ in sources."es6-promise-4.1.1" sources."encoding-0.1.12" sources."json-parse-better-errors-1.0.1" - sources."iconv-lite-0.4.18" + sources."iconv-lite-0.4.19" sources."socks-1.1.10" sources."ip-1.1.5" sources."smart-buffer-1.1.15" @@ -31517,32 +31912,32 @@ in sources."coffee-script-1.12.7" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."request-2.81.0" + sources."request-2.82.0" sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" sources."mkdirp-0.3.5" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."retry-0.6.0" sources."couch-login-0.1.20" sources."npmlog-4.1.2" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" @@ -31550,45 +31945,31 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."core-util-is-1.0.2" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -31616,7 +31997,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -31677,7 +32058,7 @@ in sources."cint-8.2.1" sources."cli-table-0.3.1" sources."commander-2.11.0" - sources."fast-diff-1.1.1" + sources."fast-diff-1.1.2" sources."find-up-1.1.2" sources."get-stdin-5.0.1" sources."json-parse-helpfulerror-1.0.3" @@ -31696,7 +32077,7 @@ in sources."require-dir-0.3.2" sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.40.2" // { + (sources."snyk-1.41.0" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -31997,13 +32378,14 @@ in sources."mute-stream-0.0.6" ]; }) + sources."needle-2.0.1" sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" - sources."snyk-go-plugin-1.1.3" + sources."snyk-go-plugin-1.2.1" sources."snyk-gradle-plugin-1.1.2" sources."snyk-module-1.8.1" - sources."snyk-mvn-plugin-1.0.1" + sources."snyk-mvn-plugin-1.0.3" sources."snyk-policy-1.7.1" sources."snyk-python-plugin-1.2.4" (sources."snyk-recursive-readdir-2.0.0" // { @@ -32045,6 +32427,7 @@ in sources."exit-hook-1.1.1" sources."onetime-1.1.0" sources."is-promise-2.1.0" + sources."iconv-lite-0.4.19" (sources."osx-release-1.1.0" // { dependencies = [ sources."minimist-1.2.0" @@ -32070,7 +32453,6 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" - sources."fs-0.0.1-security" sources."toml-2.3.3" sources."clone-deep-0.3.0" sources."for-own-1.0.0" @@ -32089,7 +32471,7 @@ in sources."for-in-0.1.8" ]; }) - sources."js-yaml-3.9.1" + sources."js-yaml-3.10.0" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" @@ -32215,21 +32597,22 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "0.2.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-0.2.0.tgz"; - sha1 = "f9ae38396f893863ed52c1a29fb45b42236e1a36"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.0.tgz"; + sha512 = "32glgr9c42bz2yp3k7kff9skkvrm1zrvcvv2pkifjmzbl3kca3bmapgz598jdm64hi3y0jbby4s90bv8838q40ni5lfh35863c57i0n"; }; dependencies = [ - sources."async-2.1.5" - sources."glob-7.1.1" + sources."async-2.4.1" + sources."glob-7.1.2" sources."lodash-4.17.4" sources."lokijs-1.4.3" sources."pegjs-0.10.0" - sources."vscode-jsonrpc-3.0.4" - sources."vscode-languageclient-3.0.4" - sources."vscode-languageserver-3.0.5" - sources."vscode-languageserver-types-3.0.3" + sources."vscode-jsonrpc-3.2.0" + sources."vscode-languageclient-3.2.2" + sources."vscode-languageserver-3.2.2" + sources."vscode-languageserver-types-3.2.0" + sources."vscode-uri-1.0.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -32260,15 +32643,14 @@ in dependencies = [ sources."async-0.9.2" sources."babybird-0.0.1" - (sources."body-parser-1.17.2" // { + (sources."body-parser-1.18.1" // { dependencies = [ - sources."content-type-1.0.2" + sources."content-type-1.0.4" ]; }) (sources."compression-1.7.0" // { dependencies = [ sources."bytes-2.5.0" - sources."debug-2.6.8" ]; }) sources."connect-busboy-0.0.2" @@ -32279,9 +32661,8 @@ in sources."entities-1.1.1" (sources."express-4.15.4" // { dependencies = [ - sources."content-type-1.0.2" - sources."debug-2.6.8" - sources."finalhandler-1.0.4" + sources."content-type-1.0.4" + sources."finalhandler-1.0.5" sources."qs-6.5.0" ]; }) @@ -32292,17 +32673,17 @@ in sources."ms-0.7.1" ]; }) - sources."js-yaml-3.9.1" + sources."js-yaml-3.10.0" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.8" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" sources."prfun-2.1.4" - sources."request-2.81.0" + sources."request-2.82.0" sources."semver-5.4.1" - (sources."serve-favicon-2.4.3" // { + (sources."serve-favicon-2.4.4" // { dependencies = [ - sources."safe-buffer-5.0.1" + sources."fresh-0.5.1" ]; }) (sources."service-runner-2.3.0" // { @@ -32323,14 +32704,14 @@ in }) sources."asap-2.0.6" sources."is-arguments-1.0.2" - sources."bytes-2.4.0" - sources."debug-2.6.7" + sources."bytes-3.0.0" + sources."debug-2.6.8" sources."depd-1.1.1" sources."http-errors-1.6.2" - sources."iconv-lite-0.4.15" + sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."qs-6.4.0" - sources."raw-body-2.2.0" + sources."qs-6.5.1" + sources."raw-body-2.3.2" sources."type-is-1.6.15" sources."ms-2.0.0" sources."inherits-2.0.3" @@ -32359,22 +32740,18 @@ in sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" + sources."etag-1.8.1" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."send-0.15.4" sources."serve-static-1.12.4" sources."utils-merge-1.0.0" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" @@ -32430,65 +32807,51 @@ in sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -32498,7 +32861,7 @@ in sources."bunyan-1.8.12" sources."bunyan-syslog-udp-0.1.0" sources."gelf-stream-1.1.1" - sources."hot-shots-4.5.0" + sources."hot-shots-4.7.0" (sources."limitation-0.2.0" // { dependencies = [ sources."readable-stream-2.3.3" @@ -32808,7 +33171,7 @@ in sources."ip-set-1.0.1" sources."mkdirp-0.3.5" sources."peer-wire-swarm-0.12.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" (sources."random-access-file-1.8.1" // { @@ -32947,7 +33310,7 @@ in ]; }) sources."content-disposition-0.5.0" - sources."content-type-1.0.2" + sources."content-type-1.0.4" sources."commander-2.6.0" sources."cookie-0.1.3" sources."cookie-signature-1.0.6" @@ -32958,7 +33321,7 @@ in sources."fresh-0.3.0" sources."merge-descriptors-1.0.0" sources."methods-1.1.2" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."proxy-addr-1.0.10" (sources."send-0.13.0" // { dependencies = [ @@ -33054,7 +33417,7 @@ in sources."batch-0.5.3" sources."destroy-1.0.4" sources."mime-1.3.4" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.0.5" sources."minimist-0.0.8" sources."end-of-stream-1.4.0" @@ -33167,7 +33530,7 @@ in sources."immediate-chunk-store-1.0.8" sources."ip-set-1.0.1" sources."peer-wire-swarm-0.12.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" (sources."random-access-file-1.8.1" // { @@ -33299,7 +33662,7 @@ in sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -33401,10 +33764,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.6.1.tgz"; - sha512 = "31al4m6n59a0mr6q8fn231zn4navr252z2pgq7dhcxdpp5a1aqaqmvx0sgamv97pkygswlcpbsj7a1dg2ijb9n0zr623ai2hh36mkkz"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.7.0.tgz"; + sha512 = "1ib30g1a6lq7pn1ajpmvajs3y4q94yb0xz53zp1s6gbbmihfn1zr8imp8vydlmh1cj41s2ymdkddq8hfq7mlr9caji83c9x87fw11lh"; }; buildInputs = globalBuildInputs; meta = { @@ -33414,6 +33777,398 @@ in }; production = true; }; + pulp = nodeEnv.buildNodePackage { + name = "pulp"; + packageName = "pulp"; + version = "12.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pulp/-/pulp-12.0.1.tgz"; + sha512 = "3n09lgnyd4p3h3jlhgcvbh6n6m9h89hwvbhli5ic32fkl5y4g7yi61m1vw483479jxkif2zyqs89l6j6hq4iy15jdknx1lcp9qbyvwy"; + }; + dependencies = [ + (sources."browserify-13.3.0" // { + dependencies = [ + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + ]; + }) + (sources."browserify-incremental-3.1.1" // { + dependencies = [ + sources."JSONStream-0.10.0" + sources."jsonparse-0.0.5" + ]; + }) + sources."concat-stream-1.6.0" + sources."glob-7.1.2" + sources."minimatch-3.0.4" + sources."node-static-0.7.10" + sources."read-1.0.7" + sources."string-stream-0.0.7" + sources."temp-0.8.3" + sources."through-2.3.8" + sources."tree-kill-1.2.0" + (sources."watchpack-1.4.0" // { + dependencies = [ + sources."async-2.5.0" + ]; + }) + sources."which-1.3.0" + sources."wordwrap-1.0.0" + sources."JSONStream-1.3.1" + sources."assert-1.4.1" + sources."browser-pack-6.0.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + sources."browserify-zlib-0.1.4" + sources."buffer-4.9.1" + sources."cached-path-relative-1.0.1" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."crypto-browserify-3.11.1" + sources."defined-1.0.0" + sources."deps-sort-2.0.0" + sources."domain-browser-1.1.7" + sources."duplexer2-0.1.4" + sources."events-1.1.1" + sources."has-1.0.1" + sources."htmlescape-1.1.1" + sources."https-browserify-0.0.1" + sources."inherits-2.0.3" + (sources."insert-module-globals-7.0.1" // { + dependencies = [ + sources."concat-stream-1.5.2" + sources."readable-stream-2.0.6" + ]; + }) + (sources."labeled-stream-splicer-2.0.0" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + (sources."module-deps-4.1.1" // { + dependencies = [ + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + ]; + }) + sources."os-browserify-0.1.2" + sources."parents-1.0.1" + sources."path-browserify-0.0.0" + sources."process-0.11.10" + sources."punycode-1.4.1" + sources."querystring-es3-0.2.1" + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.3.3" // { + dependencies = [ + sources."string_decoder-1.0.3" + ]; + }) + sources."resolve-1.4.0" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."stream-browserify-2.0.1" + sources."stream-http-2.7.2" + sources."string_decoder-0.10.31" + sources."subarg-1.0.0" + sources."syntax-error-1.3.0" + sources."through2-2.0.3" + sources."timers-browserify-1.4.2" + sources."tty-browserify-0.0.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."vm-browserify-0.0.4" + sources."xtend-4.0.1" + sources."jsonparse-1.3.1" + sources."combine-source-map-0.7.2" + sources."umd-3.0.1" + sources."convert-source-map-1.1.3" + sources."inline-source-map-0.6.2" + sources."lodash.memoize-3.0.4" + sources."source-map-0.5.7" + sources."pako-0.2.9" + sources."base64-js-1.2.1" + sources."ieee754-1.1.8" + sources."isarray-1.0.0" + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."date-now-0.1.4" + sources."browserify-cipher-1.0.0" + sources."browserify-sign-4.0.4" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + sources."diffie-hellman-5.0.2" + sources."pbkdf2-3.0.14" + sources."public-encrypt-4.0.0" + sources."randombytes-2.0.5" + sources."browserify-aes-1.0.8" + sources."browserify-des-1.0.0" + sources."evp_bytestokey-1.0.3" + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.4" + sources."safe-buffer-5.1.1" + sources."des.js-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."md5.js-1.3.4" + sources."hash-base-3.0.4" + sources."bn.js-4.11.8" + sources."browserify-rsa-4.0.1" + sources."elliptic-6.4.0" + sources."parse-asn1-5.1.0" + sources."brorand-1.1.0" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."asn1.js-4.9.1" + (sources."ripemd160-2.0.1" // { + dependencies = [ + sources."hash-base-2.0.2" + ]; + }) + sources."sha.js-2.4.8" + sources."miller-rabin-4.0.0" + sources."function-bind-1.1.1" + sources."is-buffer-1.1.5" + sources."lexical-scope-1.2.0" + sources."astw-2.2.0" + sources."acorn-4.0.13" + sources."stream-splicer-2.0.0" + sources."detective-4.5.0" + sources."stream-combiner2-1.1.1" + sources."path-platform-0.11.15" + sources."path-parse-1.0.5" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."array-filter-0.0.1" + sources."array-reduce-0.0.0" + sources."array-map-0.0.0" + sources."builtin-status-codes-3.0.0" + sources."to-arraybuffer-1.0.1" + sources."minimist-1.2.0" + sources."querystring-0.2.0" + sources."indexof-0.0.1" + sources."browserify-cache-api-3.0.1" + sources."async-1.5.2" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + ]; + }) + sources."colors-1.1.2" + sources."mime-1.4.0" + sources."mute-stream-0.0.7" + sources."os-tmpdir-1.0.2" + sources."rimraf-2.2.8" + sources."chokidar-1.7.0" + sources."graceful-fs-4.1.11" + sources."lodash-4.17.4" + sources."anymatch-1.3.2" + sources."async-each-1.0.1" + sources."glob-parent-2.0.0" + sources."is-binary-path-1.0.1" + sources."is-glob-2.0.1" + sources."readdirp-2.1.0" + sources."fsevents-1.1.2" + sources."micromatch-2.3.11" + sources."normalize-path-2.1.1" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.1" + sources."is-extglob-1.0.0" + sources."kind-of-3.2.2" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.4" + sources."arr-flatten-1.1.0" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."repeat-string-1.6.1" + sources."is-posix-bracket-0.1.1" + sources."for-own-0.1.5" + sources."is-extendable-0.1.1" + sources."for-in-1.0.2" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."remove-trailing-separator-1.1.0" + sources."binary-extensions-1.10.0" + sources."set-immediate-shim-1.0.1" + sources."nan-2.7.0" + (sources."node-pre-gyp-0.6.37" // { + dependencies = [ + sources."rimraf-2.6.2" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + sources."rc-1.2.1" + sources."request-2.82.0" + sources."semver-5.4.1" + sources."tape-4.8.0" + sources."tar-2.2.1" + (sources."tar-pack-3.4.0" // { + dependencies = [ + sources."rimraf-2.6.2" + ]; + }) + sources."abbrev-1.1.0" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."are-we-there-yet-1.1.4" + sources."console-control-strings-1.1.0" + sources."gauge-2.7.4" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.2.0" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.1" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.2" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.1.1" + sources."deep-extend-0.4.2" + sources."ini-1.3.4" + sources."strip-json-comments-2.0.1" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."qs-6.5.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + (sources."ajv-5.2.2" // { + dependencies = [ + sources."json-stable-stringify-1.0.1" + ]; + }) + sources."har-schema-2.0.0" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."deep-equal-1.0.1" + sources."for-each-0.3.2" + sources."object-inspect-1.3.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."is-function-1.0.1" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" + sources."block-stream-0.0.9" + sources."fstream-1.0.11" + sources."debug-2.6.8" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."ms-2.0.0" + sources."isexe-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A build system for PureScript projects"; + homepage = https://github.com/bodil/pulp; + license = "LGPL-3.0+"; + }; + production = true; + }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; packageName = "react-tools"; @@ -33433,7 +34188,7 @@ in sources."detective-4.5.0" sources."glob-5.0.15" sources."graceful-fs-4.1.11" - sources."iconv-lite-0.4.18" + sources."iconv-lite-0.4.19" sources."mkdirp-0.5.1" sources."private-0.1.7" sources."q-1.5.0" @@ -33536,30 +34291,30 @@ in sources."request-2.9.203" (sources."openid-2.0.6" // { dependencies = [ - sources."request-2.81.0" - sources."qs-6.4.0" + sources."request-2.82.0" + sources."qs-6.5.1" ]; }) sources."node-swt-0.1.1" sources."node-wsfederation-0.1.1" sources."formidable-1.0.11" sources."crc-0.2.0" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" @@ -33567,44 +34322,30 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -33637,17 +34378,21 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.0.6"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.0.6.tgz"; - sha512 = "1r8g02k4ab6rr6mbh0pib7wg2q08nmydkz5mgvg5mjlq41q7cqi3gsxw85d9qw891rmrhx66zm0h7m85y7mldp3b7nhqqgmqblsl9h2"; + url = "https://registry.npmjs.org/serve/-/serve-6.1.0.tgz"; + sha512 = "3hrp79lvglwci8nbyxqwy38f27xfa2axsb5nzqy6hsg4sjs1fpn0va22zv01jgdxjqs9lhpisc47y5aidd699mnrxpvp787gsgvx8ic"; }; dependencies = [ - sources."args-3.0.4" - sources."basic-auth-1.1.0" + (sources."args-3.0.4" // { + dependencies = [ + sources."chalk-2.0.1" + ]; + }) + sources."basic-auth-2.0.0" sources."bluebird-3.5.0" sources."boxen-1.2.1" - sources."chalk-2.0.1" + sources."chalk-2.1.0" (sources."clipboardy-1.1.4" // { dependencies = [ sources."execa-0.6.3" @@ -33656,24 +34401,16 @@ in sources."dargs-5.1.0" sources."detect-port-1.2.1" sources."filesize-3.5.10" - sources."fs-extra-4.0.1" + sources."fs-extra-4.0.2" sources."handlebars-4.0.10" sources."ip-1.1.5" - sources."micro-8.0.1" + sources."micro-9.0.0" sources."micro-compress-1.0.0" - (sources."mime-types-2.1.16" // { - dependencies = [ - sources."mime-db-1.29.0" - ]; - }) + sources."mime-types-2.1.17" sources."node-version-1.1.0" sources."opn-5.1.0" sources."path-type-3.0.0" - (sources."send-0.15.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) + sources."send-0.15.4" (sources."update-notifier-2.2.0" // { dependencies = [ sources."chalk-1.1.3" @@ -33687,7 +34424,14 @@ in sources."minimist-1.2.0" sources."pkginfo-0.4.0" sources."string-similarity-1.2.0" + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.4.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" sources."lodash-4.17.4" + sources."safe-buffer-5.1.1" sources."ansi-align-2.0.0" sources."cli-boxes-1.0.0" sources."string-width-2.1.1" @@ -33721,17 +34465,11 @@ in sources."path-key-2.0.1" sources."code-point-at-1.1.0" sources."number-is-nan-1.0.1" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.4.0" - sources."color-convert-1.9.0" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" sources."address-1.0.3" sources."debug-2.6.8" sources."ms-2.0.0" sources."graceful-fs-4.1.11" - sources."jsonfile-3.0.1" + sources."jsonfile-4.0.0" sources."universalify-0.1.1" sources."async-1.5.2" (sources."optimist-0.6.1" // { @@ -33770,10 +34508,15 @@ in sources."is-buffer-1.1.5" sources."media-typer-0.3.0" sources."mri-1.1.0" - sources."raw-body-2.2.0" - sources."bytes-2.4.0" - sources."iconv-lite-0.4.15" + sources."raw-body-2.3.2" + sources."bytes-3.0.0" + sources."http-errors-1.6.2" + sources."iconv-lite-0.4.19" sources."unpipe-1.0.0" + sources."depd-1.1.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" (sources."compression-1.7.0" // { dependencies = [ sources."bytes-2.5.0" @@ -33782,25 +34525,19 @@ in sources."accepts-1.3.4" sources."compressible-2.0.11" sources."on-headers-1.0.1" - sources."safe-buffer-5.1.1" sources."vary-1.1.1" sources."negotiator-0.6.1" sources."mime-db-1.30.0" sources."is-wsl-1.1.0" sources."pify-3.0.0" - sources."depd-1.1.1" sources."destroy-1.0.4" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" + sources."etag-1.8.1" sources."fresh-0.5.0" - sources."http-errors-1.6.2" sources."mime-1.3.4" sources."on-finished-2.3.0" sources."range-parser-1.2.0" - sources."statuses-1.3.1" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" sources."ee-first-1.1.1" sources."configstore-3.1.1" sources."import-lazy-2.1.0" @@ -33863,12 +34600,13 @@ in dependencies = [ sources."express-5.0.0-alpha.5" sources."express-json5-0.1.0" - (sources."body-parser-1.17.2" // { + (sources."body-parser-1.18.1" // { dependencies = [ - sources."bytes-2.4.0" - sources."debug-2.6.7" - sources."iconv-lite-0.4.15" - sources."raw-body-2.2.0" + sources."bytes-3.0.0" + sources."debug-2.6.8" + sources."iconv-lite-0.4.19" + sources."qs-6.5.1" + sources."raw-body-2.3.2" sources."ms-2.0.0" ]; }) @@ -33880,9 +34618,13 @@ in ]; }) sources."commander-2.11.0" - sources."js-yaml-3.9.1" + sources."js-yaml-3.10.0" sources."cookies-0.7.1" - sources."request-2.81.0" + (sources."request-2.82.0" // { + dependencies = [ + sources."qs-6.5.1" + ]; + }) sources."async-0.9.2" sources."es6-shim-0.21.1" sources."semver-4.3.6" @@ -33908,15 +34650,15 @@ in sources."accepts-1.3.4" sources."array-flatten-2.1.1" sources."content-disposition-0.5.2" - sources."content-type-1.0.2" + sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."debug-2.6.1" sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" - (sources."finalhandler-1.0.4" // { + sources."etag-1.8.1" + (sources."finalhandler-1.0.5" // { dependencies = [ sources."debug-2.6.8" sources."ms-2.0.0" @@ -33926,7 +34668,7 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" @@ -33951,7 +34693,7 @@ in sources."ms-0.7.2" sources."unpipe-1.0.0" sources."ee-first-1.1.1" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" @@ -33966,66 +34708,52 @@ in sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."keygrip-1.0.2" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."core-util-is-1.0.2" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -34220,7 +34948,7 @@ in sources."dtrace-provider-0.6.0" sources."precond-0.2.3" sources."csv-generate-0.0.6" - sources."csv-parse-1.2.1" + sources."csv-parse-1.2.2" sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" sources."asn1-0.1.11" @@ -34338,7 +35066,7 @@ in sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."minimist-0.0.8" - sources."clap-1.2.0" + sources."clap-1.2.3" sources."source-map-0.5.7" sources."chalk-1.1.3" sources."ansi-styles-2.2.1" @@ -34420,10 +35148,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.0.28"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz"; - sha512 = "0c2lanpm4sac5iz6mybcdxyh2y1hrgjghlggjh1wq2nr19lr9yig6j2hgjvghm1pzv5r3lm7pfhbgnpndrbynjmva3a3mxlmhcyl7yj"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.1.tgz"; + sha512 = "324ss2wqxsz86ih8hy14lkaqaq32kck3mkka79nj7v3bk9288c9a1x7pc88na5g17ch83qvg9j5hwlzl7v72crl5c01dz9d92cfkc3z"; }; dependencies = [ sources."commander-2.11.0" @@ -34520,20 +35248,33 @@ in }) (sources."npm-registry-client-8.4.0" // { dependencies = [ - sources."request-2.81.0" + sources."request-2.82.0" + sources."aws-sign2-0.7.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."hawk-3.1.3" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" ]; }) sources."octicons-3.5.0" @@ -34553,7 +35294,7 @@ in sources."minimist-1.2.0" ]; }) - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."semver-5.4.1" sources."serve-static-1.12.4" sources."signals-1.0.0" @@ -34593,7 +35334,7 @@ in ]; }) sources."bytes-2.4.0" - sources."content-type-1.0.2" + sources."content-type-1.0.4" sources."debug-2.6.7" sources."depd-1.1.1" sources."http-errors-1.6.2" @@ -34632,8 +35373,8 @@ in sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.8.0" - (sources."finalhandler-1.0.4" // { + sources."etag-1.8.1" + (sources."finalhandler-1.0.5" // { dependencies = [ sources."debug-2.6.8" ]; @@ -34641,7 +35382,7 @@ in sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."parseurl-1.3.1" + sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" @@ -34653,7 +35394,7 @@ in sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."negotiator-0.6.1" - sources."forwarded-0.1.0" + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" @@ -35100,6 +35841,8 @@ in sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" sources."ssri-4.1.6" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" @@ -35261,7 +36004,7 @@ in sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" - sources."rimraf-2.6.1" + sources."rimraf-2.6.2" sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -35363,10 +36106,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "3.5.6"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.5.6.tgz"; - sha512 = "074qvc0afzqmgizpxih7yhbp3bzf77l3jf91zssaqlilvz56jkgj6mnyw5r2qv2y8kgqc8q147ys00b8bc8v2q12imrb8ca3rzz2ydi"; + url = "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz"; + sha512 = "12fzgy04c0gwlpr5bn66q92kbnv8wn4sm6xd2mmhc3dwq0fkrl2h1pmad3wh56x8zia8v7s4jcwxndhv8pb9d0y7s7skl0n7pfd7h9s"; }; dependencies = [ sources."acorn-5.1.2" @@ -35380,7 +36123,7 @@ in sources."async-2.5.0" sources."enhanced-resolve-3.4.1" sources."escope-3.6.0" - sources."interpret-1.0.3" + sources."interpret-1.0.4" sources."json-loader-0.5.7" sources."json5-0.5.1" sources."loader-runner-2.3.0" @@ -35430,7 +36173,7 @@ in sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" sources."event-emitter-0.3.5" - sources."big.js-3.1.3" + sources."big.js-3.2.0" sources."emojis-list-2.1.0" sources."errno-0.1.4" sources."readable-stream-2.3.3" @@ -35482,7 +36225,7 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.13" + sources."pbkdf2-3.0.14" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" sources."browserify-aes-1.0.8" @@ -35590,7 +36333,7 @@ in sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."nan-2.7.0" - sources."node-pre-gyp-0.6.36" + sources."node-pre-gyp-0.6.37" sources."nopt-4.0.1" sources."npmlog-4.1.2" (sources."rc-1.2.1" // { @@ -35598,9 +36341,14 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.81.0" - sources."rimraf-2.6.1" + sources."request-2.82.0" + sources."rimraf-2.6.2" sources."semver-5.4.1" + (sources."tape-4.8.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."abbrev-1.1.0" @@ -35612,7 +36360,7 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -35625,67 +36373,47 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - (sources."har-validator-4.2.1" // { - dependencies = [ - sources."ajv-4.11.8" - ]; - }) - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."har-schema-1.0.5" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."har-schema-2.0.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -35696,6 +36424,27 @@ in sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" + sources."deep-equal-1.0.1" + sources."defined-1.0.0" + sources."for-each-0.3.2" + sources."function-bind-1.1.1" + sources."has-1.0.1" + sources."object-inspect-1.3.0" + sources."resolve-1.4.0" + sources."resumer-0.0.0" + sources."string.prototype.trim-1.1.2" + sources."through-2.3.8" + sources."is-function-1.0.1" + sources."path-parse-1.0.5" + sources."define-properties-1.1.2" + sources."es-abstract-1.8.2" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."debug-2.6.8" @@ -35784,246 +36533,11 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.27.5"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.27.5.tgz"; - sha1 = "06fe67d8040802993f9f1e1923d671cbf9ead5d1"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.0.2.tgz"; + sha1 = "d1b8f4b6d3b0684e86f63a072ac630995b8b7b0a"; }; - dependencies = [ - sources."babel-runtime-6.26.0" - sources."bytes-2.5.0" - sources."camelcase-4.1.0" - sources."chalk-1.1.3" - sources."cmd-shim-2.0.2" - sources."commander-2.11.0" - sources."death-1.1.0" - sources."debug-2.6.8" - sources."detect-indent-5.0.0" - sources."glob-7.1.2" - sources."gunzip-maybe-1.4.1" - sources."ini-1.3.4" - (sources."inquirer-3.2.3" // { - dependencies = [ - sources."chalk-2.1.0" - sources."strip-ansi-4.0.0" - sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" - sources."ansi-regex-3.0.0" - ]; - }) - sources."invariant-2.2.2" - sources."is-builtin-module-1.0.0" - sources."is-ci-1.0.10" - sources."leven-2.1.0" - sources."loud-rejection-1.6.0" - sources."micromatch-2.3.11" - sources."mkdirp-0.5.1" - sources."node-emoji-1.8.1" - sources."object-path-0.11.4" - sources."proper-lockfile-2.0.1" - sources."read-1.0.7" - sources."request-2.81.0" - sources."request-capture-har-1.2.2" - sources."rimraf-2.6.1" - sources."semver-5.4.1" - sources."strip-bom-3.0.0" - sources."tar-fs-1.15.3" - sources."tar-stream-1.5.4" - sources."uuid-3.1.0" - sources."v8-compile-cache-1.1.0" - sources."validate-npm-package-license-3.0.1" - sources."core-js-2.5.1" - sources."regenerator-runtime-0.11.0" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."graceful-fs-4.1.11" - sources."ms-2.0.0" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."browserify-zlib-0.1.4" - sources."is-deflate-1.0.0" - sources."is-gzip-1.0.0" - sources."peek-stream-1.1.2" - sources."pumpify-1.3.5" - sources."through2-2.0.3" - sources."pako-0.2.9" - sources."duplexify-3.5.1" - sources."end-of-stream-1.4.0" - sources."readable-stream-2.3.3" - sources."stream-shift-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."pump-1.0.2" - sources."xtend-4.0.1" - sources."ansi-escapes-2.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.0.4" - sources."figures-2.0.0" - sources."lodash-4.17.4" - sources."mute-stream-0.0.7" - sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - ]; - }) - sources."through-2.3.8" - sources."color-convert-1.9.0" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" - sources."signal-exit-3.0.2" - sources."mimic-fn-1.1.0" - sources."iconv-lite-0.4.18" - sources."jschardet-1.5.1" - sources."tmp-0.0.31" - sources."os-tmpdir-1.0.2" - sources."is-promise-2.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."loose-envify-1.3.1" - sources."js-tokens-3.0.2" - sources."builtin-modules-1.1.1" - sources."ci-info-1.1.1" - sources."currently-unhandled-0.4.1" - sources."array-find-index-1.0.2" - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - sources."braces-1.8.5" - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - sources."arr-flatten-1.1.0" - sources."expand-range-1.8.2" - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-2.1.0" - sources."isobject-2.1.0" - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" - sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.1.0" - sources."for-own-0.1.5" - sources."is-extendable-0.1.1" - sources."for-in-1.0.2" - sources."glob-base-0.3.0" - sources."is-dotfile-1.0.3" - sources."glob-parent-2.0.0" - sources."is-equal-shallow-0.1.3" - sources."is-primitive-2.0.0" - sources."minimist-0.0.8" - sources."lodash.toarray-4.4.0" - sources."retry-0.10.1" - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" - sources."co-4.6.0" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.30.0" - sources."punycode-1.4.1" - sources."chownr-1.0.1" - sources."bl-1.2.1" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" - ]; buildInputs = globalBuildInputs; meta = { description = "📦🐈 Fast, reliable, and secure dependency management."; @@ -36050,7 +36564,7 @@ in sources."fullname-3.3.0" sources."got-6.7.1" sources."humanize-string-1.0.1" - (sources."inquirer-3.2.3" // { + (sources."inquirer-3.3.0" // { dependencies = [ sources."chalk-2.1.0" sources."strip-ansi-4.0.0" @@ -36212,10 +36726,10 @@ in sources."capture-stack-trace-1.0.0" sources."prepend-http-1.0.4" sources."decamelize-1.2.0" - sources."ansi-escapes-2.0.0" + sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."external-editor-2.0.4" + sources."external-editor-2.0.5" sources."mute-stream-0.0.7" sources."run-async-2.3.0" sources."rx-lite-4.0.8" @@ -36232,15 +36746,15 @@ in sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" - sources."iconv-lite-0.4.18" + sources."iconv-lite-0.4.19" sources."jschardet-1.5.1" - sources."tmp-0.0.31" + sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" sources."lodash.debounce-3.1.1" sources."os-name-1.0.3" - sources."request-2.81.0" + sources."request-2.82.0" sources."tough-cookie-2.3.2" sources."uuid-3.1.0" (sources."mkdirp-0.5.1" // { @@ -36266,66 +36780,52 @@ in sources."osx-release-1.1.0" sources."win-release-1.1.1" sources."semver-5.4.1" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.2" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."core-util-is-1.0.2" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" From 334dfc3086444e72e3ec3426dcb58ae9d8cf9392 Mon Sep 17 00:00:00 2001 From: Diego Zamboni Date: Thu, 21 Sep 2017 22:23:16 +0200 Subject: [PATCH 29/80] assh: init at 2.6.0 Powerful wrapper around ssh. --- lib/maintainers.nix | 1 + pkgs/tools/networking/assh/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/tools/networking/assh/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e9cf58c5baa..a256f4444e7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -662,4 +662,5 @@ zoomulator = "Kim Simmons "; zraexy = "David Mell "; zx2c4 = "Jason A. Donenfeld "; + zzamboni = "Diego Zamboni "; } diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix new file mode 100644 index 00000000000..bbed205cce8 --- /dev/null +++ b/pkgs/tools/networking/assh/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "assh-${version}"; + version = "2.6.0"; + + goPackagePath = "github.com/moul/advanced-ssh-config"; + subPackages = [ "cmd/assh" ]; + + postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' + install_name_tool -delete_rpath $out/lib $bin/bin/assh + ''; + + src = fetchFromGitHub { + repo = "advanced-ssh-config"; + owner = "moul"; + rev = "v${version}"; + sha256 = "1vv98dz5822k51xklnmky0lwfjw8nc6ryvn8lmv9n63ppwh9s2s6"; + }; + + meta = with stdenv.lib; { + description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts"; + homepage = https://github.com/moul/advanced-ssh-config; + license = licenses.mit; + maintainers = with maintainers; [ zzamboni ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b75752bd42..ac78881d723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1234,6 +1234,8 @@ with pkgs; autossh = callPackage ../tools/networking/autossh { }; + assh = callPackage ../tools/networking/assh { }; + asynk = callPackage ../tools/networking/asynk { }; bacula = callPackage ../tools/backup/bacula { }; From 62f8e255a49e485742096bf985cd81d3af9280e6 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 21 Sep 2017 22:22:38 +0200 Subject: [PATCH 30/80] vapoursynth: fix darwin build --- pkgs/development/libraries/vapoursynth/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index b37f28f868e..cdbecb4dc8b 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, - zimg, libass, yasm, python3, + zimg, libass, yasm, python3, libiconv, ApplicationServices, ocrSupport ? false, tesseract, imwriSupport? true, imagemagick7 }: @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0"; }; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - pkgconfig autoreconfHook zimg libass tesseract yasm (python3.withPackages (ps: with ps; [ sphinx cython ])) - ] ++ optional ocrSupport tesseract + ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] + ++ optional ocrSupport tesseract ++ optional imwriSupport imagemagick7; configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65cf86dff5..63d30c22ff2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17807,7 +17807,9 @@ with pkgs; vapor = callPackage ../games/vapor { love = love_0_8; }; - vapoursynth = callPackage ../development/libraries/vapoursynth { }; + vapoursynth = callPackage ../development/libraries/vapoursynth { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; From 351f5fc58519be059f9d6703f2f90a39ba2d1839 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 19 Aug 2017 18:50:53 +0200 Subject: [PATCH 31/80] fuse3: init at 3.1.1 This includes fuse-common (fusePackages.fuse_3.common) as recommended by upstream. But while fuse(2) and fuse3 would normally depend on fuse-common we can't do that in nixpkgs while fuse-common is just another output from the fuse3 multiple-output derivation (i.e. this would result in a circular dependency). To avoid building fuse3 twice I decided it would be best to copy the shared files (i.e. the ones provided by fuse(2) and fuse3) from fuse-common to fuse (version 2) and avoid collision warnings by defining priorities. Now it should be possible to install an arbitrary combination of "fuse", "fuse3", and "fuse-common" without getting any collision warnings. The end result should be the same and all changes should be backwards compatible (assuming that mount.fuse from fuse3 is backwards compatible as stated by upstream [0] - if not this might break some /etc/fstab definitions but that should be very unlikely). My tests with sshfs (version 2 and 3) didn't show any problems. See #28409 for some additional information. [0]: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0 --- nixos/modules/profiles/base.nix | 1 + nixos/modules/security/wrappers/default.nix | 5 +- nixos/modules/tasks/filesystems.nix | 2 +- pkgs/os-specific/linux/fuse/common.nix | 72 +++++++++++++++++++++ pkgs/os-specific/linux/fuse/default.nix | 57 +++++----------- pkgs/top-level/all-packages.nix | 5 +- 6 files changed, 97 insertions(+), 45 deletions(-) create mode 100644 pkgs/os-specific/linux/fuse/common.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 687cd9d80d3..39b8553976e 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -20,6 +20,7 @@ # Some networking tools. pkgs.fuse + pkgs.fuse3 pkgs.sshfs-fuse pkgs.socat pkgs.screen diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index a6dc8faaae9..1f64213accd 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -155,7 +155,10 @@ in ###### implementation config = { - security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount"; + security.wrappers = { + fusermount.source = "${pkgs.fuse}/bin/fusermount"; + fusermount3.source = "${pkgs.fuse3}/bin/fusermount3"; + }; boot.specialFileSystems.${parentWrapperDir} = { fsType = "tmpfs"; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 1922d2924bc..6ceb36714b2 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -217,7 +217,7 @@ in # Add the mount helpers to the system path so that `mount' can find them. system.fsPackages = [ pkgs.dosfstools ]; - environment.systemPackages = [ pkgs.fuse ] ++ config.system.fsPackages; + environment.systemPackages = with pkgs; [ fuse3 fuse ] ++ config.system.fsPackages; environment.etc.fstab.text = let diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix new file mode 100644 index 00000000000..8938eaae818 --- /dev/null +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -0,0 +1,72 @@ +{ version, sha256Hash, maintainers }: + +{ stdenv, fetchFromGitHub, fetchpatch +, utillinux, autoconf, automake, libtool, gettext +, fusePackages }: + +let + isFuse3 = stdenv.lib.hasPrefix "3" version; +in stdenv.mkDerivation rec { + name = "fuse-${version}"; + + src = fetchFromGitHub { + owner = "libfuse"; + repo = "libfuse"; + rev = name; + sha256 = sha256Hash; + }; + + patches = stdenv.lib.optional + (!isFuse3 && stdenv.isAarch64) + (fetchpatch { + url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; + sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; + }); + + nativeBuildInputs = [ libtool autoconf automake ]; + buildInputs = [ gettext utillinux ]; + + outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; + + preConfigure = '' + export MOUNT_FUSE_PATH=$out/sbin + export INIT_D_PATH=$TMPDIR/etc/init.d + export UDEV_RULES_PATH=$out/etc/udev/rules.d + + # Ensure that FUSE calls the setuid wrapper, not + # $out/bin/fusermount. It falls back to calling fusermount in + # $PATH, so it should also work on non-NixOS systems. + export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\"" + + sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c + sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh + + ./makeconf.sh + ''; + + postFixup = if isFuse3 then '' + cd $out + + mv bin/mount.fuse3 bin/mount.fuse + mv etc/udev/rules.d/99-fuse3.rules etc/udev/rules.d/99-fuse.rules + + install -D -m555 bin/mount.fuse $common/bin/mount.fuse + install -D -m444 etc/udev/rules.d/99-fuse.rules $common/etc/udev/rules.d/99-fuse.rules + install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz + '' else '' + cd $out + + cp ${fusePackages.fuse_3.common}/bin/mount.fuse bin/mount.fuse + cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules + cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz + ''; + + enableParallelBuilding = true; + + meta = { + inherit (src.meta) homepage; + description = "Kernel module and library that allows filesystems to be implemented in user space"; + platforms = stdenv.lib.platforms.linux; + inherit maintainers; + }; +} diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index b36d13a0b1d..1a6c45c7cee 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,47 +1,20 @@ -{ stdenv, fetchFromGitHub, fetchpatch, utillinux -, autoconf, automake, libtool, gettext }: +{ stdenv, callPackage, utillinux }: -stdenv.mkDerivation rec { - name = "fuse-${version}"; - version = "2.9.7"; - - src = fetchFromGitHub { - owner = "libfuse"; - repo = "libfuse"; - rev = name; - sha256 = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; +let + mkFuse = args: callPackage (import ./common.nix args) { + inherit utillinux; }; - - buildInputs = [ utillinux autoconf automake libtool gettext ]; - - patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { - url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; - sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; - }); - - preConfigure = - '' - export MOUNT_FUSE_PATH=$out/sbin - export INIT_D_PATH=$TMPDIR/etc/init.d - export UDEV_RULES_PATH=$out/etc/udev/rules.d - - # Ensure that FUSE calls the setuid wrapper, not - # $out/bin/fusermount. It falls back to calling fusermount in - # $PATH, so it should also work on non-NixOS systems. - export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\"" - - sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c - sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh - - ./makeconf.sh - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://github.com/libfuse/libfuse; - description = "Kernel module and library that allows filesystems to be implemented in user space"; - platforms = platforms.linux; + maintainers = stdenv.lib.maintainers; +in { + fuse_2 = mkFuse { + version = "2.9.7"; + sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; maintainers = [ maintainers.mornfall ]; }; + + fuse_3 = mkFuse { + version = "3.1.1"; + sha256Hash = "14mazl2i55fp4vjphwgcmk3mp2x3mhqwh9nci0rd0jl5lhpdmpq6"; + maintainers = [ maintainers.primeos ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63d30c22ff2..bf60c6c3682 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12052,9 +12052,12 @@ with pkgs; inherit (linuxPackages) kernel; }; - fuse = callPackage ../os-specific/linux/fuse { + fusePackages = callPackage ../os-specific/linux/fuse { utillinux = utillinuxMinimal; }; + fuse = lowPrio fusePackages.fuse_2; + fuse3 = fusePackages.fuse_3; + fuse-common = hiPrio fusePackages.fuse_3.common; fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { }; From 137142a72cd6ef96b227dd0f1164504abf5546f1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 19 Aug 2017 21:42:50 +0200 Subject: [PATCH 32/80] sshfs-fuse: 2.10 -> 3.2.0 --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 8 ++++---- pkgs/top-level/aliases.nix | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index c1502a3227d..62505ac041e 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkgconfig, glib, fuse3, autoreconfHook }: stdenv.mkDerivation rec { - version = "2.10"; # Temporary (need to add libfuse 3.x first) + version = "3.2.0"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1"; + sha256 = "09pqdibhcj1p7m6vxkqiprvbcxp9iq2lm1hb6w7p8iarmvp80rlv"; }; - buildInputs = [ pkgconfig glib fuse autoreconfHook ]; + buildInputs = [ pkgconfig glib fuse3 autoreconfHook ]; postInstall = '' mkdir -p $out/sbin diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 181e8a35277..c40dcb63bf7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -135,6 +135,7 @@ mapAliases (rec { spaceOrbit = space-orbit; # addewd 2016-05-23 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 surf-webkit2 = surf; # added 2017-04-02 system_config_printer = system-config-printer; # added 2016-01-03 From 81569ecd722c466d3753caef0806adb12b8f3595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 21 Sep 2017 23:03:55 +0100 Subject: [PATCH 33/80] assh: add openssh to PATH --- pkgs/tools/networking/assh/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index bbed205cce8..1de87e07e04 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: buildGoPackage rec { name = "assh-${version}"; @@ -7,8 +7,13 @@ buildGoPackage rec { goPackagePath = "github.com/moul/advanced-ssh-config"; subPackages = [ "cmd/assh" ]; + nativeBuildInputs = [ makeWrapper ]; + postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' install_name_tool -delete_rpath $out/lib $bin/bin/assh + '' + '' + wrapProgram "$bin/bin/assh" \ + --prefix PATH : ${openssh}/bin ''; src = fetchFromGitHub { From 570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 22 Sep 2017 00:23:39 +0200 Subject: [PATCH 34/80] transfig: cleanup and fix darwin clang --- pkgs/tools/graphics/transfig/builder.sh | 38 -------------- pkgs/tools/graphics/transfig/default.nix | 67 +++++++++++++++++------- 2 files changed, 48 insertions(+), 57 deletions(-) delete mode 100644 pkgs/tools/graphics/transfig/builder.sh diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh deleted file mode 100644 index c466f759446..00000000000 --- a/pkgs/tools/graphics/transfig/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - -patchPhase() { - for i in $patches; do - header "applying patch $i" 3 - patch -p0 < $i - stopNest - done - - configureImakefiles "s:__PREFIX_PNG:$libpng:" - configureImakefiles "s:__PREFIX:$out:" -} - -configureImakefiles() { - local sedcmd=$1 - - sed "${sedcmd}" fig2dev/Imakefile > tmpsed - cp tmpsed fig2dev/Imakefile - - sed "${sedcmd}" fig2dev/dev/Imakefile > tmpsed - cp tmpsed fig2dev/dev/Imakefile - - sed "${sedcmd}" transfig/Imakefile > tmpsed - cp tmpsed transfig/Imakefile -} - -buildPhase() { - xmkmf - make Makefiles - make -} - -preInstall() { - mkdir -p $out - mkdir -p $out/lib -} - -genericBuild diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index 948bba6d459..cb3f0edff0f 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -2,34 +2,63 @@ stdenv.mkDerivation rec { name = "transfig-3.2.4"; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; buildInputs = [zlib libjpeg libpng imake]; - inherit libpng; + + patches = [ + ./patch-fig2dev-dev-Imakefile + ./patch-fig2dev-Imakefile + ./patch-transfig-Imakefile + ./patch-fig2dev-fig2dev.h + ./patch-fig2dev-dev-gensvg.c + ]; + + patchPhase = '' + runHook prePatch + + configureImakefiles() { + local sedcmd=$1 + + sed "$sedcmd" fig2dev/Imakefile > tmpsed + cp tmpsed fig2dev/Imakefile + + sed "$sedcmd" fig2dev/dev/Imakefile > tmpsed + cp tmpsed fig2dev/dev/Imakefile + + sed "$sedcmd" transfig/Imakefile > tmpsed + cp tmpsed transfig/Imakefile + } + + for i in $patches; do + header "applying patch $i" 3 + patch -p0 < $i + stopNest + done + + configureImakefiles "s:__PREFIX_PNG:${libpng}:" + configureImakefiles "s:__PREFIX:$out:" + + runHook postPatch + ''; + + preBuild = '' + xmkmf + make Makefiles + ''; + + makeFlags = [ "CC=cc" ]; + + preInstall = '' + mkdir -p $out + mkdir -p $out/lib + ''; hardeningDisable = [ "format" ]; - patches = [prefixPatch1 prefixPatch2 prefixPatch3 varargsPatch gensvgPatch]; - - prefixPatch1 = - ./patch-fig2dev-dev-Imakefile; - - prefixPatch2 = - ./patch-fig2dev-Imakefile; - - prefixPatch3 = - ./patch-transfig-Imakefile; - - varargsPatch = - ./patch-fig2dev-fig2dev.h; - - gensvgPatch = - ./patch-fig2dev-dev-gensvg.c; - meta = { platforms = stdenv.lib.platforms.unix; }; From be530263bc0bb2888ccec4d3194832076420392d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 21 Sep 2017 17:16:35 -0400 Subject: [PATCH 35/80] topydo: 0.9 -> 0.13 --- pkgs/applications/misc/topydo/default.nix | 34 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 24 +--------------- 3 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 pkgs/applications/misc/topydo/default.nix diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix new file mode 100644 index 00000000000..f115c7b22f0 --- /dev/null +++ b/pkgs/applications/misc/topydo/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, arrow, icalendar, mock, freezegun +, coverage, glibcLocales, isPy3k, green, pylint, prompt_toolkit, urwid, watchdog }: + +buildPythonPackage rec { + pname = "topydo"; + version = "0.13"; + name = "${pname}-${version}"; + disabled = (!isPy3k); + + src = fetchFromGitHub { + owner = "bram85"; + repo = pname; + rev = version; + sha256 = "0b3dz137lpbvpjvfy42ibqvj3yk526x4bpn819fd11lagn77w69r"; + }; + + propagatedBuildInputs = [ + arrow + icalendar + glibcLocales + prompt_toolkit + urwid + watchdog + ]; + checkInputs = [ mock freezegun coverage green pylint ]; + + LC_ALL="en_US.UTF-8"; + + meta = with stdenv.lib; { + description = "A cli todo application compatible with the todo.txt format"; + homepage = "https://github.com/bram85/topydo"; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 068fa3230d6..2e326c8be1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16522,6 +16522,8 @@ with pkgs; quazip = quazip_qt4; }; + topydo = (newScope python3Packages) ../applications/misc/topydo {}; + torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { lua = luajit ; } ); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2584b6f2810..13df3a6fc0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25804,29 +25804,7 @@ EOF }; }; - topydo = buildPythonPackage rec { - name = "topydo-${version}"; - version = "0.9"; - disabled = (!isPy3k); - - src = pkgs.fetchFromGitHub { - owner = "bram85"; - repo = "topydo"; - rev = version; - sha256 = "0vmfr2cxn3r5zc0c4q3a94xy1r0cv177b9zrm9hkkjcmhgq42s3h"; - }; - - propagatedBuildInputs = with self; [ arrow icalendar ]; - buildInputs = with self; [ mock freezegun coverage pkgs.glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - meta = { - description = "A cli todo application compatible with the todo.txt format"; - homepage = "https://github.com/bram85/topydo"; - license = licenses.gpl3; - }; - }; + topydo = callPackage ../development/python-modules/topydo {}; w3lib = buildPythonPackage rec { name = "w3lib-${version}"; From 51aa419354ab297e80a105a0b85ff3f4c378f05a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 20 Sep 2017 22:56:06 +0800 Subject: [PATCH 36/80] erlang: introduce "no X" variation --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ef812b388d..fd36557c6db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6295,7 +6295,7 @@ with pkgs; inherit (beam.interpreters) erlang erlangR17 erlangR18 erlangR19 erlangR20 - erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 + erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 elixir elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index fd2a5569171..bffd86da52e 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -6,11 +6,12 @@ rec { # Each interpreters = rec { - # R18 is the default version. + # R19 is the default version. erlang = erlangR19; # The main switch to change default Erlang version. erlang_odbc = erlangR19_odbc; erlang_javac = erlangR19_javac; erlang_odbc_javac = erlangR19_odbc_javac; + erlang_nox = erlangR19_nox; # These are standard Erlang versions, using the generic builder. erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {}; @@ -21,6 +22,7 @@ rec { erlangR17_odbc_javac = erlangR17.override { javacSupport = true; odbcSupport = true; }; + erlangR17_nox = erlangR17.override { wxSupport = false; }; erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; }; @@ -29,6 +31,7 @@ rec { erlangR18_odbc_javac = erlangR18.override { javacSupport = true; odbcSupport = true; }; + erlangR18_nox = erlangR18.override { wxSupport = false; }; erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; }; @@ -37,6 +40,7 @@ rec { erlangR19_odbc_javac = erlangR19.override { javacSupport = true; odbcSupport = true; }; + erlangR19_nox = erlangR19.override { wxSupport = false; }; erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; }; @@ -45,6 +49,7 @@ rec { erlangR20_odbc_javac = erlangR20.override { javacSupport = true; odbcSupport = true; }; + erlangR20_nox = erlangR20.override { wxSupport = false; }; # Bash fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix { From 3b7c68615e4d537dc7fc640224ab2a7d4fc4661f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Sep 2017 03:30:52 +0000 Subject: [PATCH 37/80] =?UTF-8?q?abella:=20fix=20build=20with=20OCaml=20?= =?UTF-8?q?=E2=89=A5=204.03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/abella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 1c3e8e412f8..d9afc897cff 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rsync, ocaml }: +{ stdenv, fetchurl, rsync, ocamlPackages }: stdenv.mkDerivation rec { name = "abella-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "b56d865ebdb198111f1dcd5b6fbcc0d7fc6dd1294f7601903ba4e3c3322c099c"; }; - buildInputs = [ rsync ocaml ]; + buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild ]); installPhase = '' mkdir -p $out/bin From 5522cd5cb10eeb04813cc00c27c96c4430cc47aa Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 21 Sep 2017 22:57:27 -0700 Subject: [PATCH 38/80] wineUnstable: 2.16 -> 2.17 per usual, staging has been updated as well! --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index c3db9b06ef5..aaaec67c751 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,15 +32,15 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.16"; + version = "2.17"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "089cvb7gvhcq5kx1h114fmr09fmj84cz2bjvisa48v6dpv5fsqd5"; + sha256 = "0sgazjn30ki2y3bjrd0xbpf870ii22wkyrmgaxcwbk23j1rrbp3y"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1q9dnifz02l96s1bafb4w2z779k8ancl37zd7wxbkf0ks2vrnln0"; + sha256 = "11jm39g1kc77fvn02j9g8syyc095b6w2jashyr28v4gi7g0fqv6h"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 6075d4ad07bb9a1d105db7f6e0dfda60a3099ec6 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 19 Sep 2017 16:21:26 -0400 Subject: [PATCH 39/80] bitcoin: 0.15.0 -> 0.15.0.1 --- pkgs/applications/altcoins/bitcoin.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index d2083f4ecfb..23c9ffe3a09 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.15.0"; + version = "0.15.0.1"; src = fetchurl { - urls = [ "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" - "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${version}/bitcoin-${version}.tar.gz" - ]; - sha256 = "18gj5gdscarv2a1hdgjps50czwi4hrmrrmhssaag55ysh94zbdjl"; + url = "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"; + sha256 = "16si3skhm6jhw1pkniv2b9y1kkdhjmhj392palphir0qc1srwzmm"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 723042efa9e722e4540a535ae92fe463a1067540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 21 Sep 2017 16:02:38 +0200 Subject: [PATCH 40/80] ttwatch: init at 2017-04-20 --- pkgs/tools/misc/ttwatch/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/ttwatch/default.nix diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix new file mode 100644 index 00000000000..855baa83060 --- /dev/null +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1 }: + +stdenv.mkDerivation rec { + name = "ttwatch-${version}"; + version = "2017-04-20"; + + src = fetchFromGitHub { + owner = "ryanbinns"; + repo = "ttwatch"; + rev = "f07a12712ed331f1530db3846828641eb0e2f5c5"; + sha256 = "0y27bldmp6w02pjhr2cmy9g6n23vi0q26pil3rd7vbg4qjahxz27"; + }; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ openssl curl libusb1 ]; + + preFixup = '' + chmod +x $out/bin/ttbin2mysports + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ryanbinns/ttwatch; + description = "Linux TomTom GPS Watch Utilities"; + maintainers = with maintainers; [ dotlambda ]; + license = licenses.mit; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043a27cacfb..44fd079ac06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4896,6 +4896,8 @@ with pkgs; ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; + ttwatch = callPackage ../tools/misc/ttwatch { }; + udunits = callPackage ../development/libraries/udunits { }; uemacs = callPackage ../applications/editors/uemacs { }; From 4e12dbb09247e9e547a7a62649071bae43ad74ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 22 Sep 2017 11:13:48 +0200 Subject: [PATCH 41/80] jetbrains.clion: set CL_JDK --- pkgs/applications/editors/jetbrains/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d7f71af6529..06cc189ca40 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -53,6 +53,9 @@ let patchelf --set-interpreter $interp \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$lldbLibPath" \ bin/clang/clang-tidy + + wrapProgram $out/bin/clion \ + --set CL_JDK "${jdk}" ) ''; }); From fd56648a04dbd61dc7f5e20b843c8a6a3baccef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 22 Sep 2017 11:27:59 +0200 Subject: [PATCH 42/80] knot-resolver: 1.3.3 -> 1.4.0 Also drop rarely used dependencies, by default, and utilize root server addresses from nixpkgs. --- pkgs/servers/dns/knot-resolver/default.nix | 52 +++++++++++----------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 390bf43d4d6..6130550917e 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, pkgconfig, hexdump, which -, knot-dns, luajit, libuv, lmdb -, cmocka, systemd, hiredis, libmemcached -, gnutls, nettle -, luajitPackages, makeWrapper +, knot-dns, luajit, libuv, lmdb, gnutls, nettle +, cmocka, systemd, dns-root-data, makeWrapper +, extraFeatures ? false /* catch-all if defaults aren't enough */ +, hiredis, libmemcached, luajitPackages }: let - inherit (stdenv.lib) optional; + inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "c679238bea5744de8a99f4402a61e9e58502bc42b40ecfa370e53679ed5d5b80"; + sha256 = "ac19c121fd687c7e4f5f907b46932d26f8f9d9e01626c4dadb3847e25ea31ceb"; }; outputs = [ "out" "dev" ]; @@ -23,18 +23,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ]; - buildInputs = [ knot-dns luajit libuv gnutls ] + # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements + buildInputs = [ knot-dns luajit libuv gnutls nettle ] ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin - ## optional dependencies; TODO: libedit, dnstap? ++ optional doInstallCheck cmocka - ++ optional stdenv.isLinux systemd # socket activation - ++ [ - nettle # DNS cookies + ++ optional stdenv.isLinux systemd # sd_notify + ++ optionals extraFeatures [ hiredis libmemcached # additional cache backends - # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements ]; + ## optional dependencies; TODO: libedit, dnstap, http2 module? - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "ROOTHINTS=${dns-root-data}/root.hints" ]; CFLAGS = [ "-O2" "-DNDEBUG" ]; enableParallelBuilding = true; @@ -45,18 +44,21 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$out/lib" ''; + postInstall = '' + rm "$out"/etc/kresd/root.hints # using system-wide instead + '' # optional: to allow auto-bootstrapping root trust anchor via https - postInstall = with luajitPackages; '' - wrapProgram "$out/sbin/kresd" \ - --set LUA_PATH '${ - stdenv.lib.concatStringsSep ";" - (map getLuaPath [ luasec luasocket ]) - }' \ - --set LUA_CPATH '${ - stdenv.lib.concatStringsSep ";" - (map getLuaCPath [ luasec luasocket ]) - }' - ''; + + (with luajitPackages; '' + wrapProgram "$out/sbin/kresd" \ + --set LUA_PATH '${ + stdenv.lib.concatStringsSep ";" + (map getLuaPath [ luasec luasocket ]) + }' \ + --set LUA_CPATH '${ + stdenv.lib.concatStringsSep ";" + (map getLuaCPath [ luasec luasocket ]) + }' + ''); meta = with stdenv.lib; { description = "Caching validating DNS resolver, from .cz domain registry"; From 446f9c96f548cab37984aa6cd510ae7e16c3791d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 22 Sep 2017 08:44:04 +0100 Subject: [PATCH 43/80] topydo: really move out of python-packages --- pkgs/applications/misc/topydo/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index f115c7b22f0..34952b9c0f4 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, arrow, icalendar, mock, freezegun -, coverage, glibcLocales, isPy3k, green, pylint, prompt_toolkit, urwid, watchdog }: +{ stdenv, python3Packages, fetchFromGitHub, glibcLocales }: -buildPythonPackage rec { +with python3Packages; + +buildPythonApplication rec { pname = "topydo"; version = "0.13"; name = "${pname}-${version}"; - disabled = (!isPy3k); src = fetchFromGitHub { owner = "bram85"; @@ -22,6 +22,7 @@ buildPythonPackage rec { urwid watchdog ]; + checkInputs = [ mock freezegun coverage green pylint ]; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e326c8be1a..2a4f43a4353 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16522,7 +16522,7 @@ with pkgs; quazip = quazip_qt4; }; - topydo = (newScope python3Packages) ../applications/misc/topydo {}; + topydo = callPackage ../applications/misc/topydo {}; torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { lua = luajit ; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13df3a6fc0b..aa432650c3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25804,7 +25804,7 @@ EOF }; }; - topydo = callPackage ../development/python-modules/topydo {}; + topydo = builtins.trace "python3Packages.topydo was moved to topydo" pkgs.topydo; # 2017-09-22 w3lib = buildPythonPackage rec { name = "w3lib-${version}"; From f2aecac5c74d82e8720b89964c8691473ca578ea Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 22 Sep 2017 10:54:01 +0100 Subject: [PATCH 44/80] topydo: use throw instead of trace to not break evaluation --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb38aff56ba..2cd41b23c16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25788,7 +25788,7 @@ EOF }; }; - topydo = builtins.trace "python3Packages.topydo was moved to topydo" pkgs.topydo; # 2017-09-22 + topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 w3lib = buildPythonPackage rec { name = "w3lib-${version}"; From b2924389accc533489d74ea9d870b2ca48f74df6 Mon Sep 17 00:00:00 2001 From: "John M. Harris, Jr" Date: Fri, 22 Sep 2017 06:20:49 -0400 Subject: [PATCH 45/80] pim-data-exporter: init at 17.08.1 * Add pim-data-exporter * pim-data-exporter: fix indentation --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/pim-data-exporter.nix | 22 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/kde/pim-data-exporter.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index bbef7e9618b..2053d183ff1 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -145,6 +145,7 @@ let okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; pimcommon = callPackage ./pimcommon.nix {}; + pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix new file mode 100644 index 00000000000..10123944e3a --- /dev/null +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, + kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, + kwallet, libkdepim, libkleo, pimcommon, qttools, + karchive, mailcommon, messagelib, pim-data-exporter +}: + +mkDerivation { + name = "pim-data-exporter"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport + knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim + libkleo pimcommon qttools karchive mailcommon messagelib + ]; +} From 92ec5cddbce1091d9a457b238b5fd28b56f10876 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 22 Sep 2017 21:37:26 +1000 Subject: [PATCH 46/80] trackballs: 1.1.4 (broken) -> 1.2.3 --- pkgs/games/trackballs/default.nix | 35 ++++++++++--------------------- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 5606be6a594..93dd579b4e0 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,35 +1,22 @@ -{ stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile -, debug ? false }: +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, mesa }: with stdenv.lib; stdenv.mkDerivation rec { - name = "trackballs-1.1.4"; - - src = fetchurl { - url = mirror://sourceforge/trackballs/trackballs-1.1.4.tar.gz; - sha256 = "19ilnif59sxa8xmfisk90wngrd11pj8s86ixzypv8krm4znbm7a5"; + name = "trackballs-${version}"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "trackballs"; + repo = "trackballs"; + rev = "v${version}"; + sha256 = "13f28frni7fkalxx4wqvmkzz7ba3d8pic9f9sd2z9wa6gbjs9zrf"; }; - buildInputs = [ zlib mesa SDL SDL_ttf SDL_mixer SDL_image guile gettext ]; - - hardeningDisable = [ "format" ]; - - CFLAGS = optionalString debug "-g -O0"; - CXXFLAGS = CFLAGS; - dontStrip = debug; - postUnpack = optionalString debug - "mkdir -p $out/src; cp -R * $out/src ; cd $out/src"; - - NIX_CFLAGS_COMPILE = "-iquote ${SDL.dev}/include/SDL"; - configureFlags = optionalString debug "--enable-debug"; - - patchPhase = '' - sed -i -e 's/images icons music/images music/' share/Makefile.in - ''; + buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext mesa ]; meta = { - homepage = http://trackballs.sourceforge.net/; + homepage = https://trackballs.github.io/; description = "3D Marble Madness clone"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19a4432dfb8..2a73a4dce04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17752,10 +17752,7 @@ with pkgs; tome4 = callPackage ../games/tome4 { }; - trackballs = callPackage ../games/trackballs { - debug = false; - guile = guile_1_8; - }; + trackballs = callPackage ../games/trackballs { }; tremulous = callPackage ../games/tremulous { }; From 14f2e0cd3627744c251b93e523790de35fcaa82d Mon Sep 17 00:00:00 2001 From: Brandon Barker Date: Wed, 13 Sep 2017 13:32:51 +0000 Subject: [PATCH 47/80] jetbrains: update.pl fixes * indentation, retab * url handling for alternative version names * handling for alt. download url format * made unknown channel error non-fatal --- pkgs/applications/editors/jetbrains/update.pl | 63 ++++++++++++------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl index 0c551d994a9..a0479fc9112 100755 --- a/pkgs/applications/editors/jetbrains/update.pl +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -27,46 +27,61 @@ sub get_latest_versions { next unless $latest_build; # version as in download url + my ($version) = $latest_build =~ /^]*version="([^"]+)"/; + my ($fullNumber) = $latest_build =~ /^]*fullNumber="([^"]+)"/; + my $latest_version_full1 = "$version-$fullNumber"; + $latest_version_full1 =~ s/\s*EAP//; + my ($latest_version) = $latest_build =~ /^]*version="([^"]+)"/; ($latest_version) = $latest_build =~ /^]*fullNumber="([^"]+)"/ if $latest_version =~ / /; $h{$id} = $latest_version; + $h{"full1_" . $id} = $latest_version_full1; } return %h; } my %latest_versions = get_latest_versions(); -#for my $ch (sort keys %latest_versions) { +# for my $ch (sort keys %latest_versions) { # print("$ch $latest_versions{$ch}\n"); -#} +# } sub update_nix_block { my ($block) = @_; my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/; if ($channel) { - die "unknown update-channel $channel" unless $latest_versions{$channel}; - my ($version) = $block =~ /version\s*=\s*"([^"]+)"/; - die "no version in $block" unless $version; - if ($version eq $latest_versions{$channel}) { - print("$channel is up to date at $version\n"); + if ($latest_versions{$channel}) { + my ($version) = $block =~ /version\s*=\s*"([^"]+)"/; + die "no version in $block" unless $version; + if ($version eq $latest_versions{$channel}) { + print("$channel is up to date at $version\n"); + } else { + print("updating $channel: $version -> $latest_versions{$channel}\n"); + my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; + # try to interpret some nix + my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; + $name =~ s/\$\{version\}/$latest_versions{$channel}/; + $url =~ s/\$\{name\}/$name/; + $url =~ s/\$\{version\}/$latest_versions{$channel}/; + die "$url still has some interpolation" if $url =~ /\$/; + my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; + my $version_string = $latest_versions{$channel}; + unless ( $sha256 ) { + my $full_version = $latest_versions{"full1_" . $channel}; + $url =~ s/$version_string/$full_version/; + ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; + $version_string = $full_version; + } + die "invalid sha256 in $url.sha256" unless $sha256; + my ($sha256Base32) = readpipe("nix-hash --type sha256 --to-base32 $sha256"); + chomp $sha256Base32; + print "Jetbrains published SHA256: $sha256\n"; + print "Conversion into base32 yields: $sha256Base32\n"; + $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m; + $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; + } } else { - print("updating $channel: $version -> $latest_versions{$channel}\n"); - my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; - # try to interpret some nix - my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; - $name =~ s/\$\{version\}/$latest_versions{$channel}/; - $url =~ s/\$\{name\}/$name/; - $url =~ s/\$\{version\}/$latest_versions{$channel}/; - die "$url still has some interpolation" if $url =~ /\$/; - - my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - my ($sha256Base32) = readpipe("nix-hash --type sha256 --to-base32 $sha256"); - chomp $sha256Base32; - print "Jetbrains published SHA256: $sha256\n"; - print "Conversion into base32 yeilds: $sha256Base32\n"; - - $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$latest_versions{$channel}"; /* updated by script */#m; - $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; + warn "unknown update-channel $channel"; } } return $block; From 5da75526f7f3c67ad4c78ee1cfc10b9b9e3f056a Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 22 Sep 2017 21:55:14 +1000 Subject: [PATCH 48/80] giv: 20150811-git (broken) -> 0.9.26 --- pkgs/applications/graphics/giv/build.patch | 17 +++++++++++------ pkgs/applications/graphics/giv/default.nix | 7 ++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/giv/build.patch b/pkgs/applications/graphics/giv/build.patch index ec343c90238..f57689fd3fa 100644 --- a/pkgs/applications/graphics/giv/build.patch +++ b/pkgs/applications/graphics/giv/build.patch @@ -2,16 +2,21 @@ Get the environment propagated to scons forked childs, and correct the dicom plu a typedef of size_t that failed at least on x86_64-linux. diff --git a/SConstruct b/SConstruct -index 16eccd9..603e931 100644 +index 9e752d6..f93f27f 100644 --- a/SConstruct +++ b/SConstruct -@@ -7,8 +7,7 @@ else: - cppflags = ['-O2'] - variant = 'Release' +@@ -9,13 +9,7 @@ else: + + commit_id = os.popen('git rev-parse HEAD').read().replace('\n','') -env = Environment(LIBPATH=[], -- CPPFLAGS = cppflags) +- CPPFLAGS = cppflags + ['-Wno-deprecated-declarations', +- '-Wno-reorder', +- '-Wno-unused-but-set-variable', +- '-Wno-unused-function'], +- CXXFLAGS=['-std=c++1y'] +- ) +env = Environment(ENV = os.environ) env['SBOX'] = False - + env['COMMITIDSHORT'] = commit_id[0:6] diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 6c892f1bfd4..5c15c98e482 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -2,13 +2,14 @@ pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: stdenv.mkDerivation rec { - name = "giv-20150811-git"; + name = "giv-${version}"; + version = "0.9.26"; src = fetchFromGitHub { owner = "dov"; repo = "giv"; - rev = "64648bfbbf10ec4a9adfbc939c96c7d1dbdce57a"; - sha256 = "1sz2n7jbmg3g97bs613xxjpzqbsl5rvpg6v7g3x3ycyd35r8vsfp"; + rev = "v${version}"; + sha256 = "1sfm8j3hvqij6z3h8xz724d7hjqqbzljl2a6pp4yjpnnrxksnic2"; }; hardeningDisable = [ "format" ]; From a2444a2831a45de67df6107b62440d4bcc035135 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 22 Sep 2017 13:03:35 +0100 Subject: [PATCH 49/80] neomutt: fix missing libidn --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index b0246b58e06..e18d95dc122 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation rec { "ac_cv_path_SENDMAIL=sendmail" ]; + # Fix missing libidn in mutt; + # this fix is ugly since it links all binaries in mutt against libidn + # like pgpring, pgpewrap, ... + NIX_LDFLAGS = "-lidn"; + configureScript = "./prepare"; enableParallelBuilding = true; From 99eabd6c0684eaa2761f09e9341859e5a009f05f Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 22 Sep 2017 22:26:02 +1000 Subject: [PATCH 50/80] qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed Resolves #29589. --- pkgs/development/libraries/qt-5/qtbase-setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh index e7752af4397..e080d99a4aa 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh @@ -123,7 +123,7 @@ if [ -z "$NIX_QT5_TMP" ]; then mkdir -p "$NIX_QT5_TMP/nix-support" for subdir in bin include lib mkspecs share; do - mkdir "$NIX_QT5_TMP/$subdir" + mkdir -p "$NIX_QT5_TMP/$subdir" echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs" done From 02fe1207ab08a7ead5ac9d53f95b69ddab2955e9 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Fri, 22 Sep 2017 08:27:34 -0400 Subject: [PATCH 51/80] openjdk9: init at 9.0.0+180 * openjdk 8: code cleanup as recommended by 0xABAB in #27194 * openjdk 9: init at ea build 176 this starts with copy of 8.nix and just updates hashes and replaces 8 with 9. it also tweaks the version handling because we aren't dealing with an update version yet. * openjdk 9: adapt patches from openjdk 8 fix-java-home: surrounding code changed slightly swing-use-gtk-jdk9: location of the file being patched changed due to modularization read-truststore-from-env: the code that handles the trustStore was refactored out into a helper class in upstream commit http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/904861872c0e adlc_updater: this isn't present anymore * openjdk 9: make two more warnings-as-errors non-fatal this requires that we switch to configureFlagsArray to deal with whitespace the errors being suppressed are show below: * For target support_native_java.desktop_libawt_xawt_awt_Robot.o: /tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c: In function 'isXCompositeDisplay': /tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format [-Werror=format-contains-nul] snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber); ^ /tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format [-Werror=format-contains-nul] cc1: all warnings being treated as errors * For target support_native_jdk.hotspot.agent_libsa_ps_core.o: /tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c: In function 'read_exec_segments': /tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c:834:7: error: ignoring return value of 'pread', declared with attribute warn_unused_result [-Werror=unused-result] pread(ph->core->exec_fd, interp_name, exec_php->p_filesz, exec_php->p_offset); ^ cc1: all warnings being treated as errors * openjdk 9: ea+176 -> ea+180 * openjdk 9: TODO disable infinality patches, at least to start the code being patched here seems to have changed substantially or perhaps even disappeared altogether. need to investigate whether these patches are still relevant. * openjdk 9: update installPhase for modularization * separate jdk and jre images are now present under build/*/images * samples have been removed (JEP 298) -- TODO that JEP says demos will be gone too, but it seems some are still present? * bina directory is no longer present * openjdk 9: TODO handle *.pf files or purge this code completely * openjdk 9: update minimal jre components in particular, the name of the config option for headless has changed, per https://bugs.openjdk.java.net/browse/JDK-8163102 * TODO about echo -n vs printWords, #27427 --- pkgs/development/compilers/openjdk/8.nix | 28 +- pkgs/development/compilers/openjdk/9.nix | 258 ++++++++++++++++++ .../openjdk/fix-java-home-jdk9.patch | 14 + .../read-truststore-from-env-jdk9.patch | 20 ++ .../openjdk/swing-use-gtk-jdk9.patch | 26 ++ pkgs/top-level/all-packages.nix | 19 ++ 6 files changed, 353 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/9.nix create mode 100644 pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch create mode 100644 pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch create mode 100644 pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 45054a3577d..fef41d33d08 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cpio, pkgconfig, file, which, unzip, zip, cups, freetype +{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor , libjpeg, giflib @@ -75,11 +75,14 @@ let gtk2 gnome_vfs GConf glib ]; + #move the seven other source dirs under the main jdk8u directory, + #with version suffixes removed, as the remainder of the build will expect prePatch = '' - ls | grep jdk | grep -v '^jdk8u' | awk -F- '{print $1}' | while read p; do - mv $p-* $(ls | grep '^jdk8u')/$p + mainDir=$(find . -maxdepth 1 -name jdk8u\*); + find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do + mv $p-* $mainDir/$p done - cd $(ls | grep '^jdk8u') + cd $mainDir ''; patches = [ @@ -95,7 +98,7 @@ let preConfigure = '' chmod +x configure - substituteInPlace configure --replace /bin/bash "$shell" + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell" substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" '' @@ -188,10 +191,11 @@ let done # Generate certificates. - pushd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - popd + ( + cd $jre/lib/openjdk/jre/lib/security + rm cacerts + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt + ) ln -s $out/lib/openjdk/bin $out/bin ln -s $jre/lib/openjdk/jre/bin $jre/bin @@ -221,13 +225,13 @@ let # Build the set of output library directories to rpath against LIBDIRS="" for output in $outputs; do - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS" + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do - OUTPUTDIR="$(eval echo \$$output)" - BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)" + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) echo "$BINLIBS" | while read i; do patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true patchelf --shrink-rpath "$i" || true diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix new file mode 100644 index 00000000000..65ef6ec5f2e --- /dev/null +++ b/pkgs/development/compilers/openjdk/9.nix @@ -0,0 +1,258 @@ +{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype +, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libjpeg, giflib +, setJavaClassPath +, minimal ? false +#, enableInfinality ? true # font rendering patch +, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf +}: + +let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else if stdenv.system == "x86_64-linux" then + "amd64" + else + throw "openjdk requires i686-linux or x86_64 linux"; + + update = ""; + build = "180"; + baseurl = "http://hg.openjdk.java.net/jdk9/jdk9"; + repover = "jdk-9${update}+${build}"; + paxflags = if stdenv.isi686 then "msp" else "m"; + jdk9 = fetchurl { + url = "${baseurl}/archive/${repover}.tar.gz"; + sha256 = "05f3i6p35nh4lwh17znkmwbb8ccw1hl1qs5hnqivpph27lpdpqnn"; + }; + langtools = fetchurl { + url = "${baseurl}/langtools/archive/${repover}.tar.gz"; + sha256 = "0gpgg0mz29jvfck6p6kqqyi3b9lx3d4s3h0dnriswmjnw0dy3bc6"; + }; + hotspot = fetchurl { + url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; + sha256 = "1zb0pzfgnykpllm9ibwqqrzhbsxdxq1cj5rdmd5h51qjfzd8k3js"; + }; + corba = fetchurl { + url = "${baseurl}/corba/archive/${repover}.tar.gz"; + sha256 = "1rv4gcidr0b71d7wkchx4g3gxkirpg98y0mlicqaah1vmvx3knkp"; + }; + jdk = fetchurl { + url = "${baseurl}/jdk/archive/${repover}.tar.gz"; + sha256 = "1g3dwszz7v8812fp53vpsbmd5ingzwym8kwz4iq45bf0d1df95x9"; + }; + jaxws = fetchurl { + url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; + sha256 = "0f7vblr4c322rvjgaim8lp91s9gkf1sf31mgzhl433h5m5hs5z26"; + }; + jaxp = fetchurl { + url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; + sha256 = "1c552q4360aqfr8h6720ckk8sn4fw8c5nix5gc826sj4vrk7gqz2"; + }; + nashorn = fetchurl { + url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; + sha256 = "1hi9152w94gkwypj32nlxzp7ryzc04pp72qvr4z9m2vdc85hglhc"; + }; + openjdk9 = stdenv.mkDerivation { + # name = "openjdk-9u${update}b${build}"; + name = "openjdk-9ea-b${build}"; + + srcs = [ jdk9 langtools hotspot corba jdk jaxws jaxp nashorn ]; + sourceRoot = "."; + + outputs = [ "out" "jre" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst + libXi libXinerama libXcursor lndir fontconfig + ] ++ lib.optionals (!minimal && enableGnome2) [ + gtk2 gnome_vfs GConf glib + ]; + + #move the seven other source dirs under the main jdk8u directory, + #with version suffixes removed, as the remainder of the build will expect + prePatch = '' + mainDir=$(find . -maxdepth 1 -name jdk9\*); + find . -maxdepth 1 -name \*jdk\* -not -name jdk9\* | awk -F- '{print $1}' | while read p; do + mv $p-* $mainDir/$p + done + cd $mainDir + ''; + + patches = [ + ./fix-java-home-jdk9.patch + ./read-truststore-from-env-jdk9.patch + ./currency-date-range-jdk8.patch + #] ++ lib.optionals (!minimal && enableInfinality) [ + # ./004_add-fontconfig.patch + # ./005_enable-infinality.patch + ] ++ lib.optionals (!minimal && enableGnome2) [ + ./swing-use-gtk-jdk9.patch + ]; + + preConfigure = '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" + + configureFlagsArray=( + "--with-boot-jdk=${bootjdk.home}" + "--with-update-version=${update}" + "--with-build-number=${build}" + "--with-milestone=fcs" + "--enable-unlimited-crypto" + "--disable-debug-symbols" + "--disable-freetype-bundling" + "--with-zlib=system" + "--with-giflib=system" + "--with-stdc++lib=dynamic" + + # glibc 2.24 deprecated readdir_r so we need this + # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html + "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" + '' + + lib.optionalString minimal "\"--enable-headless-only\"" + + ");"; + + NIX_LDFLAGS= lib.optionals (!minimal) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!minimal && enableGnome2) [ + "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]; + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk + + cp -av build/*/images/jdk/* $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir $out/include $out/share/man + ln -s $out/lib/openjdk/include/* $out/include/ + ln -s $out/lib/openjdk/man/* $out/share/man/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Copy the JRE to a separate output and setup fallback fonts + cp -av build/*/images/jre $jre/lib/openjdk/ + mkdir $out/lib/openjdk/jre + ${lib.optionalString (!minimal) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback + lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString minimal '' + for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do + rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so + done + ''} + + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + # Make sure cmm/*.pf are not symlinks: + # https://youtrack.jetbrains.com/issue/IDEA-147272 + # in 9, it seems no *.pf files end up in $out ... ? + # rm -rf $out/lib/openjdk/jre/lib/cmm + # ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + + # Set PaX markings + exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + echo "to mark: *$exes*" + for file in $exes; do + echo "marking *$file*" + paxmark ${paxflags} "$file" + done + + # Remove duplicate binaries. + for i in $(cd $out/lib/openjdk/bin && echo *); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then + ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i + fi + done + + # Generate certificates. + ( + cd $jre/lib/openjdk/jre/lib/security + rm cacerts + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt + ) + + ln -s $out/lib/openjdk/bin $out/bin + ln -s $jre/lib/openjdk/jre/bin $jre/bin + ln -s $jre/lib/openjdk/jre $out/jre + ''; + + # FIXME: this is unnecessary once the multiple-outputs branch is merged. + preFixup = '' + prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + patchELF $jre + propagatedNativeBuildInputs+=" $jre" + + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $jre/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + + passthru = { + inherit architecture; + home = "${openjdk9}/lib/openjdk"; + }; + }; +in openjdk9 diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch new file mode 100644 index 00000000000..f9755d58e48 --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch @@ -0,0 +1,14 @@ +--- a/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400 ++++ b/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400 +@@ -2318,10 +2318,7 @@ + assert(ret, "cannot locate libjvm"); + char *rp = NULL; + if (ret && dli_fname[0] != '\0') { +- rp = realpath(dli_fname, buf); +- } +- if (rp == NULL) { +- return; ++ snprintf(buf, buflen, "%s", dli_fname); + } + + if (Arguments::sun_java_launcher_is_altjvm()) { diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch new file mode 100644 index 00000000000..cb8d59ff806 --- /dev/null +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch @@ -0,0 +1,20 @@ +--- a/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 ++++ b/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java.new 2017-07-05 20:45:57.491295030 -0400 +@@ -71,6 +71,7 @@ + * + * The preference of the default trusted KeyStore is: + * javax.net.ssl.trustStore ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + */ +@@ -144,6 +145,9 @@ + String temporaryName = ""; + File temporaryFile = null; + long temporaryTime = 0L; ++ if (storePropName == null){ ++ storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); ++ } + if (!"NONE".equals(storePropName)) { + String[] fileNames = + new String[] {storePropName, defaultStore}; diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch new file mode 100644 index 00000000000..07d95ba71b8 --- /dev/null +++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch @@ -0,0 +1,26 @@ +diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java +--- a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-07-26 00:41:37.000000000 +0300 ++++ b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-10-02 22:46:01.890071761 +0300 +@@ -607,11 +607,9 @@ + if (osType == OSInfo.OSType.WINDOWS) { + return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; + } else { +- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop")); + Toolkit toolkit = Toolkit.getDefaultToolkit(); +- if ("gnome".equals(desktop) && +- toolkit instanceof SunToolkit && +- ((SunToolkit) toolkit).isNativeGTKAvailable()) { ++ if (toolkit instanceof SunToolkit && ++ ((SunToolkit) toolkit).isNativeGTKAvailable()) { + // May be set on Linux and Solaris boxs. + return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; + } +@@ -1341,7 +1339,7 @@ + lafName = (String) lafData.remove("defaultlaf"); + } + if (lafName == null) { +- lafName = getCrossPlatformLookAndFeelClassName(); ++ lafName = getSystemLookAndFeelClassName(); + } + lafName = swingProps.getProperty(defaultLAFKey, lafName); + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 924a5e8d7e0..6bffd358b18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5826,6 +5826,15 @@ with pkgs; inherit (gnome2) GConf gnome_vfs; }; + openjdk9 = + if stdenv.isDarwin then + callPackage ../development/compilers/openjdk-darwin/9.nix { } + else + callPackage ../development/compilers/openjdk/9.nix { + bootjdk = openjdk8; + inherit (gnome2) GConf gnome_vfs; + }; + openjdk = openjdk8; jdk7 = openjdk7 // { outputs = [ "out" ]; }; @@ -5843,6 +5852,16 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk9 = openjdk9 // { outputs = [ "out" ]; }; + jre9 = lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + (openjdk9.jre // { outputs = [ "jre" ]; })); + jre9_headless = + if stdenv.isDarwin then jre9 else + lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}-headless" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk = jdk8; jre = jre8; jre_headless = jre8_headless; From e4a859a95d0087cd6e2e9ad5939b067cda51ab18 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 22 Sep 2017 13:39:01 +0100 Subject: [PATCH 52/80] jetbrains.datagrip: 2017.1.5 -> 2017.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 06cc189ca40..65721361cd6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -232,15 +232,15 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.1.5"; /* updated by script */ + version = "2017.2.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "8847c35761fcf6fc7a1d3f2bed0fa3971fbf28721c144f41d21feb473bb212dc"; /* updated by script */ + sha256 = "1l8y65fw9g5ckzwpcgigm2qwy8fhpw2hil576rphsnx6qvnh4swn"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "datagrip_2017_1"; + update-channel = "datagrip_2017_2"; }; gogland = buildGogland rec { From 8758a4dde22e574622218a191d00608c693f5e4e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Sep 2017 14:12:37 +0200 Subject: [PATCH 53/80] pythonPackages.raven: 6.1.0 -> 6.2.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cd41b23c16..9cf96d81f62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7516,11 +7516,11 @@ in { }; raven = buildPythonPackage rec { - name = "raven-6.1.0"; + name = "raven-6.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "1158fsjjl8byzl9nw52jhhdssjl6n7l0hjaxm5hdi69v2zxvzjh2"; + sha256 = "1jmr9kpajfh6fvxbym6fdybmlr14216y0dkbial7ris9pi1pwhf5"; }; # way too many dependencies to run tests From ab71280823ff3da7d936fb5e01ad30806111a12e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 22 Sep 2017 17:24:29 +0300 Subject: [PATCH 54/80] darwin: Disable some packages that have never built successfully mate.mate-desktop: https://hydra.nixos.org/build/61110037 gdmap: https://hydra.nixos.org/build/61144743 redsocks: https://hydra.nixos.org/build/61123106 resolv_wrapper: https://hydra.nixos.org/build/61121132 ogmtools: https://hydra.nixos.org/build/61108726 mp3info: https://hydra.nixos.org/build/61139015 lxappearance-gtk3: https://hydra.nixos.org/build/61126327 hdf5-fortran: https://hydra.nixos.org/build/61146631 pqiv: https://hydra.nixos.org/build/61124724 --- pkgs/applications/audio/mp3info/default.nix | 2 +- pkgs/applications/graphics/pqiv/default.nix | 2 +- pkgs/applications/video/ogmtools/default.nix | 2 +- pkgs/desktops/lxde/core/lxappearance/default.nix | 2 +- pkgs/desktops/mate/mate-desktop/default.nix | 2 +- pkgs/development/libraries/resolv_wrapper/default.nix | 2 +- pkgs/tools/misc/hdf5/default.nix | 2 +- pkgs/tools/networking/redsocks/default.nix | 2 +- pkgs/tools/system/gdmap/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 5f1d2bfa93d..1a1ebc56a84 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 7e375367a2d..202bbb5b13f 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation (rec { homepage = http://www.pberndt.com/Programme/Linux/pqiv; license = licenses.gpl3; maintainers = [ maintainers.ndowens ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }) diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 82077e4d3dd..83e69495b03 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.bunkus.org/videotools/ogmtools/; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index 8c6eb596515..aece5fefaec 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A lightweight program for configuring the theme and fonts of gtk applications"; homepage = http://lxde.org/; maintainers = [ stdenv.lib.maintainers.hinton ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 8fea89cdcb6..039c3732d11 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Library with common API for various MATE modules"; homepage = http://mate-desktop.org; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index bc39b320c8e..4ec06d68a32 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index eb29e7d914c..7dea58fc502 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.free; # BSD-like homepage = https://www.hdfgroup.org/HDF5/; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index e9aced06728..981ecdb0355 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://darkk.net.ru/redsocks/; license = stdenv.lib.licenses.asl20; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 1d33e5fb09f..b03ec34972e 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://gdmap.sourceforge.net; description = "Recursive rectangle map of disk usage"; license = licenses.gpl2; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } From 6f02c3bf7766c89a4efddf84f29184a14afa726f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Sep 2017 17:10:12 +0200 Subject: [PATCH 55/80] sshfs-fuse: Fix the build on i686-linux The last upgrade (137142a72cd6ef96b227dd0f1164504abf5546f1) broke the build on i686. Thanks @globin for noticing this. --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 62505ac041e..274be305da8 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -3,16 +3,20 @@ stdenv.mkDerivation rec { version = "3.2.0"; name = "sshfs-fuse-${version}"; - + src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; sha256 = "09pqdibhcj1p7m6vxkqiprvbcxp9iq2lm1hb6w7p8iarmvp80rlv"; }; - + buildInputs = [ pkgconfig glib fuse3 autoreconfHook ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional + (stdenv.system == "i686-linux") + "-D_FILE_OFFSET_BITS=64"; + postInstall = '' mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs From 24bed29809b2021d94a3fd928e32c95c4795f2e3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 22 Sep 2017 11:15:57 -0400 Subject: [PATCH 56/80] openjdk: Fix build --- pkgs/development/compilers/openjdk/9.nix | 28 ++++++++++++++---------- pkgs/top-level/all-packages.nix | 6 ++--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix index 65ef6ec5f2e..ce556a32c11 100644 --- a/pkgs/development/compilers/openjdk/9.nix +++ b/pkgs/development/compilers/openjdk/9.nix @@ -22,45 +22,44 @@ let throw "openjdk requires i686-linux or x86_64 linux"; update = ""; - build = "180"; + build = "181"; baseurl = "http://hg.openjdk.java.net/jdk9/jdk9"; repover = "jdk-9${update}+${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk9 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "05f3i6p35nh4lwh17znkmwbb8ccw1hl1qs5hnqivpph27lpdpqnn"; + sha256 = "0c7jwz4qvl93brs6c2v4dfc2v3lsv6ic0y72lkh04bnxg9343z82"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0gpgg0mz29jvfck6p6kqqyi3b9lx3d4s3h0dnriswmjnw0dy3bc6"; + sha256 = "1wa5rjan6lcs8nnxndbwpw6gkx3qbw013s6zisjjczkcaiq044pp"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "1zb0pzfgnykpllm9ibwqqrzhbsxdxq1cj5rdmd5h51qjfzd8k3js"; + sha256 = "00jnj19rim1gxpsxrpr8ifx1glwrbma3qjiy1ya7n5f08fb263hs"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1rv4gcidr0b71d7wkchx4g3gxkirpg98y0mlicqaah1vmvx3knkp"; + sha256 = "1gvx6dblzj7rb8648iqwdiv36x97ibykgs323dd9044n3vbqihvj"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1g3dwszz7v8812fp53vpsbmd5ingzwym8kwz4iq45bf0d1df95x9"; + sha256 = "15pwdw6s03rfyw2gx06xg4f70bjl8j19ycssxiigj39h524xc9aw"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0f7vblr4c322rvjgaim8lp91s9gkf1sf31mgzhl433h5m5hs5z26"; + sha256 = "0jz32pjbgr77ybb2v1vwr1n9ljdrc3y0d5lrj072g3is1hmn2wbh"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "1c552q4360aqfr8h6720ckk8sn4fw8c5nix5gc826sj4vrk7gqz2"; + sha256 = "1jdxr9hcqx6va56ll5s2x9bx9dnlrs7zyvhjk1zgr5hxg5yfcqzr"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "1hi9152w94gkwypj32nlxzp7ryzc04pp72qvr4z9m2vdc85hglhc"; + sha256 = "12lihmw9ga6yhz0h26fvfablcjkkma0k3idjggmap97xha8zgd6n"; }; openjdk9 = stdenv.mkDerivation { - # name = "openjdk-9u${update}b${build}"; - name = "openjdk-9ea-b${build}"; + name = "openjdk-9${update}-b${build}"; srcs = [ jdk9 langtools hotspot corba jdk jaxws jaxp nashorn ]; sourceRoot = "."; @@ -118,7 +117,12 @@ let "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" '' + lib.optionalString minimal "\"--enable-headless-only\"" - + ");"; + + ");" + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + + stdenv.lib.optionalString stdenv.cc.isGNU '' + NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" + ''; NIX_LDFLAGS= lib.optionals (!minimal) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bffd358b18..374dc8e81c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5827,9 +5827,9 @@ with pkgs; }; openjdk9 = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk-darwin/9.nix { } - else + # if stdenv.isDarwin then + # callPackage ../development/compilers/openjdk-darwin/9.nix { } + # else callPackage ../development/compilers/openjdk/9.nix { bootjdk = openjdk8; inherit (gnome2) GConf gnome_vfs; From c73a3813fa0fed7620fda45f1414e56e35a3538d Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Fri, 22 Sep 2017 09:16:36 +0700 Subject: [PATCH 57/80] nixos/gitolite: customize .gitolite.rc declaratively Add the `extraGitoliteRc` option to customize the `.gitolite.rc` configuration file declaratively. Resolves #29249. --- nixos/modules/services/misc/gitolite.nix | 126 ++++++++++++++++++++--- 1 file changed, 111 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 60fc9d58ed0..d803a4e0bf1 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -49,6 +49,35 @@ in ''; }; + extraGitoliteRc = mkOption { + type = types.lines; + default = ""; + example = literalExample '' + $RC{UMASK} = 0027; + $RC{SITE_INFO} = 'This is our private repository host'; + push( @{$RC{ENABLE}}, 'Kindergarten' ); # enable the command/feature + @{$RC{ENABLE}} = grep { $_ ne 'desc' } @{$RC{ENABLE}}; # disable the command/feature + ''; + description = '' + Extra configuration to append to the default ~/.gitolite.rc. + + This should be Perl code that modifies the %RC + configuration variable. The default ~/.gitolite.rc + content is generated by invoking gitolite print-default-rc, + and extra configuration from this option is appended to it. The result + is placed to Nix store, and the ~/.gitolite.rc file + becomes a symlink to it. + + If you already have a customized (or otherwise changed) + ~/.gitolite.rc file, NixOS will refuse to replace + it with a symlink, and the `gitolite-init` initialization service + will fail. In this situation, in order to use this option, you + will need to take any customizations you may have in + ~/.gitolite.rc, convert them to appropriate Perl + statements, add them to this option, and remove the file. + ''; + }; + user = mkOption { type = types.str; default = "gitolite"; @@ -59,7 +88,34 @@ in }; }; - config = mkIf cfg.enable { + config = mkIf cfg.enable ( + let + manageGitoliteRc = cfg.extraGitoliteRc != ""; + rcDir = pkgs.runCommand "gitolite-rc" { } rcDirScript; + rcDirScript = + '' + mkdir "$out" + export HOME=temp-home + mkdir -p "$HOME/.gitolite/logs" # gitolite can't run without it + '${pkgs.gitolite}'/bin/gitolite print-default-rc >>"$out/gitolite.rc.default" + cat <>"$out/gitolite.rc" + # This file is managed by NixOS. + # Use services.gitolite options to control it. + + END + cat "$out/gitolite.rc.default" >>"$out/gitolite.rc" + '' + + optionalString (cfg.extraGitoliteRc != "") '' + echo -n ${escapeShellArg '' + + # Added by NixOS: + ${removeSuffix "\n" cfg.extraGitoliteRc} + + # per perl rules, this should be the last line in such a file: + 1; + ''} >>"$out/gitolite.rc" + ''; + in { users.extraUsers.${cfg.user} = { description = "Gitolite user"; home = cfg.dataDir; @@ -77,21 +133,61 @@ in serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash config.programs.ssh.package ]; - script = '' - cd ${cfg.dataDir} - mkdir -p .gitolite/logs - if [ ! -d repositories ]; then - gitolite setup -pk ${pubkeyFile} - fi - if [ -n "${hooks}" ]; then - cp ${hooks} .gitolite/hooks/common/ - chmod +x .gitolite/hooks/common/* - fi - gitolite setup # Upgrade if needed - ''; + path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.diffutils config.programs.ssh.package ]; + script = + let + rcSetupScriptIfCustomFile = + if manageGitoliteRc then '' + cat <ERROR: NixOS can't apply declarative configuration + <3>to your .gitolite.rc file, because it seems to be + <3>already customized manually. + <3>See the services.gitolite.extraGitoliteRc option + <3>in "man configuration.nix" for more information. + END + # Not sure if the line below addresses the issue directly or just + # adds a delay, but without it our error message often doesn't + # show up in `systemctl status gitolite-init`. + journalctl --flush + exit 1 + '' else '' + : + ''; + rcSetupScriptIfDefaultFileOrStoreSymlink = + if manageGitoliteRc then '' + ln -sf "${rcDir}/gitolite.rc" "$GITOLITE_RC" + '' else '' + [[ -L "$GITOLITE_RC" ]] && rm -f "$GITOLITE_RC" + ''; + in + '' + cd ${cfg.dataDir} + mkdir -p .gitolite/logs + + GITOLITE_RC=.gitolite.rc + GITOLITE_RC_DEFAULT=${rcDir}/gitolite.rc.default + if ( [[ ! -e "$GITOLITE_RC" ]] && [[ ! -L "$GITOLITE_RC" ]] ) || + ( [[ -f "$GITOLITE_RC" ]] && diff -q "$GITOLITE_RC" "$GITOLITE_RC_DEFAULT" >/dev/null ) || + ( [[ -L "$GITOLITE_RC" ]] && [[ "$(readlink "$GITOLITE_RC")" =~ ^/nix/store/ ]] ) + then + '' + rcSetupScriptIfDefaultFileOrStoreSymlink + + '' + else + '' + rcSetupScriptIfCustomFile + + '' + fi + + if [ ! -d repositories ]; then + gitolite setup -pk ${pubkeyFile} + fi + if [ -n "${hooks}" ]; then + cp ${hooks} .gitolite/hooks/common/ + chmod +x .gitolite/hooks/common/* + fi + gitolite setup # Upgrade if needed + ''; }; environment.systemPackages = [ pkgs.gitolite pkgs.git ]; - }; + }); } From e9a56e798a79f41acf4aa97e7ec199cd710d5b71 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 22 Sep 2017 18:42:38 +0200 Subject: [PATCH 58/80] ferm: 2.3.1 -> 2.4.1 --- pkgs/tools/networking/ferm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 45460589382..a0b298f3f4e 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4.1"; name = "ferm-${version}"; src = fetchurl { - url = "http://ferm.foo-projects.org/download/2.3/ferm-${version}.tar.gz"; - sha256 = "1scdnd2jk4787jyr6fxav2598g0x7hjic5b8bj77j8s0hki48m4a"; + url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz"; + sha256 = "1fv8wk513yysp4q0i65rl2m0hg2lxwwgk9ppprsca1xcxrdpsvwa"; }; buildInputs = [ perl ipset ebtables iptables makeWrapper ]; From 4b4bfbf3e51c78924dcd5c27db5207092f9534ca Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 22 Sep 2017 19:49:57 +0300 Subject: [PATCH 59/80] darwin: Disable another bunch of packages never having built successfully tecoc: https://hydra.nixos.org/build/61141995 shallot: https://hydra.nixos.org/build/61145497 plink-ng: https://hydra.nixos.org/build/61130149 tshark: https://hydra.nixos.org/build/61479600 --- pkgs/applications/editors/tecoc/default.nix | 2 +- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 +- pkgs/applications/science/biology/plink-ng/default.nix | 2 +- pkgs/tools/misc/shallot/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix index a3f58012e53..1c5730838ff 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/applications/editors/tecoc/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/blakemcbride/TECOC; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } # TODO: test in other platforms - especially Darwin diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index a4a3741aeee..20a0f947f10 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { experts. It runs on UNIX, macOS and Windows. ''; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index 06fc1ef641b..2efb59f536f 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A comprehensive update to the PLINK association analysis toolset"; homepage = https://www.cog-genomics.org/plink2; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index 279de83e817..6c757ca224a 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -27,6 +27,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.mit; homepage = https://github.com/katmagic/Shallot; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } From a7440aa7c6b22cad5dd30ee6cb253abf01664560 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 22 Sep 2017 19:56:49 +0300 Subject: [PATCH 60/80] hdf5: Re-enable on darwin Oops, ab71280823ff3da7d9 intended to only disable hdf5-fortran but also disabled the others that are fine. --- pkgs/tools/misc/hdf5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 7dea58fc502..eb29e7d914c 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.free; # BSD-like homepage = https://www.hdfgroup.org/HDF5/; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 8a0d857aa95a07d366e59a306dbcaef900e8d84e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 22 Sep 2017 19:44:09 +0200 Subject: [PATCH 61/80] tw-rs: fix darwin build --- pkgs/misc/tw-rs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix index 6c6963303e9..2459e157a90 100644 --- a/pkgs/misc/tw-rs/default.nix +++ b/pkgs/misc/tw-rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, perl, zlib, openssl }: +{ stdenv, fetchFromGitHub, rustPlatform, perl, zlib, openssl, curl }: rustPlatform.buildRustPackage rec { name = "tw-rs-${version}"; @@ -10,7 +10,9 @@ rustPlatform.buildRustPackage rec { rev = "${version}"; sha256 = "1s1gk2wcs3792gdzrngksczz3gma5kv02ni2jqrhib8l6z8mg9ia"; }; - buildInputs = [ perl zlib openssl ]; + + buildInputs = [ perl zlib openssl ] + ++ stdenv.lib.optional stdenv.isDarwin curl; depsSha256 = "1lg1jh6f9w28i94vaj62r859g6raalxmxabvw7av6sqr0hr56p05"; From 4acb425c39bbc685ef3b168aa3b4311c8a191b61 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 22 Sep 2017 21:03:17 +0300 Subject: [PATCH 62/80] darwin: Disable yet another bunch of packages never having built successfully cjdns: https://hydra.nixos.org/build/61134279 jonprl: https://hydra.nixos.org/build/61123711 mate.libmatemixer: https://hydra.nixos.org/build/61126968 dirac: https://hydra.nixos.org/build/61132432 idnkit: https://hydra.nixos.org/build/61123544 trousers: https://hydra.nixos.org/build/61109766 packetdrill: https://hydra.nixos.org/build/61116190 osm2pgsql: https://hydra.nixos.org/build/61118017 nawk: https://hydra.nixos.org/build/61139000 --- pkgs/applications/science/logic/jonprl/default.nix | 2 +- pkgs/desktops/mate/libmatemixer/default.nix | 2 +- pkgs/development/libraries/dirac/default.nix | 2 +- pkgs/development/libraries/idnkit/default.nix | 2 +- pkgs/tools/misc/osm2pgsql/default.nix | 2 +- pkgs/tools/networking/cjdns/default.nix | 2 +- pkgs/tools/networking/packetdrill/default.nix | 2 +- pkgs/tools/security/trousers/default.nix | 2 +- pkgs/tools/text/nawk/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index 12891697a70..982b5fc8b5f 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://www.jonprl.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 614124f8a0c..20cf71c7554 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Mixer library for MATE"; homepage = https://github.com/mate-desktop/libmatemixer; license = with licenses; [ gpl2 lgpl2 ]; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index 7b42ead14bd..b64c6c84980 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/pkgs/development/libraries/dirac/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/dirac; description = "A general-purpose video codec based on wavelets"; - platforms = platforms.all; + platforms = platforms.linux; license = with licenses; [ mpl11 gpl2 lgpl21 ]; maintainer = maintainers.igsha; }; diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index fe816ee5267..4cee2863093 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = https://www.nic.ad.jp/ja/idn/idnkit; description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 98489358738..67e0c2b21d8 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { version = "0.92.1-unstable"; homepage = https://github.com/openstreetmap/osm2pgsql; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 12a8a1a184f..11f65ea82b0 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { description = "Encrypted networking for regular people"; license = licenses.gpl3; maintainers = with maintainers; [ ehmry ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 75007b5ed68..d770a51dc82 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks"; homepage = https://github.com/google/packetdrill; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ dmjio cleverca22 ]; }; } diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index d57aa8c63a9..e49f2f8ed0f 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://trousers.sourceforge.net/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix index d3056735b8d..a746c454435 100644 --- a/pkgs/tools/text/nawk/default.nix +++ b/pkgs/tools/text/nawk/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = https://www.cs.princeton.edu/~bwk/btl.mirror/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.konimex ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } From 1acf6716aafc863ce33e3b7b431c1defbbd88275 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 22 Sep 2017 21:24:43 +0200 Subject: [PATCH 63/80] textql: fix darwin build --- pkgs/development/tools/textql/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 65c0bb8e41e..bd1dbb3f90a 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "textql-${version}"; version = "2.0.3"; rev = "${version}"; - + goPackagePath = "github.com/dinedal/textql"; src = fetchFromGitHub { @@ -16,6 +16,10 @@ buildGoPackage rec { goDeps = ./deps.nix; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib $bin/bin/textql + ''; + meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = https://github.com/dinedal/textql; From 5257232ac7a59dc3c7598042f0d21dc4ae60ea14 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Sep 2017 21:18:37 +0200 Subject: [PATCH 64/80] gns3: "Improve" the packaging This is "a bit" hacky tho... The improvement is that it now covers the stable as well as the preview releases and doesn't require Python 3.4 anymore. --- pkgs/applications/networking/gns3/default.nix | 30 +++++++++ pkgs/applications/networking/gns3/gui.nix | 27 ++++---- pkgs/applications/networking/gns3/server.nix | 62 +++++++++++++++---- pkgs/top-level/all-packages.nix | 5 +- 4 files changed, 100 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/networking/gns3/default.nix diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix new file mode 100644 index 00000000000..bec700367da --- /dev/null +++ b/pkgs/applications/networking/gns3/default.nix @@ -0,0 +1,30 @@ +{ callPackage, stdenv }: + +let + stableVersion = "2.0.3"; + previewVersion = "2.1.0rc1"; + addVersion = args: + let version = if args.stable then stableVersion else previewVersion; + branch = if args.stable then "stable" else "preview"; + in args // { inherit version branch; }; + mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; + mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; +in { + guiStable = mkGui { + stable = true; + sha256Hash = "10qp6430md8d0h2wamgfaq7pai59mqmcw6sw3i1gvb20m0avvsvb"; + }; + guiPreview = mkGui { + stable = false; + sha256Hash = "0rmvanzc0fjw9giqwnf98yc49cxaz637w8b865dv08lcf1fg9j8l"; + }; + + serverStable = mkServer { + stable = true; + sha256Hash = "1c7mzj1r2zh90a7vs3s17jakfp9s43b8nnj29rpamqxvl3qhbdy7"; + }; + serverPreview = mkServer { + stable = false; + sha256Hash = "181689fpjxq4hy2lyxk4zciqhgnhj5srvb4xsxdlbf68n89fj2zf"; + }; +} diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 284c4f8cee1..1352774953d 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -1,19 +1,22 @@ -{ stdenv, python34Packages, fetchFromGitHub }: +{ stable, branch, version, sha256Hash }: -# TODO: Python 3.6 was failing -python34Packages.buildPythonPackage rec { +{ stdenv, python3Packages, fetchFromGitHub }: + +let + pythonPackages = python3Packages; + +in pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "gns3-gui"; - version = "2.0.3"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "10qp6430md8d0h2wamgfaq7pai59mqmcw6sw3i1gvb20m0avvsvb"; + sha256 = sha256Hash; }; - propagatedBuildInputs = with python34Packages; [ + propagatedBuildInputs = with pythonPackages; [ raven psutil jsonschema # tox for check # Runtime dependencies sip pyqt5 @@ -22,11 +25,13 @@ python34Packages.buildPythonPackage rec { doCheck = false; # Failing meta = with stdenv.lib; { - description = "Graphical Network Simulator"; - #longDescription = '' - # ... - #''; - homepage = "https://www.gns3.com/"; + description = "Graphical Network Simulator 3 GUI (${branch} release)"; + longDescription = '' + Graphical user interface for controlling the GNS3 network simulator. This + requires access to a local or remote GNS3 server (it's recommended to + download the official GNS3 VM). + ''; + homepage = https://www.gns3.com/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 7d5d9433bf3..9d7bf6f5a3a 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,23 +1,63 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ stable, branch, version, sha256Hash }: -python3Packages.buildPythonPackage rec { +{ stdenv, python3Packages, fetchFromGitHub, fetchurl }: + +let + pythonPackages = python3Packages; + yarl = if (!stable) then pythonPackages.yarl + else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs: + rec { + pname = "yarl"; + version = "0.9.8"; + name = "${pname}-${version}"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7"; + }; + })); + aiohttp = if (!stable) then pythonPackages.aiohttp + else (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs: + rec { + pname = "aiohttp"; + version = "1.3.5"; + name = "${pname}-${version}"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0hpqdiaifgyfqmxkyzwypwvrnvz5rqzgzylzhihfidc5ldfs856d"; + }; + propagatedBuildInputs = [ yarl ] + ++ (with pythonPackages; [ async-timeout chardet multidict ]); + })); + aiohttp-cors = if (!stable) then pythonPackages.aiohttp-cors + else (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs: + rec { + pname = "aiohttp-cors"; + version = "0.5.1"; + name = "${pname}-${version}"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0szma27ri25fq4nwwvs36myddggw3jz4pyzmq63yz4xpw0jjdxck"; + }; + propagatedBuildInputs = [ aiohttp ]; + })); +in pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "gns3-server"; - version = "2.1.0rc1"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "181689fpjxq4hy2lyxk4zciqhgnhj5srvb4xsxdlbf68n89fj2zf"; + sha256 = sha256Hash; }; - propagatedBuildInputs = with python3Packages; [ - aiohttp jinja2 psutil zipstream aiohttp-cors raven jsonschema yarl typing - prompt_toolkit - ]; + propagatedBuildInputs = [ yarl aiohttp aiohttp-cors ] + ++ (with pythonPackages; [ + jinja2 psutil zipstream raven jsonschema typing + prompt_toolkit + ]); - postPatch = '' + postPatch = stdenv.lib.optionalString (!stable) '' sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt ''; @@ -28,13 +68,13 @@ python3Packages.buildPythonPackage rec { rm $out/bin/gns3loopback # For windows only ''; meta = with stdenv.lib; { - description = "Graphical Network Simulator 3 server"; + description = "Graphical Network Simulator 3 server (${branch} release)"; longDescription = '' The GNS3 server manages emulators such as Dynamips, VirtualBox or Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST API. ''; - homepage = "https://www.gns3.com/"; + homepage = https://www.gns3.com/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 374dc8e81c7..0798cb204e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8256,8 +8256,9 @@ with pkgs; # A GMP fork mpir = callPackage ../development/libraries/mpir {}; - gns3-gui = callPackage ../applications/networking/gns3/gui.nix { }; - gns3-server = callPackage ../applications/networking/gns3/server.nix { }; + gns3Packages = callPackage ../applications/networking/gns3 { }; + gns3-gui = gns3Packages.guiStable; + gns3-server = gns3Packages.serverStable; gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; From fd3a9e64683b99a1cb1df4315af3a513ca963483 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 22 Sep 2017 22:24:48 +0200 Subject: [PATCH 65/80] tor: enable parallel building --- pkgs/tools/security/tor/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index ad94192d14f..3daf30d2ff0 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libevent openssl zlib ] ++ stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; From 84bd2f4ab04b8b53718db6b5ba208a62ae083941 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 22 Sep 2017 23:12:12 +0200 Subject: [PATCH 66/80] lmdb: fix library id on darwin --- pkgs/development/libraries/lmdb/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 30703fc7e3e..d96b5ed6d52 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub }: -let optional = stdenv.lib.optional; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "lmdb-${version}"; version = "0.9.21"; @@ -16,7 +15,8 @@ in stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - makeFlags = [ "prefix=$(out)" "CC=cc" ]; + makeFlags = [ "prefix=$(out)" "CC=cc" ] + ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; doCheck = true; checkPhase = "make test"; @@ -25,12 +25,6 @@ in stdenv.mkDerivation rec { moveToOutput bin "$bin" moveToOutput "lib/*.a" REMOVE # until someone needs it '' - - # fix bogus library name - + stdenv.lib.optionalString stdenv.isDarwin '' - mv "$out"/lib/liblmdb.{so,dylib} - '' - # add lmdb.pc (dynamic only) + '' mkdir -p "$dev/lib/pkgconfig" From 15a4f9d8efd4418bc748b57aa7df377b1c024974 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 10 Sep 2017 01:10:29 +0200 Subject: [PATCH 67/80] nixos/hardened: simplify script --- nixos/modules/security/lock-kernel-modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index 260ec3fc946..30fdb1e2bab 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -21,15 +21,15 @@ with lib; description = "Disable kernel module loading"; wantedBy = [ config.systemd.defaultUnit ]; - after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy; - script = "echo -n 1 > /proc/sys/kernel/modules_disabled"; + after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy; unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; + ExecStart = "/bin/sh -c 'echo -n 1 >/proc/sys/kernel/modules_disabled'"; }; }; }; From bccaf630679a5251549fd11abb08eb35e6bcec8e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 22 Sep 2017 23:20:42 +0200 Subject: [PATCH 68/80] nixos/hardened test: add failing test-case for deferred mounts --- nixos/tests/hardened.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index ee7ffe83ba3..cb33b69e719 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -10,6 +10,17 @@ import ./make-test.nix ({ pkgs, ...} : { { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; imports = [ ../modules/profiles/hardened.nix ]; + virtualisation.emptyDiskImages = [ 4096 ]; + boot.initrd.postDeviceCommands = '' + ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb + ''; + fileSystems = lib.mkVMOverride { + "/efi" = { + device = "/dev/disk/by-label/EFISYS"; + fsType = "vfat"; + options = [ "noauto" ]; + }; + }; }; testScript = @@ -42,5 +53,13 @@ import ./make-test.nix ({ pkgs, ...} : { subtest "kcore", sub { $machine->fail("cat /proc/kcore"); }; + + # Test deferred mount + subtest "mount", sub { + $machine->fail("mountpoint -q /efi"); # was deferred + $machine->execute("mkdir -p /efi"); + $machine->succeed("mount /dev/disk/by-label/EFISYS /efi"); + $machine->succeed("mountpoint -q /efi"); # now mounted + }; ''; }) From 1df6cf5d1d6d4fa092252275ab82f409dd8f79fe Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 22 Sep 2017 23:45:04 +0200 Subject: [PATCH 69/80] nixos/lock-kernel-modules: fix deferred fileSystem mounts Ensure that modules required by all declared fileSystems are explicitly loaded. A little ugly but fixes the deferred mount test. See also https://github.com/NixOS/nixpkgs/issues/29019 --- nixos/modules/security/lock-kernel-modules.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index 30fdb1e2bab..c81521ed9b0 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -17,6 +17,14 @@ with lib; }; config = mkIf config.security.lockKernelModules { + boot.kernelModules = concatMap (x: + if x.device != null + then + if x.fsType == "vfat" + then [ "vfat" "nls-cp437" "nls-iso8859-1" ] + else [ x.fsType ] + else []) config.system.build.fileSystems; + systemd.services.disable-kernel-module-loading = rec { description = "Disable kernel module loading"; From 676db57c37cae4dac8fd4073597b5ceb4772c0d9 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 23 Sep 2017 00:13:42 +0200 Subject: [PATCH 70/80] calc: 2.12.6.1 -> 2.12.6.3 --- pkgs/applications/science/math/calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index ff8a1ff9584..5787cb3d6b8 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "calc-${version}"; - version = "2.12.6.1"; + version = "2.12.6.3"; src = fetchurl { url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1vy4jmhmpl3gzgpkpv0kqwjv8hn1cza8cn1g8c69gq3inqvr4fvd"; + sha256 = "01m20s5zs74zyb23x6zg6i13gc30a2ay2iz1rdbkxram01cblzky"; }; buildInputs = [ makeWrapper readline ncurses utillinux ]; From 69e3817eb64c0621703be05cb1bcfcc76d97dd77 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 15 Sep 2017 11:41:49 +0200 Subject: [PATCH 71/80] tor-browser-bundle-bin: optionally disable multiprocess support Multiprocess tabs always crash, as first reported by the issue mentioned below. It is now consistently reproducible both on NixOS and non-NixOS for me, so I've decided to add a toggle to conveniently disable multiprocess support as a work-around. Closes https://github.com/NixOS/nixpkgs/issues/27759 but does not really fix the underlying problem ... --- .../browsers/tor-browser-bundle-bin/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) 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 b91b789a22b..1e61cabb7a1 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -44,6 +44,10 @@ , hicolor_icon_theme , shared_mime_info +# Whether to disable multiprocess support to work around crashing tabs +# TODO: fix the underlying problem instead of this terrible work-around +, disableContentSandbox ? true + # Extra preferences , extraPrefs ? "" }: @@ -210,6 +214,10 @@ stdenv.mkDerivation rec { lockPref("extensions.torlauncher.control_port_use_ipc", true); lockPref("extensions.torlauncher.socks_port_use_ipc", true); + // Optionally disable multiprocess support. We always set this to ensure that + // toggling the pref takes effect. + lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"}); + ${optionalString (extraPrefs != "") '' ${extraPrefs} ''} From 5f0a7cded718d0092229ba078cb7f0f7733bf636 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 23 Sep 2017 04:23:23 +0200 Subject: [PATCH 72/80] nox: Add a temporary patch for the "wip" command See #29684. --- pkgs/tools/package-management/nox/default.nix | 2 ++ .../tools/package-management/nox/nox-review-wip.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/tools/package-management/nox/nox-review-wip.patch diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index f12af074d41..ed7ec74483f 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -10,6 +10,8 @@ pythonPackages.buildPythonApplication rec { sha256 = "1qcbhdnhdhhv7q6cqdgv0q55ic8fk18526zn2yb12x9r1s0lfp9z"; }; + patches = [ ./nox-review-wip.patch ]; + buildInputs = [ pythonPackages.pbr git ]; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/package-management/nox/nox-review-wip.patch b/pkgs/tools/package-management/nox/nox-review-wip.patch new file mode 100644 index 00000000000..e82dc7a2c26 --- /dev/null +++ b/pkgs/tools/package-management/nox/nox-review-wip.patch @@ -0,0 +1,11 @@ +--- a/nox/review.py 2017-09-23 04:04:37.322484753 +0200 ++++ a/nox/review.py 2017-09-23 04:18:31.582692181 +0200 +@@ -84,7 +84,7 @@ + ctx.obj['dry_run'] = dry_run + + +-@cli.command(short_help='difference between working tree and a commit') ++@cli.command('wip', short_help='difference between working tree and a commit') + @click.option('--against', default='HEAD') + @click.pass_context + @setup_nixpkgs_config From 2948b570f5fda505c80c76b52033c0cc3998fd8b Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 1 Sep 2017 21:07:06 +0930 Subject: [PATCH 73/80] maintainers.nix: Add myself --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3f7eae52f6b..aba9eb0e2bc 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -186,6 +186,7 @@ ellis = "Ellis Whitehead "; eperuffo = "Emanuele Peruffo "; epitrochoid = "Mabry Cervin "; + eqyiel = "Ruben Maher "; ericbmerritt = "Eric Merritt "; ericsagnes = "Eric Sagnes "; erikryb = "Erik Rybakken "; From 9a0155a241cbc89ef53ae168219a430667c130db Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 1 Sep 2017 21:08:22 +0930 Subject: [PATCH 74/80] pythonPackages.blessed: init at 1.14.2 This is a dependency of awsebcli. --- .../python-modules/blessed/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/blessed/default.nix diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix new file mode 100644 index 00000000000..2d1ac11f3b5 --- /dev/null +++ b/pkgs/development/python-modules/blessed/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "blessed"; + version = "1.14.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fv9f0074kxy1849h0kwwxw12sifpq3bv63pcz900zzjsigi4hi3"; + }; + + propagatedBuildInputs = [ wcwidth six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/jquast/blessed; + description = "A thin, practical wrapper around terminal capabilities in Python."; + maintainers = with maintainers; [ eqyiel ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cf96d81f62..bc09f0c1a37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1470,6 +1470,8 @@ in { }; }; + blessed = callPackage ../development/python-modules/blessed {}; + # Build boost for this specific Python version # TODO: use separate output for libboost_python.so boost = pkgs.boost.override {inherit python;}; From 742de0bf24718c2f5a664d9c909e5aeae8d2c855 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 1 Sep 2017 21:09:45 +0930 Subject: [PATCH 75/80] pythonPackages.cement: init at 2.8.2 This is a dependency of awsebcli. --- .../python-modules/cement/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/cement/default.nix diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix new file mode 100644 index 00000000000..2ed704e3482 --- /dev/null +++ b/pkgs/development/python-modules/cement/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cement"; + name = "${pname}-${version}"; + version = "2.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; + }; + + # Disable test tests since they depend on a memcached server running on + # 127.0.0.1:11211. + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://builtoncement.com/; + description = "A CLI Application Framework for Python."; + maintainers = with maintainers; [ eqyiel ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc09f0c1a37..5ea6ae8e648 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1560,6 +1560,8 @@ in { }; }; + cement = callPackage ../development/python-modules/cement {}; + cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; postPatch = '' substituteInPlace setup.py --replace "argparse" "" From 41015822707540143db3f7d4a9ead56c7f5c8198 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 1 Sep 2017 21:17:01 +0930 Subject: [PATCH 76/80] pythonPackages.tabulate: use fetchPypi In order to make it nicer to override when a specific version is required for Python derivations. --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ea6ae8e648..04fd8d2ed11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21107,10 +21107,11 @@ in { tabulate = buildPythonPackage rec { version = "0.7.7"; - name = "tabulate-${version}"; + pname = "tabulate"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/tabulate/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; }; From 65aba6ed172b26ac97cf25c6fc123a7e58deca87 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 1 Sep 2017 21:17:40 +0930 Subject: [PATCH 77/80] pythonPackages.semantic-version: use fetchPypi In order to make it nicer to override when a specific version is required for Python derivations. --- pkgs/top-level/python-packages.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04fd8d2ed11..22823acee24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20318,9 +20318,12 @@ in { }; semantic-version = buildPythonPackage rec { - name = "semantic_version-2.4.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/semantic_version/${name}.tar.gz"; + pname = "semantic_version"; + version = "2.4.2"; + name = "${pname}${version}"; + + src = self.fetchPypi { + inherit pname version; sha256 = "7e8b7fa74a3bc9b6e90b15b83b9bc2377c78eaeae3447516425f475d5d6932d2"; }; From b1c4498b415f3b9cfec8f619c749eccbb5314e66 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 1 Sep 2017 21:21:28 +0930 Subject: [PATCH 78/80] awsebcli: init at 3.10.5 --- .../tools/virtualization/awsebcli/default.nix | 99 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 101 insertions(+) create mode 100644 pkgs/tools/virtualization/awsebcli/default.nix diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix new file mode 100644 index 00000000000..91cb148d8fe --- /dev/null +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -0,0 +1,99 @@ + { stdenv, python }: +let + + localPython = python.override { + packageOverrides = self: super: rec { + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { + version = "0.3.7"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; + }; + }); + + docker = super.docker.overridePythonAttrs (oldAttrs: rec { + pname = "docker-py"; + version = "1.7.2"; + name = "${pname}-${version}"; + + src = super.fetchPypi { + inherit pname version; + sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; + }; + }); + + pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { + version = "0.5.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "07yx1gxj9v1iyyiy5fhq2wsmh4qfbrx158wi7jb0nx6lah80ffma"; + }; + }); + + requests = super.requests.overridePythonAttrs (oldAttrs: rec { + version = "2.9.1"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5"; + }; + }); + + semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { + version = "2.5.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; inherit version; + sha256 = "0p5n3d6blgkncxdz00yxqav0cis87fisdkirjm0ljjh7rdfx7aiv"; + }; + }); + + tabulate = super.tabulate.overridePythonAttrs (oldAttrs: rec { + version = "0.7.5"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "03l1r7ddd1a0j2snv1yd0hlnghjad3fg1an1jr8936ksv75slwch"; + }; + }); + }; + }; +in with localPython.pkgs; buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "awsebcli"; + version = "3.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1g53z2flhp3navdf8lw6rgh99akf3k0ng1zkkqswvh66zswkxnwn"; + }; + + checkInputs = [ + pytest mock nose pathspec colorama requests docutils + ]; + + doCheck = false; + + propagatedBuildInputs = [ + blessed botocore cement colorama docker dockerpty docopt pathspec pyyaml + requests semantic-version setuptools tabulate termcolor websocket_client + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + mv $out/bin/eb_completion.bash $out/etc/bash_completion.d + ''; + + meta = with stdenv.lib; { + homepage = http://aws.amazon.com/elasticbeanstalk/; + description = "A command line interface for Elastic Beanstalk."; + maintainers = with maintainers; [ eqyiel ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a6bd4f0130..cc8559b5739 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -511,6 +511,8 @@ with pkgs; awscli = pythonPackages.awscli; # Should be moved out of python-packages.nix + awsebcli = callPackage ../tools/virtualization/awsebcli {}; + awslogs = callPackage ../tools/admin/awslogs { }; aws_shell = python2Packages.aws_shell; # Should be moved out of python-packages.nix From 5e916914efef3444c54a01a7ebe962a01ef80a9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Sep 2017 08:22:58 +0200 Subject: [PATCH 79/80] python.pkgs: alias dateutil to python-dateutil --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22823acee24..ccfc94ef682 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4667,7 +4667,10 @@ in { }; }; - dateutil = callPackage ../development/python-modules/dateutil { }; + # Actual name of package + python-dateutil = callPackage ../development/python-modules/dateutil { }; + # Alias that we should deprecate + dateutil = self.python-dateutil; # Buildbot 0.8.7p1 needs dateutil==1.5 dateutil_1_5 = buildPythonPackage (rec { From 805fa2e667d597469f55be3f315a2747589455b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Sep 2017 08:23:14 +0200 Subject: [PATCH 80/80] python.pkgs.botocore: fix dependencies --- pkgs/top-level/python-packages.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ccfc94ef682..e94da936af3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2156,13 +2156,15 @@ in { sha256 = "1fgg28halsy4g43wjpkbd6l0wqiwyzkd4zjrzbbyzw4dxbsf3xfm"; }; - propagatedBuildInputs = - [ self.dateutil - self.requests - self.jmespath - ]; + propagatedBuildInputs = with self; [ + dateutil + jmespath + docutils + ordereddict + simplejson + ]; - buildInputs = with self; [ docutils mock nose ]; + checkInputs = with self; [ mock nose ]; checkPhase = '' nosetests -v