summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-02-09 14:54:56 +0100
committertv <tv@krebsco.de>2017-02-09 14:54:56 +0100
commit38d2ff961f2ad8d02ae6061952abe42e4de89f75 (patch)
treea8573db9389ba5268a8fb83ddef6d92e3e1a7815
parented406bd979609fd05f5846049f571f43e6512050 (diff)
parent954477b8674156754cd51021d92885b456a04a5b (diff)
Merge remote-tracking branch 'prism/master'
-rw-r--r--krebs/3modules/default.nix1
-rw-r--r--krebs/3modules/kapacitor.nix173
-rw-r--r--krebs/3modules/lass/default.nix4
-rw-r--r--krebs/5pkgs/Reaktor/plugins.nix2
-rw-r--r--krebs/5pkgs/default.nix11
-rw-r--r--krebs/5pkgs/fortclientsslvpn/default.nix4
-rw-r--r--krebs/5pkgs/kapacitor/default.nix23
-rw-r--r--krebs/5pkgs/newsbot-js/packages.nix1273
-rw-r--r--krebs/5pkgs/telegraf/default.nix27
-rw-r--r--krebs/5pkgs/telegraf/deps-1.1.2.nix588
-rw-r--r--lass/1systems/iso.nix152
-rw-r--r--lass/1systems/prism.nix3
-rw-r--r--lass/2configs/baseX.nix1
-rw-r--r--lass/2configs/buildbot-standalone.nix2
-rw-r--r--lass/2configs/mail.nix4
-rw-r--r--lass/2configs/monitoring/client.nix105
-rw-r--r--lass/2configs/monitoring/server.nix83
-rw-r--r--lass/2configs/newsbot-js.nix5
-rw-r--r--lass/2configs/nixpkgs.nix2
-rw-r--r--lass/2configs/repo-sync.nix3
-rw-r--r--lass/2configs/websites/domsen.nix10
-rw-r--r--lass/3modules/default.nix3
-rw-r--r--lass/3modules/kapacitor.nix143
-rw-r--r--lass/3modules/telegraf.nix84
-rw-r--r--lass/3modules/urxvtd.nix55
-rw-r--r--lass/5pkgs/xmonad-lass.nix1
-rw-r--r--makefu/2configs/default.nix1
27 files changed, 1216 insertions, 1547 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 4b17c4abd..e0810ab63 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -21,6 +21,7 @@ let
./git.nix
./go.nix
./iptables.nix
+ ./kapacitor.nix
./newsbot-js.nix
./nginx.nix
./nixpkgs.nix
diff --git a/krebs/3modules/kapacitor.nix b/krebs/3modules/kapacitor.nix
new file mode 100644
index 000000000..2ec67c73d
--- /dev/null
+++ b/krebs/3modules/kapacitor.nix
@@ -0,0 +1,173 @@
+{ config, lib, pkgs, ... }:
+
+with builtins;
+with import <stockholm/lib>;
+
+let
+ cfg = config.krebs.kapacitor;
+
+ out = {
+ options.krebs.kapacitor = api;
+ config = mkIf cfg.enable imp;
+ };
+
+ configOptions = recursiveUpdate {
+ hostname = "localhost";
+ data_dir = cfg.dataDir;
+ http = {
+ bind-address = ":9092";
+ auth-enabled = false;
+ log-enabled = false;
+ gtgwrite-tracing = false;
+ pprof-enabled = false;
+ https-enabled = false;
+ https-certificate = "/etc/ssl/kapacitor.pem";
+ shutdown-timeout = "10s";
+ shared-secret = "";
+ };
+
+ replay ={
+ dir = "${cfg.dataDir}/replay";
+ };
+
+ storage = {
+ boltdb = "${cfg.dataDir}/kapacitor.db";
+ };
+
+ task = {
+ dir = "${cfg.dataDir}/tasks";
+ snapshot-interval = "1m0s";
+ };
+
+ influxdb = [{
+ enabled = true;
+ name = "default";
+ default = false;
+ urls = ["http://localhost:8086"];
+ username = "";
+ password = "";
+ ssl-ca = "";
+ ssl-cert = "";
+ ssl-key = "";
+ insecure-skip-verify = false;
+ timeout = "0s";
+ disable-subscriptions = false;
+ subscription-protocol = "http";
+ udp-bind = "";
+ udp-buffer = 1000;
+ udp-read-buffer = 0;
+ startup-timeout = "5m0s";
+ subscriptions-sync-interval = "1m0s";
+ influxdb.excluded-subscriptions = {
+ _kapacitor = ["autogen"];
+ };
+ }];
+
+ logging = {
+ file = "STDERR";
+ level = "INFO";
+ };
+
+ deadman = {
+ interval = "10s";
+ id = "{{ .Group }}:NODE_NAME for task '{{ .TaskName }}'";
+ message = "{{ .ID }} is {{ if eq .Level \"OK\" }}alive{{ else }}dead{{ end }}: {{ index .Fields \"emitted\" | printf \"%0.3f\" }} points/INTERVAL.";
+ global = false;
+ };
+ } cfg.extraConfig;
+
+ api = {
+ enable = mkEnableOption "kapacitor";
+ dataDir = mkOption {
+ type = types.str;
+ default = "/var/lib/kapacitor";
+ };
+ user = mkOption {
+ type = types.user;
+ default = {
+ name = "kapacitor";
+ home = cfg.dataDir;
+ };
+ };
+ group = mkOption {
+ type = types.group;
+ default = {
+ name = "kapacitor";
+ };
+ };
+ extraConfig = mkOption {
+ type = types.attrs;
+ default = {};
+ };
+ alarms = mkOption {
+ type = with types; attrsOf (submodule {
+ options = {
+ database = mkOption {
+ type = str;
+ };
+ text = mkOption {
+ type = str;
+ };
+ };
+ });
+ default = {};
+ };
+ };
+
+ configFile = pkgs.runCommand "kapacitor.toml" {} ''
+ ${pkgs.remarshal}/bin/remarshal -if json -of toml \
+ < ${pkgs.writeText "kapacitor.json" (builtins.toJSON configOptions)} \
+ > $out
+ '';
+
+ imp = {
+ users = {
+ groups.${cfg.group.name} = {
+ inherit (cfg.group) name gid;
+ };
+ users.${cfg.user.name} = {
+ inherit (cfg.user) home name uid;
+ createHome = true;
+ group = cfg.group.name;
+ };
+ };
+
+ systemd.services.kapacitor = {
+ description = "kapacitor";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ restartIfChanged = true;
+
+ serviceConfig = {
+ Restart = "always";
+ User = cfg.user.name;
+ ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${configFile}";
+ };
+ };
+
+ systemd.services.kapacitor-alarms = {
+ description = "kapacitor-alarms";
+ after = [ "kapacitor.service" ];
+ wantedBy = [ "multi-user.target" ];
+
+ restartIfChanged = true;
+
+ serviceConfig = {
+ Type = "oneshot";
+ User = cfg.user.name;
+ ExecStart = pkgs.writeDash "add_alarms" ''
+ ${pkgs.kapacitor}/bin/kapacitor delete tasks \*
+ ${concatStrings (mapAttrsToList (name: alarm: ''
+ ${pkgs.kapacitor}/bin/kapacitor define ${name} \
+ -type batch \
+ -tick ${pkgs.writeText "${name}.tick" alarm.text} \
+ -dbrp ${alarm.database}.default
+ ${pkgs.kapacitor}/bin/kapacitor enable ${name}
+ '') cfg.alarms)}
+ '';
+ };
+ };
+
+ };
+in out
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index d35a9f357..0b67abd11 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -302,7 +302,9 @@ with import <stockholm/lib>;
ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOPgQIMYiyD4/Co+nlOQWEzCKssemOEXAY/lbIZZaMhj";
};
-
+ iso = {
+ cores = 1;
+ };
};
users = {
lass = {
diff --git a/krebs/5pkgs/Reaktor/plugins.nix b/krebs/5pkgs/Reaktor/plugins.nix
index d4774dd69..e85e41cfe 100644
--- a/krebs/5pkgs/Reaktor/plugins.nix
+++ b/krebs/5pkgs/Reaktor/plugins.nix
@@ -118,7 +118,7 @@ rec {
};
url-title = (buildSimpleReaktorPlugin "url-title" {
- pattern = "^.*(?P<args>http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)$$";
+ pattern = "^.*(?P<args>http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$$";
path = with pkgs; [ curl perl ];
script = pkgs.writeDash "lambda-pl" ''
if [ "$#" -gt 0 ]; then
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index e01b6e804..c79a639a4 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -45,12 +45,11 @@ with import <stockholm/lib>;
buildbot-worker = callPackage ./buildbot/worker.nix {};
# https://github.com/proot-me/PRoot/issues/106
- proot = overrideDerivation pkgs.proot (oldAttrs: {
- patches = singleton (pkgs.fetchurl {
- url = https://github.com/openmole/PRoot/commit/10119a1f1fd7dea012464ae176c2b5fc3eb18928.diff;
- sha256 = "0cmd95mz8p5ifjvfvi4g9zzyxqddbscxin2j3a9zbmbjl2wi458g";
- });
- });
+ proot = pkgs.writeScriptBin "proot" ''
+ #!${pkgs.dash}/bin/dash
+ export PROOT_NO_SECCOMP=1
+ exec ${pkgs.proot}/bin/proot "$@"
+ '';
# XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
symlinkJoin = { name, paths, ... }@args: let
diff --git a/krebs/5pkgs/fortclientsslvpn/default.nix b/krebs/5pkgs/fortclientsslvpn/default.nix
index 07420c4d3..cbcfab05f 100644
--- a/krebs/5pkgs/fortclientsslvpn/default.nix
+++ b/krebs/5pkgs/fortclientsslvpn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, gtk, glib, libSM, gdk_pixbuf, libX11, libXinerama, iproute,
+{ stdenv, lib, fetchurl, gnome3, glib, libSM, gdk_pixbuf, libX11, libXinerama, iproute,
makeWrapper, libredirect, ppp, coreutils, gawk, pango }:
stdenv.mkDerivation rec {
name = "forticlientsslvpn";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
];
guiLibPath = lib.makeLibraryPath [
- gtk
+ gnome3.gtk
glib
libSM
gdk_pixbuf
diff --git a/krebs/5pkgs/kapacitor/default.nix b/krebs/5pkgs/kapacitor/default.nix
deleted file mode 100644
index 804826941..000000000
--- a/krebs/5pkgs/kapacitor/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
-
-buildGoPackage rec {
- name = "kapacitor-${version}";
- version = "1.0.0";
-
- goPackagePath = "github.com/influxdata/kapacitor";
-
- src = fetchFromGitHub {
- owner = "influxdata";
- repo = "kapacitor";
- rev = "v${version}";
- sha256 = "14l9bhj6qdif79s4dyqqbnjgj3m4iarvw0ckld1wdhpdgvl8w9qh";
- };
-
- meta = with lib; {
- description = "Open source framework for processing, monitoring, and alerting on time series data";
- license = licenses.mit;
- homepage = https://influxdata.com/time-series-platform/kapacitor/;
- maintainers = with maintainers; [offline];
- platforms = with platforms; linux;
- };
-}
diff --git a/krebs/5pkgs/newsbot-js/packages.nix b/krebs/5pkgs/newsbot-js/packages.nix
index 982a9d55c..62921cb8f 100644
--- a/krebs/5pkgs/newsbot-js/packages.nix
+++ b/krebs/5pkgs/newsbot-js/packages.nix
@@ -1,35 +1,16 @@
{ self, fetchurl, fetchgit ? null, lib }:
{
- by-spec."addressparser"."~0.1.3" =
- self.by-version."addressparser"."0.1.3";
- by-version."addressparser"."0.1.3" = self.buildNodePackage {
- name = "addressparser-0.1.3";
- version = "0.1.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
- name = "addressparser-0.1.3.tgz";
- sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ansi-color"."0.2.1" =
- self.by-version."ansi-color"."0.2.1";
- by-version."ansi-color"."0.2.1" = self.buildNodePackage {
- name = "ansi-color-0.2.1";
- version = "0.2.1";
+ by-spec."addressparser"."^1.0.1" =
+ self.by-version."addressparser"."1.0.1";
+ by-version."addressparser"."1.0.1" = self.buildNodePackage {
+ name = "addressparser-1.0.1";
+ version = "1.0.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz";
- name = "ansi-color-0.2.1.tgz";
- sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a";
+ url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz";
+ name = "addressparser-1.0.1.tgz";
+ sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
};
deps = {
};
@@ -40,15 +21,15 @@
cpu = [ ];
};
by-spec."ansi-regex"."^2.0.0" =
- self.by-version."ansi-regex"."2.0.0";
- by-version."ansi-regex"."2.0.0" = self.buildNodePackage {
- name = "ansi-regex-2.0.0";
- version = "2.0.0";
+ self.by-version."ansi-regex"."2.1.1";
+ by-version."ansi-regex"."2.1.1" = self.buildNodePackage {
+ name = "ansi-regex-2.1.1";
+ version = "2.1.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
- name = "ansi-regex-2.0.0.tgz";
- sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+ name = "ansi-regex-2.1.1.tgz";
+ sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
};
deps = {
};
@@ -58,16 +39,16 @@
os = [ ];
cpu = [ ];
};
- by-spec."ansi-styles"."^2.1.0" =
- self.by-version."ansi-styles"."2.1.0";
- by-version."ansi-styles"."2.1.0" = self.buildNodePackage {
- name = "ansi-styles-2.1.0";
- version = "2.1.0";
+ by-spec."ansi-styles"."^2.2.1" =
+ self.by-version."ansi-styles"."2.2.1";
+ by-version."ansi-styles"."2.2.1" = self.buildNodePackage {
+ name = "ansi-styles-2.2.1";
+ version = "2.2.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";
- name = "ansi-styles-2.1.0.tgz";
- sha1 = "990f747146927b559a932bf92959163d60c0d0e2";
+ url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+ name = "ansi-styles-2.2.1.tgz";
+ sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
};
deps = {
};
@@ -84,7 +65,7 @@
version = "0.0.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
+ url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
name = "array-filter-0.0.1.tgz";
sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
};
@@ -103,7 +84,7 @@
version = "0.0.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
+ url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
name = "array-indexofobject-0.0.1.tgz";
sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a";
};
@@ -122,7 +103,7 @@
version = "0.0.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
+ url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
name = "array-map-0.0.0.tgz";
sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
};
@@ -141,7 +122,7 @@
version = "0.0.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
+ url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
name = "array-reduce-0.0.0.tgz";
sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
};
@@ -153,16 +134,35 @@
os = [ ];
cpu = [ ];
};
- by-spec."asn1"."0.1.11" =
- self.by-version."asn1"."0.1.11";
- by-version."asn1"."0.1.11" = self.buildNodePackage {
- name = "asn1-0.1.11";
- version = "0.1.11";
+ by-spec."asn1"."~0.2.3" =
+ self.by-version."asn1"."0.2.3";
+ by-version."asn1"."0.2.3" = self.buildNodePackage {
+ name = "asn1-0.2.3";
+ version = "0.2.3";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+ name = "asn1-0.2.3.tgz";
+ sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
+ by-spec."assert-plus"."^0.2.0" =
+ self.by-version."assert-plus"."0.2.0";
+ by-version."assert-plus"."0.2.0" = self.buildNodePackage {
+ name = "assert-plus-0.2.0";
+ version = "0.2.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
- name = "asn1-0.1.11.tgz";
- sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+ url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+ name = "assert-plus-0.2.0.tgz";
+ sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
};
deps = {
};
@@ -172,16 +172,16 @@
os = [ ];
cpu = [ ];
};
- by-spec."assert-plus"."^0.1.5" =
- self.by-version."assert-plus"."0.1.5";
- by-version."assert-plus"."0.1.5" = self.buildNodePackage {
- name = "assert-plus-0.1.5";
- version = "0.1.5";
+ by-spec."assert-plus"."^1.0.0" =
+ self.by-version."assert-plus"."1.0.0";
+ by-version."assert-plus"."1.0.0" = self.buildNodePackage {
+ name = "assert-plus-1.0.0";
+ version = "1.0.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
- name = "assert-plus-0.1.5.tgz";
- sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+ url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+ name = "assert-plus-1.0.0.tgz";
+ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
};
deps = {
};
@@ -191,16 +191,16 @@
os = [ ];
cpu = [ ];
};
- by-spec."async"."^1.4.0" =
- self.by-version."async"."1.4.2";
- by-version."async"."1.4.2" = self.buildNodePackage {
- name = "async-1.4.2";
- version = "1.4.2";
+ by-spec."asynckit"."^0.4.0" =
+ self.by-version."asynckit"."0.4.0";
+ by-version."asynckit"."0.4.0" = self.buildNodePackage {
+ name = "asynckit-0.4.0";
+ version = "0.4.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz";
- name = "async-1.4.2.tgz";
- sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
+ url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+ name = "asynckit-0.4.0.tgz";
+ sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
};
deps = {
};
@@ -210,16 +210,16 @@
os = [ ];
cpu = [ ];
};
- by-spec."aws-sign2"."~0.5.0" =
- self.by-version."aws-sign2"."0.5.0";
- by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
- name = "aws-sign2-0.5.0";
- version = "0.5.0";
+ by-spec."aws-sign2"."~0.6.0" =
+ self.by-version."aws-sign2"."0.6.0";
+ by-version."aws-sign2"."0.6.0" = self.buildNodePackage {
+ name = "aws-sign2-0.6.0";
+ version = "0.6.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
- name = "aws-sign2-0.5.0.tgz";
- sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+ url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+ name = "aws-sign2-0.6.0.tgz";
+ sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
};
deps = {
};
@@ -229,19 +229,18 @@
os = [ ];
cpu = [ ];
};
- by-spec."bl"."~1.0.0" =
- self.by-version."bl"."1.0.0";
- by-version."bl"."1.0.0" = self.buildNodePackage {
- name = "bl-1.0.0";
- version = "1.0.0";
+ by-spec."aws4"."^1.2.1" =
+ self.by-version."aws4"."1.5.0";
+ by-version."aws4"."1.5.0" = self.buildNodePackage {
+ name = "aws4-1.5.0";
+ version = "1.5.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz";
- name = "bl-1.0.0.tgz";
- sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5";
+ url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
+ name = "aws4-1.5.0.tgz";
+ sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
};
deps = {
- "readable-stream-2.0.2" = self.by-version."readable-stream"."2.0.2";
};
optionalDependencies = {
};
@@ -249,18 +248,19 @@
os = [ ];
cpu = [ ];
};
- by-spec."bluebird"."^2.9.30" =
- self.by-version."bluebird"."2.10.2";
- by-version."bluebird"."2.10.2" = self.buildNodePackage {
- name = "bluebird-2.10.2";
- version = "2.10.2";
+ by-spec."bcrypt-pbkdf"."^1.0.0" =
+ self.by-version."bcrypt-pbkdf"."1.0.1";
+ by-version."bcrypt-pbkdf"."1.0.1" = self.buildNodePackage {
+ name = "bcrypt-pbkdf-1.0.1";
+ version = "1.0.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz";
- name = "bluebird-2.10.2.tgz";
- sha1 = "024a5517295308857f14f91f1106fc3b555f446b";
+ url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
+ name = "bcrypt-pbkdf-1.0.1.tgz";
+ sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
};
deps = {
+ "tweetnacl-0.14.5" = self.by-version."tweetnacl"."0.14.5";
};
optionalDependencies = {
};
@@ -269,15 +269,15 @@
cpu = [ ];
};
by-spec."boom"."2.x.x" =
- self.by-version."boom"."2.9.0";
- by-version."boom"."2.9.0" = self.buildNodePackage {
- name = "boom-2.9.0";
- version = "2.9.0";
+ self.by-version."boom"."2.10.1";
+ by-version."boom"."2.10.1" = self.buildNodePackage {
+ name = "boom-2.10.1";
+ version = "2.10.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/boom/-/boom-2.9.0.tgz";
- name = "boom-2.9.0.tgz";
- sha1 = "a54b7fd2fee477d351bf9e371680cbea67f12715";
+ url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+ name = "boom-2.10.1.tgz";
+ sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
};
deps = {
"hoek-2.16.3" = self.by-version."hoek"."2.16.3";
@@ -288,8 +288,25 @@
os = [ ];
cpu = [ ];
};
- by-spec."boom"."^2.8.x" =
- self.by-version."boom"."2.9.0";
+ by-spec."buffer-shims"."^1.0.0" =
+ self.by-version."buffer-shims"."1.0.0";
+ by-version."buffer-shims"."1.0.0" = self.buildNodePackage {
+ name = "buffer-shims-1.0.0";
+ version = "1.0.0";
+ bin = false;
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+ name = "buffer-shims-1.0.0.tgz";
+ sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+ };
+ deps = {
+ };
+ optionalDependencies = {
+ };
+ peerDependencies = [];
+ os = [ ];
+ cpu = [ ];
+ };
by-spec."caseless"."~0.11.0" =
self.by-version."caseless"."0.11.0";
by-version."caseless"."0.11.0" = self.buildNodePackage {
@@ -297,7 +314,7 @@
version = "0.11.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+ url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
name = "caseless-0.11.0.tgz";
sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
};
@@ -309,22 +326,22 @@
os = [ ];
cpu = [ ];
};
- by-spec."chalk"."^1.0.0" =
- self.by-version."chalk"."1.1.1";
- by-version."chalk"."1.1.1" = self.buildNodePackage {
- name = "chalk-1.1.1";
- version = "1.1.1";
+ by-spec."chalk"."^1.1.1" =
+ self.by-version."chalk"."1.1.3";
+ by-version."chalk"."1.1.3" = self.buildNodePackage {
+ name = "chalk-1.1.3";
+ version = "1.1.3";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz";
- name = "chalk-1.1.1.tgz";
- sha1 = "509afb67066e7499f7eb3535c77445772ae2d019";
+ url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+ name = "chalk-1.1.3.tgz";
+ sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
};
deps = {
- "ansi-styles-2.1.0" = self.by-version."ansi-styles"."2.1.0";
- "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+ "ansi-styles-2.2.1" = self.by-version."ansi-styles"."2.2.1";
+ "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5";
"has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0";
- "strip-ansi-3.0.0" = self.by-version."strip-ansi"."3.0.0";
+ "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
"supports-color-2.0.0" = self.by-version."supports-color"."2.0.0";
};
optionalDependencies = {
@@ -340,7 +357,7 @@
version = "1.0.5";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+ url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
name = "combined-stream-1.0.5.tgz";
sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
};
@@ -353,18 +370,18 @@
os = [ ];
cpu = [ ];
};
- by-spec."combined-stream"."~1.0.1" =
+ by-spec."combined-stream"."~1.0.5" =
self.by-version."combined-stream"."1.0.5";
- by-spec."commander"."^2.8.1" =
- self.by-version."commander"."2.8.1";
- by-version."commander"."2.8.1" = self.buildNodePackage {
- name = "commander-2.8.1";
- version = "2.8.1";
+ by-spec."commander"."^2.9.0" =
+ self.by-version."commander"."2.9.0";
+ by-version."commander"."2.9.0" = self.buildNodePackage {
+ name = "commander-2.9.0";
+ version = "2.9.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
- name = "commander-2.8.1.tgz";
- sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+ url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+ name = "commander-2.9.0.tgz";
+ sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
};
deps = {
"graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
@@ -376,15 +393,15 @@
cpu = [ ];
};
by-spec."core-util-is"."~1.0.0" =
- self.by-version."core-util-is"."1.0.1";
- by-version."core-util-is"."1.0.1" = self.buildNodePackage {
- name = "core-util-is-1.0.1";
- version = "1.0.1";
+ self.by-version."core-util-is"."1.0.2";
+ by-version."core-util-is"."1.0.2" = self.buildNodePackage {
+ name = "core-util-is-1.0.2";
+ version = "1.0.2";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
- name = "core-util-is-1.0.1.tgz";
- sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
+ url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+ name = "core-util-is-1.0.2.tgz";
+ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
};
deps = {
};
@@ -401,12 +418,12 @@
version = "2.0.5";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+ url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
name = "cryptiles-2.0.5.tgz";
sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
};
deps = {
- "boom-2.9.0" = self.by-version."boom"."2.9.0";
+ "boom-2.10.1" = self.by-version."boom"."2.10.1";
};
optionalDependencies = {
};
@@ -414,18 +431,19 @@
os = [ ];
cpu = [ ];
};
- by-spec."ctype"."0.5.3" =
- self.by-version."ctype"."0.5.3";
- by-version."ctype"."0.5.3" = self.buildNodePackage {
- name = "ctype-0.5.3";
- version = "0.5.3";
+ by-spec."dashdash"."^1.12.0" =
+ self.by-version."dashdash"."1.14.1";
+ by-version."dashdash"."1.14.1" = self.buildNodePackage {
+ name = "dashdash-1.14.1";
+ version = "1.14.1";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
- name = "ctype-0.5.3.tgz";
- sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+ url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+ name = "dashdash-1.14.1.tgz";
+ sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
};
deps = {
+ "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0";
};
optionalDependencies = {
};
@@ -440,7 +458,7 @@
version = "1.0.0";
bin = false;
src = fetchurl {
- url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+ url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
name =