From 5cd5c399153703ba50e6d9e6e04767871b400f6f Mon Sep 17 00:00:00 2001 From: Oliver Dunkl Date: Thu, 30 Jul 2015 21:16:50 +0200 Subject: [PATCH 01/54] python-packages: mps-youtube init at 0.2.5 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2c83016dca..ec7f1db41c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16821,4 +16821,27 @@ let }; }; + mps-youtube = buildPythonPackage rec { + name = "mps-youtube-${version}"; + version = "0.2.5"; + + disabled = (!isPy3k); + + src = pkgs.fetchFromGitHub { + owner = "mps-youtube"; + repo = "mps-youtube"; + rev = "7e457d2b4700387b88a3c96579e13cb76ca1f06b"; + sha256 = "1811vlhgfi4rasjfsfdl7x174s75zk3x08p2z05wfcvinflfgxly"; + }; + + propagatedBuildInputs = with self; [ pafy ]; + + meta = with stdenv.lib; { + description = "Terminal based YouTube player and downloader"; + homepage = http://github.com/np1/mps-youtube; + license = licenses.gpl3; + maintainers = with maintainers; [ odi ]; + }; + }; + }; in pythonPackages From f4502e650b5287257be45b61e5fde5f2c4bc0431 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 31 Jul 2015 16:08:10 -0700 Subject: [PATCH 02/54] shout: init at 0.51.1 Shout is an IRC client with a nice web interface. --- .../networking/irc/shout/default.nix | 49 + .../networking/irc/shout/package.nix | 5049 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 5100 insertions(+) create mode 100644 pkgs/applications/networking/irc/shout/default.nix create mode 100644 pkgs/applications/networking/irc/shout/package.nix diff --git a/pkgs/applications/networking/irc/shout/default.nix b/pkgs/applications/networking/irc/shout/default.nix new file mode 100644 index 00000000000..9d3e3ba449c --- /dev/null +++ b/pkgs/applications/networking/irc/shout/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, callPackage, python, utillinux }: + +with stdenv.lib; + +let + nodePackages = callPackage (import ../../../../top-level/node-packages.nix) { + neededNatives = [ python ] ++ optional (stdenv.isLinux) utillinux; + self = nodePackages; + generated = ./package.nix; + }; + +in nodePackages.buildNodePackage rec { + name = "shout-${version}"; + version = "0.51.1"; + + src = fetchFromGitHub { + owner = "erming"; + repo = "shout"; + rev = "2cee0ea6ef5ee51de0190332f976934b55bbc8e4"; + sha256 = "1kci1qha1csb9sqb4ig487q612hgdn5lycbcpad7m9r6chn835qg"; + }; + + buildInputs = nodePackages.nativeDeps."shout" or []; + + deps = [ + nodePackages.by-spec."bcrypt-nodejs"."0.0.3" + nodePackages.by-spec."cheerio"."^0.17.0" + nodePackages.by-spec."commander"."^2.3.0" + nodePackages.by-spec."event-stream"."^3.1.7" + nodePackages.by-spec."express"."^4.9.5" + nodePackages.by-spec."lodash"."~2.4.1" + nodePackages.by-spec."mkdirp"."^0.5.0" + nodePackages.by-spec."moment"."~2.7.0" + nodePackages.by-spec."read"."^1.0.5" + nodePackages.by-spec."request"."^2.51.0" + nodePackages.by-spec."slate-irc"."~0.7.3" + nodePackages.by-spec."socket.io"."~1.0.6" + ]; + + peerDependencies = []; + + meta = { + description = "Web IRC client that you host on your own server"; + license = licenses.mit; + homepage = http://shout-irc.com/; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/irc/shout/package.nix b/pkgs/applications/networking/irc/shout/package.nix new file mode 100644 index 00000000000..cd9677e1ccc --- /dev/null +++ b/pkgs/applications/networking/irc/shout/package.nix @@ -0,0 +1,5049 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."CSSselect"."~0.4.0" = + self.by-version."CSSselect"."0.4.1"; + by-version."CSSselect"."0.4.1" = self.buildNodePackage { + name = "CSSselect-0.4.1"; + version = "0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; + name = "CSSselect-0.4.1.tgz"; + sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; + }; + deps = { + "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7"; + "domutils-1.4.3" = self.by-version."domutils"."1.4.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."CSSwhat"."0.4" = + self.by-version."CSSwhat"."0.4.7"; + by-version."CSSwhat"."0.4.7" = self.buildNodePackage { + name = "CSSwhat-0.4.7"; + version = "0.4.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; + name = "CSSwhat-0.4.7.tgz"; + sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."abbrev"."1" = + self.by-version."abbrev"."1.0.7"; + by-version."abbrev"."1.0.7" = self.buildNodePackage { + name = "abbrev-1.0.7"; + version = "1.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"; + name = "abbrev-1.0.7.tgz"; + sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."accepts"."~1.2.10" = + self.by-version."accepts"."1.2.11"; + by-version."accepts"."1.2.11" = self.buildNodePackage { + name = "accepts-1.2.11"; + version = "1.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.11.tgz"; + name = "accepts-1.2.11.tgz"; + sha1 = "d341c6e3b420489632f0f4f8d2ad4fd9ddf374e0"; + }; + deps = { + "mime-types-2.1.3" = self.by-version."mime-types"."2.1.3"; + "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."after"."0.8.1" = + self.by-version."after"."0.8.1"; + by-version."after"."0.8.1" = self.buildNodePackage { + name = "after-0.8.1"; + version = "0.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz"; + name = "after-0.8.1.tgz"; + sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."amdefine".">=0.0.4" = + self.by-version."amdefine"."1.0.0"; + by-version."amdefine"."1.0.0" = self.buildNodePackage { + name = "amdefine-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; + name = "amdefine-1.0.0.tgz"; + sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-regex"."^0.2.0" = + self.by-version."ansi-regex"."0.2.1"; + by-version."ansi-regex"."0.2.1" = self.buildNodePackage { + name = "ansi-regex-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; + name = "ansi-regex-0.2.1.tgz"; + sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-regex"."^0.2.1" = + self.by-version."ansi-regex"."0.2.1"; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-styles"."^1.1.0" = + self.by-version."ansi-styles"."1.1.0"; + by-version."ansi-styles"."1.1.0" = self.buildNodePackage { + name = "ansi-styles-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; + name = "ansi-styles-1.1.0.tgz"; + sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."argparse"."~ 0.1.11" = + self.by-version."argparse"."0.1.16"; + by-version."argparse"."0.1.16" = self.buildNodePackage { + name = "argparse-0.1.16"; + version = "0.1.16"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + name = "argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + }; + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."array-flatten"."1.1.0" = + self.by-version."array-flatten"."1.1.0"; + by-version."array-flatten"."1.1.0" = self.buildNodePackage { + name = "array-flatten-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz"; + name = "array-flatten-1.1.0.tgz"; + sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."arraybuffer.slice"."0.0.6" = + self.by-version."arraybuffer.slice"."0.0.6"; + by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage { + name = "arraybuffer.slice-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; + name = "arraybuffer.slice-0.0.6.tgz"; + sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."^1.2.1" = + self.by-version."async"."1.4.0"; + by-version."async"."1.4.0" = self.buildNodePackage { + name = "async-1.4.0"; + version = "1.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-1.4.0.tgz"; + name = "async-1.4.0.tgz"; + sha1 = "35f86f83c59e0421d099cd9a91d8278fb578c00d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."~0.1.22" = + self.by-version."async"."0.1.22"; + by-version."async"."0.1.22" = self.buildNodePackage { + name = "async-0.1.22"; + version = "0.1.22"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; + name = "async-0.1.22.tgz"; + sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."~0.2.6" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = self.buildNodePackage { + name = "async-0.2.10"; + version = "0.2.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."~0.2.9" = + self.by-version."async"."0.2.10"; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."base64-arraybuffer"."0.1.2" = + self.by-version."base64-arraybuffer"."0.1.2"; + by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage { + name = "base64-arraybuffer-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; + name = "base64-arraybuffer-0.1.2.tgz"; + sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."base64id"."0.1.0" = + self.by-version."base64id"."0.1.0"; + by-version."base64id"."0.1.0" = self.buildNodePackage { + name = "base64id-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + name = "base64id-0.1.0.tgz"; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bcrypt-nodejs"."0.0.3" = + self.by-version."bcrypt-nodejs"."0.0.3"; + by-version."bcrypt-nodejs"."0.0.3" = self.buildNodePackage { + name = "bcrypt-nodejs-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz"; + name = "bcrypt-nodejs-0.0.3.tgz"; + sha1 = "c60917f26dc235661566c681061c303c2b28842b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "bcrypt-nodejs" = self.by-version."bcrypt-nodejs"."0.0.3"; + by-spec."better-assert"."~1.0.0" = + self.by-version."better-assert"."1.0.2"; + by-version."better-assert"."1.0.2" = self.buildNodePackage { + name = "better-assert-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; + name = "better-assert-1.0.2.tgz"; + sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; + }; + deps = { + "callsite-1.0.0" = self.by-version."callsite"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz"; + name = "bl-1.0.0.tgz"; + sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5"; + }; + deps = { + "readable-stream-2.0.2" = self.by-version."readable-stream"."2.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."blob"."0.0.2" = + self.by-version."blob"."0.0.2"; + by-version."blob"."0.0.2" = self.buildNodePackage { + name = "blob-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/blob/-/blob-0.0.2.tgz"; + name = "blob-0.0.2.tgz"; + sha1 = "b89562bd6994af95ba1e812155536333aa23cf24"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bluebird"."^2.9.30" = + self.by-version."bluebird"."2.9.34"; + by-version."bluebird"."2.9.34" = self.buildNodePackage { + name = "bluebird-2.9.34"; + version = "2.9.34"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"; + name = "bluebird-2.9.34.tgz"; + sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."boom"."2.x.x" = + self.by-version."boom"."2.8.0"; + by-version."boom"."2.8.0" = self.buildNodePackage { + name = "boom-2.8.0"; + version = "2.8.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-2.8.0.tgz"; + name = "boom-2.8.0.tgz"; + sha1 = "317bdfd47018fe7dd79b0e9da73efe244119fdf1"; + }; + deps = { + "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."boom"."^2.8.x" = + self.by-version."boom"."2.8.0"; + by-spec."browserify-zlib"."^0.1.4" = + self.by-version."browserify-zlib"."0.1.4"; + by-version."browserify-zlib"."0.1.4" = self.buildNodePackage { + name = "browserify-zlib-0.1.4"; + version = "0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + name = "browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + }; + deps = { + "pako-0.2.7" = self.by-version."pako"."0.2.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."callsite"."1.0.0" = + self.by-version."callsite"."1.0.0"; + by-version."callsite"."1.0.0" = self.buildNodePackage { + name = "callsite-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + name = "callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."camelcase"."^1.0.2" = + self.by-version."camelcase"."1.1.0"; + by-version."camelcase"."1.1.0" = self.buildNodePackage { + name = "camelcase-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"; + name = "camelcase-1.1.0.tgz"; + sha1 = "953b25c3bc98671ee59a44cb9d542672da7331b9"; + }; + 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 { + name = "caseless-0.11.0"; + version = "0.11.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + name = "caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."chalk"."^0.5.0" = + self.by-version."chalk"."0.5.1"; + by-version."chalk"."0.5.1" = self.buildNodePackage { + name = "chalk-0.5.1"; + version = "0.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; + name = "chalk-0.5.1.tgz"; + sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; + }; + deps = { + "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0"; + "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; + "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0"; + "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0"; + "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."chalk"."^0.5.1" = + self.by-version."chalk"."0.5.1"; + by-spec."chalk"."^1.0.0" = + self.by-version."chalk"."1.1.0"; + by-version."chalk"."1.1.0" = self.buildNodePackage { + name = "chalk-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz"; + name = "chalk-1.1.0.tgz"; + sha1 = "09b453cec497a75520e4a60ae48214a8700e0921"; + }; + 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"; + "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"; + "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cheerio"."^0.17.0" = + self.by-version."cheerio"."0.17.0"; + by-version."cheerio"."0.17.0" = self.buildNodePackage { + name = "cheerio-0.17.0"; + version = "0.17.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz"; + name = "cheerio-0.17.0.tgz"; + sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea"; + }; + deps = { + "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1"; + "entities-1.1.1" = self.by-version."entities"."1.1.1"; + "htmlparser2-3.7.3" = self.by-version."htmlparser2"."3.7.3"; + "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "cheerio" = self.by-version."cheerio"."0.17.0"; + by-spec."coffee-script"."~1.3.3" = + self.by-version."coffee-script"."1.3.3"; + by-version."coffee-script"."1.3.3" = self.buildNodePackage { + name = "coffee-script-1.3.3"; + version = "1.3.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"; + name = "coffee-script-1.3.3.tgz"; + sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."colors"."~0.6.2" = + self.by-version."colors"."0.6.2"; + by-version."colors"."0.6.2" = self.buildNodePackage { + name = "colors-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."combined-stream"."^1.0.3" = + self.by-version."combined-stream"."1.0.5"; + by-version."combined-stream"."1.0.5" = self.buildNodePackage { + name = "combined-stream-1.0.5"; + version = "1.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + name = "combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + deps = { + "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."combined-stream"."~1.0.1" = + self.by-version."combined-stream"."1.0.5"; + by-spec."commander"."0.6.1" = + self.by-version."commander"."0.6.1"; + by-version."commander"."0.6.1" = self.buildNodePackage { + name = "commander-0.6.1"; + version = "0.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + name = "commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."commander"."2.3.0" = + self.by-version."commander"."2.3.0"; + by-version."commander"."2.3.0" = self.buildNodePackage { + name = "commander-2.3.0"; + version = "2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; + name = "commander-2.3.0.tgz"; + sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."commander"."^2.3.0" = + self.by-version."commander"."2.8.1"; + by-version."commander"."2.8.1" = self.buildNodePackage { + name = "commander-2.8.1"; + version = "2.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + name = "commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + }; + deps = { + "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "commander" = self.by-version."commander"."2.8.1"; + by-spec."commander"."^2.8.1" = + self.by-version."commander"."2.8.1"; + by-spec."commander"."~0.6.1" = + self.by-version."commander"."0.6.1"; + by-spec."component-bind"."1.0.0" = + self.by-version."component-bind"."1.0.0"; + by-version."component-bind"."1.0.0" = self.buildNodePackage { + name = "component-bind-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + name = "component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."component-emitter"."1.1.2" = + self.by-version."component-emitter"."1.1.2"; + by-version."component-emitter"."1.1.2" = self.buildNodePackage { + name = "component-emitter-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + name = "component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."component-inherit"."0.0.3" = + self.by-version."component-inherit"."0.0.3"; + by-version."component-inherit"."0.0.3" = self.buildNodePackage { + name = "component-inherit-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; + name = "component-inherit-0.0.3.tgz"; + sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."concat-stream"."^1.4.1" = + self.by-version."concat-stream"."1.5.0"; + by-version."concat-stream"."1.5.0" = self.buildNodePackage { + name = "concat-stream-1.5.0"; + version = "1.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"; + name = "concat-stream-1.5.0.tgz"; + sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6"; + "readable-stream-2.0.2" = self.by-version."readable-stream"."2.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = self.buildNodePackage { + name = "content-disposition-0.5.0"; + version = "0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."content-type"."~1.0.1" = + self.by-version."content-type"."1.0.1"; + by-version."content-type"."1.0.1" = self.buildNodePackage { + name = "content-type-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; + name = "content-type-1.0.1.tgz"; + sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie"."0.1.3" = + self.by-version."cookie"."0.1.3"; + by-version."cookie"."0.1.3" = self.buildNodePackage { + name = "cookie-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; + name = "cookie-0.1.3.tgz"; + sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie-signature"."1.0.6" = + self.by-version."cookie-signature"."1.0.6"; + by-version."cookie-signature"."1.0.6" = self.buildNodePackage { + name = "cookie-signature-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + name = "cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cryptiles"."2.x.x" = + self.by-version."cryptiles"."2.0.4"; + by-version."cryptiles"."2.0.4" = self.buildNodePackage { + name = "cryptiles-2.0.4"; + version = "2.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"; + name = "cryptiles-2.0.4.tgz"; + sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285"; + }; + deps = { + "boom-2.8.0" = self.by-version."boom"."2.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + name = "ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dateformat"."1.0.2-1.2.3" = + self.by-version."dateformat"."1.0.2-1.2.3"; + by-version."dateformat"."1.0.2-1.2.3" = self.buildNodePackage { + name = "dateformat-1.0.2-1.2.3"; + version = "1.0.2-1.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; + name = "dateformat-1.0.2-1.2.3.tgz"; + sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."*" = + self.by-version."debug"."2.2.0"; + by-version."debug"."2.2.0" = self.buildNodePackage { + name = "debug-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."0.6.0" = + self.by-version."debug"."0.6.0"; + by-version."debug"."0.6.0" = self.buildNodePackage { + name = "debug-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; + name = "debug-0.6.0.tgz"; + sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."0.7.4" = + self.by-version."debug"."0.7.4"; + by-version."debug"."0.7.4" = self.buildNodePackage { + name = "debug-0.7.4"; + version = "0.7.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + name = "debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."2.0.0" = + self.by-version."debug"."2.0.0"; + by-version."debug"."2.0.0" = self.buildNodePackage { + name = "debug-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; + name = "debug-2.0.0.tgz"; + sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + }; + deps = { + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."~0.7.0" = + self.by-version."debug"."0.7.4"; + by-spec."debug"."~0.7.2" = + self.by-version."debug"."0.7.4"; + by-spec."debug"."~2.2.0" = + self.by-version."debug"."2.2.0"; + by-spec."decamelize"."^1.0.0" = + self.by-version."decamelize"."1.0.0"; + by-version."decamelize"."1.0.0" = self.buildNodePackage { + name = "decamelize-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"; + name = "decamelize-1.0.0.tgz"; + sha1 = "5287122f71691d4505b18ff2258dc400a5b23847"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."delayed-stream"."~1.0.0" = + self.by-version."delayed-stream"."1.0.0"; + by-version."delayed-stream"."1.0.0" = self.buildNodePackage { + name = "delayed-stream-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + name = "delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."depd"."~1.0.1" = + self.by-version."depd"."1.0.1"; + by-version."depd"."1.0.1" = self.buildNodePackage { + name = "depd-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + name = "depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."destroy"."1.0.3" = + self.by-version."destroy"."1.0.3"; + by-version."destroy"."1.0.3" = self.buildNodePackage { + name = "destroy-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + name = "destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."diff"."1.0.8" = + self.by-version."diff"."1.0.8"; + by-version."diff"."1.0.8" = self.buildNodePackage { + name = "diff-1.0.8"; + version = "1.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + name = "diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dom-serializer"."0" = + self.by-version."dom-serializer"."0.1.0"; + by-version."dom-serializer"."0.1.0" = self.buildNodePackage { + name = "dom-serializer-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + name = "dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + }; + deps = { + "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; + "entities-1.1.1" = self.by-version."entities"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dom-serializer"."~0.0.0" = + self.by-version."dom-serializer"."0.0.1"; + by-version."dom-serializer"."0.0.1" = self.buildNodePackage { + name = "dom-serializer-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz"; + name = "dom-serializer-0.0.1.tgz"; + sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf"; + }; + deps = { + "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; + "entities-1.1.1" = self.by-version."entities"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."domelementtype"."1" = + self.by-version."domelementtype"."1.3.0"; + by-version."domelementtype"."1.3.0" = self.buildNodePackage { + name = "domelementtype-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + name = "domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."domelementtype"."~1.1.1" = + self.by-version."domelementtype"."1.1.3"; + by-version."domelementtype"."1.1.3" = self.buildNodePackage { + name = "domelementtype-1.1.3"; + version = "1.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; + name = "domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."domhandler"."2.2" = + self.by-version."domhandler"."2.2.1"; + by-version."domhandler"."2.2.1" = self.buildNodePackage { + name = "domhandler-2.2.1"; + version = "2.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"; + name = "domhandler-2.2.1.tgz"; + sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2"; + }; + deps = { + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."domutils"."1.4" = + self.by-version."domutils"."1.4.3"; + by-version."domutils"."1.4.3" = self.buildNodePackage { + name = "domutils-1.4.3"; + version = "1.4.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; + name = "domutils-1.4.3.tgz"; + sha1 = "0865513796c6b306031850e175516baf80b72a6f"; + }; + deps = { + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."domutils"."1.5" = + self.by-version."domutils"."1.5.1"; + by-version."domutils"."1.5.1" = self.buildNodePackage { + name = "domutils-1.5.1"; + version = "1.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + name = "domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + deps = { + "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0"; + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."duplexer"."~0.1.1" = + self.by-version."duplexer"."0.1.1"; + by-version."duplexer"."0.1.1" = self.buildNodePackage { + name = "duplexer-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + name = "duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ee-first"."1.1.1" = + self.by-version."ee-first"."1.1.1"; + by-version."ee-first"."1.1.1" = self.buildNodePackage { + name = "ee-first-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + name = "ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."emitter"."http://github.com/component/emitter/archive/1.0.1.tar.gz" = + self.by-version."emitter"."1.0.1"; + by-version."emitter"."1.0.1" = self.buildNodePackage { + name = "emitter-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://github.com/component/emitter/archive/1.0.1.tar.gz"; + name = "emitter-1.0.1.tgz"; + sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; + }; + deps = { + "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."engine.io"."1.3.1" = + self.by-version."engine.io"."1.3.1"; + by-version."engine.io"."1.3.1" = self.buildNodePackage { + name = "engine.io-1.3.1"; + version = "1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz"; + name = "engine.io-1.3.1.tgz"; + sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e"; + }; + deps = { + "debug-0.6.0" = self.by-version."debug"."0.6.0"; + "ws-0.4.31" = self.by-version."ws"."0.4.31"; + "engine.io-parser-1.0.6" = self.by-version."engine.io-parser"."1.0.6"; + "base64id-0.1.0" = self.by-version."base64id"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."engine.io-client"."1.3.1" = + self.by-version."engine.io-client"."1.3.1"; + by-version."engine.io-client"."1.3.1" = self.buildNodePackage { + name = "engine.io-client-1.3.1"; + version = "1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz"; + name = "engine.io-client-1.3.1.tgz"; + sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; + }; + deps = { + "has-cors-1.0.3" = self.by-version."has-cors"."1.0.3"; + "ws-0.4.31" = self.by-version."ws"."0.4.31"; + "xmlhttprequest-1.5.0" = self.by-version."xmlhttprequest"."1.5.0"; + "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; + "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; + "engine.io-parser-1.0.6" = self.by-version."engine.io-parser"."1.0.6"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "parseuri-0.0.2" = self.by-version."parseuri"."0.0.2"; + "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1"; + "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2"; + "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."engine.io-parser"."1.0.6" = + self.by-version."engine.io-parser"."1.0.6"; + by-version."engine.io-parser"."1.0.6" = self.buildNodePackage { + name = "engine.io-parser-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz"; + name = "engine.io-parser-1.0.6.tgz"; + sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; + }; + deps = { + "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2"; + "after-0.8.1" = self.by-version."after"."0.8.1"; + "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6"; + "blob-0.0.2" = self.by-version."blob"."0.0.2"; + "utf8-2.0.0" = self.by-version."utf8"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."entities"."1.0" = + self.by-version."entities"."1.0.0"; + by-version."entities"."1.0.0" = self.buildNodePackage { + name = "entities-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; + name = "entities-1.0.0.tgz"; + sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."entities"."~1.1.1" = + self.by-version."entities"."1.1.1"; + by-version."entities"."1.1.1" = self.buildNodePackage { + name = "entities-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; + name = "entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-html"."1.0.2" = + self.by-version."escape-html"."1.0.2"; + by-version."escape-html"."1.0.2" = self.buildNodePackage { + name = "escape-html-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; + name = "escape-html-1.0.2.tgz"; + sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-string-regexp"."1.0.2" = + self.by-version."escape-string-regexp"."1.0.2"; + by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage { + name = "escape-string-regexp-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"; + name = "escape-string-regexp-1.0.2.tgz"; + sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-string-regexp"."^1.0.0" = + 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"; + 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"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-string-regexp"."^1.0.2" = + self.by-version."escape-string-regexp"."1.0.3"; + by-spec."esprima"."~ 1.0.2" = + self.by-version."esprima"."1.0.4"; + by-version."esprima"."1.0.4" = self.buildNodePackage { + name = "esprima-1.0.4"; + version = "1.0.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + name = "esprima-1.0.4.tgz"; + sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."etag"."~1.7.0" = + self.by-version."etag"."1.7.0"; + by-version."etag"."1.7.0" = self.buildNodePackage { + name = "etag-1.7.0"; + version = "1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; + name = "etag-1.7.0.tgz"; + sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."event-stream"."^3.1.7" = + self.by-version."event-stream"."3.3.1"; + by-version."event-stream"."3.3.1" = self.buildNodePackage { + name = "event-stream-3.3.1"; + version = "3.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.1.tgz"; + name = "event-stream-3.3.1.tgz"; + sha1 = "b8cf6c00119181e688f335363daa7915ce890bdb"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + "from-0.1.3" = self.by-version."from"."0.1.3"; + "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0"; + "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11"; + "split-0.3.3" = self.by-version."split"."0.3.3"; + "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "event-stream" = self.by-version."event-stream"."3.3.1"; + by-spec."eventemitter2"."~0.4.13" = + self.by-version."eventemitter2"."0.4.14"; + by-version."eventemitter2"."0.4.14" = self.buildNodePackage { + name = "eventemitter2-0.4.14"; + version = "0.4.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; + name = "eventemitter2-0.4.14.tgz"; + sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."exit"."~0.1.1" = + self.by-version."exit"."0.1.2"; + by-version."exit"."0.1.2" = self.buildNodePackage { + name = "exit-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + name = "exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."express"."^4.9.5" = + self.by-version."express"."4.13.1"; + by-version."express"."4.13.1" = self.buildNodePackage { + name = "express-4.13.1"; + version = "4.13.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/express/-/express-4.13.1.tgz"; + name = "express-4.13.1.tgz"; + sha1 = "f117aa1d1f6bedbc8de5b6d71fc31a5acd0f63df"; + }; + deps = { + "accepts-1.2.11" = self.by-version."accepts"."1.2.11"; + "array-flatten-1.1.0" = self.by-version."array-flatten"."1.1.0"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "cookie-0.1.3" = self.by-version."cookie"."0.1.3"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2"; + "etag-1.7.0" = self.by-version."etag"."1.7.0"; + "finalhandler-0.4.0" = self.by-version."finalhandler"."0.4.0"; + "fresh-0.3.0" = self.by-version."fresh"."0.3.0"; + "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; + "methods-1.1.1" = self.by-version."methods"."1.1.1"; + "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "path-to-regexp-0.1.6" = self.by-version."path-to-regexp"."0.1.6"; + "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; + "qs-4.0.0" = self.by-version."qs"."4.0.0"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.13.0" = self.by-version."send"."0.13.0"; + "serve-static-1.10.0" = self.by-version."serve-static"."1.10.0"; + "type-is-1.6.5" = self.by-version."type-is"."1.6.5"; + "vary-1.0.1" = self.by-version."vary"."1.0.1"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "express" = self.by-version."express"."4.13.1"; + by-spec."extend"."~3.0.0" = + self.by-version."extend"."3.0.0"; + by-version."extend"."3.0.0" = self.buildNodePackage { + name = "extend-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + name = "extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."faye-websocket"."~0.4.3" = + self.by-version."faye-websocket"."0.4.4"; + by-version."faye-websocket"."0.4.4" = self.buildNodePackage { + name = "faye-websocket-0.4.4"; + version = "0.4.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"; + name = "faye-websocket-0.4.4.tgz"; + sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."figures"."^1.0.1" = + self.by-version."figures"."1.3.5"; + by-version."figures"."1.3.5" = self.buildNodePackage { + name = "figures-1.3.5"; + version = "1.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/figures/-/figures-1.3.5.tgz"; + name = "figures-1.3.5.tgz"; + sha1 = "d1a31f4e1d2c2938ecde5c06aa16134cf29f4771"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."finalhandler"."0.4.0" = + self.by-version."finalhandler"."0.4.0"; + by-version."finalhandler"."0.4.0" = self.buildNodePackage { + name = "finalhandler-0.4.0"; + version = "0.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; + name = "finalhandler-0.4.0.tgz"; + sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; + }; + deps = { + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2"; + "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0"; + "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."findup-sync"."~0.1.2" = + self.by-version."findup-sync"."0.1.3"; + by-version."findup-sync"."0.1.3" = self.buildNodePackage { + name = "findup-sync-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz"; + name = "findup-sync-0.1.3.tgz"; + sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683"; + }; + deps = { + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."forever-agent"."~0.6.0" = + 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"; + name = "forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."~1.0.0-rc1" = + self.by-version."form-data"."1.0.0-rc2"; + by-version."form-data"."1.0.0-rc2" = self.buildNodePackage { + name = "form-data-1.0.0-rc2"; + version = "1.0.0-rc2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc2.tgz"; + name = "form-data-1.0.0-rc2.tgz"; + sha1 = "5bc9c9b3dd3dec1977b0abf58790192081d95235"; + }; + deps = { + "async-1.4.0" = self.by-version."async"."1.4.0"; + "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; + "mime-types-2.1.3" = self.by-version."mime-types"."2.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."forwarded"."~0.1.0" = + self.by-version."forwarded"."0.1.0"; + by-version."forwarded"."0.1.0" = self.buildNodePackage { + name = "forwarded-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + name = "forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fresh"."0.3.0" = + self.by-version."fresh"."0.3.0"; + by-version."fresh"."0.3.0" = self.buildNodePackage { + name = "fresh-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; + name = "fresh-0.3.0.tgz"; + sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."from"."~0" = + self.by-version."from"."0.1.3"; + by-version."from"."0.1.3" = self.buildNodePackage { + name = "from-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz"; + name = "from-0.1.3.tgz"; + sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."gaze"."~0.5.1" = + self.by-version."gaze"."0.5.1"; + by-version."gaze"."0.5.1" = self.buildNodePackage { + name = "gaze-0.5.1"; + version = "0.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz"; + name = "gaze-0.5.1.tgz"; + sha1 = "22e731078ef3e49d1c4ab1115ac091192051824c"; + }; + deps = { + "globule-0.1.0" = self.by-version."globule"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."generate-function"."^2.0.0" = + self.by-version."generate-function"."2.0.0"; + by-version."generate-function"."2.0.0" = self.buildNodePackage { + name = "generate-function-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + name = "generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."generate-object-property"."^1.1.0" = + self.by-version."generate-object-property"."1.2.0"; + by-version."generate-object-property"."1.2.0" = self.buildNodePackage { + name = "generate-object-property-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + name = "generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + deps = { + "is-property-1.0.2" = self.by-version."is-property"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."getobject"."~0.1.0" = + self.by-version."getobject"."0.1.0"; + by-version."getobject"."0.1.0" = self.buildNodePackage { + name = "getobject-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"; + name = "getobject-0.1.0.tgz"; + sha1 = "047a449789fa160d018f5486ed91320b6ec7885c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."3.2.3" = + self.by-version."glob"."3.2.3"; + by-version."glob"."3.2.3" = self.buildNodePackage { + name = "glob-3.2.3"; + version = "3.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + name = "glob-3.2.3.tgz"; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; + }; + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."~3.1.21" = + self.by-version."glob"."3.1.21"; + by-version."glob"."3.1.21" = self.buildNodePackage { + name = "glob-3.1.21"; + version = "3.1.21"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; + name = "glob-3.1.21.tgz"; + sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; + }; + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; + "inherits-1.0.0" = self.by-version."inherits"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."~3.2.9" = + self.by-version."glob"."3.2.11"; + by-version."glob"."3.2.11" = self.buildNodePackage { + name = "glob-3.2.11"; + version = "3.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + name = "glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."global"."https://github.com/component/global/archive/v2.0.1.tar.gz" = + self.by-version."global"."2.0.1"; + by-version."global"."2.0.1" = self.buildNodePackage { + name = "global-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "https://github.com/component/global/archive/v2.0.1.tar.gz"; + name = "global-2.0.1.tgz"; + sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."globule"."~0.1.0" = + self.by-version."globule"."0.1.0"; + by-version."globule"."0.1.0" = self.buildNodePackage { + name = "globule-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; + name = "globule-0.1.0.tgz"; + sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; + }; + deps = { + "lodash-1.0.2" = self.by-version."lodash"."1.0.2"; + "glob-3.1.21" = self.by-version."glob"."3.1.21"; + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."~1.2.0" = + self.by-version."graceful-fs"."1.2.3"; + by-version."graceful-fs"."1.2.3" = self.buildNodePackage { + name = "graceful-fs-1.2.3"; + version = "1.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + name = "graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."~2.0.0" = + self.by-version."graceful-fs"."2.0.3"; + by-version."graceful-fs"."2.0.3" = self.buildNodePackage { + name = "graceful-fs-2.0.3"; + version = "2.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; + name = "graceful-fs-2.0.3.tgz"; + sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; + }; + deps = { + }; + 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 { + name = "graceful-readlink-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + name = "graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."growl"."1.8.1" = + self.by-version."growl"."1.8.1"; + by-version."growl"."1.8.1" = self.buildNodePackage { + name = "growl-1.8.1"; + version = "1.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz"; + name = "growl-1.8.1.tgz"; + sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."grunt"."~0.4.0" = + self.by-version."grunt"."0.4.5"; + by-version."grunt"."0.4.5" = self.buildNodePackage { + name = "grunt-0.4.5"; + version = "0.4.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz"; + name = "grunt-0.4.5.tgz"; + sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0"; + }; + deps = { + "async-0.1.22" = self.by-version."async"."0.1.22"; + "coffee-script-1.3.3" = self.by-version."coffee-script"."1.3.3"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3"; + "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14"; + "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3"; + "glob-3.1.21" = self.by-version."glob"."3.1.21"; + "hooker-0.2.3" = self.by-version."hooker"."0.2.3"; + "iconv-lite-0.2.11" = self.by-version."iconv-lite"."0.2.11"; + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "nopt-1.0.10" = self.by-version."nopt"."1.0.10"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "lodash-0.9.2" = self.by-version."lodash"."0.9.2"; + "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; + "which-1.0.9" = self.by-version."which"."1.0.9"; + "js-yaml-2.0.5" = self.by-version."js-yaml"."2.0.5"; + "exit-0.1.2" = self.by-version."exit"."0.1.2"; + "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; + "grunt-legacy-util-0.2.0" = self.by-version."grunt-legacy-util"."0.2.0"; + "grunt-legacy-log-0.1.2" = self.by-version."grunt-legacy-log"."0.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."grunt"."~0.4.5" = + self.by-version."grunt"."0.4.5"; + "grunt" = self.by-version."grunt"."0.4.5"; + by-spec."grunt-contrib-uglify"."~0.5.0" = + self.by-version."grunt-contrib-uglify"."0.5.1"; + by-version."grunt-contrib-uglify"."0.5.1" = self.buildNodePackage { + name = "grunt-contrib-uglify-0.5.1"; + version = "0.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.5.1.tgz"; + name = "grunt-contrib-uglify-0.5.1.tgz"; + sha1 = "15f0aa5e8e8ba421aea980879ee505bc712b6cde"; + }; + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + "maxmin-0.2.2" = self.by-version."maxmin"."0.2.2"; + "uglify-js-2.4.24" = self.by-version."uglify-js"."2.4.24"; + }; + optionalDependencies = { + }; + peerDependencies = [ + self.by-version."grunt"."0.4.5"]; + os = [ ]; + cpu = [ ]; + }; + "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.5.1"; + by-spec."grunt-contrib-watch"."^0.6.1" = + self.by-version."grunt-contrib-watch"."0.6.1"; + by-version."grunt-contrib-watch"."0.6.1" = self.buildNodePackage { + name = "grunt-contrib-watch-0.6.1"; + version = "0.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-0.6.1.tgz"; + name = "grunt-contrib-watch-0.6.1.tgz"; + sha1 = "64fdcba25a635f5b4da1b6ce6f90da0aeb6e3f15"; + }; + deps = { + "gaze-0.5.1" = self.by-version."gaze"."0.5.1"; + "tiny-lr-fork-0.0.5" = self.by-version."tiny-lr-fork"."0.0.5"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + "async-0.2.10" = self.by-version."async"."0.2.10"; + }; + optionalDependencies = { + }; + peerDependencies = [ + self.by-version."grunt"."0.4.5"]; + os = [ ]; + cpu = [ ]; + }; + "grunt-contrib-watch" = self.by-version."grunt-contrib-watch"."0.6.1"; + by-spec."grunt-legacy-log"."~0.1.0" = + self.by-version."grunt-legacy-log"."0.1.2"; + by-version."grunt-legacy-log"."0.1.2" = self.buildNodePackage { + name = "grunt-legacy-log-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.2.tgz"; + name = "grunt-legacy-log-0.1.2.tgz"; + sha1 = "15ee03b61e262e1b36f13762d967923cd1ce515e"; + }; + deps = { + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "grunt-legacy-log-utils-0.1.1" = self.by-version."grunt-legacy-log-utils"."0.1.1"; + "hooker-0.2.3" = self.by-version."hooker"."0.2.3"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."grunt-legacy-log-utils"."^0.1.1" = + self.by-version."grunt-legacy-log-utils"."0.1.1"; + by-version."grunt-legacy-log-utils"."0.1.1" = self.buildNodePackage { + name = "grunt-legacy-log-utils-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz"; + name = "grunt-legacy-log-utils-0.1.1.tgz"; + sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e"; + }; + deps = { + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."grunt-legacy-util"."~0.2.0" = + self.by-version."grunt-legacy-util"."0.2.0"; + by-version."grunt-legacy-util"."0.2.0" = self.buildNodePackage { + name = "grunt-legacy-util-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"; + name = "grunt-legacy-util-0.2.0.tgz"; + sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b"; + }; + deps = { + "hooker-0.2.3" = self.by-version."hooker"."0.2.3"; + "async-0.1.22" = self.by-version."async"."0.1.22"; + "lodash-0.9.2" = self.by-version."lodash"."0.9.2"; + "exit-0.1.2" = self.by-version."exit"."0.1.2"; + "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; + "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; + "which-1.0.9" = self.by-version."which"."1.0.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."gzip-size"."^0.2.0" = + self.by-version."gzip-size"."0.2.0"; + by-version."gzip-size"."0.2.0" = self.buildNodePackage { + name = "gzip-size-0.2.0"; + version = "0.2.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.2.0.tgz"; + name = "gzip-size-0.2.0.tgz"; + sha1 = "e3a2a191205fe56ee326f5c271435dfaecfb3e1c"; + }; + deps = { + "concat-stream-1.5.0" = self.by-version."concat-stream"."1.5.0"; + "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."handlebars"."^2.0.0" = + self.by-version."handlebars"."2.0.0"; + by-version."handlebars"."2.0.0" = self.buildNodePackage { + name = "handlebars-2.0.0"; + version = "2.0.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; + name = "handlebars-2.0.0.tgz"; + sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; + }; + deps = { + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + }; + optionalDependencies = { + "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "handlebars" = self.by-version."handlebars"."2.0.0"; + 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"; + 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"; + }; + deps = { + "bluebird-2.9.34" = self.by-version."bluebird"."2.9.34"; + "chalk-1.1.0" = self.by-version."chalk"."1.1.0"; + "commander-2.8.1" = self.by-version."commander"."2.8.1"; + "is-my-json-valid-2.12.1" = self.by-version."is-my-json-valid"."2.12.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-ansi"."^0.1.0" = + self.by-version."has-ansi"."0.1.0"; + by-version."has-ansi"."0.1.0" = self.buildNodePackage { + name = "has-ansi-0.1.0"; + version = "0.1.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; + name = "has-ansi-0.1.0.tgz"; + sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; + }; + deps = { + "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-ansi"."^2.0.0" = + self.by-version."has-ansi"."2.0.0"; + by-version."has-ansi"."2.0.0" = self.buildNodePackage { + name = "has-ansi-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://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."has-binary-data"."0.1.1" = + self.by-version."has-binary-data"."0.1.1"; + by-version."has-binary-data"."0.1.1" = self.buildNodePackage { + name = "has-binary-data-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz"; + name = "has-binary-data-0.1.1.tgz"; + sha1 = "e10749fb87828a52df96f4086587eb4a03966439"; + }; + deps = { + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-cors"."1.0.3" = + self.by-version."has-cors"."1.0.3"; + by-version."has-cors"."1.0.3" = self.buildNodePackage { + name = "has-cors-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz"; + name = "has-cors-1.0.3.tgz"; + sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3"; + }; + deps = { + "global-2.0.1" = self.by-version."global"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + 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"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz"; + name = "hawk-3.1.0.tgz"; + sha1 = "8a13ae19977ec607602f3f0b9fd676f18c384e44"; + }; + deps = { + "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; + "boom-2.8.0" = self.by-version."boom"."2.8.0"; + "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; + "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hoek"."2.x.x" = + self.by-version."hoek"."2.14.0"; + by-version."hoek"."2.14.0" = self.buildNodePackage { + name = "hoek-2.14.0"; + version = "2.14.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"; + name = "hoek-2.14.0.tgz"; + sha1 = "81211691f52a5a835ae49edbf1e89c9003476aa4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hooker"."~0.2.3" = + self.by-version."hooker"."0.2.3"; + by-version."hooker"."0.2.3" = self.buildNodePackage { + name = "hooker-0.2.3"; + version = "0.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"; + name = "hooker-0.2.3.tgz"; + sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."htmlparser2"."~3.7.2" = + self.by-version."htmlparser2"."3.7.3"; + by-version."htmlparser2"."3.7.3" = self.buildNodePackage { + name = "htmlparser2-3.7.3"; + version = "3.7.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz"; + name = "htmlparser2-3.7.3.tgz"; + sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e"; + }; + deps = { + "domhandler-2.2.1" = self.by-version."domhandler"."2.2.1"; + "domutils-1.5.1" = self.by-version."domutils"."1.5.1"; + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "entities-1.0.0" = self.by-version."entities"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."http-errors"."~1.3.1" = + self.by-version."http-errors"."1.3.1"; + by-version."http-errors"."1.3.1" = self.buildNodePackage { + name = "http-errors-1.3.1"; + version = "1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; + name = "http-errors-1.3.1.tgz"; + sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."http-signature"."~0.11.0" = + self.by-version."http-signature"."0.11.0"; + by-version."http-signature"."0.11.0" = self.buildNodePackage { + name = "http-signature-0.11.0"; + version = "0.11.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; + name = "http-signature-0.11.0.tgz"; + sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; + }; + deps = { + "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."iconv-lite"."~0.2.11" = + self.by-version."iconv-lite"."0.2.11"; + by-version."iconv-lite"."0.2.11" = self.buildNodePackage { + name = "iconv-lite-0.2.11"; + version = "0.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"; + name = "iconv-lite-0.2.11.tgz"; + sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."indexof"."0.0.1" = + self.by-version."indexof"."0.0.1"; + by-version."indexof"."0.0.1" = self.buildNodePackage { + name = "indexof-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + name = "indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."1" = + self.by-version."inherits"."1.0.0"; + by-version."inherits"."1.0.0" = self.buildNodePackage { + name = "inherits-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; + name = "inherits-1.0.0.tgz"; + sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = self.buildNodePackage { + name = "inherits-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; + by-spec."ipaddr.js"."1.0.1" = + self.by-version."ipaddr.js"."1.0.1"; + by-version."ipaddr.js"."1.0.1" = self.buildNodePackage { + name = "ipaddr.js-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; + name = "ipaddr.js-1.0.1.tgz"; + sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."irc-replies"."~2.0.0" = + self.by-version."irc-replies"."2.0.1"; + by-version."irc-replies"."2.0.1" = self.buildNodePackage { + name = "irc-replies-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/irc-replies/-/irc-replies-2.0.1.tgz"; + name = "irc-replies-2.0.1.tgz"; + sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-my-json-valid"."^2.12.0" = + self.by-version."is-my-json-valid"."2.12.1"; + by-version."is-my-json-valid"."2.12.1" = self.buildNodePackage { + name = "is-my-json-valid-2.12.1"; + version = "2.12.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.1.tgz"; + name = "is-my-json-valid-2.12.1.tgz"; + sha1 = "0ee5c19c9e93bae2760410cc72ef2798b52cc871"; + }; + deps = { + "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; + "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0"; + "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-property"."^1.0.0" = + self.by-version."is-property"."1.0.2"; + by-version."is-property"."1.0.2" = self.buildNodePackage { + name = "is-property-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + name = "is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = self.buildNodePackage { + name = "isarray-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isstream"."~0.1.1" = + self.by-version."isstream"."0.1.2"; + by-version."isstream"."0.1.2" = self.buildNodePackage { + name = "isstream-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + name = "isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jade"."0.26.3" = + self.by-version."jade"."0.26.3"; + by-version."jade"."0.26.3" = self.buildNodePackage { + name = "jade-0.26.3"; + version = "0.26.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + name = "jade-0.26.3.tgz"; + sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; + }; + deps = { + "commander-0.6.1" = self.by-version."commander"."0.6.1"; + "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."js-yaml"."~2.0.5" = + self.by-version."js-yaml"."2.0.5"; + by-version."js-yaml"."2.0.5" = self.buildNodePackage { + name = "js-yaml-2.0.5"; + version = "2.0.5"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz"; + name = "js-yaml-2.0.5.tgz"; + sha1 = "a25ae6509999e97df278c6719da11bd0687743a8"; + }; + deps = { + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; + "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.1"; + by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage { + name = "json-stringify-safe-5.0.1"; + version = "5.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + name = "json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json3"."3.2.6" = + self.by-version."json3"."3.2.6"; + by-version."json3"."3.2.6" = self.buildNodePackage { + name = "json3-3.2.6"; + version = "3.2.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; + name = "json3-3.2.6.tgz"; + sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jsonpointer"."^1.1.0" = + self.by-version."jsonpointer"."1.1.0"; + by-version."jsonpointer"."1.1.0" = self.buildNodePackage { + name = "jsonpointer-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"; + name = "jsonpointer-1.1.0.tgz"; + sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."linewise"."0.0.3" = + self.by-version."linewise"."0.0.3"; + by-version."linewise"."0.0.3" = self.buildNodePackage { + name = "linewise-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/linewise/-/linewise-0.0.3.tgz"; + name = "linewise-0.0.3.tgz"; + sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."^2.4.1" = + self.by-version."lodash"."2.4.2"; + by-version."lodash"."2.4.2" = self.buildNodePackage { + name = "lodash-2.4.2"; + version = "2.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + name = "lodash-2.4.2.tgz"; + sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."~0.9.2" = + self.by-version."lodash"."0.9.2"; + by-version."lodash"."0.9.2" = self.buildNodePackage { + name = "lodash-0.9.2"; + version = "0.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"; + name = "lodash-0.9.2.tgz"; + sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."~1.0.1" = + self.by-version."lodash"."1.0.2"; + by-version."lodash"."1.0.2" = self.buildNodePackage { + name = "lodash-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; + name = "lodash-1.0.2.tgz"; + sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."~2.4.1" = + self.by-version."lodash"."2.4.2"; + "lodash" = self.by-version."lodash"."2.4.2"; + by-spec."lru-cache"."2" = + self.by-version."lru-cache"."2.6.5"; + by-version."lru-cache"."2.6.5" = self.buildNodePackage { + name = "lru-cache-2.6.5"; + version = "2.6.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"; + name = "lru-cache-2.6.5.tgz"; + sha1 = "e56d6354148ede8d7707b58d143220fd08df0fd5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."map-stream"."~0.1.0" = + self.by-version."map-stream"."0.1.0"; + by-version."map-stream"."0.1.0" = self.buildNodePackage { + name = "map-stream-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + name = "map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."maxmin"."^0.2.0" = + self.by-version."maxmin"."0.2.2"; + by-version."maxmin"."0.2.2" = self.buildNodePackage { + name = "maxmin-0.2.2"; + version = "0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/maxmin/-/maxmin-0.2.2.tgz"; + name = "maxmin-0.2.2.tgz"; + sha1 = "a36ced8cc22e3abcd108cfb797a3a4b40275593f"; + }; + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "figures-1.3.5" = self.by-version."figures"."1.3.5"; + "gzip-size-0.2.0" = self.by-version."gzip-size"."0.2.0"; + "pretty-bytes-0.1.2" = self.by-version."pretty-bytes"."0.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."media-typer"."0.3.0" = + self.by-version."media-typer"."0.3.0"; + by-version."media-typer"."0.3.0" = self.buildNodePackage { + name = "media-typer-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + name = "media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."merge-descriptors"."1.0.0" = + self.by-version."merge-descriptors"."1.0.0"; + by-version."merge-descriptors"."1.0.0" = self.buildNodePackage { + name = "merge-descriptors-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + name = "merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."methods"."~1.1.1" = + self.by-version."methods"."1.1.1"; + by-version."methods"."1.1.1" = self.buildNodePackage { + name = "methods-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; + name = "methods-1.1.1.tgz"; + sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."1.3.4" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = self.buildNodePackage { + name = "mime-1.3.4"; + version = "1.3.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-db"."~1.15.0" = + self.by-version."mime-db"."1.15.0"; + by-version."mime-db"."1.15.0" = self.buildNodePackage { + name = "mime-db-1.15.0"; + version = "1.15.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz"; + name = "mime-db-1.15.0.tgz"; + sha1 = "d219e6214bbcae23a6fa69c0868c4fadc1405e8a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."^2.1.1" = + self.by-version."mime-types"."2.1.3"; + by-version."mime-types"."2.1.3" = self.buildNodePackage { + name = "mime-types-2.1.3"; + version = "2.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.3.tgz"; + name = "mime-types-2.1.3.tgz"; + sha1 = "f259849c7eb1f85b8f5f826187278a7f74f0c966"; + }; + deps = { + "mime-db-1.15.0" = self.by-version."mime-db"."1.15.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."~2.1.2" = + self.by-version."mime-types"."2.1.3"; + by-spec."mime-types"."~2.1.3" = + self.by-version."mime-types"."2.1.3"; + by-spec."minimatch"."0.3" = + self.by-version."minimatch"."0.3.0"; + by-version."minimatch"."0.3.0" = self.buildNodePackage { + name = "minimatch-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + name = "minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + }; + deps = { + "lru-cache-2.6.5" = self.by-version."lru-cache"."2.6.5"; + "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."~0.2.11" = + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = self.buildNodePackage { + name = "minimatch-0.2.14"; + version = "0.2.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + }; + deps = { + "lru-cache-2.6.5" = self.by-version."lru-cache"."2.6.5"; + "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."~0.2.12" = + self.by-version."minimatch"."0.2.14"; + by-spec."minimist"."0.0.8" = + self.by-version."minimist"."0.0.8"; + by-version."minimist"."0.0.8" = self.buildNodePackage { + name = "minimist-0.0.8"; + version = "0.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + name = "minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.3.0" = + self.by-version."mkdirp"."0.3.0"; + by-version."mkdirp"."0.3.0" = self.buildNodePackage { + name = "mkdirp-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + name = "mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.5.0" = + self.by-version."mkdirp"."0.5.0"; + by-version."mkdirp"."0.5.0" = self.buildNodePackage { + name = "mkdirp-0.5.0"; + version = "0.5.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + name = "mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."^0.5.0" = + self.by-version."mkdirp"."0.5.1"; + by-version."mkdirp"."0.5.1" = self.buildNodePackage { + name = "mkdirp-0.5.1"; + version = "0.5.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + name = "mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "mkdirp" = self.by-version."mkdirp"."0.5.1"; + by-spec."mocha"."~2.0.1" = + self.by-version."mocha"."2.0.1"; + by-version."mocha"."2.0.1" = self.buildNodePackage { + name = "mocha-2.0.1"; + version = "2.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mocha/-/mocha-2.0.1.tgz"; + name = "mocha-2.0.1.tgz"; + sha1 = "5a16e88b856d0c4145d8c6888c27ebd4fab13e90"; + }; + deps = { + "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "diff-1.0.8" = self.by-version."diff"."1.0.8"; + "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; + "glob-3.2.3" = self.by-version."glob"."3.2.3"; + "growl-1.8.1" = self.by-version."growl"."1.8.1"; + "jade-0.26.3" = self.by-version."jade"."0.26.3"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "mocha" = self.by-version."mocha"."2.0.1"; + by-spec."moment"."~2.7.0" = + self.by-version."moment"."2.7.0"; + by-version."moment"."2.7.0" = self.buildNodePackage { + name = "moment-2.7.0"; + version = "2.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; + name = "moment-2.7.0.tgz"; + sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "moment" = self.by-version."moment"."2.7.0"; + by-spec."ms"."0.6.2" = + self.by-version."ms"."0.6.2"; + by-version."ms"."0.6.2" = self.buildNodePackage { + name = "ms-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + name = "ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = self.buildNodePackage { + name = "ms-0.7.1"; + version = "0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mute-stream"."~0.0.4" = + self.by-version."mute-stream"."0.0.5"; + by-version."mute-stream"."0.0.5" = self.buildNodePackage { + name = "mute-stream-0.0.5"; + version = "0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"; + name = "mute-stream-0.0.5.tgz"; + sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."~0.3.0" = + self.by-version."nan"."0.3.2"; + by-version."nan"."0.3.2" = self.buildNodePackage { + name = "nan-0.3.2"; + version = "0.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; + name = "nan-0.3.2.tgz"; + sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."negotiator"."0.5.3" = + self.by-version."negotiator"."0.5.3"; + by-version."negotiator"."0.5.3" = self.buildNodePackage { + name = "negotiator-0.5.3"; + version = "0.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + name = "negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.3"; + by-version."node-uuid"."1.4.3" = self.buildNodePackage { + name = "node-uuid-1.4.3"; + version = "1.4.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + name = "node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nopt"."~1.0.10" = + self.by-version."nopt"."1.0.10"; + by-version."nopt"."1.0.10" = self.buildNodePackage { + name = "nopt-1.0.10"; + version = "1.0.10"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + name = "nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + deps = { + "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nopt"."~2.0.0" = + self.by-version."nopt"."2.0.0"; + by-version."nopt"."2.0.0" = self.buildNodePackage { + name = "nopt-2.0.0"; + version = "2.0.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; + name = "nopt-2.0.0.tgz"; + sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; + }; + deps = { + "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."noptify"."~0.0.3" = + self.by-version."noptify"."0.0.3"; + by-version."noptify"."0.0.3" = self.buildNodePackage { + name = "noptify-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz"; + name = "noptify-0.0.3.tgz"; + sha1 = "58f654a73d9753df0c51d9686dc92104a67f4bbb"; + }; + deps = { + "nopt-2.0.0" = self.by-version."nopt"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-sign"."~0.8.0" = + self.by-version."oauth-sign"."0.8.0"; + by-version."oauth-sign"."0.8.0" = self.buildNodePackage { + name = "oauth-sign-0.8.0"; + version = "0.8.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"; + name = "oauth-sign-0.8.0.tgz"; + sha1 = "938fdc875765ba527137d8aec9d178e24debc553"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."object-component"."0.0.3" = + self.by-version."object-component"."0.0.3"; + by-version."object-component"."0.0.3" = self.buildNodePackage { + name = "object-component-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + name = "object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."on-finished"."~2.3.0" = + self.by-version."on-finished"."2.3.0"; + by-version."on-finished"."2.3.0" = self.buildNodePackage { + name = "on-finished-2.3.0"; + version = "2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + name = "on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + deps = { + "ee-first-1.1.1" = self.by-version."ee-first"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."~0.3" = + self.by-version."optimist"."0.3.7"; + by-version."optimist"."0.3.7" = self.buildNodePackage { + name = "optimist-0.3.7"; + version = "0.3.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + name = "optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + deps = { + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."~0.3.5" = + self.by-version."optimist"."0.3.7"; + by-spec."options".">=0.0.5" = + self.by-version."options"."0.0.6"; + by-version."options"."0.0.6" = self.buildNodePackage { + name = "options-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; + name = "options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pako"."~0.2.0" = + self.by-version."pako"."0.2.7"; + by-version."pako"."0.2.7" = self.buildNodePackage { + name = "pako-0.2.7"; + version = "0.2.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pako/-/pako-0.2.7.tgz"; + name = "pako-0.2.7.tgz"; + sha1 = "90e8917affd5ee2b69dfe943ec16b783c4e0c441"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parsejson"."0.0.1" = + self.by-version."parsejson"."0.0.1"; + by-version."parsejson"."0.0.1" = self.buildNodePackage { + name = "parsejson-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; + name = "parsejson-0.0.1.tgz"; + sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; + }; + deps = { + "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parseqs"."0.0.2" = + self.by-version."parseqs"."0.0.2"; + by-version."parseqs"."0.0.2" = self.buildNodePackage { + name = "parseqs-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; + name = "parseqs-0.0.2.tgz"; + sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; + }; + deps = { + "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parseuri"."0.0.2" = + self.by-version."parseuri"."0.0.2"; + by-version."parseuri"."0.0.2" = self.buildNodePackage { + name = "parseuri-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz"; + name = "parseuri-0.0.2.tgz"; + sha1 = "db41878f2d6964718be870b3140973d8093be156"; + }; + deps = { + "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parseurl"."~1.3.0" = + self.by-version."parseurl"."1.3.0"; + by-version."parseurl"."1.3.0" = self.buildNodePackage { + name = "parseurl-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; + name = "parseurl-1.3.0.tgz"; + sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."path-to-regexp"."0.1.6" = + self.by-version."path-to-regexp"."0.1.6"; + by-version."path-to-regexp"."0.1.6" = self.buildNodePackage { + name = "path-to-regexp-0.1.6"; + version = "0.1.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz"; + name = "path-to-regexp-0.1.6.tgz"; + sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pause-stream"."0.0.11" = + self.by-version."pause-stream"."0.0.11"; + by-version."pause-stream"."0.0.11" = self.buildNodePackage { + name = "pause-stream-0.0.11"; + version = "0.0.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + name = "pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pretty-bytes"."^0.1.0" = + self.by-version."pretty-bytes"."0.1.2"; + by-version."pretty-bytes"."0.1.2" = self.buildNodePackage { + name = "pretty-bytes-0.1.2"; + version = "0.1.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.2.tgz"; + name = "pretty-bytes-0.1.2.tgz"; + sha1 = "cd90294d58a1ca4e8a5d0fb9c8225998881acf00"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."process-nextick-args"."~1.0.0" = + self.by-version."process-nextick-args"."1.0.2"; + by-version."process-nextick-args"."1.0.2" = self.buildNodePackage { + name = "process-nextick-args-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"; + name = "process-nextick-args-1.0.2.tgz"; + sha1 = "8b4d3fc586668bd5b6573e732edf2b71c1c1d8aa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."proxy-addr"."~1.0.8" = + self.by-version."proxy-addr"."1.0.8"; + by-version."proxy-addr"."1.0.8" = self.buildNodePackage { + name = "proxy-addr-1.0.8"; + version = "1.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; + name = "proxy-addr-1.0.8.tgz"; + sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; + }; + deps = { + "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; + "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."4.0.0" = + self.by-version."qs"."4.0.0"; + by-version."qs"."4.0.0" = self.buildNodePackage { + name = "qs-4.0.0"; + version = "4.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + name = "qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."~0.5.2" = + self.by-version."qs"."0.5.6"; + by-version."qs"."0.5.6" = self.buildNodePackage { + name = "qs-0.5.6"; + version = "0.5.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + name = "qs-0.5.6.tgz"; + sha1 = "31b1ad058567651c526921506b9a8793911a0384"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."~4.0.0" = + self.by-version."qs"."4.0.0"; + by-spec."range-parser"."~1.0.2" = + self.by-version."range-parser"."1.0.2"; + by-version."range-parser"."1.0.2" = self.buildNodePackage { + name = "range-parser-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; + name = "range-parser-1.0.2.tgz"; + sha1 = "06a12a42e5131ba8e457cd892044867f2344e549"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."read"."^1.0.5" = + self.by-version."read"."1.0.6"; + by-version."read"."1.0.6" = self.buildNodePackage { + name = "read-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read/-/read-1.0.6.tgz"; + name = "read-1.0.6.tgz"; + sha1 = "09873c14ecc114d063fad43b8ca5a33d304721c8"; + }; + deps = { + "mute-stream-0.0.5" = self.by-version."mute-stream"."0.0.5"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "read" = self.by-version."read"."1.0.6"; + by-spec."readable-stream"."1.1" = + self.by-version."readable-stream"."1.1.13"; + by-version."readable-stream"."1.1.13" = self.buildNodePackage { + name = "readable-stream-1.1.13"; + version = "1.1.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; + name = "readable-stream-1.1.13.tgz"; + sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; + }; + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."~2.0.0" = + self.by-version."readable-stream"."2.0.2"; + by-version."readable-stream"."2.0.2" = self.buildNodePackage { + name = "readable-stream-2.0.2"; + version = "2.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"; + name = "readable-stream-2.0.2.tgz"; + sha1 = "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b"; + }; + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "process-nextick-args-1.0.2" = self.by-version."process-nextick-args"."1.0.2"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "util-deprecate-1.0.1" = self.by-version."util-deprecate"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."request"."^2.51.0" = + self.by-version."request"."2.60.0"; + by-version."request"."2.60.0" = self.buildNodePackage { + name = "request-2.60.0"; + version = "2.60.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.60.0.tgz"; + name = "request-2.60.0.tgz"; + sha1 = "498820957fcdded1d37749069610c85f61a29f2d"; + }; + deps = { + "bl-1.0.0" = self.by-version."bl"."1.0.0"; + "caseless-0.11.0" = self.by-version."caseless"."0.11.0"; + "extend-3.0.0" = self.by-version."extend"."3.0.0"; + "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; + "form-data-1.0.0-rc2" = self.by-version."form-data"."1.0.0-rc2"; + "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; + "mime-types-2.1.3" = self.by-version."mime-types"."2.1.3"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "qs-4.0.0" = self.by-version."qs"."4.0.0"; + "tunnel-agent-0.4.1" = self.by-version."tunnel-agent"."0.4.1"; + "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0"; + "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0"; + "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0"; + "hawk-3.1.0" = self.by-version."hawk"."3.1.0"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; + "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; + "har-validator-1.8.0" = self.by-version."har-validator"."1.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "request" = self.by-version."request"."2.60.0"; + by-spec."rimraf"."~2.2.8" = + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = self.buildNodePackage { + name = "rimraf-2.2.8"; + version = "2.2.8"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + name = "rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."send"."0.13.0" = + self.by-version."send"."0.13.0"; + by-version."send"."0.13.0" = self.buildNodePackage { + name = "send-0.13.0"; + version = "0.13.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.13.0.tgz"; + name = "send-0.13.0.tgz"; + sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; + }; + deps = { + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2"; + "etag-1.7.0" = self.by-version."etag"."1.7.0"; + "fresh-0.3.0" = self.by-version."fresh"."0.3.0"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."serve-static"."~1.10.0" = + self.by-version."serve-static"."1.10.0"; + by-version."serve-static"."1.10.0" = self.buildNodePackage { + name = "serve-static-1.10.0"; + version = "1.10.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.10.0.tgz"; + name = "serve-static-1.10.0.tgz"; + sha1 = "be632faa685820e4a43ed3df1379135cc4f370d7"; + }; + deps = { + "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.13.0" = self.by-version."send"."0.13.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sigmund"."~1.0.0" = + self.by-version."sigmund"."1.0.1"; + by-version."sigmund"."1.0.1" = self.buildNodePackage { + name = "sigmund-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + name = "sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."slate-irc"."~0.7.3" = + self.by-version."slate-irc"."0.7.3"; + by-version."slate-irc"."0.7.3" = self.buildNodePackage { + name = "slate-irc-0.7.3"; + version = "0.7.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/slate-irc/-/slate-irc-0.7.3.tgz"; + name = "slate-irc-0.7.3.tgz"; + sha1 = "8d01f2bc809e00a5b2faca7d8d3130d155422a77"; + }; + deps = { + "irc-replies-2.0.1" = self.by-version."irc-replies"."2.0.1"; + "slate-irc-parser-0.0.2" = self.by-version."slate-irc-parser"."0.0.2"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "slate-irc" = self.by-version."slate-irc"."0.7.3"; + by-spec."slate-irc-parser"."0.0.2" = + self.by-version."slate-irc-parser"."0.0.2"; + by-version."slate-irc-parser"."0.0.2" = self.buildNodePackage { + name = "slate-irc-parser-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/slate-irc-parser/-/slate-irc-parser-0.0.2.tgz"; + name = "slate-irc-parser-0.0.2.tgz"; + sha1 = "0c5f8f20d817bb85329da9fca135c66b05947d80"; + }; + deps = { + "linewise-0.0.3" = self.by-version."linewise"."0.0.3"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sntp"."1.x.x" = + self.by-version."sntp"."1.0.9"; + by-version."sntp"."1.0.9" = self.buildNodePackage { + name = "sntp-1.0.9"; + version = "1.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + name = "sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + deps = { + "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."socket.io"."~1.0.6" = + self.by-version."socket.io"."1.0.6"; + by-version."socket.io"."1.0.6" = self.buildNodePackage { + name = "socket.io-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz"; + name = "socket.io-1.0.6.tgz"; + sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a"; + }; + deps = { + "engine.io-1.3.1" = self.by-version."engine.io"."1.3.1"; + "socket.io-parser-2.2.0" = self.by-version."socket.io-parser"."2.2.0"; + "socket.io-client-1.0.6" = self.by-version."socket.io-client"."1.0.6"; + "socket.io-adapter-0.2.0" = self.by-version."socket.io-adapter"."0.2.0"; + "has-binary-data-0.1.1" = self.by-version."has-binary-data"."0.1.1"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "socket.io" = self.by-version."socket.io"."1.0.6"; + by-spec."socket.io-adapter"."0.2.0" = + self.by-version."socket.io-adapter"."0.2.0"; + by-version."socket.io-adapter"."0.2.0" = self.buildNodePackage { + name = "socket.io-adapter-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz"; + name = "socket.io-adapter-0.2.0.tgz"; + sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; + }; + deps = { + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "socket.io-parser-2.1.2" = self.by-version."socket.io-parser"."2.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."socket.io-client"."1.0.6" = + self.by-version."socket.io-client"."1.0.6"; + by-version."socket.io-client"."1.0.6" = self.buildNodePackage { + name = "socket.io-client-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz"; + name = "socket.io-client-1.0.6.tgz"; + sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e"; + }; + deps = { + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "engine.io-client-1.3.1" = self.by-version."engine.io-client"."1.3.1"; + "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0"; + "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; + "object-component-0.0.3" = self.by-version."object-component"."0.0.3"; + "socket.io-parser-2.2.0" = self.by-version."socket.io-parser"."2.2.0"; + "has-binary-data-0.1.1" = self.by-version."has-binary-data"."0.1.1"; + "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; + "parseuri-0.0.2" = self.by-version."parseuri"."0.0.2"; + "to-array-0.1.3" = self.by-version."to-array"."0.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."socket.io-parser"."2.1.2" = + self.by-version."socket.io-parser"."2.1.2"; + by-version."socket.io-parser"."2.1.2" = self.buildNodePackage { + name = "socket.io-parser-2.1.2"; + version = "2.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; + name = "socket.io-parser-2.1.2.tgz"; + sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0"; + }; + deps = { + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "json3-3.2.6" = self.by-version."json3"."3.2.6"; + "emitter-1.0.1" = self.by-version."emitter"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."socket.io-parser"."2.2.0" = + self.by-version."socket.io-parser"."2.2.0"; + by-version."socket.io-parser"."2.2.0" = self.buildNodePackage { + name = "socket.io-parser-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; + name = "socket.io-parser-2.2.0.tgz"; + sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; + }; + deps = { + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "json3-3.2.6" = self.by-version."json3"."3.2.6"; + "emitter-1.0.1" = self.by-version."emitter"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."source-map"."0.1.34" = + self.by-version."source-map"."0.1.34"; + by-version."source-map"."0.1.34" = self.buildNodePackage { + name = "source-map-0.1.34"; + version = "0.1.34"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; + name = "source-map-0.1.34.tgz"; + sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; + }; + deps = { + "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."source-map"."~0.1.7" = + self.by-version."source-map"."0.1.43"; + by-version."source-map"."0.1.43" = self.buildNodePackage { + name = "source-map-0.1.43"; + version = "0.1.43"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + name = "source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + deps = { + "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."split"."0.3" = + self.by-version."split"."0.3.3"; + by-version."split"."0.3.3" = self.buildNodePackage { + name = "split-0.3.3"; + version = "0.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/split/-/split-0.3.3.tgz"; + name = "split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."statuses"."1" = + self.by-version."statuses"."1.2.1"; + by-version."statuses"."1.2.1" = self.buildNodePackage { + name = "statuses-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; + name = "statuses-1.2.1.tgz"; + sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."statuses"."~1.2.1" = + self.by-version."statuses"."1.2.1"; + by-spec."stream-combiner"."~0.0.4" = + self.by-version."stream-combiner"."0.0.4"; + by-version."stream-combiner"."0.0.4" = self.buildNodePackage { + name = "stream-combiner-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + name = "stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + deps = { + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."string_decoder"."~0.10.x" = + self.by-version."string_decoder"."0.10.31"; + by-version."string_decoder"."0.10.31" = self.buildNodePackage { + name = "string_decoder-0.10.31"; + version = "0.10.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stringstream"."~0.0.4" = + self.by-version."stringstream"."0.0.4"; + by-version."stringstream"."0.0.4" = self.buildNodePackage { + name = "stringstream-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"; + name = "stringstream-0.0.4.tgz"; + sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-ansi"."^0.3.0" = + self.by-version."strip-ansi"."0.3.0"; + by-version."strip-ansi"."0.3.0" = self.buildNodePackage { + name = "strip-ansi-0.3.0"; + version = "0.3.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; + name = "strip-ansi-0.3.0.tgz"; + sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; + }; + deps = { + "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-ansi"."^3.0.0" = + self.by-version."strip-ansi"."3.0.0"; + by-version."strip-ansi"."3.0.0" = self.buildNodePackage { + name = "strip-ansi-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"; + name = "strip-ansi-3.0.0.tgz"; + sha1 = "7510b665567ca914ccb5d7e072763ac968be3724"; + }; + deps = { + "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."supports-color"."^0.2.0" = + self.by-version."supports-color"."0.2.0"; + by-version."supports-color"."0.2.0" = self.buildNodePackage { + name = "supports-color-0.2.0"; + version = "0.2.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; + name = "supports-color-0.2.0.tgz"; + sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."supports-color"."^2.0.0" = + self.by-version."supports-color"."2.0.0"; + by-version."supports-color"."2.0.0" = self.buildNodePackage { + name = "supports-color-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + name = "supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."through"."2" = + self.by-version."through"."2.3.8"; + by-version."through"."2.3.8" = self.buildNodePackage { + name = "through-2.3.8"; + version = "2.3.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; + name = "through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."through"."~2.3" = + self.by-version."through"."2.3.8"; + by-spec."through"."~2.3.1" = + self.by-version."through"."2.3.8"; + by-spec."tiny-lr-fork"."0.0.5" = + self.by-version."tiny-lr-fork"."0.0.5"; + by-version."tiny-lr-fork"."0.0.5" = self.buildNodePackage { + name = "tiny-lr-fork-0.0.5"; + version = "0.0.5"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz"; + name = "tiny-lr-fork-0.0.5.tgz"; + sha1 = "1e99e1e2a8469b736ab97d97eefa98c71f76ed0a"; + }; + deps = { + "qs-0.5.6" = self.by-version."qs"."0.5.6"; + "faye-websocket-0.4.4" = self.by-version."faye-websocket"."0.4.4"; + "noptify-0.0.3" = self.by-version."noptify"."0.0.3"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tinycolor"."0.x" = + self.by-version."tinycolor"."0.0.1"; + by-version."tinycolor"."0.0.1" = self.buildNodePackage { + name = "tinycolor-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + name = "tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."to-array"."0.1.3" = + self.by-version."to-array"."0.1.3"; + by-version."to-array"."0.1.3" = self.buildNodePackage { + name = "to-array-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz"; + name = "to-array-0.1.3.tgz"; + sha1 = "d45dadc6363417f60f28474fea50ecddbb4f4991"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."2.0.0"; + by-version."tough-cookie"."2.0.0" = self.buildNodePackage { + name = "tough-cookie-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"; + name = "tough-cookie-2.0.0.tgz"; + sha1 = "41ce08720b35cf90beb044dd2609fb19e928718f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tunnel-agent"."~0.4.0" = + self.by-version."tunnel-agent"."0.4.1"; + by-version."tunnel-agent"."0.4.1" = self.buildNodePackage { + name = "tunnel-agent-0.4.1"; + version = "0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"; + name = "tunnel-agent-0.4.1.tgz"; + sha1 = "bbeecff4d679ce753db9462761a88dfcec3c5ab3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."type-is"."~1.6.4" = + self.by-version."type-is"."1.6.5"; + by-version."type-is"."1.6.5" = self.buildNodePackage { + name = "type-is-1.6.5"; + version = "1.6.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.6.5.tgz"; + name = "type-is-1.6.5.tgz"; + sha1 = "92129495c7b7563eaf923b447382c6c471f95de4"; + }; + deps = { + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "mime-types-2.1.3" = self.by-version."mime-types"."2.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."typedarray"."~0.0.5" = + self.by-version."typedarray"."0.0.6"; + by-version."typedarray"."0.0.6" = self.buildNodePackage { + name = "typedarray-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + name = "typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uglify-js"."^2.4.0" = + self.by-version."uglify-js"."2.4.24"; + by-version."uglify-js"."2.4.24" = self.buildNodePackage { + name = "uglify-js-2.4.24"; + version = "2.4.24"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; + name = "uglify-js-2.4.24.tgz"; + sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "source-map-0.1.34" = self.by-version."source-map"."0.1.34"; + "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2"; + "yargs-3.5.4" = self.by-version."yargs"."3.5.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uglify-js"."~2.3" = + self.by-version."uglify-js"."2.3.6"; + by-version."uglify-js"."2.3.6" = self.buildNodePackage { + name = "uglify-js-2.3.6"; + version = "2.3.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + name = "uglify-js-2.3.6.tgz"; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uglify-to-browserify"."~1.0.0" = + self.by-version."uglify-to-browserify"."1.0.2"; + by-version."uglify-to-browserify"."1.0.2" = self.buildNodePackage { + name = "uglify-to-browserify-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + name = "uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."~1.7.0" = + self.by-version."underscore"."1.7.0"; + by-version."underscore"."1.7.0" = self.buildNodePackage { + name = "underscore-1.7.0"; + version = "1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + name = "underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore.string"."~2.2.1" = + self.by-version."underscore.string"."2.2.1"; + by-version."underscore.string"."2.2.1" = self.buildNodePackage { + name = "underscore.string-2.2.1"; + version = "2.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"; + name = "underscore.string-2.2.1.tgz"; + sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore.string"."~2.3.3" = + self.by-version."underscore.string"."2.3.3"; + by-version."underscore.string"."2.3.3" = self.buildNodePackage { + name = "underscore.string-2.3.3"; + version = "2.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + name = "underscore.string-2.3.3.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore.string"."~2.4.0" = + self.by-version."underscore.string"."2.4.0"; + by-version."underscore.string"."2.4.0" = self.buildNodePackage { + name = "underscore.string-2.4.0"; + version = "2.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + name = "underscore.string-2.4.0.tgz"; + sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."unpipe"."~1.0.0" = + self.by-version."unpipe"."1.0.0"; + by-version."unpipe"."1.0.0" = self.buildNodePackage { + name = "unpipe-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + name = "unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."utf8"."2.0.0" = + self.by-version."utf8"."2.0.0"; + by-version."utf8"."2.0.0" = self.buildNodePackage { + name = "utf8-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz"; + name = "utf8-2.0.0.tgz"; + sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."util-deprecate"."~1.0.1" = + self.by-version."util-deprecate"."1.0.1"; + by-version."util-deprecate"."1.0.1" = self.buildNodePackage { + name = "util-deprecate-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"; + name = "util-deprecate-1.0.1.tgz"; + sha1 = "3556a3d13c4c6aa7983d7e2425478197199b7881"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."utils-merge"."1.0.0" = + self.by-version."utils-merge"."1.0.0"; + by-version."utils-merge"."1.0.0" = self.buildNodePackage { + name = "utils-merge-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + name = "utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."vary"."~1.0.0" = + self.by-version."vary"."1.0.1"; + by-version."vary"."1.0.1" = self.buildNodePackage { + name = "vary-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + name = "vary-1.0.1.tgz"; + sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."which"."~1.0.5" = + self.by-version."which"."1.0.9"; + by-version."which"."1.0.9" = self.buildNodePackage { + name = "which-1.0.9"; + version = "1.0.9"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/which/-/which-1.0.9.tgz"; + name = "which-1.0.9.tgz"; + sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."window-size"."0.1.0" = + self.by-version."window-size"."0.1.0"; + by-version."window-size"."0.1.0" = self.buildNodePackage { + name = "window-size-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + name = "window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."wordwrap"."0.0.2" = + self.by-version."wordwrap"."0.0.2"; + by-version."wordwrap"."0.0.2" = self.buildNodePackage { + name = "wordwrap-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + name = "wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.3"; + by-version."wordwrap"."0.0.3" = self.buildNodePackage { + name = "wordwrap-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + name = "wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ws"."0.4.31" = + self.by-version."ws"."0.4.31"; + by-version."ws"."0.4.31" = self.buildNodePackage { + name = "ws-0.4.31"; + version = "0.4.31"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; + name = "ws-0.4.31.tgz"; + sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; + }; + deps = { + "commander-0.6.1" = self.by-version."commander"."0.6.1"; + "nan-0.3.2" = self.by-version."nan"."0.3.2"; + "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; + "options-0.0.6" = self.by-version."options"."0.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."xmlhttprequest"."https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = + self.by-version."xmlhttprequest"."1.5.0"; + by-version."xmlhttprequest"."1.5.0" = self.buildNodePackage { + name = "xmlhttprequest-1.5.0"; + version = "1.5.0"; + bin = false; + src = fetchurl { + url = "https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz"; + name = "xmlhttprequest-1.5.0.tgz"; + sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."xtend"."^4.0.0" = + self.by-version."xtend"."4.0.0"; + by-version."xtend"."4.0.0" = self.buildNodePackage { + name = "xtend-4.0.0"; + version = "4.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"; + name = "xtend-4.0.0.tgz"; + sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."yargs"."~3.5.4" = + self.by-version."yargs"."3.5.4"; + by-version."yargs"."3.5.4" = self.buildNodePackage { + name = "yargs-3.5.4"; + version = "3.5.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; + name = "yargs-3.5.4.tgz"; + sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; + }; + deps = { + "camelcase-1.1.0" = self.by-version."camelcase"."1.1.0"; + "decamelize-1.0.0" = self.by-version."decamelize"."1.0.0"; + "window-size-0.1.0" = self.by-version."window-size"."0.1.0"; + "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbda5432032..29b7d16cf21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2949,6 +2949,8 @@ let shotwell = callPackage ../applications/graphics/shotwell { }; + shout = callPackage ../applications/networking/irc/shout { }; + shellinabox = callPackage ../servers/shellinabox { }; sic = callPackage ../applications/networking/irc/sic { }; From ad4c95716383215b71af85c254b9320903f6f7e5 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 31 Jul 2015 16:15:18 -0700 Subject: [PATCH 03/54] shout service: New module. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/shout.nix | 80 +++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 nixos/modules/services/networking/shout.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b53b9c47b01..b25e3d7e40d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -227,6 +227,7 @@ riemanntools = 203; subsonic = 204; riak = 205; + shout = 206; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -432,6 +433,7 @@ riemanntools = 203; subsonic = 204; riak = 205; + #shout = 206; #unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c56e6a82e83..212555d7efc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -328,6 +328,7 @@ ./services/networking/searx.nix ./services/networking/seeks.nix ./services/networking/skydns.nix + ./services/networking/shout.nix ./services/networking/spiped.nix ./services/networking/sslh.nix ./services/networking/ssh/lshd.nix diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix new file mode 100644 index 00000000000..f55b87a9614 --- /dev/null +++ b/nixos/modules/services/networking/shout.nix @@ -0,0 +1,80 @@ +{ pkgs, lib, config, options, ... }: + +with lib; + +let + cfg = config.services.shout; + shoutHome = "/var/lib/shout"; + +in { + options.services.shout = { + enable = mkEnableOption "Shout web IRC client"; + + private = mkOption { + type = types.bool; + default = false; + description = '' + Make your shout instance private. You will need to configure user + accounts by adding entries in ${shoutHome}/users. + ''; + }; + + host = mkOption { + type = types.string; + default = "0.0.0.0"; + description = "IP interface to listen on for http connections."; + }; + + port = mkOption { + type = types.int; + default = 9000; + description = "TCP port to listen on for http connections."; + }; + + configFile = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + Contents of Shout's config.js file. If left empty, + Shout will generate from its defaults at first startup. + + Documentation: http://shout-irc.com/docs/server/configuration.html + ''; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers = singleton { + name = "shout"; + uid = config.ids.uids.shout; + description = "Shout daemon user"; + home = shoutHome; + createHome = true; + }; + + systemd.services.shout = { + description = "Shout web IRC client"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + preStart = if isNull cfg.configFile then null + else '' + ln -sf ${pkgs.writeText "config.js" cfg.configFile} \ + ${shoutHome}/config.js + ''; + script = concatStringsSep " " [ + "${pkgs.shout}/bin/shout" + (if cfg.private then "--private" else "--public") + "--port" (toString cfg.port) + "--host" (toString cfg.host) + "--home" shoutHome + ]; + serviceConfig = { + User = "shout"; + ProtectHome = "true"; + ProtectSystem = "full"; + PrivateTmp = "true"; + }; + }; + }; +} From 56b39c2cc57bed61b9656a55b5275d7771fb5636 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 29 Jun 2015 16:45:01 +0200 Subject: [PATCH 04/54] minisign: init at 0.4 --- pkgs/tools/security/minisign/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/minisign/default.nix diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix new file mode 100644 index 00000000000..48de14ddce6 --- /dev/null +++ b/pkgs/tools/security/minisign/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, libsodium }: + +stdenv.mkDerivation rec { + name = "minisign-${version}"; + version = "0.4"; + + src = fetchurl { + url = "https://github.com/jedisct1/minisign/archive/${version}.tar.gz"; + sha256 = "1k1dk6piaz8pw4b9zg55n4wcpyc301mkxb873njm8mki7r8raxnw"; + }; + + buildInputs = [ cmake libsodium ]; + + meta = with stdenv.lib; { + description = "A simple tool for signing files and verifying signatures"; + longDescription = '' + minisign uses public key cryptography to help facilitate secure (but not + necessarily private) file transfer, e.g., of software artefacts. minisign + is similar to and compatible with OpenBSD's signify. + ''; + homepage = https://jedisct1.github.io/minisign/; + license = licenses.isc; + maintainers = with maintainers; [ joachifm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4a14978e38..6562fa0b8ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2026,6 +2026,8 @@ let minidlna = callPackage ../tools/networking/minidlna { }; + minisign = callPackage ../tools/security/minisign { }; + mmv = callPackage ../tools/misc/mmv { }; morituri = callPackage ../applications/audio/morituri { }; From 8c652379df07f88d6b434fe1042e9a9ba9078440 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 28 May 2015 12:18:31 +0200 Subject: [PATCH 05/54] locate: option includeStore --- nixos/doc/manual/release-notes/rl-unstable.xml | 9 +++++++++ nixos/modules/misc/locate.nix | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index abfd417c53a..7106690b82b 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -179,6 +179,15 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install + + + The locate service no longer indexes the nix store + by default, preventing packages with potentially numerous versions from + cluttering the output. Indexing the store can be activated with + services.locate.includeStore = true;. + + + diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index f3ed2aaba09..bf05c460729 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -56,6 +56,14 @@ in { ''; }; + includeStore = mkOption { + type = types.bool; + default = false; + description = '' + Whether to include /nix/store in the locate database. + ''; + }; + }; }; @@ -63,7 +71,6 @@ in { ###### implementation config = { - systemd.services.update-locatedb = { description = "Update Locate Database"; path = [ pkgs.su ]; @@ -72,6 +79,7 @@ in { mkdir -m 0755 -p $(dirname ${toString cfg.output}) exec updatedb \ --localuser=${cfg.localuser} \ + ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; serviceConfig.Nice = 19; From aefc8b3ddf3de7859d9700967fa89dda5c2929a6 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 2 Aug 2015 01:24:23 +0100 Subject: [PATCH 06/54] elfutils: upgrade to 0.163 due to security ... vaguely mentioned by upstream, see e.g. FEDORA-2015-11380. Close #9084. --- .../tools/misc/elfutils/CVE-2014-0172.patch | 32 ------------------- .../tools/misc/elfutils/default.nix | 9 +++--- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch diff --git a/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch b/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch deleted file mode 100644 index 6553dea7b4c..00000000000 --- a/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=1085663 - -Reported-by: Florian Weimer -Signed-off-by: Mark Wielaard ---- - libdw/dwarf_begin_elf.c | 8 +++++++- - 2 files changed, 12 insertions(+), 1 deletions(-) - -diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c -index 79daeac..34ea373 100644 ---- a/libdw/dwarf_begin_elf.c -+++ b/libdw/dwarf_begin_elf.c -@@ -1,5 +1,5 @@ - /* Create descriptor from ELF descriptor for processing file. -- Copyright (C) 2002-2011 Red Hat, Inc. -+ Copyright (C) 2002-2011, 2014 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper , 2002. - -@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp) - memcpy (&size, data->d_buf + 4, sizeof size); - size = be64toh (size); - -+ /* Check for unsigned overflow so malloc always allocated -+ enough memory for both the Elf_Data header and the -+ uncompressed section data. */ -+ if (unlikely (sizeof (Elf_Data) + size < size)) -+ break; -+ - Elf_Data *zdata = malloc (sizeof (Elf_Data) + size); - if (unlikely (zdata == NULL)) - break; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 53e4bd6821f..95ccdd89de1 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -3,21 +3,20 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { name = "elfutils-${version}"; - version = "0.158"; + version = "0.163"; src = fetchurl { urls = [ "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "0z9rprmizd7rwb3xwfmz5liii7hbiv3g2arl23h56brm45fay9xy"; + sha256 = "7c774f1eef329309f3b05e730bdac50013155d437518a2ec0e24871d312f2e23"; }; patches = [ - ./CVE-2014-0172.patch (fetchurl { - url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability.patch"; - sha256 = "0y2fyjis5xrd3g2pcbcm145q2kmh52n5c74w8dwv3hqdp5ky7igd"; + url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability-${version}.patch"; + sha256 = "e4e82315dad2efaa4e4476503e7537e01b7c1b1f98a96de4ca1c7fa85f4f1045"; }) ]; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, From 179cdbc62cff2ca316b3dd4f64b55f3a4c1f7906 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 1 Aug 2015 19:43:55 +0100 Subject: [PATCH 07/54] ghostscript: add patch fixing CVE-2015-3228 (from debian) --- pkgs/misc/ghostscript/CVE-2015-3228.patch | 20 ++++++++++++++++++++ pkgs/misc/ghostscript/default.nix | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/ghostscript/CVE-2015-3228.patch diff --git a/pkgs/misc/ghostscript/CVE-2015-3228.patch b/pkgs/misc/ghostscript/CVE-2015-3228.patch new file mode 100644 index 00000000000..7be18b0a730 --- /dev/null +++ b/pkgs/misc/ghostscript/CVE-2015-3228.patch @@ -0,0 +1,20 @@ +Description: Sanity check for memory allocation. + In gs_heap_alloc_bytes(), add a sanity check to ensure we don't overflow the + variable holding the actual number of bytes we allocate. +Origin: upstream, http://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=0c0b085 +Author: Chris Liddell +Forwarded: yes +Bug-Debian: http://bugs.debian.org/793489 +Last-Update: 2015-07-26 + +--- a/base/gsmalloc.c ++++ b/base/gsmalloc.c +@@ -178,7 +178,7 @@ + } else { + uint added = size + sizeof(gs_malloc_block_t); + +- if (mmem->limit - added < mmem->used) ++ if (added <= size || mmem->limit - added < mmem->used) + set_msg("exceeded limit"); + else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0) + set_msg("failed"); diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 11f816dbb97..820e5f3cffe 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -40,7 +40,11 @@ stdenv.mkDerivation rec { # [] # maybe sometimes jpeg2000 support ; - patches = [ ./urw-font-files.patch ]; + patches = [ + ./urw-font-files.patch + # fetched from debian's ghostscript 9.15_dfsg-1 (called 020150707~0c0b085.patch there) + ./CVE-2015-3228.patch + ]; makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ]; From 84dc71ebe4d84ed3edece37a81c2aa7debbb2c46 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 2 Aug 2015 03:17:03 -0700 Subject: [PATCH 08/54] bump dolphinEmuMaster, remove no longer needed SDL dep also add libevdev as a dep, read about all the changes at https://dolphin-emu.org/blog/2015/08/01/dolphin-progress-report-july-2015/ --- pkgs/misc/emulators/dolphin-emu/master.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index f742973c08d..06734d24c8a 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,14 +1,14 @@ { stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, git, libpthreadstubs, libXrandr, libXext, readline -, openal, libXdmcp, portaudio, SDL, fetchgit, libusb +, openal, libXdmcp, portaudio, fetchgit, libusb, libevdev , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150609"; + name = "dolphin-emu-20150802"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695"; - sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r"; + rev = "5097a22844b850b429872f4de390bd958b11a616"; + sha256 = "1qizkahbimpmgjs51av1cdmnnyvbz0j0gknmi5vdc38vrzxvwkrf"; fetchSubmodules = false; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - git libXdmcp portaudio SDL libusb libpulseaudio ]; + libevdev git libXdmcp portaudio libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; From da0b6a4fdf0ab167bfc943176197159f10f1a8b7 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sun, 2 Aug 2015 12:40:10 +0200 Subject: [PATCH 09/54] gnome3: Add myself as a maintainer --- pkgs/desktops/gnome-3/3.16/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 4d30520df11..9c32ddf528c 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -53,7 +53,7 @@ let gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; version = "3.16"; - maintainers = with pkgs.lib.maintainers; [ lethalman ]; + maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ]; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; From 6193f5260c6070323500a96d80264332cee14e61 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Sun, 2 Aug 2015 22:55:45 +0200 Subject: [PATCH 10/54] tcsd module: adjust default value of kernelPCRs --- nixos/modules/services/hardware/tcsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index ced2d49c1e1..d957b5063d3 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -76,7 +76,7 @@ in }; kernelPCRs = mkOption { - default = "10,11"; + default = "8,9,10,11,12"; type = types.string; description = "PCR indices used in the TPM for kernel measurements."; }; From 192091dc069d86452ad0d603aa65d48042c37e59 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Sun, 2 Aug 2015 22:50:36 +0200 Subject: [PATCH 11/54] trustedGRUB2: git -> 1.2.0 --- pkgs/tools/misc/grub/trusted.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 790870cf302..315c7145cbe 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -11,7 +11,7 @@ let inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.0-git-2015-07-04"; + version = "1.2.0"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -28,12 +28,12 @@ let in ( stdenv.mkDerivation rec { - name = "trustedGRUB-${version}"; + name = "trustedGRUB2-${version}"; src = fetchgit { url = "https://github.com/Sirrix-AG/TrustedGRUB2"; - rev = "1865d07bdef7f39916790c77103fb85e99de14a4"; - sha256 = "e6bd9edfeb653e98e585fd691a31533b649b2fca1f4a903c70f6ea371014c9f7"; + rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76"; + sha256 = "8c17bd7e14dd96ae9c4e98723f4e18ec6b21d45ac486ecf771447649829d0b34"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; From b49fc966177fba9bd2e284977b7c7986393fdf18 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 3 Aug 2015 00:31:07 +0300 Subject: [PATCH 12/54] Use GNOME-enabled libsoup in Midori as the build fails otherwise --- pkgs/applications/networking/browsers/midori/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index d398cdd2942..5cdfcf5e975 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper , gtk3, webkitgtk, librsvg, libnotify, sqlite -, glib_networking, gsettings_desktop_schemas +, glib_networking, gsettings_desktop_schemas, libsoup }: let @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig intltool vala makeWrapper webkitgtk librsvg libnotify sqlite + (libsoup.override {gnomeSupport = true;}) ]; cmakeFlags = '' From 249b25698e4949d98ce0508224c72b988fe6f352 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Aug 2015 22:03:26 +0200 Subject: [PATCH 13/54] xdelta: tidy up --- pkgs/tools/compression/xdelta/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index bf02d8c3a0a..407b14a6099 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: let version = "3.0.10"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xdelta-${version}"; src = fetchFromGitHub { @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { postPatch = '' cd xdelta3 - '' + stdenv.lib.optionalString doCheck '' - mkdir tmp - substituteInPlace testing/file.h --replace /tmp tmp - substituteInPlace xdelta3-test.h --replace /tmp $PWD/tmp ''; enableParallelBuilding = true; doCheck = true; checkPhase = '' + mkdir $PWD/tmp + for i in testing/file.h xdelta3-test.h; do + substituteInPlace $i --replace /tmp $PWD/tmp + done ./xdelta3regtest ''; From a9a0fedb94e78f7b8c26df274a56d53c9d066a62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Aug 2015 23:33:50 +0200 Subject: [PATCH 14/54] stress-ng: 0.04.13 -> 0.04.14 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 38f2f2551bf..7f02eaa2d51 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr, keyutils }: -let version = "0.04.13"; in +let version = "0.04.14"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "0h4alfylf15q1rdf9v42fy0bhh4c1s1fagiym445qb3yacf5p9g3"; + sha256 = "17lgsxg2k7w12i1wmzq4zqavkicikzkgz2h7mzl8lrk8c85mwf3m"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From dad99aae8e294bfc04a5fc0f973fbc592d7c3342 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Aug 2015 23:46:38 +0200 Subject: [PATCH 15/54] clipgrab: 3.4.11 -> 3.5.1 --- pkgs/applications/video/clipgrab/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index fd336dafb23..7661bfbc5ea 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, makeDesktopItem, qt4 }: -let version = "3.4.11"; in +let version = "3.5.1"; in stdenv.mkDerivation rec { name = "clipgrab-${version}"; src = fetchurl { - sha256 = "10xxcnib7xkvrx7wma2vbya5fz5s5f6syc9dmr395c83lpcwpxs8"; - # The "Download" button is a .tar.gz, but there's a .tar.bz2 further down: - url = "http://download.clipgrab.de/${name}.tar.bz2"; + sha256 = "16hm7zv0yhxj7gdd8q462jcxy0jk6hicsk1mkhmarwrhifwsy4g9"; + # The .tar.bz2 "Download" link is a binary blob, the source is .tar.gz! + url = "http://download.clipgrab.de/${name}.tar.gz"; }; meta = with stdenv.lib; { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; homepage = http://clipgrab.org/; license = licenses.gpl3Plus; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; From 87853e7753cbbc0d4c3801a398fb1377aedce174 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Aug 2015 00:25:26 +0200 Subject: [PATCH 16/54] clipgrab: add 1080p (ffmpeg) support Support is optional (pass ffmpeg = null), but enabled by default. --- pkgs/applications/video/clipgrab/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 7661bfbc5ea..d4239685f7b 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, qt4 }: +{ stdenv, fetchurl, ffmpeg, makeDesktopItem, qt4 }: let version = "3.5.1"; in stdenv.mkDerivation rec { @@ -24,7 +24,13 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ qt4 ]; + buildInputs = [ ffmpeg qt4 ]; + + postPatch = stdenv.lib.optionalString (ffmpeg != null) '' + substituteInPlace converter_ffmpeg.cpp \ + --replace '"ffmpeg"' '"${ffmpeg}/bin/ffmpeg"' \ + --replace '"ffmpeg ' '"${ffmpeg}/bin/ffmpeg ' + ''; configurePhase = '' qmake clipgrab.pro From 9cd4763e9c6aafe71cccee24fee51dea8242b449 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Aug 2015 01:45:13 +0200 Subject: [PATCH 17/54] ipad_charge: init at 2015-02-03 --- pkgs/tools/misc/ipad_charge/default.nix | 42 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/misc/ipad_charge/default.nix diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix new file mode 100644 index 00000000000..df987ed86c1 --- /dev/null +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, libusb }: + +let version = "2015-02-03"; in +stdenv.mkDerivation rec { + name = "ipad_charge-${version}"; + + src = fetchFromGitHub { + sha256 = "0f40hqx1dbqpwrhyf42h5982jwqv8j5zp5hwwakz6600hyqvnnz7"; + rev = "bb24e1c3a79016cfdffb9d28189485766d655ec6"; + repo = "ipad_charge"; + owner = "mkorenkov"; + }; + + buildInputs = [ libusb ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace " -o root -g root" "" \ + --replace "/usr" "$out" + sed "/rules\.d/d" -i Makefile + ''; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + inherit version; + inherit (src.meta) homepage; + description = "Apple device USB charging utility for Linux"; + longDescription = '' + USB charging control utility used to enable/disable charging of an Apple + device connected to USB port. For a list of supported devices, see + https://github.com/mkorenkov/ipad_charge#supported-devices. + ''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c0a818b38f..216f1bb6463 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1918,6 +1918,8 @@ let iodine = callPackage ../tools/networking/iodine { }; + ipad_charge = callPackage ../tools/misc/ipad_charge { }; + iperf2 = callPackage ../tools/networking/iperf/2.nix { }; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; From 5210b4c7a82c3dc46826a7faf53e574645566f7d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 3 Aug 2015 08:38:00 +0300 Subject: [PATCH 18/54] ECL: Strip manual configure patching and regeneration as it doesn't work anyway --- pkgs/development/compilers/ecl/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index bb57ebbfa87..851459ad7d9 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -26,14 +26,6 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - patches = [ ./libffi-prefix.patch ]; - preConfigure = '' - (cd src ; libtoolize -f) - (cd src ; autoheader -f) - (cd src ; aclocal) - (cd src ; automake --add-missing -c) - (cd src ; autoconf -f) - ''; configureFlags = [ "--enable-threads" "--with-gmp-prefix=${gmp}" From c6f5bb57853b2fde80b733744a3eabee6aa686ef Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sun, 2 Aug 2015 12:19:06 +0200 Subject: [PATCH 19/54] gnome-tweak-tool: Add patches to work nicely on NixOS - Search for themes and icon in system data dirs - Don't show multiple entries for a single theme - Create config dir if it doesn't exist --- ...themes-and-icons-in-system-data-dirs.patch | 123 ++++++++++++++++++ ...-multiple-entries-for-a-single-theme.patch | 103 +++++++++++++++ ...reate-config-dir-if-it-doesn-t-exist.patch | 29 +++++ .../3.16/misc/gnome-tweak-tool/default.nix | 9 +- 4 files changed, 262 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch new file mode 100644 index 00000000000..d5a6f90e33d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch @@ -0,0 +1,123 @@ +From 175218579aa2b4f4974ff1cf4fd1ac93082a4714 Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sat, 1 Aug 2015 21:01:11 +0200 +Subject: [PATCH 1/1] Search for themes and icons in system data dirs + +--- + gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- + gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- + gtweak/utils.py | 17 +++++++++++++++++ + 3 files changed, 23 insertions(+), 18 deletions(-) + +diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py +index ed2ad5f..a319907 100644 +--- a/gtweak/tweaks/tweak_group_interface.py ++++ b/gtweak/tweaks/tweak_group_interface.py +@@ -26,7 +26,7 @@ from gi.repository import Gtk + from gi.repository import GLib + + import gtweak +-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file ++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs + from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.gshellwrapper import GnomeShellFactory + from gtweak.gsettings import GSettingsSetting +@@ -46,10 +46,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): + + def _get_valid_themes(self): + """ Only shows themes that have variations for gtk+-3 and gtk+-2 """ +- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), +- os.path.join(GLib.get_user_data_dir(), "themes"), +- os.path.join(os.path.expanduser("~"), ".themes")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs('themes'), lambda d: + os.path.exists(os.path.join(d, "gtk-2.0")) and \ + os.path.exists(os.path.join(d, "gtk-3.0"))) + return valid +@@ -64,10 +61,7 @@ class IconThemeSwitcher(GSettingsComboTweak): + **options) + + def _get_valid_icon_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), +- os.path.join(GLib.get_user_data_dir(), "icons"), +- os.path.join(os.path.expanduser("~"), ".icons")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "index.theme"))) + return valid +@@ -82,10 +76,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): + **options) + + def _get_valid_cursor_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), +- os.path.join(GLib.get_user_data_dir(), "icons"), +- os.path.join(os.path.expanduser("~"), ".icons")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "cursors"))) + return valid +diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py +index b56a4f4..3486098 100644 +--- a/gtweak/tweaks/tweak_group_keymouse.py ++++ b/gtweak/tweaks/tweak_group_keymouse.py +@@ -20,7 +20,7 @@ import os.path + from gi.repository import GLib + + import gtweak +-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default ++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs + from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title + + class PrimaryPasteTweak(GetterSetterSwitchTweak): +@@ -47,10 +47,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): + **options) + + def _get_valid_key_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), +- os.path.join(GLib.get_user_data_dir(), "themes"), +- os.path.join(os.path.expanduser("~"), ".themes")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("themes"), lambda d: + os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ + os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) + return valid +diff --git a/gtweak/utils.py b/gtweak/utils.py +index 3d20425..0fcb51d 100644 +--- a/gtweak/utils.py ++++ b/gtweak/utils.py +@@ -21,6 +21,7 @@ import tempfile + import shutil + import subprocess + import glob ++import itertools + + import gtweak + from gtweak.gsettings import GSettingsSetting +@@ -114,6 +115,22 @@ def execute_subprocess(cmd_then_args, block=True): + stdout, stderr = p.communicate() + return stdout, stderr, p.returncode + ++def get_resource_dirs(resource): ++ """Returns a list of all known resource dirs for a given resource. ++ ++ :param str resource: ++ Name of the resource (e.g. "themes") ++ :return: ++ A list of resource dirs ++ """ ++ dirs = [os.path.join(dir, resource) ++ for dir in itertools.chain(GLib.get_system_data_dirs(), ++ (gtweak.DATA_DIR, ++ GLib.get_user_data_dir()))] ++ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))] ++ ++ return [dir for dir in dirs if os.path.isdir(dir)] ++ + @singleton + class AutostartManager: + +-- +2.4.5 + diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch new file mode 100644 index 00000000000..61ae2734979 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch @@ -0,0 +1,103 @@ +From edd3203c7b7d5ba596df9f148c443cdfc8a58d88 Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sat, 1 Aug 2015 21:26:57 +0200 +Subject: [PATCH 1/1] Don't show multiple entries for a single theme + +--- + gtweak/tweaks/tweak_group_interface.py | 8 ++++---- + gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- + gtweak/utils.py | 16 ++++++++++++++++ + 3 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py +index a319907..82c0286 100644 +--- a/gtweak/tweaks/tweak_group_interface.py ++++ b/gtweak/tweaks/tweak_group_interface.py +@@ -26,7 +26,7 @@ from gi.repository import Gtk + from gi.repository import GLib + + import gtweak +-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs ++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources + from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.gshellwrapper import GnomeShellFactory + from gtweak.gsettings import GSettingsSetting +@@ -49,7 +49,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): + valid = walk_directories(get_resource_dirs('themes'), lambda d: + os.path.exists(os.path.join(d, "gtk-2.0")) and \ + os.path.exists(os.path.join(d, "gtk-3.0"))) +- return valid ++ return get_unique_resources(valid) + + class IconThemeSwitcher(GSettingsComboTweak): + def __init__(self, **options): +@@ -64,7 +64,7 @@ class IconThemeSwitcher(GSettingsComboTweak): + valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "index.theme"))) +- return valid ++ return get_unique_resources(valid) + + class CursorThemeSwitcher(GSettingsComboTweak): + def __init__(self, **options): +@@ -79,7 +79,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): + valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "cursors"))) +- return valid ++ return get_unique_resources(valid) + + class ShellThemeTweak(Gtk.Box, Tweak): + +diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py +index 3486098..9f53425 100644 +--- a/gtweak/tweaks/tweak_group_keymouse.py ++++ b/gtweak/tweaks/tweak_group_keymouse.py +@@ -20,7 +20,7 @@ import os.path + from gi.repository import GLib + + import gtweak +-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs ++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources + from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title + + class PrimaryPasteTweak(GetterSetterSwitchTweak): +@@ -50,7 +50,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): + valid = walk_directories(get_resource_dirs("themes"), lambda d: + os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ + os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) +- return valid ++ return get_unique_resources(valid) + + TWEAK_GROUPS = [ + ListBoxTweakGroup(_("Keyboard and Mouse"), +diff --git a/gtweak/utils.py b/gtweak/utils.py +index 0fcb51d..ce8e12e 100644 +--- a/gtweak/utils.py ++++ b/gtweak/utils.py +@@ -131,6 +131,22 @@ def get_resource_dirs(resource): + + return [dir for dir in dirs if os.path.isdir(dir)] + ++def get_unique_resources(dirs): ++ """Filter out duplicated resources. ++ ++ :param list dirs: ++ List of resource dirs (e.g. /usr/share/themes/Adwaita) ++ :return: ++ List of dirs without duplicated resources ++ """ ++ unique_dirs = {} ++ for dir in dirs: ++ basename = os.path.basename(dir) ++ if basename not in unique_dirs: ++ unique_dirs[basename] = dir ++ ++ return unique_dirs ++ + @singleton + class AutostartManager: + +-- +2.4.5 + diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch new file mode 100644 index 00000000000..840ebb82ec7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch @@ -0,0 +1,29 @@ +From dea8fc3c37c43f4fbbcc658ee995a95b93452b3c Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sun, 2 Aug 2015 12:01:20 +0200 +Subject: [PATCH 1/1] Create config dir if it doesn't exist + +Otherwise gnome-tweak-tool can't enable the dark theme and fails +without a clear error message. +--- + gtweak/gtksettings.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py +index bcec9f1..f39991b 100644 +--- a/gtweak/gtksettings.py ++++ b/gtweak/gtksettings.py +@@ -35,6 +35,10 @@ class GtkSettingsManager: + def _get_keyfile(self): + keyfile = None + try: ++ config_dir = os.path.dirname(self._path) ++ if not os.path.isdir(config_dir): ++ os.makedirs(config_dir) ++ + keyfile = GLib.KeyFile() + keyfile.load_from_file(self._path, 0) + except MemoryError: +-- +2.4.5 + diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix index 2777dc5ca09..979990c7e8e 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix @@ -28,12 +28,17 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-tweak-tool" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" ''; - patches = [ ./find_gsettings.patch ]; + patches = [ + ./find_gsettings.patch + ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch + ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch + ./0003-Create-config-dir-if-it-doesn-t-exist.patch + ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; From dc2a6e3d3da7553d1ea8720b54fa12e9b2108d2b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 3 Aug 2015 09:09:52 +0000 Subject: [PATCH 20/54] dd-agent: Add support for MongoDB monitoring --- .../modules/services/monitoring/dd-agent.nix | 19 +++++++++++++++---- pkgs/tools/networking/dd-agent/default.nix | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix index 3e90393a662..0e0340e2fa3 100644 --- a/nixos/modules/services/monitoring/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent.nix @@ -53,7 +53,8 @@ let postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig; nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig; - + mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig; + etcfiles = [ { source = ddConf; target = "dd-agent/datadog.conf"; @@ -65,6 +66,10 @@ let (optional (cfg.nginxConfig != null) { source = nginxConfig; target = "dd-agent/conf.d/nginx.yaml"; + }) ++ + (optional (cfg.mongoConfig != null) + { source = mongoConfig; + target = "dd-agent/conf.d/mongo.yaml"; }); in { @@ -106,6 +111,12 @@ in { default = null; type = types.uniq (types.nullOr types.string); }; + + mongoConfig = mkOption { + description = "MongoDB integration configuration"; + default = null; + type = types.uniq (types.nullOr types.string); + }; }; config = mkIf cfg.enable { @@ -123,7 +134,7 @@ in { systemd.services.dd-agent = { description = "Datadog agent monitor"; - path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps]; + path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; @@ -132,7 +143,7 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig ]; + restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig mongoConfig ]; }; systemd.services.dogstatsd = { @@ -149,7 +160,7 @@ in { RestartSec = 2; }; environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig ]; + restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig mongoConfig ]; }; environment.etc = etcfiles; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 5838d5407be..cbc5a20997c 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { pythonPackages.simplejson pythonPackages.pyyaml pythonPackages.requests + pythonPackages.pymongo ]; propagatedBuildInputs = [ python tornado ]; From 61ec424cd4d4371f595c43fe18a90c08cd2d9f8f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:28:11 +0000 Subject: [PATCH 21/54] python33Packages.asyncio: init at 3.4.3 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eb7174558c..0cd5ef718c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -517,6 +517,24 @@ let }; }; + asyncio = buildPythonPackage rec { + name = "asyncio-${version}"; + version = "3.4.3"; + + disabled = (!isPy33); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/asyncio/${name}.tar.gz"; + sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; + }; + + meta = { + description = "reference implementation of PEP 3156"; + homepage = http://www.python.org/dev/peps/pep-3156; + license = licenses.free; + }; + }; + funcsigs = buildPythonPackage rec { name = "funcsigs-0.4"; disabled = ! (isPy26 || isPy27 || isPy33 || isPyPy); From f3a0fa9d96abc87daded54b8c2db20a869443083 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:28:52 +0000 Subject: [PATCH 22/54] pythonPackages.pycares: init at 0.7.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0cd5ef718c2..5fcb060f6fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4216,6 +4216,23 @@ let }; }; + pycares = buildPythonPackage rec { + name = "pycares-${version}"; + version = "0.7.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pycares/${name}.tar.gz"; + sha256 = "10lr3ij67khmfm14cb3sqch3vhv37f3j1whwznq6qy4prfmz5gvl"; + }; + + propagatedBuildInputs = [ pkgs.c-ares ]; + + meta = { + homepage = http://github.com/saghul/pycares; + description = "Interface for c-ares"; + license = licenses.mit; + }; + }; pyramid = buildPythonPackage rec { name = "pyramid-1.5.2"; From 44be36869feda036a2eff3a3032c09b8acb0c5b9 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:29:34 +0000 Subject: [PATCH 23/54] =?UTF-8?q?pythonPackages.aiodns:=C2=A0init=20at=200?= =?UTF-8?q?.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fcb060f6fb..3210141564b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -275,6 +275,26 @@ let }; }; + aiodns = buildPythonPackage rec { + name = "aiodns-${version}"; + version = "0.3.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/aiodns/${name}.tar.gz"; + sha256 = "0i9ypv9l4d59j87kkrsh1livfgnspyzcbx26jw9x58xs5z05xj7k"; + }; + + propagatedBuildInputs = with self ; [ + pycares + ] ++ optional (isPy33) self.asyncio + ++ optional (isPy26 || isPy27) self.trollius; + + meta = { + homepage = http://github.com/saghul/aiodns; + license = licenses.mit; + description = "Simple DNS resolver for asyncio"; + }; + }; alabaster = buildPythonPackage rec { name = "alabaster-0.7.3"; From eda7843cab45ad4fab16896aa04a93e06745d21f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:30:27 +0000 Subject: [PATCH 24/54] python34Packages.slixmpp: init at 1.0.post5 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3210141564b..f1065390f10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8134,6 +8134,26 @@ let }; }; + slixmpp = buildPythonPackage rec { + name = "slixmpp-${version}"; + version = "1.0.post5"; + + disabled = (!isPy34); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/slixmpp/${name}.tar.gz"; + sha256 = "0ik23w3y52m30z56874wgac07j70k7b06n20j44slii8avf58p4b"; + }; + + propagatedBuildInputs = with self ; [ aiodns pyasn1 ]; + + meta = { + meta = "Elegant Python library for XMPP"; + license = licenses.mit; + homepage = https://dev.louiz.org/projects/slixmpp; + }; + }; + netaddr = buildPythonPackage rec { name = "netaddr-0.7.5"; From b867cc62a78221de7378a3e416d44151a8303251 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:31:21 +0000 Subject: [PATCH 25/54] poezio: 0.8.1 -> 0.9 --- .../poezio/fix_requirements.patch | 11 ------ .../poezio/make_default_config_writable.patch | 34 +++++++++---------- pkgs/top-level/python-packages.nix | 11 +++--- 3 files changed, 22 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/python-modules/poezio/fix_requirements.patch diff --git a/pkgs/development/python-modules/poezio/fix_requirements.patch b/pkgs/development/python-modules/poezio/fix_requirements.patch deleted file mode 100644 index 99b022c0e78..00000000000 --- a/pkgs/development/python-modules/poezio/fix_requirements.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py 2014-03-20 22:27:14.000000000 +0100 -+++ b/setup.py 2015-07-10 21:18:30.156196111 +0200 -@@ -49,7 +49,7 @@ - scripts = ['scripts/poezio'], - data_files = [('share/man/man1/', ['data/poezio.1'])], - -- install_requires = ['sleekxmpp==1.2.4', -+ install_requires = ['sleekxmpp==1.2.5', - 'dnspython3>=1.11.1'], - extras_require = {'OTR plugin': 'python-potr>=1.0', - 'Screen autoaway plugin': 'pyinotify==0.9.4'} diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch index aa431dcc928..03d732e256c 100644 --- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch +++ b/pkgs/development/python-modules/poezio/make_default_config_writable.patch @@ -1,25 +1,25 @@ diff -ruN a/src/config.py b/src/config.py ---- a/src/config.py 2014-03-20 22:27:05.000000000 +0100 -+++ b/src/config.py 2015-07-10 21:24:37.583136078 +0200 -@@ -18,6 +18,7 @@ +--- a/src/config.py 2015-07-31 19:35:37.000000000 +0000 ++++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000 +@@ -14,6 +14,7 @@ + import logging.config import os - import logging +import stat + import sys + import pkg_resources - from configparser import RawConfigParser, NoOptionError, NoSectionError - from os import environ, makedirs, path, remove -@@ -279,6 +280,13 @@ - copy2(default, options.filename) - elif path.isfile(other): - copy2(other, options.filename) +@@ -563,6 +564,13 @@ + copy2(default, options.filename) + elif path.isfile(other): + copy2(other, options.filename) + -+ # Inside the nixstore, the reference file is readonly, so is the copy. -+ # Make it writable by the user who just created it. -+ if os.path.exists(options.filename): -+ os.chmod(options.filename, -+ os.stat(options.filename).st_mode | stat.S_IWUSR) ++ # Inside the nixstore, the reference file is readonly, so is the copy. ++ # Make it writable by the user who just created it. ++ if os.path.exists(options.filename): ++ os.chmod(options.filename, ++ os.stat(options.filename).st_mode | stat.S_IWUSR) + - firstrun = True + global firstrun + firstrun = True - try: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f1065390f10..39c459259ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16822,21 +16822,20 @@ let poezio = buildPythonPackage rec { name = "poezio-${version}"; - version = "0.8.1"; + version = "0.9"; namePrefix = ""; - disabled = (!isPy3k); - propagatedBuildInputs = with self ; [ dnspython3 sleekxmpp ]; + disabled = (!isPy34); + propagatedBuildInputs = with self ; [ aiodns slixmpp ]; patches = let patch_base = ../development/python-modules/poezio ; in [ "${patch_base}/make_default_config_writable.patch" - "${patch_base}/fix_requirements.patch" ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/52/${name}.tar.xz"; - sha256 = "0n3phh3lc82609ssfvqvd4papvhykd1sf2bm88dggh2x4mypwjff"; + url = "http://dev.louiz.org/attachments/download/91/${name}.tar.xz"; + sha256 = "1vc7zn4rp0ds0cdh1xcmbwx6w2qh4pnpzi5mdnj3rpl7xdr6jqzi"; }; meta = { From 8c6a2e3b5d291bfc08bb62a50772431e3a5f1854 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Mon, 3 Aug 2015 11:37:15 +0200 Subject: [PATCH 26/54] ldns: Add linux to platforms --- pkgs/development/libraries/ldns/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 01aeeecc6f6..2b153036f90 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ]; - meta = { + meta = with stdenv.lib; { description = "Library with the aim of simplifying DNS programming in C"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; + platforms = platforms.linux; }; } From 4493ca00943196c2f9abb91aff92449a6a16626d Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Mon, 3 Aug 2015 11:37:40 +0200 Subject: [PATCH 27/54] ldns: Add myself as a maintainer --- pkgs/development/libraries/ldns/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 2b153036f90..b4dbbf792ef 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; }; } From c2aadb38a7b7b29b29135cef80b1c4c8b2b15c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 3 Aug 2015 07:36:27 +0200 Subject: [PATCH 28/54] ntopng: add extra download URL It seems upstream have moved the ntopng-1.2.1.tgz into an "old/" subdirectory. --- pkgs/tools/networking/ntopng/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 1a2bac79e1f..ddb6a7bec36 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { name = "ntopng-1.2.1"; src = fetchurl { - url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz"; + urls = [ + "mirror://sourceforge/project/ntop/ntopng/old/${name}.tgz" + "mirror://sourceforge/project/ntop/ntopng/${name}.tgz" + ]; sha256 = "1db83cd1v4ivl8hxzzdvvdcgk22ji7mwrfnd5nnwll6kb11i364v"; }; From 89e78b5211b902d0a241c67c2331d57bd8d9b3b1 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 3 Aug 2015 10:00:17 +0200 Subject: [PATCH 29/54] omapd: init at 0.9.2 --- pkgs/tools/security/omapd/default.nix | 39 +++++++++++++++++++++++++++ pkgs/tools/security/omapd/zlib.patch | 9 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/tools/security/omapd/default.nix create mode 100644 pkgs/tools/security/omapd/zlib.patch diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix new file mode 100644 index 00000000000..ae1c2c05f14 --- /dev/null +++ b/pkgs/tools/security/omapd/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, cmake, qt4, gdb, zlib }: +stdenv.mkDerivation rec { + + name = "omapd-${version}"; + version = "0.9.2"; + + src = fetchurl { + url = "http://omapd.googlecode.com/files/${name}.tgz"; + sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc"; + }; + + patches = [ ./zlib.patch ]; + + buildInputs = [ cmake qt4 zlib gdb ]; + + phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ]; + + buildPhase = '' + (cd plugins/RAMHashTables; qmake; make) + qmake + make + ''; + + installPhase = '' + mkdir -p $out $out/bin $out/etc $out/usr/lib/omapd/plugins + cp omapd $out/bin/. + cp omapd.conf $out/etc/. + cp plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/. + ln -s $out/usr/lib/omapd/plugins $out/bin/plugins + ''; + + meta = with stdenv.lib; { + homepage = http://code.google.com/p/omapd; + description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; + license = licenses.gpl3; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/omapd/zlib.patch b/pkgs/tools/security/omapd/zlib.patch new file mode 100644 index 00000000000..dc0644f2a01 --- /dev/null +++ b/pkgs/tools/security/omapd/zlib.patch @@ -0,0 +1,9 @@ +diff -uNr omapd-0.9.2-old/omapd.pro omapd-0.9.2/omapd.pro +--- omapd-0.9.2-old/omapd.pro 2015-08-03 09:46:47.463420480 +0200 ++++ omapd-0.9.2/omapd.pro 2015-08-03 09:48:32.238657105 +0200 +@@ -37,4 +37,4 @@ + clientconfiguration.h \ + managementserver.h \ + json.h +-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib ++LIBS += -lz diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 139f655110c..8aea9803be4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3134,6 +3134,8 @@ let trousers = callPackage ../tools/security/trousers { }; + omapd = callPackage ../tools/security/omapd { }; + ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttfautohint = callPackage ../tools/misc/ttfautohint { }; From 45bdde550537e7cf212e70d34e94afd4d5942aec Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 3 Aug 2015 13:30:15 +0200 Subject: [PATCH 30/54] rustRegistry: 2015-07-07 -> 2015-08-03 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 9d74ab88fc0..0454288eb01 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-07-07"; - rev = "fd9e3e4a350f5df0d975913bcc29d2051a509199"; + version = "2015-08-03"; + rev = "dd3e0cecc30d0efbb50dfe76c83900568502af45"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "1vm28gfq4fmialz5ab8cxk5q1kdf6hlg3ni41qpy9k61pp9bqdwr"; + sha256 = "0wlbaspa0mvljhkjjnglxwpp9b4mzcxpkdzrciljxwdsr8jvlz30"; }; in From ff4e92f2cc96ce4b776fe5de21b54f9c2f897e52 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Aug 2015 13:48:43 +0200 Subject: [PATCH 31/54] Spelling etc --- nixos/doc/manual/release-notes/rl-unstable.xml | 6 +++--- nixos/modules/misc/locate.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 7106690b82b..aedc85f3069 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -181,10 +181,10 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install - The locate service no longer indexes the nix store + The locate service no longer indexes the Nix store by default, preventing packages with potentially numerous versions from - cluttering the output. Indexing the store can be activated with - services.locate.includeStore = true;. + cluttering the output. Indexing the store can be activated by setting + services.locate.includeStore = true. diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index bf05c460729..e85e390acb6 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -35,7 +35,7 @@ in { type = types.listOf types.str; default = [ ]; description = '' - Extra flags to append to updatedb. + Extra flags to pass to updatedb. ''; }; @@ -60,7 +60,7 @@ in { type = types.bool; default = false; description = '' - Whether to include /nix/store in the locate database. + Whether to include /nix/store in the locate database. ''; }; @@ -78,9 +78,9 @@ in { '' mkdir -m 0755 -p $(dirname ${toString cfg.output}) exec updatedb \ - --localuser=${cfg.localuser} \ - ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ - --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} + --localuser=${cfg.localuser} \ + ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ + --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; serviceConfig.Nice = 19; serviceConfig.IOSchedulingClass = "idle"; From bae1e6a0e9f8ac0f52cd4d5aa028ab1d33c28711 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Aug 2015 14:33:54 +0200 Subject: [PATCH 32/54] geolite-legacy: 2015-07-30 -> 2015-08-03 --- pkgs/data/misc/geolite-legacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index fd940fd3b4f..6f1dfae0e21 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-07-30"; + version = "2015-08-03"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -27,10 +27,10 @@ stdenv.mkDerivation { "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "16lfazhyhwmh8fyd7pxzwxp5sxszbqw4xdx3avv78hglhyb2ijkw"; + "04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "16jd6f2pwy8616jb78x8j6zda7h0p1bp786y86rq3ipgcw6g0jgn"; + "06p9wnypnffsmqg5bszwygb73in4gc0h5l26wk0s43pdaldrdrx0"; meta = with stdenv.lib; { inherit version; From fcc671668056698b0bb3f43708c1acf27509004d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Aug 2015 17:12:27 +0300 Subject: [PATCH 33/54] openbox: propagate some dependencies --- pkgs/applications/window-managers/openbox/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 2756525b2b0..f1369ebea7d 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libxml2, libXinerama, libXcursor, libXau, libXrandr -, imlib2, pango, libstartup_notification, makeWrapper}: +, imlib2, pango, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { name = "openbox-3.5.2"; @@ -8,8 +8,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 libXinerama libXcursor libXau libXrandr - imlib2 pango libstartup_notification - makeWrapper + libstartup_notification makeWrapper + ]; + + propagatedBuildInputs = [ + pango imlib2 ]; src = fetchurl { From 5bbed3d52d242df55b6c96ee0b46b5303e673cdc Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 3 Aug 2015 14:27:23 +0000 Subject: [PATCH 34/54] dd-agent: if nginx and mongodb integrations are enabled, then disk and network settings are not gathered anymore. This fixes the problem --- .../modules/services/monitoring/dd-agent.nix | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix index 0e0340e2fa3..8c847af3bfc 100644 --- a/nixos/modules/services/monitoring/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent.nix @@ -51,6 +51,24 @@ let # ganglia_port: 8651 ''; + diskConfig = pkgs.writeText "disk.yaml" '' + init_config: + + instances: + - use_mount: no + ''; + + networkConfig = pkgs.writeText "network.yaml" '' + init_config: + + instances: + # Network check only supports one configured instance + - collect_connection_state: false + excluded_interfaces: + - lo + - lo0 + ''; + postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig; nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig; mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig; @@ -58,6 +76,12 @@ let etcfiles = [ { source = ddConf; target = "dd-agent/datadog.conf"; + } + { source = diskConfig; + target = "dd-agent/conf.d/disk.yaml"; + } + { source = networkConfig; + target = "dd-agent/conf.d/network.yaml"; } ] ++ (optional (cfg.postgresqlConfig != null) { source = postgresqlConfig; @@ -143,7 +167,7 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig mongoConfig ]; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ]; }; systemd.services.dogstatsd = { @@ -160,7 +184,7 @@ in { RestartSec = 2; }; environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig mongoConfig ]; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ]; }; environment.etc = etcfiles; From 6f727a8a8375c234aa8feef8bb30009374c68aaf Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 3 Aug 2015 16:59:33 +0200 Subject: [PATCH 35/54] strongswan: add TNC build option --- pkgs/tools/networking/strongswan/default.nix | 20 +++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 7d427ac9622..7a9edef5004 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }: +{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook +, curl, trousers, sqlite +, enableTNC ? false }: stdenv.mkDerivation rec { name = "strongswan-5.3.2"; @@ -10,7 +12,9 @@ stdenv.mkDerivation rec { dontPatchELF = true; - buildInputs = [ gmp pkgconfig python autoreconfHook ]; + buildInputs = + [ gmp pkgconfig python autoreconfHook ] + ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite ]; patches = [ ./ext_auth-path.patch @@ -18,7 +22,17 @@ stdenv.mkDerivation rec { ./updown-path.patch ]; - configureFlags = [ "--enable-swanctl" "--enable-cmd" ]; + configureFlags = + [ "--enable-swanctl" "--enable-cmd" ] + ++ stdenv.lib.optionals enableTNC [ + "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" + "--enable-curl" "--enable-openssl" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-mschapv2" + "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" + "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" + "--enable-tnc-imv" "--enable-imv-attestation" + "--with-tss=trousers" + "--enable-aikgen" + "--enable-sqlite" ]; NIX_LDFLAGS = "-lgcc_s" ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c0a818b38f..de30cfb392c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3066,6 +3066,8 @@ let strongswan = callPackage ../tools/networking/strongswan { }; + strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC=true; }; + su = shadow.su; subsonic = callPackage ../servers/misc/subsonic { }; From 1b0e82659c7bd8828137a9361c4a09c17dba3982 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Aug 2015 17:16:58 +0200 Subject: [PATCH 36/54] perl-packages: DateTime-Format-Natural 1.02 -> 1.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bfb16d3720e..6eaa7e11a11 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2374,10 +2374,10 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatNatural = buildPerlPackage { - name = "DateTime-Format-Natural-1.02"; + name = "DateTime-Format-Natural-1.03"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.02.tar.gz; - sha256 = "5479c48ade5eca9712784afee18c58308d56742a204d5ea9040d011f705303e3"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.03.tar.gz; + sha256 = "1m3bmv90kww8xr4dda75isvzigy8y3clgvk58zp0bxc5d7k4qdxi"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; From 8c244bc21c7e6de8ca6de3a3f82b4fb54e9f4dfd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 12:50:11 -0700 Subject: [PATCH 37/54] dnsmasq: 2.73 -> 2.75 --- pkgs/tools/networking/dnsmasq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 7752338c6bb..0e905bb6547 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,11 +11,11 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.73"; + name = "dnsmasq-2.75"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1xnqfaw2l78f4zw4z9sgr9nl9yc233gxc3sd7hxapz2k7q883zqb"; + sha256 = "1wa1d4if9q6k3hklv8xi06a59k3aqb7pik8rhi2l53i99hflw334"; }; preBuild = '' From 1684ec0bfc8617507f7071596a271ae443682fc5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 12:57:16 -0700 Subject: [PATCH 38/54] kernel: 3.10.84 -> 3.10.85 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 3d2b683ee72..0d3bfbefcca 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.84"; + version = "3.10.85"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "042cybswcxxzi22h96i4h73a4hcb4drhifs6l9jqlqamdn6xabd3"; + sha256 = "1zn8113m6y1wqmnr6gjzrr7ly2l8860fp2kr4q9di3c2vmnmd9v9"; }; features.iwlwifi = true; From 678efd6df09dba16c8dff1b0ba1d1437894b022c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 12:57:20 -0700 Subject: [PATCH 39/54] kernel: 3.12.44 -> 3.12.45 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index e34eccadda6..e6e04b7db53 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.44"; + version = "3.12.45"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "05fyb49ibijq2iv4x25m5a77n8609b4lz8x8n8wfkdywm13479h8"; + sha256 = "01p3zbhngqnkmzw38xmxd0lf97kf2h7ihgss6bgdnkpqrbzb1pqf"; }; features.iwlwifi = true; From 102cfc53bcf924f9fcb8ea47af15e93de01efee1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 12:57:33 -0700 Subject: [PATCH 40/54] kernel: 4.1.3 -> 4.1.4 --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 031b0d549d9..82bde253529 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.3"; + version = "4.1.4"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02z3palvki31qimmycz4y4wl4lb46n662qql46iah224k0q2rpcn"; + sha256 = "17whsim5l9i486y5kchfpm9jhbr9lak4a1gdqygp5kwfrfyz5qiy"; }; features.iwlwifi = true; From ce6b96db6e4b0f1fbdba3f669da376900b5984cc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 13:06:22 -0700 Subject: [PATCH 41/54] kernel-testing: 4.2.0-rc2 -> 4.2.0-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 0c31c558c47..216f74caa34 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.2-rc2"; - modDirVersion = "4.2.0-rc2"; + version = "4.2-rc5"; + modDirVersion = "4.2.0-rc5"; extraMeta.branch = "4.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "068g71ns8d2j66hppmnssilf185p33w7argb0r2w9kplqq2ac99w"; + sha256 = "1ir3g5in53qq50ygnwgkzjkl1pzb12ar8k1zvfzcxapddvnhayr0"; }; features.iwlwifi = true; From a8788c4d6a2630e063557b51e822da43a28eec40 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Aug 2015 20:52:53 +0300 Subject: [PATCH 42/54] bumblebee: remove redundant bash process --- nixos/modules/hardware/video/bumblebee.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index e341eac4a81..e2202e1e17d 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -52,9 +52,9 @@ in systemd.services.bumblebeed = { description = "Bumblebee Hybrid Graphics Switcher"; wantedBy = [ "display-manager.service" ]; - script = "bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}"; path = [ kernel.bbswitch bumblebee ]; serviceConfig = { + ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}"; Restart = "always"; RestartSec = 60; CPUSchedulingPolicy = "idle"; From 52fb36e7e05ffbd8f517f4b9d51c81a7ddb063b9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Aug 2015 20:53:30 +0300 Subject: [PATCH 43/54] maven: move to dedicated directory to prevent clashes with other java applications --- .../tools/build-managers/apache-maven/builder.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh index 03e4a041402..8d06352b135 100644 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -2,16 +2,16 @@ source $stdenv/setup unpackPhase -mkdir -p $out -cp -r $name/* $out +mkdir -p $out/maven +cp -r $name/* $out/maven -wrapProgram $out/bin/mvn --set JAVA_HOME "$jdk" +makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk" # Add the maven-axis and JIRA plugin by default when using maven 1.x -if [ -e $out/bin/maven ] +if [ -e $out/maven/bin/maven ] then export OLD_HOME=$HOME export HOME=. - $out/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7 + $out/maven/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7 export HOME=OLD_HOME fi From 4dde32b4f240cb68ba7455bcf98c25749fd0235e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Aug 2015 20:53:37 +0300 Subject: [PATCH 44/54] gradle: move to dedicated directory to prevent clashes with other java applications --- pkgs/development/tools/build-managers/gradle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 3bff9d59e7f..fd99437630c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -pv $out - cp -rv lib $out + mkdir -pv $out/gradle + cp -rv lib $out/gradle - gradle_launcher_jar=$(echo $out/lib/gradle-launcher-*.jar) + gradle_launcher_jar=$(echo $out/gradle/lib/gradle-launcher-*.jar) test -f $gradle_launcher_jar makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ From 4802a277a4874cf1c4971005634abb48a8d16b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 3 Aug 2015 22:27:42 +0200 Subject: [PATCH 45/54] nixos: gitit service, change yesNo to bool and add toYesNo from bool --- nixos/modules/services/misc/gitit.nix | 72 +++++++++++++-------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 72b706ddc5a..28c7396672d 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -8,6 +8,8 @@ let homeDir = "/var/lib/gitit"; + toYesNo = b: if b then "yes" else "no"; + gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version; gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self)); @@ -18,7 +20,7 @@ let #!${stdenv.shell} cd $HOME export PATH="${makeSearchPath "bin" ( - [ git curl ] ++ (if cfg.pdfExport == "yes" then [texLiveFull] else []) + [ git curl ] ++ (if cfg.pdfExport then [texLiveFull] else []) )}:$PATH"; export NIX_GHC="${env}/bin/ghc" export NIX_GHCPKG="${env}/bin/ghc-pkg" @@ -27,11 +29,7 @@ let ${env}/bin/gitit -f ${configFile} ''; - gititOptions = let - - yesNo = types.enum [ "yes" "no" ]; - - in { + gititOptions = { enable = mkOption { type = types.bool; @@ -202,8 +200,8 @@ let }; showLhsBirdTracks = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' Specifies whether to show Haskell code blocks in "bird style", with "> " at the beginning of each line. @@ -283,8 +281,8 @@ let }; tableOfContents = mkOption { - type = yesNo; - default = "yes"; + type = types.bool; + default = true; description = '' Specifies whether to print a tables of contents (with links to sections) on each wiki page. @@ -306,8 +304,8 @@ let }; useCache = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' Specifies whether to cache rendered pages. Note that if use-feed is selected, feeds will be cached regardless of the value of use-cache. @@ -338,14 +336,14 @@ let }; debugMode = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = "Causes debug information to be logged while gitit is running."; }; compressResponses = mkOption { - type = yesNo; - default = "yes"; + type = types.bool; + default = true; description = "Specifies whether HTTP responses should be compressed."; }; @@ -363,10 +361,10 @@ let }; useReCaptcha = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' - If "yes", causes gitit to use the reCAPTCHA service + If true, causes gitit to use the reCAPTCHA service (http://recaptcha.net) to prevent bots from creating accounts. ''; }; @@ -471,8 +469,8 @@ let }; useFeed = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' Specifies whether an ATOM feed should be enabled (for the site and for individual pages). @@ -490,8 +488,8 @@ let }; absoluteUrls = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' Make wikilinks absolute with respect to the base-url. So, for example, in a wiki served at the base URL '/wiki', on a page @@ -514,8 +512,8 @@ let }; pdfExport = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' If yes, PDF will appear in export options. PDF will be created using pdflatex, which must be installed and in the path. Note that PDF @@ -537,8 +535,8 @@ let }; xssSanitize = mkOption { - type = yesNo; - default = "yes"; + type = types.bool; + default = true; description = '' If yes, all HTML (including that produced by pandoc) is filtered through xss-sanitize. Set to no only if you trust all of your users. @@ -560,7 +558,7 @@ let default-page-type: ${cfg.defaultPageType} math: ${cfg.math} mathjax-script: ${cfg.mathJaxScript} - show-lhs-bird-tracks: ${cfg.showLhsBirdTracks} + show-lhs-bird-tracks: ${toYesNo cfg.showLhsBirdTracks} templates-dir: ${cfg.templatesDir} log-file: ${cfg.logFile} log-level: ${cfg.logLevel} @@ -568,16 +566,16 @@ let no-delete: ${cfg.noDelete} no-edit: ${cfg.noEdit} default-summary: ${cfg.defaultSummary} - table-of-contents: ${cfg.tableOfContents} + table-of-contents: ${toYesNo cfg.tableOfContents} plugins: ${cfg.plugins} - use-cache: ${cfg.useCache} + use-cache: ${toYesNo cfg.useCache} cache-dir: ${cfg.cacheDir} max-upload-size: ${cfg.maxUploadSize} max-page-size: ${cfg.maxPageSize} - debug-mode: ${cfg.debugMode} - compress-responses: ${cfg.compressResponses} + debug-mode: ${toYesNo cfg.debugMode} + compress-responses: ${toYesNo cfg.compressResponses} mime-types-file: ${cfg.mimeTypesFile} - use-recaptcha: ${cfg.useReCaptcha} + use-recaptcha: ${toYesNo cfg.useReCaptcha} recaptcha-private-key: ${toString cfg.reCaptchaPrivateKey} recaptcha-public-key: ${toString cfg.reCaptchaPublicKey} access-question: ${cfg.accessQuestion} @@ -586,14 +584,14 @@ let rpx-key: ${toString cfg.rpxKey} mail-command: ${cfg.mailCommand} reset-password-message: ${cfg.resetPasswordMessage} - use-feed: ${cfg.useFeed} + use-feed: ${toYesNo cfg.useFeed} base-url: ${toString cfg.baseUrl} - absolute-urls: ${cfg.absoluteUrls} + absolute-urls: ${toYesNo cfg.absoluteUrls} feed-days: ${toString cfg.feedDays} feed-refresh-time: ${toString cfg.feedRefreshTime} - pdf-export: ${cfg.pdfExport} + pdf-export: ${toYesNo cfg.pdfExport} pandoc-user-data: ${toString cfg.pandocUserData} - xss-sanitize: ${cfg.xssSanitize} + xss-sanitize: ${toYesNo cfg.xssSanitize} ''; in From 6d23f43b30e9bf0abc3d0d33cede022e8edc9ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 3 Aug 2015 22:27:43 +0200 Subject: [PATCH 46/54] nixos: gitit service, use proper documentation formatting in examples --- nixos/modules/services/misc/gitit.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 28c7396672d..83186f63c2c 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -292,14 +292,10 @@ let plugins = mkOption { type = types.path; description = '' - Specifies a list of plugins to load. Plugins may be specified either - by their path or by their module name. If the plugin name starts + Specifies a list of plugins to load. Plugins may be specified either + by their path or by their module name. If the plugin name starts with Gitit.Plugin., gitit will assume that the plugin is an installed module and will not try to find a source file. - Examples: - plugins: plugins/DotPlugin.hs, CapitalizeEmphasisPlugin.hs - plugins: plugins/DotPlugin - plugins: Gitit.Plugin.InterwikiLinks ''; }; @@ -355,7 +351,9 @@ let line of the file should contain two fields, separated by whitespace. The first field is the mime type, the second is a file extension. For example: - video/x-ms-wmx wmx + +video/x-ms-wmx wmx + If the file is not found, some simple defaults will be used. ''; }; @@ -482,7 +480,7 @@ let default = null; description = '' The base URL of the wiki, to be used in constructing feed IDs and RPX - token_urls. Set this if use-feed is 'yes' or authentication-method + token_urls. Set this if useFeed is false or authentication-method is 'rpx'. ''; }; @@ -494,7 +492,7 @@ let Make wikilinks absolute with respect to the base-url. So, for example, in a wiki served at the base URL '/wiki', on a page Sub/Page, the wikilink '[Cactus]()' will produce a link to - '/wiki/Cactus' if absolute-urls is 'yes', and a relative link to + '/wiki/Cactus' if absoluteUrls is true, and a relative link to 'Cactus' (referring to '/wiki/Sub/Cactus') if absolute-urls is 'no'. ''; }; @@ -515,7 +513,7 @@ let type = types.bool; default = false; description = '' - If yes, PDF will appear in export options. PDF will be created using + If true, PDF will appear in export options. PDF will be created using pdflatex, which must be installed and in the path. Note that PDF exports create significant additional server load. ''; @@ -538,7 +536,7 @@ let type = types.bool; default = true; description = '' - If yes, all HTML (including that produced by pandoc) is filtered + If true, all HTML (including that produced by pandoc) is filtered through xss-sanitize. Set to no only if you trust all of your users. ''; }; From 1e2d3f3b5f7c67d3462355fa81d408bbdad63cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 3 Aug 2015 22:27:43 +0200 Subject: [PATCH 47/54] nixos: gitit service, use list of strings for plugins --- nixos/modules/services/misc/gitit.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 83186f63c2c..b23bbaef5f7 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -290,7 +290,7 @@ let }; plugins = mkOption { - type = types.path; + type = with types; listOf str; description = '' Specifies a list of plugins to load. Plugins may be specified either by their path or by their module name. If the plugin name starts @@ -565,7 +565,7 @@ video/x-ms-wmx wmx no-edit: ${cfg.noEdit} default-summary: ${cfg.defaultSummary} table-of-contents: ${toYesNo cfg.tableOfContents} - plugins: ${cfg.plugins} + plugins: ${concatStringsSep "," cfg.plugins} use-cache: ${toYesNo cfg.useCache} cache-dir: ${cfg.cacheDir} max-upload-size: ${cfg.maxUploadSize} @@ -604,7 +604,7 @@ in haskellPackages = mkDefault pkgs.haskellPackages; staticDir = gititShared + "/data/static"; templatesDir = gititShared + "/data/templates"; - plugins = gititShared + "/plugins/Dot.hs"; + plugins = [ ]; }; users.extraUsers.gitit = { From 727e2b5237824e28d89056fd8b66ad0f7c5aa694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 3 Aug 2015 22:27:43 +0200 Subject: [PATCH 48/54] nixos: gitit service, add all different repo initalizers --- nixos/modules/services/misc/gitit.nix | 50 ++++++++++++++++++++------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index b23bbaef5f7..10a706fbd71 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -19,9 +19,6 @@ let in writeScript "gitit" '' #!${stdenv.shell} cd $HOME - export PATH="${makeSearchPath "bin" ( - [ git curl ] ++ (if cfg.pdfExport then [texLiveFull] else []) - )}:$PATH"; export NIX_GHC="${env}/bin/ghc" export NIX_GHCPKG="${env}/bin/ghc-pkg" export NIX_GHC_DOCDIR="${env}/share/doc/ghc/html" @@ -624,8 +621,16 @@ in description = "Git and Pandoc Powered Wiki"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ curl ] + ++ optional cfg.pdfExport texLiveFull + ++ optional (cfg.repositoryType == "darcs") darcs + ++ optional (cfg.repositoryType == "mercurial") mercurial + ++ optional (cfg.repositoryType == "git") git; - preStart = with cfg; '' + preStart = let + gm = "gitit@${config.networking.hostName}"; + in + with cfg; '' chown ${uid}:${gid} -R ${homeDir} for dir in ${repositoryPath} ${staticDir} ${templatesDir} ${cacheDir} do @@ -637,14 +642,35 @@ in fi done cd ${repositoryPath} - if [ ! -d .git ] - then - ${pkgs.git}/bin/git init - ${pkgs.git}/bin/git config user.email "gitit@${config.networking.hostName}" - ${pkgs.git}/bin/git config user.name "gitit" - chown ${uid}:${gid} -R {repositoryPath} - fi - cd - + ${ + if repositoryType == "darcs" then + '' + if [ ! -d _darcs ] + then + ${pkgs.darcs}/bin/darcs initialize + echo "${gm}" > _darcs/prefs/email + '' + else if repositoryType == "mercurial" then + '' + if [ ! -d .hg ] + then + ${pkgs.mercurial}/bin/hg init + cat >> .hg/hgrc < Date: Mon, 3 Aug 2015 13:32:11 -0700 Subject: [PATCH 49/54] gssdp: 0.14.6 -> 0.14.11 --- pkgs/development/libraries/gssdp/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 792b6d2e4db..1a8cb233b77 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, pkgconfig, libsoup, glib, libxml2}: +{ stdenv, fetchurl, pkgconfig, libsoup, glib }: stdenv.mkDerivation { - name = "gssdp-0.12.2.1"; + name = "gssdp-0.14.11"; src = fetchurl { - url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz; - sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws"; + url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.11.tar.xz; + sha256 = "0njkqr2y7c6linnw4wkc4y2vq5dfkpryqcinbzn0pzhr46psxxbv"; }; - buildInputs = [pkgconfig libsoup glib libxml2]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsoup ]; + propagatedBuildInputs = [ glib ]; meta = { description = "GObject-based API for handling resource discovery and announcement over SSDP"; From 68ba5ae1ef4cc6a9b724338528b6d8486f492f4c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 13:49:57 -0700 Subject: [PATCH 50/54] gupnp-igd: 0.2.1 -> 0.2.4 --- .../development/libraries/gupnp-igd/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 20a5f2d9c94..182905e9546 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp, python, pygobject }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp }: stdenv.mkDerivation rec { - name = "gupnp-igd-0.2.1"; + name = "gupnp-igd-${version}"; + majorVersion = "0.2"; + version = "${majorVersion}.4"; src = fetchurl { - url = https://launchpad.net/ubuntu/+archive/primary/+files/gupnp-igd_0.2.1.orig.tar.gz; - sha256 = "18ia8l24hbylz3dnbg2jf848bmbx0hjkq4fkwzzfn57z021f0fh2"; + url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz"; + sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44"; }; - propagatedBuildInputs = [ gupnp ]; - - buildInputs = [ glib python pygobject ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib gupnp ]; meta = { homepage = http://www.gupnp.org/; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; }; } From 0392e9c8c6417e4a3cdf0db38b8ba6154203073f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 13:54:38 -0700 Subject: [PATCH 51/54] gupnp-av: 0.12.4 -> 0.12.7 --- pkgs/development/libraries/gupnp-av/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 2dcd5b11c38..789fdcd9c2a 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, gupnp, pkgconfig }: +{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }: stdenv.mkDerivation rec { name = "gupnp-av-${version}"; majorVersion = "0.12"; - version = "${majorVersion}.4"; + version = "${majorVersion}.7"; + src = fetchurl { - url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz"; - sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl"; + url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz"; + sha256 = "35e775bc4f7801d65dcb710905a6b8420ce751a239b5651e6d830615dc906ea8"; }; - buildInputs = [ gupnp pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gupnp glib libxml2 ]; meta = { homepage = http://gupnp.org/; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; - longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework."; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} From 43bd15b9b51450fbd47c3b55596bffdf101a7e57 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 13:49:39 -0700 Subject: [PATCH 52/54] gupnp: 0.20.9 -> 0.20.14 --- pkgs/development/libraries/gupnp/default.nix | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index e278980e1e1..6145c8c4947 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }: +{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }: stdenv.mkDerivation rec { name = "gupnp-${version}"; majorVersion = "0.20"; - version = "${majorVersion}.9"; + version = "${majorVersion}.14"; + src = fetchurl { url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz"; - sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1"; + sha256 = "77ffb940ba77c4a6426d09d41004c75d92652dcbde86c84ac1c847dbd9ad59bd"; }; - propagatedBuildInputs = [ libxml2 libsoup gssdp ]; - buildInputs = [ glib libuuid ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ]; - postInstall = '' - cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include - cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include - cp -r ${libxml2}/include/libxml2/libxml $out/include - ''; + postInstall = '' + ln -sv ${libsoup}/include/*/libsoup $out/include + ln -sv ${libxml2}/include/*/libxml $out/include + ln -sv ${gssdp}/include/*/libgssdp $out/include + ''; meta = { homepage = http://www.gupnp.org/; From 1f103d8efcdf1bce862225e36dac4ebb8b969696 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 14:05:37 -0700 Subject: [PATCH 53/54] libnice: 0.1.4 -> 0.1.13 --- pkgs/development/libraries/libnice/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 4ccb7d4df8b..003b2acc920 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gst_plugins_base }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1 }: stdenv.mkDerivation rec { - name = "libnice-0.1.4"; + name = "libnice-0.1.13"; src = fetchurl { url = "http://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0mxzr3y91hkjxdz1mzhxwi59la86hw2rzmd3y9c32801kkg1gra4"; + sha256 = "1q8rhklbz1zla67r4mw0f7v3m5b32maj0prnr0kshcz97fgjs4b1"; }; - buildInputs = [ pkgconfig glib gupnp_igd gstreamer gst_plugins_base ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + propagatedBuildInputs = [ glib gupnp_igd ]; meta = { homepage = http://nice.freedesktop.org/wiki/; From f2d3b5ead934a3334f67405cddc705273e736ef1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Aug 2015 14:12:14 -0700 Subject: [PATCH 54/54] grub2: 2015-07-05 -> 2015-07-27 --- pkgs/tools/misc/grub/2.0x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index f8f0f088079..2880666e8db 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -20,7 +20,7 @@ let canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.x-2015-07-05"; + version = "2.x-2015-07-27"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromSavannah { repo = "grub"; - rev = "0d7c7f751dc5a8338497bef8b38f78153c4f0464"; - sha256 = "1vkd7na3kp9ri4xsd3zznvnrjzz1qsz62fycg941pm2k18r3m7xd"; + rev = "72fc110d95129410443b898e931ff7a1db75312e"; + sha256 = "0l2hws8h1jhww5s0m8pkwdggacpqb7fvz2jx83syg7ynczpgzbxs"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ];