summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r--krebs/5pkgs/Reaktor/plugins.nix2
-rw-r--r--krebs/5pkgs/builders.nix293
-rw-r--r--krebs/5pkgs/default.nix24
-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--krebs/5pkgs/writers.nix301
9 files changed, 1105 insertions, 1430 deletions
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/builders.nix b/krebs/5pkgs/builders.nix
deleted file mode 100644
index 49d04be4d..000000000
--- a/krebs/5pkgs/builders.nix
+++ /dev/null
@@ -1,293 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-rec {
- execve = name: { filename, argv ? null, envp ? {}, destination ? "" }: let
- in writeC name { inherit destination; } /* c */ ''
- #include <unistd.h>
-
- static char *const filename = ${toC filename};
-
- ${if argv == null
- then /* Propagate arguments */ /* c */ ''
- #define MAIN_ARGS int argc, char **argv
- ''
- else /* Provide fixed arguments */ /* c */ ''
- #define MAIN_ARGS void
- static char *const argv[] = ${toC (argv ++ [null])};
- ''}
-
- static char *const envp[] = ${toC (
- mapAttrsToList (k: v: "${k}=${v}") envp ++ [null]
- )};
-
- int main (MAIN_ARGS) {
- execve(filename, argv, envp);
- return -1;
- }
- '';
-
- execveBin = name: cfg: execve name (cfg // { destination = "/bin/${name}"; });
-
- makeScriptWriter = interpreter: name: text:
- assert (with types; either absolute-pathname filename).check name;
- pkgs.writeOut (baseNameOf name) {
- ${optionalString (types.absolute-pathname.check name) name} = {
- executable = true;
- text = "#! ${interpreter}\n${text}";
- };
- };
-
- writeBash = name: text:
- assert (with types; either absolute-pathname filename).check name;
- pkgs.writeOut (baseNameOf name) {
- ${optionalString (types.absolute-pathname.check name) name} = {
- check = pkgs.writeDash "shellcheck.sh" ''
- ${pkgs.haskellPackages.ShellCheck}/bin/shellcheck "$1" || :
- '';
- executable = true;
- text = "#! ${pkgs.bash}/bin/bash\n${text}";
- };
- };
-
- writeBashBin = name:
- assert types.filename.check name;
- pkgs.writeBash "/bin/${name}";
-
- writeC = name: { destination ? "" }: src: pkgs.runCommand name {} /* sh */ ''
- PATH=${makeBinPath (with pkgs; [
- binutils
- coreutils
- gcc
- ])}
- src=${pkgs.writeText "${name}.c" src}
- exe=$out${destination}
- mkdir -p "$(dirname "$exe")"
- gcc -O -Wall -o "$exe" $src
- strip --strip-unneeded "$exe"
- '';
-
- writeDash = makeScriptWriter "${pkgs.dash}/bin/dash";
-
- writeDashBin = name:
- assert types.filename.check name;
- pkgs.writeDash "/bin/${name}";
-
- writeEximConfig = name: text: pkgs.runCommand name {
- inherit text;
- passAsFile = [ "text" ];
- } /* sh */ ''
- # TODO validate exim config even with config.nix.useChroot == true
- # currently doing so will fail because "user exim was not found"
- #${pkgs.exim}/bin/exim -C "$textPath" -bV >/dev/null
- mv "$textPath" $out
- '';
-
- writeOut = name: specs0:
- let
- writers.link =
- { path
- , link
- }:
- assert path == "" || types.absolute-pathname.check path;
- assert types.package.check link;
- {
- install = /* sh */ ''
- ${optionalString (dirOf path != "/") /* sh */ ''
- ${pkgs.coreutils}/bin/mkdir -p $out${dirOf path}
- ''}
- ${pkgs.coreutils}/bin/ln -s ${link} $out${path}
- '';
- };
-
- writers.text =
- { path
- , check ? null
- , executable ? false
- , mode ? if executable then "0755" else "0644"
- , text
- }:
- assert path == "" || types.absolute-pathname.check path;
- assert types.bool.check executable;
- assert types.file-mode.check mode;
- rec {
- var = "file_${hashString "sha1" path}";
- val = text;
- install = /* sh */ ''
- ${optionalString (check != null) /* sh */ ''
- ${check} ''$${var}Path
- ''}
- ${pkgs.coreutils}/bin/install -m ${mode} -D ''$${var}Path $out${path}
- '';
- };
-
- write = spec: writers.${spec.type} (removeAttrs spec ["type"]);
-
- specs =
- mapAttrsToList
- (path: spec: let
- known-types = [ "link" "text" ];
- found-types = attrNames (getAttrs known-types spec);
- type = assert length found-types == 1; head found-types;
- in spec // { inherit path type; })
- specs0;
-
- files = map write specs;
-
- filevars = genAttrs' (filter (hasAttr "var") files)
- (spec: nameValuePair spec.var spec.val);
-
- env = filevars // { passAsFile = attrNames filevars; };
- in
- pkgs.runCommand name env /* sh */ ''
- set -efu
- ${concatMapStringsSep "\n" (getAttr "install") files}
- '';
-
- writeHaskell =
- k:
- let
- k' = parseDrvName k;
- name = k'.name;
- version = if k'.version != "" then k'.version else "0";
- in
- { base-depends ? ["base"]
- , executables ? {}
- , ghc-options ? ["-Wall" "-O3" "-threaded" "-rtsopts"]
- , haskellPackages ? pkgs.haskellPackages
- , library ? null
- , license ? "WTFPL"
- }:
- let
- isExecutable = executables != {};
- isLibrary = library != null;
-
- cabal-file = pkgs.writeText "${name}-${version}.cabal" /* cabal */ ''
- build-type: Simple
- cabal-version: >= 1.2
- name: ${name}
- version: ${version}
- ${concatStringsSep "\n" (mapAttrsToList exe-section executables)}
- ${optionalString isLibrary (lib-section library)}
- '';
-
- exe-install =
- exe-name:
- { file ? pkgs.writeText "${name}-${exe-name}.hs" text
- , relpath ? "${exe-name}.hs"
- , text
- , ... }:
- if types.filename.check exe-name
- then /* sh */ "install -D ${file} $out/${relpath}"
- else throw "argument ‘exe-name’ is not a ${types.filename.name}";
-
- exe-section =
- exe-name:
- { build-depends ? base-depends ++ extra-depends
- , extra-depends ? []
- , file ? pkgs.writeText "${name}-${exe-name}.hs" text
- , relpath ? "${exe-name}.hs"
- , text
- , ... }: /* cabal */ ''
- executable ${exe-name}
- build-depends: ${concatStringsSep "," build-depends}
- ghc-options: ${toString ghc-options}
- main-is: ${relpath}
- '';
-
- get-depends =
- { build-depends ? base-depends ++ extra-depends
- , extra-depends ? []
- , ...
- }:
- build-depends;
-
- lib-install =
- { exposed-modules
- , ... }:
- concatStringsSep "\n" (mapAttrsToList mod-install exposed-modules);
-
- lib-section =
- { build-depends ? base-depends ++ extra-depends
- , extra-depends ? []
- , exposed-modules
- , ... }: /* cabal */ ''
- library
- build-depends: ${concatStringsSep "," build-depends}
- ghc-options: ${toString ghc-options}
- exposed-modules: ${concatStringsSep "," (attrNames exposed-modules)}
- '';
-
- mod-install =
- mod-name:
- { file ? pkgs.writeText "${name}-${mod-name}.hs" text
- , relpath ? "${replaceStrings ["."] ["/"] mod-name}.hs"
- , text
- , ... }:
- if types.haskell.modid.check mod-name
- then /* sh */ "install -D ${file} $out/${relpath}"
- else throw "argument ‘mod-name’ is not a ${types.haskell.modid.name}";
- in
- haskellPackages.mkDerivation {
- inherit isExecutable isLibrary license version;
- executableHaskellDepends =
- attrVals
- (concatMap get-depends (attrValues executables))
- haskellPackages;
- libraryHaskellDepends =
- attrVals
- (optionals isLibrary (get-depends library))
- haskellPackages;
- pname = name;
- src = pkgs.runCommand "${name}-${version}-src" {} /* sh */ ''
- install -D ${cabal-file} $out/${cabal-file.name}
- ${optionalString isLibrary (lib-install library)}
- ${concatStringsSep "\n" (mapAttrsToList exe-install executables)}
- '';
- };
-
- writeJq = name: src: pkgs.runCommand name {} /* sh */ ''
- name=${assert types.filename.check name; name}
- src=${shell.escape src}
-
- # syntax check
- printf '%s' "$src" > src.jq
- ${pkgs.jq}/bin/jq -f src.jq < /dev/null
-
- cp src.jq "$out"
- '';
-
- writeJSON = name: value: pkgs.writeText name (toJSON value);
-
- writeNixFromCabal =
- trace (toString [
- "The function `writeNixFromCabal` has been deprecated in favour of"
- "`writeHaskell`."
- ])
- (name: path: pkgs.runCommand name {} /* sh */ ''
- ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
- '');
-
- writePython2 = name: src: pkgs.runCommand name {} /* sh */ ''
- name=${assert types.filename.check name; name}
- src=${shell.escape src}
-
- # syntax check
- printf '%s' "$src" > src.py
- ${pkgs.python2}/bin/python -m py_compile src.py
-
- cp src.py "$out"
- '';
-
- writePython3 = name: src: pkgs.runCommand name {} /* sh */ ''
- name=${assert types.filename.check name; name}
- src=${shell.escape src}
-
- # syntax check
- printf '%s' "$src" > src.py
- ${pkgs.python3}/bin/python -m py_compile src.py
-
- cp src.py "$out"
- '';
-
- writeSed = makeScriptWriter "${pkgs.gnused}/bin/sed -f";
-}
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index e01b6e804..8bb244cd3 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,13 +1,16 @@
{ config, lib, pkgs, ... }@args:
with import <stockholm/lib>;
{
- nixpkgs.config.packageOverrides = pkgs: let
+ imports = [
+ ./writers.nix
+ ];
+ nixpkgs.config.packageOverrides = oldpkgs: let
# This callPackage will try to detect obsolete overrides.
callPackage = path: args: let
override = pkgs.callPackage path args;
upstream = optionalAttrs (override ? "name")
- (pkgs.${(parseDrvName override.name).name} or {});
+ (oldpkgs.${(parseDrvName override.name).name} or {});
in if upstream ? "name" &&
override ? "name" &&
compareVersions upstream.name override.name != -1
@@ -15,14 +18,13 @@ with import <stockholm/lib>;
else override;
in {}
- // import ./builders.nix args
// mapAttrs (_: flip callPackage {})
(filterAttrs (_: dir: pathExists (dir + "/default.nix"))
(subdirsOf ./.))
// {
empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
- haskellPackages = pkgs.haskellPackages.override {
+ haskellPackages = oldpkgs.haskellPackages.override {
overrides = self: super:
mapAttrs (name: path: self.callPackage path {})
(mapAttrs'
@@ -45,17 +47,15 @@ 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.writeDashBin "proot" ''
+ export PROOT_NO_SECCOMP=1
+ exec ${oldpkgs.proot}/bin/proot "$@"
+ '';
# XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
symlinkJoin = { name, paths, ... }@args: let
- x = pkgs.symlinkJoin args;
- in if typeOf x != "lambda" then x else pkgs.symlinkJoin name paths;
+ x = oldpkgs.symlinkJoin args;
+ in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
test = {
infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
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 = "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";