From 2c484daf3cb78deefdcfe2ef6cececaab397dace Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 00:23:44 +0100 Subject: l 2 monitoring client: remove dns query --- lass/2configs/monitoring/client.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix index e879d6960..210fd2d10 100644 --- a/lass/2configs/monitoring/client.nix +++ b/lass/2configs/monitoring/client.nix @@ -29,10 +29,6 @@ with import ; '' [[inputs.net]] '' - '' - [[inputs.dns_query]] - servers = ["8.8.8.8"] - '' ]; }; systemd.services.telegraf.path = with pkgs; [ -- cgit v1.2.3 From 0ea991ffe9252041751e6e740c5166e164541928 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 00:25:39 +0100 Subject: l 2 monitoring server: add ram & deadman alarm --- lass/2configs/monitoring/server.nix | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/lass/2configs/monitoring/server.nix b/lass/2configs/monitoring/server.nix index 2e1c15ca1..505cb7a17 100644 --- a/lass/2configs/monitoring/server.nix +++ b/lass/2configs/monitoring/server.nix @@ -1,9 +1,7 @@ {pkgs, config, ...}: with import ; { - services.influxdb = { - enable = true; - }; + services.influxdb.enable = true; services.influxdb.extraConfig = { meta.hostname = config.krebs.build.host.name; @@ -29,24 +27,39 @@ with import ; data="$(${pkgs.jq}/bin/jq -r .message)" export LOGNAME=prism-alarm ${pkgs.irc-announce}/bin/irc-announce \ - irc.freenode.org 6667 prism-alarm \#krebs-bots "$data" >/dev/null + ni.r 6667 prism-alarm \#retiolum "$data" >/dev/null ''; in { enable = true; + check_db = "telegraf_db"; alarms = { - test2 = '' - batch + cpu = '' + var data = batch |query(${"'''"} SELECT mean("usage_user") AS mean FROM "${config.lass.kapacitor.check_db}"."default"."cpu" ${"'''"}) - .every(3m) - .period(1m) + .period(10m) + .every(1m) + .groupBy('host') + data |alert() + .crit(lambda: "mean" > 90) + .exec('${echoToIrc}') + data |deadman(1.0,5m) + .stateChangesOnly() + .exec('${echoToIrc}') + ''; + ram = '' + var data = batch + |query(${"'''"} + SELECT mean("used_percent") AS mean + FROM "${config.lass.kapacitor.check_db}"."default"."mem" + ${"'''"}) + .period(10m) + .every(1m) .groupBy('host') - |alert() - .crit(lambda: "mean" > 90) - // Whenever we get an alert write it to a file. - .log('/tmp/alerts.log') + data |alert() + .crit(lambda: "mean" > 90) .exec('${echoToIrc}') ''; }; -- cgit v1.2.3 From 2a3176d871497daf95cd5c28fc5c2d02d1bd32fd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 00:28:41 +0100 Subject: l 2 nixpkgs: 5fff5a9 -> f66d782 unstable --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 4a1b0379b..e7229654d 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "5fff5a902594b34471b613eb2babcec923e1e1f1"; + ref = "f66d782"; }; } -- cgit v1.2.3 From 25597af7630ba57a771c90748dd7e0d18e42052b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 00:48:06 +0100 Subject: l 3: remove urxvtd --- lass/3modules/default.nix | 1 - lass/3modules/urxvtd.nix | 55 ----------------------------------------------- 2 files changed, 56 deletions(-) delete mode 100644 lass/3modules/urxvtd.nix diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix index 2bf2df8b3..f97b041ac 100644 --- a/lass/3modules/default.nix +++ b/lass/3modules/default.nix @@ -6,7 +6,6 @@ _: ./hosts.nix ./mysql-backup.nix ./umts.nix - ./urxvtd.nix ./usershadow.nix ./xresources.nix ./kapacitor.nix diff --git a/lass/3modules/urxvtd.nix b/lass/3modules/urxvtd.nix deleted file mode 100644 index 469616a9f..000000000 --- a/lass/3modules/urxvtd.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ config, lib, pkgs, ... }: - -let -in - -with builtins; -with lib; - -{ - options = { - services.urxvtd = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable urxvtd per user"; - }; - users = mkOption { - type = types.listOf types.string; - default = []; - description = "users to run urxvtd for"; - }; - urxvtPackage = mkOption { - type = types.package; - default = pkgs.rxvt_unicode; - description = "urxvt package to use"; - }; - }; - }; - - config = - let - cfg = config.services.urxvtd; - users = cfg.users; - urxvt = cfg.urxvtPackage; - mkService = user: { - description = "urxvt terminal daemon"; - wantedBy = [ "multi-user.target" ]; - restartIfChanged = false; - path = [ pkgs.xlibs.xrdb ]; - environment = { - DISPLAY = ":0"; - URXVT_PERL_LIB = "${urxvt}/lib/urxvt/perl"; - }; - serviceConfig = { - Restart = "always"; - User = user; - ExecStart = "${urxvt}/bin/urxvtd"; - }; - }; - in - mkIf cfg.enable { - environment.systemPackages = [ urxvt ]; - systemd.services = listToAttrs (map (u: { name = "${u}-urxvtd"; value = mkService u; }) users); - }; -} -- cgit v1.2.3 From 2d8c8c4cf51db69912633283c53327197ad5b437 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 01:18:53 +0100 Subject: l 2 baseX: remove broken termite --- lass/2configs/baseX.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index e879e8e58..2933ca0e4 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -66,7 +66,6 @@ in { youtube-tools rxvt_unicode - termite #window manager stuff #haskellPackages.xmobar #haskellPackages.yeganesh -- cgit v1.2.3 From 427482e4793cb679804d2d0c1f8b5a809502464f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 01:19:10 +0100 Subject: l 5 xmonad: remove broken termite --- lass/5pkgs/xmonad-lass.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix index cf8eaf058..dd4d8803c 100644 --- a/lass/5pkgs/xmonad-lass.nix +++ b/lass/5pkgs/xmonad-lass.nix @@ -129,7 +129,6 @@ myKeyMap = , ("M4-", toggleWS) , ("M4-S-", spawn urxvtcPath) , ("M4-x", floatNext True >> spawn urxvtcPath) - , ("M4-z", floatNext True >> spawn "${pkgs.termite}/bin/termite") , ("M4-f", floatNext True) , ("M4-b", sendMessage ToggleStruts) -- cgit v1.2.3 From cf5cb7267f0df98997452a1d9faf910946c709ee Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 09:30:56 +0100 Subject: l 2 mail: mutt-kz -> neomutt --- lass/2configs/mail.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 872acc003..5ca84133d 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -17,7 +17,7 @@ let muttrc = pkgs.writeText "muttrc" '' # gpg - source ${pkgs.mutt-kz}/share/doc/mutt-kz/samples/gpg.rc + source ${pkgs.neomutt}/share/doc/neomutt/samples/gpg.rc set pgp_use_gpg_agent = yes set pgp_sign_as = 0x976A7E4D set crypt_autosign = yes @@ -99,7 +99,7 @@ let ''; mutt = pkgs.writeDashBin "mutt" '' - exec ${pkgs.mutt-kz}/bin/mutt -F ${muttrc} $@ + exec ${pkgs.neomutt}/bin/mutt -F ${muttrc} $@ ''; in { -- cgit v1.2.3 From 035dce390cf0de75cf9e10e67c51388a9d1b648b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 09:35:31 +0100 Subject: l 2 websites domsen: remove user nrg --- lass/2configs/websites/domsen.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 66fc681b1..0b75425c4 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -118,8 +118,7 @@ in { { from = "mail@jla-trading.com"; to = "jla-trading"; } { from = "jms@ubikmedia.eu"; to = "jms"; } { from = "ms@ubikmedia.eu"; to = "ms"; } - { from = "nrg@ubikmedia.eu"; to = "nrg"; } - { from = "ubik@ubikmedia.eu"; to = "domsen, jms, ms, nrg"; } + { from = "ubik@ubikmedia.eu"; to = "domsen, jms, ms"; } { from = "testuser@lassul.us"; to = "testuser"; } ]; @@ -161,13 +160,6 @@ in { createHome = true; }; - users.users.nrg = { - uid = genid_signed "nrg"; - home = "/home/nrg"; - useDefaultShell = true; - createHome = true; - }; - users.users.testuser = { uid = genid_signed "testuser"; home = "/home/testuser"; -- cgit v1.2.3 From aedb8cf265960c528db31b0aba00ec799b90d27a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 11:47:43 +0100 Subject: k 5: remove obsolete telegraf --- krebs/5pkgs/telegraf/default.nix | 27 -- krebs/5pkgs/telegraf/deps-1.1.2.nix | 588 ------------------------------------ 2 files changed, 615 deletions(-) delete mode 100644 krebs/5pkgs/telegraf/default.nix delete mode 100644 krebs/5pkgs/telegraf/deps-1.1.2.nix diff --git a/krebs/5pkgs/telegraf/default.nix b/krebs/5pkgs/telegraf/default.nix deleted file mode 100644 index 996c839ac..000000000 --- a/krebs/5pkgs/telegraf/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "telegraf-${version}"; - version = "1.1.2"; - - goPackagePath = "github.com/influxdata/telegraf"; - - excludedPackages = "test"; - - src = fetchFromGitHub { - owner = "influxdata"; - repo = "telegraf"; - rev = "${version}"; - sha256 = "0dgrbdyz261j28wcq636125ha4xmfgh4y9shlg8m1y6jqdqd2zf2"; - }; - - goDeps = ./. + builtins.toPath "/deps-${version}.nix"; - - meta = with lib; { - description = "The plugin-driven server agent for collecting & reporting metrics."; - license = licenses.mit; - homepage = https://www.influxdata.com/time-series-platform/telegraf/; - maintainers = with maintainers; [ mic92 roblabla ]; - platforms = platforms.linux; - }; -} diff --git a/krebs/5pkgs/telegraf/deps-1.1.2.nix b/krebs/5pkgs/telegraf/deps-1.1.2.nix deleted file mode 100644 index b62ae44db..000000000 --- a/krebs/5pkgs/telegraf/deps-1.1.2.nix +++ /dev/null @@ -1,588 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/Shopify/sarama"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "8aadb476e66ca998f2f6bb3c993e9a2daa3666b9"; - sha256 = "1ndaddqcll9r22jg9x36acanxv5ds3xwahrm4b6nmmg06670gksv"; - }; - } - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "219c8cb75c258c552e999735be6df753ffc7afdc"; - sha256 = "04v55846v1535dplldyjhr0yqxl6n1mr4kiy2vz3ragv92xpshr6"; - }; - } - { - goPackagePath = "github.com/aerospike/aerospike-client-go"; - fetch = { - type = "git"; - url = "https://github.com/aerospike/aerospike-client-go"; - rev = "7f3a312c3b2a60ac083ec6da296091c52c795c63"; - sha256 = "05ancqplckvni9xp6xd4bv2pgkfa4v23svfcg27m8xinzi4ry219"; - }; - } - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "53c1b967405155bfc8758557863bf2e14f814687"; - sha256 = "08a6zz4akkm7lk02w53vfhkxdf0ikv32x41rc4jyi2qaf0wyw6b4"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "13a12060f716145019378a10e2806c174356b857"; - sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; - sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "4dc77674aceaabba2c7e3da25d4c823edfb73f99"; - sha256 = "0icf4vrgzksr0g8h6y00rd92h1mym6waf3mbqpf890bkw60gnm0w"; - }; - } - { - goPackagePath = "github.com/couchbase/go-couchbase"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/go-couchbase"; - rev = "cb664315a324d87d19c879d9cc67fda6be8c2ac1"; - sha256 = "1dfw1apwrlfwl7bahb6dy5g9z2vs431l4lpaj3k9bnm13p0awivr"; - }; - } - { - goPackagePath = "github.com/couchbase/gomemcached"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/gomemcached"; - rev = "a5ea6356f648fec6ab89add00edd09151455b4b2"; - sha256 = "00x57qqdv9ciyxiw2y6p4s65sfgi4cs6zi39qlqlw90nh133xnwi"; - }; - } - { - goPackagePath = "github.com/couchbase/goutils"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/goutils"; - rev = "5823a0cbaaa9008406021dc5daf80125ea30bba6"; - sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c"; - }; - } - { - goPackagePath = "github.com/dancannon/gorethink"; - fetch = { - type = "git"; - url = "https://github.com/dancannon/gorethink"; - rev = "e7cac92ea2bc52638791a021f212145acfedb1fc"; - sha256 = "0f9gwsqf93qzvfpdwgam7vcfzrrkcj2s9ms4p056kcyxv9snwq3g"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; - sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; - }; - } - { - goPackagePath = "github.com/docker/engine-api"; - fetch = { - type = "git"; - url = "https://github.com/docker/engine-api"; - rev = "8924d6900370b4c7e7984be5adc61f50a80d7537"; - sha256 = "1klimc3d1a2vfgl14a7js20ricpghq5jzvh8l46kf87ycjwc0q4n"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "f549a9393d05688dff0992ef3efd8bbe6c628aeb"; - sha256 = "0k1yf4bimmwxc0qiz997nagfmddbm8nwb0c1q16387m8lgw1gbwg"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; - sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; - }; - } - { - goPackagePath = "github.com/eapache/go-resiliency"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-resiliency"; - rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; - sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; - }; - } - { - goPackagePath = "github.com/eapache/queue"; - fetch = { - type = "git"; - url = "https://github.com/eapache/queue"; - rev = "ded5959c0d4e360646dc9e9908cff48666781367"; - sha256 = "0inclypw0kln8hsn34c5ww34h0qa9fcqwak93lac5dp59rz5430n"; - }; - } - { - goPackagePath = "github.com/eclipse/paho.mqtt.golang"; - fetch = { - type = "git"; - url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "0f7a459f04f13a41b7ed752d47944528d4bf9a86"; - sha256 = "13l6mrx9z859r4r7kpa9rsbf4ni7dn6xgz8iyv2xnz53pqffanjh"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "1fca743146605a172a266e1654e01e5cd5669bee"; - sha256 = "02vbq8j4r3skg3fmiv1wvjqh1542dr515w8f3d42b5lpwc1fsn38"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "49571a1557cd20e6a2410adc6421f85b66c730b5"; - sha256 = "16j7pdxajqrl20a737p7kgsngr2f7gkkpgqxxmfkrmgckgkc8cvk"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "552c7b9542c194800fd493123b3798ef0a832032"; - sha256 = "1zaw1xxnvgsvfcrv5xkn1f7p87vyh9i6mc44csl11fgc2hvqp6xm"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; - sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; - }; - } - { - goPackagePath = "github.com/gonuts/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/gonuts/go-shellquote"; - rev = "e842a11b24c6abfb3dd27af69a17f482e4b483c2"; - sha256 = "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"; - sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "c9e326e2bdec29039a3761c07bece13133863e1e"; - sha256 = "1bplp6v14isjdfpf8328k8bvkn35n451axkxlm822d9h5ccg47g6"; - }; - } - { - goPackagePath = "github.com/hailocab/go-hostpool"; - fetch = { - type = "git"; - url = "https://github.com/hailocab/go-hostpool"; - rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; - sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "5aa90455ce78d4d41578bafc86305e6e6b28d7d2"; - sha256 = "1xas814kkhwnjg5ghhlkgygcgi5p7h6dczmpbrzzh3yygbfdzxgw"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "b2940955ab8b26e19d43a43c4da0475dd81bdb56"; - sha256 = "1x266pdfvcymsbdrdsns06qq5qfjb62z6h4512ylhakbm64qkn4s"; - }; - } - { - goPackagePath = "github.com/influxdata/config"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/config"; - rev = "b79f6829346b8d6e78ba73544b1e1038f1f1c9da"; - sha256 = "0k4iywy83n3kq2f58a41rjinj03wp1di67aacpf04p25qmf46c4z"; - }; - } - { - goPackagePath = "github.com/influxdata/influxdb"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/influxdb"; - rev = "fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae"; - sha256 = "07cv1gryp4a84a2acgc8k8alr7jw4jwphf12cby8jjy1br35jrbq"; - }; - } - { - goPackagePath = "github.com/influxdata/toml"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/toml"; - rev = "af4df43894b16e3fd2b788d01bd27ad0776ef2d0"; - sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4"; - }; - } - { - goPackagePath = "github.com/influxdata/wlog"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/wlog"; - rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; - sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; - sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; - }; - } - { - goPackagePath = "github.com/kardianos/service"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/service"; - rev = "5e335590050d6d00f3aa270217d288dda1c94d0a"; - sha256 = "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h"; - }; - } - { - goPackagePath = "github.com/klauspost/crc32"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/crc32"; - rev = "19b0b332c9e4516a6370a0456e6182c3b5036720"; - sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "e182dc4027e2ded4b19396d638610f2653295f36"; - sha256 = "1636v3snixapjf7rbjq0xn1sbym7hwckqfla0dm5cr4a5q4fw5cj"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; - sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "cce6c130cdb92c752850880fd285bea1d64439dd"; - sha256 = "098gadhfjiijlgq497gbccvf26xrmjvln1fws56m0ljcgszq3jdx"; - }; - } - { - goPackagePath = "github.com/mreiferson/go-snappystream"; - fetch = { - type = "git"; - url = "https://github.com/mreiferson/go-snappystream"; - rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; - sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; - }; - } - { - goPackagePath = "github.com/naoina/go-stringutil"; - fetch = { - type = "git"; - url = "https://github.com/naoina/go-stringutil"; - rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; - sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; - }; - } - { - goPackagePath = "github.com/nats-io/nats"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nats"; - rev = "ea8b4fd12ebb823073c0004b9f09ac8748f4f165"; - sha256 = "0i5f6n9k0d2vzdy20sqygmss5j45y72irxsi80grjsh7qkxa6vn1"; - }; - } - { - goPackagePath = "github.com/nats-io/nuid"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nuid"; - rev = "a5152d67cf63cbfb5d992a395458722a45194715"; - sha256 = "0fphar5bz735wwa7549j31nxnm5a9dyw472gs9zafz0cv7g8np40"; - }; - } - { - goPackagePath = "github.com/nsqio/go-nsq"; - fetch = { - type = "git"; - url = "https://github.com/nsqio/go-nsq"; - rev = "0b80d6f05e15ca1930e0c5e1d540ed627e299980"; - sha256 = "1zi9jazjfzilp2g0xy30dlx9nd9g47cjqrnqxallly97mz9n01xr"; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8"; - sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "18acf9993a863f4c4b40612e19cdd243e7c86831"; - sha256 = "1gyjvwnvgyl0fs4hd2vp5hj1dsafhwb2h55w8zgzdpshvhwrpmhv"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "e8eabff8812b05acf522b45fdcd725a785188e37"; - sha256 = "08magd2aw7dqaa8bbv85404zvy120ify61msfpy75az5rdl5anxq"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; - sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; - }; - } - { - goPackagePath = "github.com/samuel/go-zookeeper"; - fetch = { - type = "git"; - url = "https://github.com/samuel/go-zookeeper"; - rev = "218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f"; - sha256 = "1v0m6wn83v4pbqz6hs7z1h5hbjk7k6npkpl7icvcxdcjd7rmyjp2"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; - sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; - }; - } - { - goPackagePath = "github.com/soniah/gosnmp"; - fetch = { - type = "git"; - url = "https://github.com/soniah/gosnmp"; - rev = "3fe3beb30fa9700988893c56a63b1df8e1b68c26"; - sha256 = "0a0vlxx1plqj9fi863wd8ajbzl705wgma4qk75v949azgn1yx9ib"; - }; - } - { - goPackagePath = "github.com/streadway/amqp"; - fetch = { - type = "git"; - url = "https://github.com/streadway/amqp"; - rev = "b4f3ceab0337f013208d31348b578d83c0064744"; - sha256 = "1whcg2l6w2q7xrkk8q5y95i90ckq72bpgksii9ibrpyixbx7p5xp"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c"; - sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl"; - }; - } - { - goPackagePath = "github.com/vjeantet/grok"; - fetch = { - type = "git"; - url = "https://github.com/vjeantet/grok"; - rev = "83bfdfdfd1a8146795b28e547a8e3c8b28a466c2"; - sha256 = "03zdcg9gy482gbasa7sw4cpw1k1n3dr2q06q80qnkqn268p7hp80"; - }; - } - { - goPackagePath = "github.com/wvanbergen/kafka"; - fetch = { - type = "git"; - url = "https://github.com/wvanbergen/kafka"; - rev = "46f9a1cf3f670edec492029fadded9c2d9e18866"; - sha256 = "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694"; - }; - } - { - goPackagePath = "github.com/wvanbergen/kazoo-go"; - fetch = { - type = "git"; - url = "https://github.com/wvanbergen/kazoo-go"; - rev = "0f768712ae6f76454f987c3356177e138df258f8"; - sha256 = "1paaayg03nknbnl3kdl0ybqv4llz7iwry7f29i0bh9srb6c87x16"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "bf3808abd44b1e55143a2d7f08571aaa80db1808"; - sha256 = "02m7ly5yzc3snvxlfl9j4ggwd7v0kpvy3pqgqbfr7scdjxdap4nm"; - }; - } - { - goPackagePath = "github.com/zensqlmonitor/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/zensqlmonitor/go-mssqldb"; - rev = "ffe5510c6fa5e15e6d983210ab501c815b56b363"; - sha256 = "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; - sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; - sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; - sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; - }; - } - { - goPackagePath = "gopkg.in/dancannon/gorethink.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/dancannon/gorethink.v1"; - rev = "7d1af5be49cb5ecc7b177bf387d232050299d6ef"; - sha256 = "0036hcadshka19bcqmq4mm9ssl9qhsx1n96lj1y24mh9g1api8fi"; - }; - } - { - goPackagePath = "gopkg.in/fatih/pool.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/fatih/pool.v2"; - rev = "cba550ebf9bce999a02e963296d4bc7a486cb715"; - sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "d90005c5262a3463800497ea5a89aed5fe22c886"; - sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } -] -- cgit v1.2.3 From f44d29940e4168738b6b600003da44e52c1d383b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 11:52:01 +0100 Subject: l 5: remove obsolete kapacitor --- krebs/5pkgs/kapacitor/default.nix | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 krebs/5pkgs/kapacitor/default.nix 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; - }; -} -- cgit v1.2.3 From 6ad79bd34eb62d916d5802536174bdb6c3fcd363 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 12:15:17 +0100 Subject: l 2 monitoring client: use services.telegraf --- lass/2configs/monitoring/client.nix | 105 ++++++++---------------------------- 1 file changed, 22 insertions(+), 83 deletions(-) diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix index 210fd2d10..d20ad475d 100644 --- a/lass/2configs/monitoring/client.nix +++ b/lass/2configs/monitoring/client.nix @@ -1,90 +1,29 @@ {pkgs, config, ...}: with import ; { - lass.telegraf = { + services.telegraf = { enable = true; - interval = "1s"; - - outputs = '' - [outputs.influxdb] - urls = ["http://prism:8086"] - database = "telegraf_db" - user_agent = "telegraf" - ''; - inputs = [ - '' - [cpu] - percpu = false - totalcpu = true - drop = ["cpu_time"] - '' - '' - [[inputs.mem]] - '' - '' - [[inputs.ping]] - urls = ["8.8.8.8"] - '' - '' - [[inputs.net]] - '' - ]; - }; - systemd.services.telegraf.path = with pkgs; [ - iputils - lm_sensors - ]; - - services.collectd = { - enable = true; - autoLoadPlugin = true; - extraConfig = '' - Hostname ${config.krebs.build.host.name} - LoadPlugin load - LoadPlugin disk - LoadPlugin memory - Interval 30.0 - - LoadPlugin interface - - Interface "*Link" - Interface "lo" - Interface "vboxnet*" - Interface "virbr*" - IgnoreSelected true - - - LoadPlugin df - - MountPoint "/nix/store" - FSType "tmpfs" - FSType "binfmt_misc" - FSType "debugfs" - FSType "mqueue" - FSType "hugetlbfs" - FSType "systemd-1" - FSType "cgroup" - FSType "securityfs" - FSType "ramfs" - FSType "proc" - FSType "devpts" - FSType "devtmpfs" - MountPoint "/var/lib/docker/devicemapper" - IgnoreSelected true - - - LoadPlugin cpu - - ReportByCpu true - ReportByState true - ValuesPercentage true - - - LoadPlugin network - - Server "prism" "25826" - - ''; + extraConfig = { + interval = "1s"; + outputs = { + influxdb = { + urls = ["http://prism:8086"]; + database = "telegraf_db"; + user_agent = "telegraf"; + }; + }; + inputs = { + cpu = { + percpu = false; + totalcpu = true; + }; + mem = {}; + ping = { + urls = ["8.8.8.8"]; + }; + net = {}; + }; + }; }; } -- cgit v1.2.3 From 4dd88ea7d2cfe55ff4e40f3231fc212061c930cc Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 12:23:14 +0100 Subject: k 5 fortclientsslvpn: use gnome3.gtk --- krebs/5pkgs/fortclientsslvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From dd84ced18678444e29d81daaa6fca53a4c47ad4c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 Feb 2017 12:51:10 +0100 Subject: k 5 newsbot-js: update packages.nix --- krebs/5pkgs/newsbot-js/packages.nix | 1273 ++++++++++++++++++++++------------- 1 file changed, 789 insertions(+), 484 deletions(-) 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 = "delayed-stream-1.0.0.tgz"; sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; @@ -452,16 +470,36 @@ os = [ ]; cpu = [ ]; }; + by-spec."ecc-jsbn"."~0.1.1" = + self.by-version."ecc-jsbn"."0.1.1"; + by-version."ecc-jsbn"."0.1.1" = self.buildNodePackage { + name = "ecc-jsbn-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + name = "ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + deps = { + "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."escape-string-regexp"."^1.0.2" = - self.by-version."escape-string-regexp"."1.0.3"; - by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage { - name = "escape-string-regexp-1.0.3"; - version = "1.0.3"; + self.by-version."escape-string-regexp"."1.0.5"; + by-version."escape-string-regexp"."1.0.5" = self.buildNodePackage { + name = "escape-string-regexp-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"; - name = "escape-string-regexp-1.0.3.tgz"; - sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5"; + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + name = "escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; deps = { }; @@ -478,7 +516,7 @@ version = "3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; name = "extend-3.0.0.tgz"; sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; }; @@ -490,22 +528,45 @@ os = [ ]; cpu = [ ]; }; - by-spec."feedparser"."*" = - self.by-version."feedparser"."1.1.3"; - by-version."feedparser"."1.1.3" = self.buildNodePackage { - name = "feedparser-1.1.3"; - version = "1.1.3"; + by-spec."extsprintf"."1.0.2" = + self.by-version."extsprintf"."1.0.2"; + by-version."extsprintf"."1.0.2" = self.buildNodePackage { + name = "extsprintf-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz"; - name = "feedparser-1.1.3.tgz"; - sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + name = "extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }; deps = { - "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "addressparser-0.1.3" = self.by-version."addressparser"."0.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."feedparser"."*" = + self.by-version."feedparser"."2.1.0"; + by-version."feedparser"."2.1.0" = self.buildNodePackage { + name = "feedparser-2.1.0"; + version = "2.1.0"; + bin = true; + src = fetchurl { + url = "https://registry.npmjs.org/feedparser/-/feedparser-2.1.0.tgz"; + name = "feedparser-2.1.0.tgz"; + sha1 = "4cd98bf04e18db5b8644f91e98da89dd179f1fe7"; + }; + deps = { + "addressparser-1.0.1" = self.by-version."addressparser"."1.0.1"; "array-indexofobject-0.0.1" = self.by-version."array-indexofobject"."0.0.1"; - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + "lodash.assign-4.2.0" = self.by-version."lodash.assign"."4.2.0"; + "lodash.get-4.4.2" = self.by-version."lodash.get"."4.4.2"; + "lodash.has-4.5.2" = self.by-version."lodash.has"."4.5.2"; + "lodash.uniq-4.5.0" = self.by-version."lodash.uniq"."4.5.0"; + "readable-stream-2.2.2" = self.by-version."readable-stream"."2.2.2"; + "sax-1.2.1" = self.by-version."sax"."1.2.1"; }; optionalDependencies = { }; @@ -513,15 +574,15 @@ os = [ ]; cpu = [ ]; }; - "feedparser" = self.by-version."feedparser"."1.1.3"; - by-spec."forever-agent"."~0.6.0" = + "feedparser" = self.by-version."feedparser"."2.1.0"; + by-spec."forever-agent"."~0.6.1" = self.by-version."forever-agent"."0.6.1"; by-version."forever-agent"."0.6.1" = self.buildNodePackage { name = "forever-agent-0.6.1"; version = "0.6.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; name = "forever-agent-0.6.1.tgz"; sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; @@ -534,20 +595,20 @@ cpu = [ ]; }; by-spec."form-data"."*" = - self.by-version."form-data"."1.0.0-rc3"; - by-version."form-data"."1.0.0-rc3" = self.buildNodePackage { - name = "form-data-1.0.0-rc3"; - version = "1.0.0-rc3"; + self.by-version."form-data"."2.1.2"; + by-version."form-data"."2.1.2" = self.buildNodePackage { + name = "form-data-2.1.2"; + version = "2.1.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"; - name = "form-data-1.0.0-rc3.tgz"; - sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; + name = "form-data-2.1.2.tgz"; + sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; deps = { - "async-1.4.2" = self.by-version."async"."1.4.2"; + "asynckit-0.4.0" = self.by-version."asynckit"."0.4.0"; "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "mime-types-2.1.7" = self.by-version."mime-types"."2.1.7"; + "mime-types-2.1.14" = self.by-version."mime-types"."2.1.14"; }; optionalDependencies = { }; @@ -555,9 +616,9 @@ os = [ ]; cpu = [ ]; }; - "form-data" = self.by-version."form-data"."1.0.0-rc3"; - by-spec."form-data"."~1.0.0-rc1" = - self.by-version."form-data"."1.0.0-rc3"; + "form-data" = self.by-version."form-data"."2.1.2"; + by-spec."form-data"."~2.1.1" = + self.by-version."form-data"."2.1.2"; by-spec."generate-function"."^2.0.0" = self.by-version."generate-function"."2.0.0"; by-version."generate-function"."2.0.0" = self.buildNodePackage { @@ -565,7 +626,7 @@ version = "2.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; name = "generate-function-2.0.0.tgz"; sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; }; @@ -584,7 +645,7 @@ version = "1.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; name = "generate-object-property-1.2.0.tgz"; sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; @@ -597,6 +658,26 @@ os = [ ]; cpu = [ ]; }; + by-spec."getpass"."^0.1.1" = + self.by-version."getpass"."0.1.6"; + by-version."getpass"."0.1.6" = self.buildNodePackage { + name = "getpass-0.1.6"; + version = "0.1.6"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + name = "getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + deps = { + "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."graceful-readlink".">= 1.0.0" = self.by-version."graceful-readlink"."1.0.1"; by-version."graceful-readlink"."1.0.1" = self.buildNodePackage { @@ -604,7 +685,7 @@ version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; name = "graceful-readlink-1.0.1.tgz"; sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; @@ -616,22 +697,22 @@ os = [ ]; cpu = [ ]; }; - by-spec."har-validator"."^1.6.1" = - self.by-version."har-validator"."1.8.0"; - by-version."har-validator"."1.8.0" = self.buildNodePackage { - name = "har-validator-1.8.0"; - version = "1.8.0"; + by-spec."har-validator"."~2.0.6" = + self.by-version."har-validator"."2.0.6"; + by-version."har-validator"."2.0.6" = self.buildNodePackage { + name = "har-validator-2.0.6"; + version = "2.0.6"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"; - name = "har-validator-1.8.0.tgz"; - sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + name = "har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; }; deps = { - "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2"; - "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; - "commander-2.8.1" = self.by-version."commander"."2.8.1"; - "is-my-json-valid-2.12.2" = self.by-version."is-my-json-valid"."2.12.2"; + "chalk-1.1.3" = self.by-version."chalk"."1.1.3"; + "commander-2.9.0" = self.by-version."commander"."2.9.0"; + "is-my-json-valid-2.15.0" = self.by-version."is-my-json-valid"."2.15.0"; + "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1"; }; optionalDependencies = { }; @@ -646,32 +727,12 @@ version = "2.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; name = "has-ansi-2.0.0.tgz"; sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; deps = { - "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hashish"."~0.0.4" = - self.by-version."hashish"."0.0.4"; - by-version."hashish"."0.0.4" = self.buildNodePackage { - name = "hashish-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz"; - name = "hashish-0.0.4.tgz"; - sha1 = "6d60bc6ffaf711b6afd60e426d077988014e6554"; - }; - deps = { - "traverse-0.6.6" = self.by-version."traverse"."0.6.6"; + "ansi-regex-2.1.1" = self.by-version."ansi-regex"."2.1.1"; }; optionalDependencies = { }; @@ -679,20 +740,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."hawk"."~3.1.0" = - self.by-version."hawk"."3.1.0"; - by-version."hawk"."3.1.0" = self.buildNodePackage { - name = "hawk-3.1.0"; - version = "3.1.0"; + by-spec."hawk"."~3.1.3" = + self.by-version."hawk"."3.1.3"; + by-version."hawk"."3.1.3" = self.buildNodePackage { + name = "hawk-3.1.3"; + version = "3.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz"; - name = "hawk-3.1.0.tgz"; - sha1 = "8a13ae19977ec607602f3f0b9fd676f18c384e44"; + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + name = "hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; deps = { "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; - "boom-2.9.0" = self.by-version."boom"."2.9.0"; + "boom-2.10.1" = self.by-ver